pimlico: remove Poky overrides
PATCH 1/1 pimlico: remove Poky overrides
--- meta-gnome/recipes-gnome/pimlico/contacts.inc | 4 +--- meta-gnome/recipes-gnome/pimlico/dates.inc | 4 +--- meta-gnome/recipes-gnome/pimlico/tasks.inc | 2 -- 3 files changed, 2 insertions(+), 8 deletions(-)
meta-gnome/recipes-gnome/pimlico/contacts.inc +1 -3
@@ -5,13 +5,11 @@ BUGTRACKER = "https://bugzilla.gnome.org/" LICENSE = "GPLv2 & GPLv2+ & GPLv3+ " SECTION = "x11" DEPENDS = "glib-2.0 gtk+ evolution-data-server" -DEPENDS_append_poky = " libowl" RDEPENDS_${PN} = "libedata-book" inherit autotools pkgconfig OWL = "--disable-owl" -OWL_poky = "--enable-owl" EXTRA_OECONF += "--disable-gnome-vfs ${OWL}" EXTRA_OEMAKE += "GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1"
@@ -31,4 +29,4 @@ SRC_URI = "file://stock_contact.png \ file://contacts-conditionally-install-schema.patch \ " -SRC_URI_append_poky = " file://contacts-owl-window-menu.patch;apply=yes " +#SRC_URI_append_poky = " file://contacts-owl-window-menu.patch;apply=yes "
meta-gnome/recipes-gnome/pimlico/dates.inc +1 -3
@@ -12,9 +12,7 @@ inherit autotools gettext pkgconfig gtk-icon-cache # Poky/Sato specific enhancements OWL = "--disable-owl" -OWL_poky = "--enable-owl --disable-dnd" EXTRA_OECONF += "${OWL}" -DEPENDS_append_poky = " libowl" -SRC_URI_append_poky = " file://dates-owl-window-menu.patch;apply=yes " +#SRC_URI_append_poky = " file://dates-owl-window-menu.patch;apply=yes "
meta-gnome/recipes-gnome/pimlico/tasks.inc +0 -2
@@ -6,11 +6,9 @@ LICENSE = "GPLv2 & GPLv2+" SECTION = "x11" DEPENDS = "glib-2.0 gtk+ evolution-data-server" -DEPENDS_append_poky = " libowl" inherit autotools pkgconfig gtk-icon-cache OWL ?= "--disable-owl" -OWL_poky ?= "--enable-owl" EXTRA_OECONF += "${OWL}"
Signature · 1 line
1.7.10
A bit explanation as to why it's done will be nice. Why comment out instead delete
Is this window menu patch needed somewhere else If not it must go as well
Quoted 69 lines · Ross Burton
---
meta-gnome/recipes-gnome/pimlico/contacts.inc | 4 +--- meta-gnome/recipes-gnome/pimlico/dates.inc | 4 +--- meta-gnome/recipes-gnome/pimlico/tasks.inc | 2 -- 3 files changed, 2 insertions(+), 8 deletions(-)meta-gnome/recipes-gnome/pimlico/contacts.inc +0
-0@@ -5,13 +5,11 @@ BUGTRACKER = "https://bugzilla.gnome.org/"LICENSE = "GPLv2 & GPLv2+ & GPLv3+ "
SECTION = "x11"
DEPENDS = "glib-2.0 gtk+ evolution-data-server"
-DEPENDS_append_poky = " libowl"
RDEPENDS_${PN} = "libedata-book"inherit autotools pkgconfig
OWL = "--disable-owl"
-OWL_poky = "--enable-owl"
EXTRA_OECONF+= "--disable-gnome-vfs ${OWL}"EXTRA_OEMAKE+= "GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1"meta-gnome/recipes-gnome/pimlico/contacts.inc +1
-1@@ -31,4 +29,4 @@ SRC_URI = "file://stock_contact.png \ file://contacts-conditionally-install-schema.patch \ " -SRC_URI_append_poky = " file://contacts-owl-window-menu.patch;apply=yes " +#SRC_URI_append_poky = " file://contacts-owl-window-menu.patch;apply=yes "meta-gnome/recipes-gnome/pimlico/dates.inc +0
-0@@ -12,9 +12,7 @@ inherit autotools gettext pkgconfig gtk-icon-cache # Poky/Sato specific enhancementsOWL = "--disable-owl"
-OWL_poky = "--enable-owl --disable-dnd"
EXTRA_OECONF+= "${OWL}"meta-gnome/recipes-gnome/pimlico/dates.inc +1
-2-DEPENDS_append_poky = " libowl" -SRC_URI_append_poky = " file://dates-owl-window-menu.patch;apply=yes " +#SRC_URI_append_poky = " file://dates-owl-window-menu.patch;apply=yes "meta-gnome/recipes-gnome/pimlico/tasks.inc +0
-0@@ -6,11 +6,9 @@ LICENSE = "GPLv2 & GPLv2+"SECTION = "x11"
DEPENDS = "glib-2.0 gtk+ evolution-data-server"
-DEPENDS_append_poky = " libowl"inherit autotools pkgconfig gtk-icon-cache
OWL ?= "--disable-owl"
-OWL_poky ?= "--enable-owl"
EXTRA_OECONF+= "${OWL}"Signature · 7 lines
1.7.10 _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Quoted 4 lines · Khem Raj
A bit explanation as to why it's done will be nice. Why comment out instead delete
Is this window menu patch needed somewhere else If not it must go as well
Thinking about it, I'd like to retract this patch and leave the Poky distro overrides in that file. If someone wants dates/contacts/tasks on Poky then they'll get the extra integration, and it serves as an example/reminder of the functionality it brings (makes the menu bar a dropdown from the window title).
Ross
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Op 29-08-12 17:31, Burton, Ross schreef:
Quoted 10 lines · Khem Raj
Quoted 3 lines
A bit explanation as to why it's done will be nice. Why comment out instead delete Is this window menu patch needed somewhere else If not it must go as well
Thinking about it, I'd like to retract this patch and leave the Poky distro overrides in that file. If someone wants dates/contacts/tasks on Poky then they'll get the extra integration, and it serves as an example/reminder of the functionality it brings (makes the menu bar a dropdown from the window title).
Either take the distro stuff out or take the recipes out. Meta-openembedded is supposed to be a shining example of layer correctness.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
Comment: GPGTools - http://gpgtools.org
iD8DBQFQPkjwMkyGM64RGpERAsu9AJ92ZNXlSRYyHdWkXRbOdr/STaFdawCgo6+T 7n5Du6jUwDYmd0JvJs9o+7s=
=losa
-----END PGP SIGNATURE-----
Quoted 2 lines · Koen Kooi
Either take the distro stuff out or take the recipes out. Meta-openembedded is supposed to be a shining example of layer correctness.
I don't particularly want to maintain bbappends in meta-yocto for these as I'd prefer to see the recipes (well, contacts and dates, I still "maintain" tasks) gone.
Ross
Quoted 8 lines · Ross
Quoted 3 lines · Koen Kooi
Either take the distro stuff out or take the recipes out. Meta-openembedded
is supposed to be a shining example of layer correctness.I don't particularly want to maintain bbappends in meta-yocto for these as I'd prefer to see the recipes (well, contacts and dates, I still "maintain" tasks) gone.
The ideal option would be to turn these into PACKAGECONFIG options and then they can be set from anyone's distro config as desired (using pn- overrides) - no bbappends needed.
Cheers,
Paul
Signature · 2 lines
Paul Eggleton Intel Open Source Technology Centre
Quoted 6 lines · Ross
Thinking about it, I'd like to retract this patch and leave the Poky distro overrides in that file. If someone wants dates/contacts/tasks on Poky then they'll get the extra integration, and it serves as an example/reminder of the functionality it brings (makes the menu bar a dropdown from the window title).
Patch is fine.
it should go into meta-yocto which is integration layer for poky distro so you patch to delete is fine. may be convert it to some sort of PACKAGECONFIG which distros can use.
Quoted 4 lines · Khem Raj
Patch is fine.
it should go into meta-yocto which is integration layer for poky distro so you patch to delete is fine. may be convert it to some sort of PACKAGECONFIG which distros can use.
I don't want them in Poky. :) I started by simply deleting them, but Martin insisted that he still has users. They are not using Poky, I presume.
Ross
Quoted 9 lines · Ross
Quoted 4 lines · Khem Raj
Patch is fine.
it should go into meta-yocto which is integration layer for poky distro so you patch to delete is fine. may be convert it to some sort of PACKAGECONFIG which distros can use.I don't want them in Poky. :) I started by simply deleting them, but Martin insisted that he still has users. They are not using Poky, I presume.
No, they are not using Poky, so I'm fine with removing all poky overrides and poky-only patches from meta-oe.
Cheers,
Signature · 1 line
Martin 'JaMa' Jansa jabber: [email protected]
PATCH 1/1 pimlico: remove Poky overrides
There was a poky distro override to enable the "owl" window menu functionality. As these packages are in meta-oe now and only Sato/poky supported owl, remove the override and patches.
--- meta-gnome/recipes-gnome/pimlico/contacts.inc | 8 +-- .../contacts/contacts-owl-window-menu.patch | 54 ---------------- meta-gnome/recipes-gnome/pimlico/contacts_0.9.bb | 2 +- meta-gnome/recipes-gnome/pimlico/dates.inc | 9 --- .../pimlico/dates/dates-owl-window-menu.patch | 67 -------------------- meta-gnome/recipes-gnome/pimlico/dates_git.bb | 2 +- meta-gnome/recipes-gnome/pimlico/tasks.inc | 6 -- .../recipes-gnome/pimlico/tasks/tasks-owl.diff | 67 -------------------- meta-gnome/recipes-gnome/pimlico/tasks_0.19.bb | 4 +- 9 files changed, 4 insertions(+), 215 deletions(-) delete mode 100644 meta-gnome/recipes-gnome/pimlico/contacts/contacts-owl-window-menu.patch delete mode 100644 meta-gnome/recipes-gnome/pimlico/dates/dates-owl-window-menu.patch delete mode 100644 meta-gnome/recipes-gnome/pimlico/tasks/tasks-owl.diff
meta-gnome/recipes-gnome/pimlico/contacts.inc +1 -7
@@ -5,15 +5,11 @@ BUGTRACKER = "https://bugzilla.gnome.org/" LICENSE = "GPLv2 & GPLv2+ & GPLv3+ " SECTION = "x11" DEPENDS = "glib-2.0 gtk+ evolution-data-server" -DEPENDS_append_poky = " libowl" RDEPENDS_${PN} = "libedata-book" inherit autotools pkgconfig -OWL = "--disable-owl" -OWL_poky = "--enable-owl" - -EXTRA_OECONF += "--disable-gnome-vfs ${OWL}" +EXTRA_OECONF += "--disable-gnome-vfs" EXTRA_OEMAKE += "GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1" do_install_append () {
@@ -30,5 +26,3 @@ SRC_URI = "file://stock_contact.png \ file://stock_person.png \ file://contacts-conditionally-install-schema.patch \ " - -SRC_URI_append_poky = " file://contacts-owl-window-menu.patch;apply=yes "
meta-gnome/recipes-gnome/pimlico/contacts/contacts-owl-window-menu.patch deleted +0 -54
54 lines not on this page · raw message
meta-gnome/recipes-gnome/pimlico/contacts_0.9.bb +1 -1
@@ -1,6 +1,6 @@ require contacts.inc -PR = "r7" +PR = "r8" SRC_URI =+ "http://pimlico-project.org/sources/${BPN}/${BPN}-${PV}.tar.gz"
meta-gnome/recipes-gnome/pimlico/dates.inc +0 -9
@@ -9,12 +9,3 @@ DEPENDS = "glib-2.0 gtk+ libglade evolution-data-server" RDEPENDS_${PN} = "libedata-cal" inherit autotools gettext pkgconfig gtk-icon-cache - -# Poky/Sato specific enhancements -OWL = "--disable-owl" -OWL_poky = "--enable-owl --disable-dnd" - -EXTRA_OECONF += "${OWL}" -DEPENDS_append_poky = " libowl" -SRC_URI_append_poky = " file://dates-owl-window-menu.patch;apply=yes " -
meta-gnome/recipes-gnome/pimlico/dates/dates-owl-window-menu.patch deleted +0 -67
67 lines not on this page · raw message
meta-gnome/recipes-gnome/pimlico/dates_git.bb +1 -1
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ SRCREV = "514185dc1f6588085fda41eb59898b93d0487dd4" PV = "0.4.11+git${SRCPV}" -PR = "r8" +PR = "r9" S = "${WORKDIR}/git"
meta-gnome/recipes-gnome/pimlico/tasks.inc +0 -6
@@ -6,11 +6,5 @@ LICENSE = "GPLv2 & GPLv2+" SECTION = "x11" DEPENDS = "glib-2.0 gtk+ evolution-data-server" -DEPENDS_append_poky = " libowl" inherit autotools pkgconfig gtk-icon-cache - -OWL ?= "--disable-owl" -OWL_poky ?= "--enable-owl" - -EXTRA_OECONF += "${OWL}"
meta-gnome/recipes-gnome/pimlico/tasks/tasks-owl.diff deleted +0 -67
67 lines not on this page · raw message
meta-gnome/recipes-gnome/pimlico/tasks_0.19.bb +1 -3
@@ -10,6 +10,4 @@ SRC_URI = "http://pimlico-project.org/sources/${BPN}/${BPN}-${PV}.tar.gz" SRC_URI[md5sum] = "0afd969758561599fd782e1effb39c08" SRC_URI[sha256sum] = "1a7fdc5f95a2193a1a25fdb13f071867fb7e42245ce19ccee4bcccb69e557f2e" -OWL_poky = "--with-owl" - -PR = "r2" +PR = "r3"
Signature · 1 line
1.7.10
Bump.
Ross
Quoted 326 lines · Ross Burton
There was a poky distro override to enable the "owl" window menu functionality. As these packages are in meta-oe now and only Sato/poky supported owl, remove the override and patches.
Signed-off-by Ross Burton <[email protected]>--- meta-gnome/recipes-gnome/pimlico/contacts.inc | 8 +-- .../contacts/contacts-owl-window-menu.patch | 54 ---------------- meta-gnome/recipes-gnome/pimlico/contacts_0.9.bb | 2 +- meta-gnome/recipes-gnome/pimlico/dates.inc | 9 --- .../pimlico/dates/dates-owl-window-menu.patch | 67 -------------------- meta-gnome/recipes-gnome/pimlico/dates_git.bb | 2 +- meta-gnome/recipes-gnome/pimlico/tasks.inc | 6 -- .../recipes-gnome/pimlico/tasks/tasks-owl.diff | 67 -------------------- meta-gnome/recipes-gnome/pimlico/tasks_0.19.bb | 4 +- 9 files changed, 4 insertions(+), 215 deletions(-) delete mode 100644 meta-gnome/recipes-gnome/pimlico/contacts/contacts-owl-window-menu.patch delete mode 100644 meta-gnome/recipes-gnome/pimlico/dates/dates-owl-window-menu.patch delete mode 100644 meta-gnome/recipes-gnome/pimlico/tasks/tasks-owl.diffmeta-gnome/recipes-gnome/pimlico/contacts.inc +1
-7@@ -5,15 +5,11 @@ BUGTRACKER = "https://bugzilla.gnome.org/" LICENSE = "GPLv2 & GPLv2+ & GPLv3+ " SECTION = "x11" DEPENDS = "glib-2.0 gtk+ evolution-data-server" -DEPENDS_append_poky = " libowl" RDEPENDS_${PN} = "libedata-book" inherit autotools pkgconfig -OWL = "--disable-owl" -OWL_poky = "--enable-owl" - -EXTRA_OECONF += "--disable-gnome-vfs ${OWL}" +EXTRA_OECONF += "--disable-gnome-vfs" EXTRA_OEMAKE += "GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1" do_install_append () {@@ -30,5 +26,3 @@ SRC_URI = "file://stock_contact.png \ file://stock_person.png \ file://contacts-conditionally-install-schema.patch \ " - -SRC_URI_append_poky = " file://contacts-owl-window-menu.patch;apply=yes "meta-gnome/recipes-gnome/pimlico/contacts/contacts-owl-window-menu.patch deleted +0
-54@@ -1,54 +0,0 @@ -Upstream-Status: Inappropriate [enable feature] - -Index: contacts-0.9/src/contacts-gtk.c -=================================================================== ---- contacts-0.9.orig/src/contacts-gtk.c 2008-06-06 12:56:08.000000000 +0100 -+++ contacts-0.9/src/contacts-gtk.c 2008-06-16 08:14:28.000000000 +0100 -@@ -220,8 +220,8 @@ - vbox7 = gtk_vbox_new (FALSE, 0); - gtk_container_add (GTK_CONTAINER (main_window), vbox7); - -- main_menubar = gtk_menu_bar_new (); -- gtk_box_pack_start (GTK_BOX (vbox7), main_menubar, FALSE, FALSE, 0); -+ main_menubar = gtk_menu_new (); -+ gtk_widget_show (main_menubar); - - contacts_menu = gtk_menu_item_new_with_mnemonic (_("C_ontacts")); - gtk_container_add (GTK_CONTAINER (main_menubar), contacts_menu); -Index: contacts-0.9/src/Makefile.am -=================================================================== ---- contacts-0.9.orig/src/Makefile.am 2008-06-03 09:16:56.000000000 +0100 -+++ contacts-0.9/src/Makefile.am 2008-06-16 08:15:34.000000000 +0100 -@@ -40,7 +40,7 @@ - contacts-@[email protected] \ - contacts-@[email protected] - --contacts_LDADD = $(CONTACTS_LIBS) $(DBUS_LIBS) -+contacts_LDADD = $(CONTACTS_LIBS) $(DBUS_LIBS) -lowl - - contacts_LDFLAGS = @CONTACTS_LIBS@ @DBUS_LIBS@ - -Index: contacts-0.9/src/contacts-main.c -=================================================================== ---- contacts-0.9.orig/src/contacts-main.c 2008-06-06 10:26:52.000000000 +0100 -+++ contacts-0.9/src/contacts-main.c 2008-06-16 08:14:28.000000000 +0100 -@@ -27,6 +27,8 @@ - #include <libgnomevfs/gnome-vfs.h> - #endif - -+#include <libowl/owlwindowmenu.h> -+ - #include "bacon-message-connection.h" - #include "contacts-defs.h" - #include "contacts-utils.h" -@@ -266,6 +268,10 @@ - gtk_widget_show_all (widget); - } - -+ gtk_widget_show_all (data->ui->main_menubar); -+ owl_set_window_menu (GTK_WINDOW (data->ui->main_window), -+ GTK_MENU (data->ui->main_menubar)); -+ - gtk_main (); - - /* if we have modified the current contact, but not saved it, do so now */meta-gnome/recipes-gnome/pimlico/contacts_0.9.bb +1
-1@@ -1,6 +1,6 @@ require contacts.inc -PR = "r7" +PR = "r8" SRC_URI =+ "http://pimlico-project.org/sources/${BPN}/${BPN}-${PV}.tar.gz"meta-gnome/recipes-gnome/pimlico/dates.inc +0
-9@@ -9,12 +9,3 @@ DEPENDS = "glib-2.0 gtk+ libglade evolution-data-server" RDEPENDS_${PN} = "libedata-cal" inherit autotools gettext pkgconfig gtk-icon-cache - -# Poky/Sato specific enhancements -OWL = "--disable-owl" -OWL_poky = "--enable-owl --disable-dnd" - -EXTRA_OECONF += "${OWL}" -DEPENDS_append_poky = " libowl" -SRC_URI_append_poky = " file://dates-owl-window-menu.patch;apply=yes " -meta-gnome/recipes-gnome/pimlico/dates/dates-owl-window-menu.patch deleted +0
-67@@ -1,67 +0,0 @@ ---- - src/dates_gtk.c | 5 ----- - src/dates_main.c | 5 +++++ - src/dates_platform.h | 2 +- - 3 files changed, 7 insertions(+), 7 deletions(-) - -Upstream-Status: Inappropriate [enable feature] - -Index: git/src/dates_gtk.c -=================================================================== ---- git.orig/src/dates_gtk.c 2009-08-18 12:44:56.000000000 +0100 -+++ git/src/dates_gtk.c 2009-09-03 22:28:50.000000000 +0100 -@@ -33,10 +33,6 @@ - #endif - - #ifndef DATES_PLATFORM_create_main_window --/* the default implementation assumes that menu is GtkMenuBar */ --#ifdef DATES_MENU_WITHOUT_BAR --#error Cannot use default create_main_window () if DATES_MENU_WITHOUT_BAR is defined !!! --#endif - static GtkWidget * - create_main_window (DatesData * d, GtkWidget * toolbar, - GtkWidget * menu, GtkAccelGroup * accel_group) -@@ -59,7 +55,6 @@ - gtk_container_add (GTK_CONTAINER (d->main_window), main_vbox); - - gtk_widget_show (menu); -- gtk_box_pack_start (GTK_BOX (main_vbox), menu, FALSE, FALSE, 0); - - gtk_box_pack_end (GTK_BOX (main_vbox), toolbar, FALSE, FALSE, 0); - gtk_container_set_border_width (GTK_CONTAINER (toolbar), 3); -Index: git/src/dates_main.c -=================================================================== ---- git.orig/src/dates_main.c 2009-08-18 12:44:56.000000000 +0100 -+++ git/src/dates_main.c 2009-09-03 22:29:21.000000000 +0100 -@@ -26,6 +26,8 @@ - #include <libical/icaltime.h> - #include <gconf/gconf-client.h> - -+#include <gtk/gtkmenuitem.h> -+#include <libowl/owlwindowmenu.h> - #include "dates_types.h" - #include "dates_platform.h" - #include "dates_callbacks.h" -@@ -582,6 +584,9 @@ - g_free (url_uri); - } - -+ owl_set_window_menu (GTK_WINDOW (data.main_window), -+ GTK_MENU (data.main_menu)); -+ - gtk_main (); - - return 0; -Index: git/src/dates_platform.h -=================================================================== ---- git.orig/src/dates_platform.h 2009-08-18 12:44:56.000000000 +0100 -+++ git/src/dates_platform.h 2009-09-03 22:28:50.000000000 +0100 -@@ -20,7 +20,7 @@ - - #include "dates_types.h" - --#ifdef WITH_HILDON -+#if 1 - #define DATES_MENU_WITHOUT_BAR 1 - #endif -meta-gnome/recipes-gnome/pimlico/dates_git.bb +1
-1@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ SRCREV = "514185dc1f6588085fda41eb59898b93d0487dd4" PV = "0.4.11+git${SRCPV}" -PR = "r8" +PR = "r9" S = "${WORKDIR}/git"meta-gnome/recipes-gnome/pimlico/tasks.inc +0
-6@@ -6,11 +6,5 @@ LICENSE = "GPLv2 & GPLv2+" SECTION = "x11" DEPENDS = "glib-2.0 gtk+ evolution-data-server" -DEPENDS_append_poky = " libowl" inherit autotools pkgconfig gtk-icon-cache - -OWL ?= "--disable-owl" -OWL_poky ?= "--enable-owl" - -EXTRA_OECONF += "${OWL}"meta-gnome/recipes-gnome/pimlico/tasks/tasks-owl.diff deleted +0
-67@@ -1,67 +0,0 @@ -This patch enable owl menu, which is hidden in the title bar to save space on -small screen. It has not been used for a long time, rebase needed. - -Upstream-Status: Inappropriate [enable feature] - -Index: src/gtk/tasks-ui.xml -=================================================================== ---- src/gtk/tasks-ui.xml (revision 338) -+++ src/gtk/tasks-ui.xml (working copy) -@@ -7,17 +7,14 @@ - <menuitem action="EditTask"/> - <menuitem action="CompleteTask"/> - <separator/> -+ <menuitem action="Undo"/> -+ <menuitem action="Redo"/> -+ <separator/> - <menuitem action="DeleteTask"/> - <menuitem action="PurgeTasks"/> - <separator/> -+ <menuitem action="About"/> - <menuitem action="Quit"/> - </menu> -- <menu action="EditMenu"> -- <menuitem action="Undo"/> -- <menuitem action="Redo"/> -- </menu> -- <menu action="HelpMenu"> -- <menuitem action="About"/> -- </menu> - </menubar> - </ui> -Index: src/gtk/main.c -=================================================================== ---- src/gtk/main.c (revision 338) -+++ src/gtk/main.c (working copy) -@@ -21,6 +21,7 @@ - #include <libecal/e-cal.h> - #include <glib/gi18n.h> - #include <gtk/gtk.h> -+#include <libowl/owlwindowmenu.h> - - #include <libkoto/ical-util.h> - #include <libkoto/koto-actions.h> -@@ -564,8 +565,8 @@ - gtk_window_add_accel_group (GTK_WINDOW (window), gtk_ui_manager_get_accel_group (ui_manager)); - gtk_ui_manager_ensure_update (ui_manager); - -- menu = gtk_ui_manager_get_widget (ui_manager, "/MenuBar"); -- gtk_box_pack_start (GTK_BOX (top_box), menu, FALSE, FALSE, 0); -+ menu = gtk_ui_manager_get_widget (ui_manager, "/MenuBar/TasksMenu"); -+ owl_set_window_menu_item (GTK_WINDOW (window), GTK_MENU_ITEM (menu)); - - box = gtk_vbox_new (FALSE, 4); - gtk_container_set_border_width (GTK_CONTAINER (box), 4); -Index: src/gtk/Makefile.am -=================================================================== ---- src/gtk/Makefile.am (revision 338) -+++ src/gtk/Makefile.am (working copy) -@@ -4,7 +4,7 @@ - bin_PROGRAMS = tasks - tasks_CPPFLAGS = -I$(top_srcdir)/ - tasks_CFLAGS = $(WARN_CFLAGS) $(GTK_CFLAGS) $(ECAL_CFLAGS) $(SEXY_CFLAGS) --tasks_LDADD = $(top_builddir)/libkoto/libkoto.a $(GTK_LIBS) $(ECAL_LIBS) $(SEXY_LIBS) -+tasks_LDADD = $(top_builddir)/libkoto/libkoto.a $(GTK_LIBS) $(ECAL_LIBS) $(SEXY_LIBS) -lowl - - tasks_SOURCES = \ - main.c \meta-gnome/recipes-gnome/pimlico/tasks_0.19.bb +1
-4@@ -10,6 +10,4 @@ SRC_URI = "http://pimlico-project.org/sources/${BPN}/${BPN}-${PV}.tar.gz" SRC_URI[md5sum] = "0afd969758561599fd782e1effb39c08" SRC_URI[sha256sum] = "1a7fdc5f95a2193a1a25fdb13f071867fb7e42245ce19ccee4bcccb69e557f2e" -OWL_poky = "--with-owl" - -PR = "r2" +PR = "r3" --1.7.10