From 3ab04a953d70ff99c980089859dac6b32bb6e9eb Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 7 Dec 2009 16:23:08 +0000 Subject: pimlico: Clean up libowl handling to be consistent --- meta/packages/pimlico/contacts.inc | 8 ++++++-- meta/packages/pimlico/contacts_0.9.bb | 2 +- meta/packages/pimlico/contacts_git.bb | 2 +- meta/packages/pimlico/dates.inc | 8 ++++++-- meta/packages/pimlico/dates/dates-owl-window-menu.patch | 16 +--------------- meta/packages/pimlico/dates_0.4.8.bb | 6 ++---- meta/packages/pimlico/dates_git.bb | 2 ++ meta/packages/pimlico/tasks.inc | 7 ++++++- meta/packages/pimlico/tasks_0.13.bb | 2 +- meta/packages/pimlico/tasks_git.bb | 2 ++ 10 files changed, 28 insertions(+), 27 deletions(-) (limited to 'meta/packages/pimlico') diff --git a/meta/packages/pimlico/contacts.inc b/meta/packages/pimlico/contacts.inc index 240540f6a..679e70a8f 100644 --- a/meta/packages/pimlico/contacts.inc +++ b/meta/packages/pimlico/contacts.inc @@ -1,12 +1,16 @@ DESCRIPTION = "Address-book application." LICENSE = "LGPL" SECTION = "x11" -DEPENDS = "glib-2.0 gtk+ eds-dbus libowl" +DEPENDS = "glib-2.0 gtk+ eds-dbus" +DEPENDS_append_poky = " libowl" RDEPENDS = "libedata-book" inherit autotools_stage pkgconfig -EXTRA_OECONF += "--disable-gnome-vfs" +OWL = "--disable-owl" +OWL_poky = "--enable-owl" + +EXTRA_OECONF += "--disable-gnome-vfs ${OWL}" EXTRA_OEMAKE += "GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1" do_install_append () { diff --git a/meta/packages/pimlico/contacts_0.9.bb b/meta/packages/pimlico/contacts_0.9.bb index fa2aa74dc..1e4628737 100644 --- a/meta/packages/pimlico/contacts_0.9.bb +++ b/meta/packages/pimlico/contacts_0.9.bb @@ -1,5 +1,5 @@ require contacts.inc -PR="r1" +PR = "r2" SRC_URI =+ "http://pimlico-project.org/sources/${PN}/${PN}-${PV}.tar.gz" diff --git a/meta/packages/pimlico/contacts_git.bb b/meta/packages/pimlico/contacts_git.bb index 8f3bc23b0..0e8aa3872 100644 --- a/meta/packages/pimlico/contacts_git.bb +++ b/meta/packages/pimlico/contacts_git.bb @@ -1,7 +1,7 @@ require contacts.inc PV = "0.9+git${SRCPV}" - +PR = "r1" SRC_URI =+ "git://git.gnome.org/${PN};protocol=git" diff --git a/meta/packages/pimlico/dates.inc b/meta/packages/pimlico/dates.inc index f36d26052..a6590da67 100644 --- a/meta/packages/pimlico/dates.inc +++ b/meta/packages/pimlico/dates.inc @@ -1,12 +1,16 @@ DESCRIPTION = "Dates is a calendar application." LICENSE = "LGPL" SECTION = "x11" -DEPENDS = "glib-2.0 gtk+ libglade eds-dbus libowl" +DEPENDS = "glib-2.0 gtk+ libglade eds-dbus" RDEPENDS = "libedata-cal" inherit autotools_stage pkgconfig gtk-icon-cache # Poky/Sato specific enhancements -EXTRA_OECONF_append_poky = " --enable-owl=true --disable-dnd" +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;patch=1 " diff --git a/meta/packages/pimlico/dates/dates-owl-window-menu.patch b/meta/packages/pimlico/dates/dates-owl-window-menu.patch index df24a1881..d5901658b 100644 --- a/meta/packages/pimlico/dates/dates-owl-window-menu.patch +++ b/meta/packages/pimlico/dates/dates-owl-window-menu.patch @@ -1,23 +1,9 @@ --- - src/Makefile.am | 2 +- src/dates_gtk.c | 5 ----- src/dates_main.c | 5 +++++ src/dates_platform.h | 2 +- - 4 files changed, 7 insertions(+), 7 deletions(-) + 3 files changed, 7 insertions(+), 7 deletions(-) -Index: git/src/Makefile.am -=================================================================== ---- git.orig/src/Makefile.am 2009-08-18 12:44:56.000000000 +0100 -+++ git/src/Makefile.am 2009-09-03 22:28:50.000000000 +0100 -@@ -35,7 +35,7 @@ - gconf-bridge.h \ - gconf-bridge.c - --dates_LDADD = $(DATES_LIBS) libgtkdatesview.la -+dates_LDADD = $(DATES_LIBS) libgtkdatesview.la -lowl - - if USE_OWL - dates_LDADD += $(top_builddir)/libowl/libowl.la Index: git/src/dates_gtk.c =================================================================== --- git.orig/src/dates_gtk.c 2009-08-18 12:44:56.000000000 +0100 diff --git a/meta/packages/pimlico/dates_0.4.8.bb b/meta/packages/pimlico/dates_0.4.8.bb index cb452994a..13afc157d 100644 --- a/meta/packages/pimlico/dates_0.4.8.bb +++ b/meta/packages/pimlico/dates_0.4.8.bb @@ -1,7 +1,5 @@ require dates.inc -PR = "r1" +PR = "r3" -SRC_URI = "http://pimlico-project.org/sources/dates/dates-${PV}.tar.gz \ - file://dates-owl-window-menu.patch;patch=1 \ - " +SRC_URI = "http://pimlico-project.org/sources/dates/dates-${PV}.tar.gz" diff --git a/meta/packages/pimlico/dates_git.bb b/meta/packages/pimlico/dates_git.bb index 79bc342b0..229772a43 100644 --- a/meta/packages/pimlico/dates_git.bb +++ b/meta/packages/pimlico/dates_git.bb @@ -1,6 +1,8 @@ require dates.inc PV = "0.4.9+git${SRCPV}" +PR = "r2" + S = "${WORKDIR}/git" SRC_URI = "git://git.gnome.org/${PN};protocol=git" diff --git a/meta/packages/pimlico/tasks.inc b/meta/packages/pimlico/tasks.inc index 77872b2e2..794705114 100644 --- a/meta/packages/pimlico/tasks.inc +++ b/meta/packages/pimlico/tasks.inc @@ -1,7 +1,12 @@ DESCRIPTION = "Task list application" LICENSE = "GPL" SECTION = "x11" -DEPENDS = "glib-2.0 gtk+ eds-dbus libowl" +DEPENDS = "glib-2.0 gtk+ eds-dbus" DEPENDS_append_poky = " libowl" inherit autotools_stage pkgconfig gtk-icon-cache + +OWL = "--disable-owl" +OWL_poky = "--enable-owl" + +EXTRA_OECONF += "${OWL} diff --git a/meta/packages/pimlico/tasks_0.13.bb b/meta/packages/pimlico/tasks_0.13.bb index f26724e3b..f09c0abf2 100644 --- a/meta/packages/pimlico/tasks_0.13.bb +++ b/meta/packages/pimlico/tasks_0.13.bb @@ -5,4 +5,4 @@ SRC_URI = "http://pimlico-project.org/sources/${PN}/${PN}-${PV}.tar.gz \ SRC_URI_append_poky = " file://tasks-owl.diff;patch=1 " -PR = "r2" +PR = "r3" diff --git a/meta/packages/pimlico/tasks_git.bb b/meta/packages/pimlico/tasks_git.bb index c80639e67..1ab8cd18c 100644 --- a/meta/packages/pimlico/tasks_git.bb +++ b/meta/packages/pimlico/tasks_git.bb @@ -3,4 +3,6 @@ require tasks.inc SRC_URI = "git://git.gnome.org/${PN};protocol=git" PV = "0.13+git${SRCPV}" +PR = "r1" + S = "${WORKDIR}/git" -- cgit v1.2.3