summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-12-07 16:23:08 +0000
committerJoshua Lock <josh@linux.intel.com>2009-12-08 21:08:17 +0000
commit9cb8f533fe8eeb3e074e40b7a748367604b1e5eb (patch)
treeb1512ef0ffecf125dff5e690c0eac10f5c1e6759
parentf2bc66b10210e9936a6f8c4a4bbe92cff8807d81 (diff)
downloadpoky-9cb8f533fe8eeb3e074e40b7a748367604b1e5eb.tar.gz
pimlico: Clean up libowl handling to be consistent
-rw-r--r--meta/conf/distro/include/poky-fixed-revisions.inc2
-rw-r--r--meta/packages/pimlico/contacts.inc8
-rw-r--r--meta/packages/pimlico/contacts_0.9.bb2
-rw-r--r--meta/packages/pimlico/contacts_git.bb2
-rw-r--r--meta/packages/pimlico/dates.inc8
-rw-r--r--meta/packages/pimlico/dates/dates-owl-window-menu.patch16
-rw-r--r--meta/packages/pimlico/dates_0.4.8.bb6
-rw-r--r--meta/packages/pimlico/dates_git.bb2
-rw-r--r--meta/packages/pimlico/tasks.inc7
-rw-r--r--meta/packages/pimlico/tasks_0.13.bb2
-rw-r--r--meta/packages/pimlico/tasks_git.bb2
11 files changed, 29 insertions, 28 deletions
diff --git a/meta/conf/distro/include/poky-fixed-revisions.inc b/meta/conf/distro/include/poky-fixed-revisions.inc
index 5af14e909d..ce1c2c5661 100644
--- a/meta/conf/distro/include/poky-fixed-revisions.inc
+++ b/meta/conf/distro/include/poky-fixed-revisions.inc
@@ -114,7 +114,7 @@ SRCREV_pn-networkmanager ?= "2984"
114SRCREV_pn-table ?= "4b267533ce16656cba4104fc39dc12709c1bdddf" 114SRCREV_pn-table ?= "4b267533ce16656cba4104fc39dc12709c1bdddf"
115SRCREV_pn-ubootchart ?= "10" 115SRCREV_pn-ubootchart ?= "10"
116 116
117SRCREV_pn-dates ?= "966969063535da0786b7483c1bcd427df8a0d87d" 117SRCREV_pn-dates ?= "8a79a9fc52c73bf256decfedd0fe7d399553e7aa"
118SRCREV_pn-tasks ?= "ea52d46d691c5fce4473ea4e24a35411381f3a65" 118SRCREV_pn-tasks ?= "ea52d46d691c5fce4473ea4e24a35411381f3a65"
119SRCREV_pn-contacts ?= "c8e6b16222d5bc9d8f60ae6594af4933613a4e25" 119SRCREV_pn-contacts ?= "c8e6b16222d5bc9d8f60ae6594af4933613a4e25"
120SRCREV_pn-dfu-util-native ?= "3139" 120SRCREV_pn-dfu-util-native ?= "3139"
diff --git a/meta/packages/pimlico/contacts.inc b/meta/packages/pimlico/contacts.inc
index 240540f6af..679e70a8fd 100644
--- a/meta/packages/pimlico/contacts.inc
+++ b/meta/packages/pimlico/contacts.inc
@@ -1,12 +1,16 @@
1DESCRIPTION = "Address-book application." 1DESCRIPTION = "Address-book application."
2LICENSE = "LGPL" 2LICENSE = "LGPL"
3SECTION = "x11" 3SECTION = "x11"
4DEPENDS = "glib-2.0 gtk+ eds-dbus libowl" 4DEPENDS = "glib-2.0 gtk+ eds-dbus"
5DEPENDS_append_poky = " libowl"
5RDEPENDS = "libedata-book" 6RDEPENDS = "libedata-book"
6 7
7inherit autotools_stage pkgconfig 8inherit autotools_stage pkgconfig
8 9
9EXTRA_OECONF += "--disable-gnome-vfs" 10OWL = "--disable-owl"
11OWL_poky = "--enable-owl"
12
13EXTRA_OECONF += "--disable-gnome-vfs ${OWL}"
10EXTRA_OEMAKE += "GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1" 14EXTRA_OEMAKE += "GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1"
11 15
12do_install_append () { 16do_install_append () {
diff --git a/meta/packages/pimlico/contacts_0.9.bb b/meta/packages/pimlico/contacts_0.9.bb
index fa2aa74dc0..1e4628737d 100644
--- a/meta/packages/pimlico/contacts_0.9.bb
+++ b/meta/packages/pimlico/contacts_0.9.bb
@@ -1,5 +1,5 @@
1require contacts.inc 1require contacts.inc
2 2
3PR="r1" 3PR = "r2"
4 4
5SRC_URI =+ "http://pimlico-project.org/sources/${PN}/${PN}-${PV}.tar.gz" 5SRC_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 8f3bc23b03..0e8aa38722 100644
--- a/meta/packages/pimlico/contacts_git.bb
+++ b/meta/packages/pimlico/contacts_git.bb
@@ -1,7 +1,7 @@
1require contacts.inc 1require contacts.inc
2 2
3PV = "0.9+git${SRCPV}" 3PV = "0.9+git${SRCPV}"
4 4PR = "r1"
5 5
6SRC_URI =+ "git://git.gnome.org/${PN};protocol=git" 6SRC_URI =+ "git://git.gnome.org/${PN};protocol=git"
7 7
diff --git a/meta/packages/pimlico/dates.inc b/meta/packages/pimlico/dates.inc
index f36d260520..a6590da679 100644
--- a/meta/packages/pimlico/dates.inc
+++ b/meta/packages/pimlico/dates.inc
@@ -1,12 +1,16 @@
1DESCRIPTION = "Dates is a calendar application." 1DESCRIPTION = "Dates is a calendar application."
2LICENSE = "LGPL" 2LICENSE = "LGPL"
3SECTION = "x11" 3SECTION = "x11"
4DEPENDS = "glib-2.0 gtk+ libglade eds-dbus libowl" 4DEPENDS = "glib-2.0 gtk+ libglade eds-dbus"
5RDEPENDS = "libedata-cal" 5RDEPENDS = "libedata-cal"
6 6
7inherit autotools_stage pkgconfig gtk-icon-cache 7inherit autotools_stage pkgconfig gtk-icon-cache
8 8
9# Poky/Sato specific enhancements 9# Poky/Sato specific enhancements
10EXTRA_OECONF_append_poky = " --enable-owl=true --disable-dnd" 10OWL = "--disable-owl"
11OWL_poky = "--enable-owl --disable-dnd"
12
13EXTRA_OECONF += "${OWL}"
14DEPENDS_append_poky = " libowl"
11SRC_URI_append_poky = " file://dates-owl-window-menu.patch;patch=1 " 15SRC_URI_append_poky = " file://dates-owl-window-menu.patch;patch=1 "
12 16
diff --git a/meta/packages/pimlico/dates/dates-owl-window-menu.patch b/meta/packages/pimlico/dates/dates-owl-window-menu.patch
index df24a1881b..d5901658be 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 @@
1--- 1---
2 src/Makefile.am | 2 +-
3 src/dates_gtk.c | 5 ----- 2 src/dates_gtk.c | 5 -----
4 src/dates_main.c | 5 +++++ 3 src/dates_main.c | 5 +++++
5 src/dates_platform.h | 2 +- 4 src/dates_platform.h | 2 +-
6 4 files changed, 7 insertions(+), 7 deletions(-) 5 3 files changed, 7 insertions(+), 7 deletions(-)
7 6
8Index: git/src/Makefile.am
9===================================================================
10--- git.orig/src/Makefile.am 2009-08-18 12:44:56.000000000 +0100
11+++ git/src/Makefile.am 2009-09-03 22:28:50.000000000 +0100
12@@ -35,7 +35,7 @@
13 gconf-bridge.h \
14 gconf-bridge.c
15
16-dates_LDADD = $(DATES_LIBS) libgtkdatesview.la
17+dates_LDADD = $(DATES_LIBS) libgtkdatesview.la -lowl
18
19 if USE_OWL
20 dates_LDADD += $(top_builddir)/libowl/libowl.la
21Index: git/src/dates_gtk.c 7Index: git/src/dates_gtk.c
22=================================================================== 8===================================================================
23--- git.orig/src/dates_gtk.c 2009-08-18 12:44:56.000000000 +0100 9--- 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 cb452994ac..13afc157d0 100644
--- a/meta/packages/pimlico/dates_0.4.8.bb
+++ b/meta/packages/pimlico/dates_0.4.8.bb
@@ -1,7 +1,5 @@
1require dates.inc 1require dates.inc
2 2
3PR = "r1" 3PR = "r3"
4 4
5SRC_URI = "http://pimlico-project.org/sources/dates/dates-${PV}.tar.gz \ 5SRC_URI = "http://pimlico-project.org/sources/dates/dates-${PV}.tar.gz"
6 file://dates-owl-window-menu.patch;patch=1 \
7 "
diff --git a/meta/packages/pimlico/dates_git.bb b/meta/packages/pimlico/dates_git.bb
index 79bc342b0e..229772a438 100644
--- a/meta/packages/pimlico/dates_git.bb
+++ b/meta/packages/pimlico/dates_git.bb
@@ -1,6 +1,8 @@
1require dates.inc 1require dates.inc
2 2
3PV = "0.4.9+git${SRCPV}" 3PV = "0.4.9+git${SRCPV}"
4PR = "r2"
5
4S = "${WORKDIR}/git" 6S = "${WORKDIR}/git"
5 7
6SRC_URI = "git://git.gnome.org/${PN};protocol=git" 8SRC_URI = "git://git.gnome.org/${PN};protocol=git"
diff --git a/meta/packages/pimlico/tasks.inc b/meta/packages/pimlico/tasks.inc
index 77872b2e2d..7947051140 100644
--- a/meta/packages/pimlico/tasks.inc
+++ b/meta/packages/pimlico/tasks.inc
@@ -1,7 +1,12 @@
1DESCRIPTION = "Task list application" 1DESCRIPTION = "Task list application"
2LICENSE = "GPL" 2LICENSE = "GPL"
3SECTION = "x11" 3SECTION = "x11"
4DEPENDS = "glib-2.0 gtk+ eds-dbus libowl" 4DEPENDS = "glib-2.0 gtk+ eds-dbus"
5DEPENDS_append_poky = " libowl" 5DEPENDS_append_poky = " libowl"
6 6
7inherit autotools_stage pkgconfig gtk-icon-cache 7inherit autotools_stage pkgconfig gtk-icon-cache
8
9OWL = "--disable-owl"
10OWL_poky = "--enable-owl"
11
12EXTRA_OECONF += "${OWL}
diff --git a/meta/packages/pimlico/tasks_0.13.bb b/meta/packages/pimlico/tasks_0.13.bb
index f26724e3b3..f09c0abf28 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 \
5 5
6SRC_URI_append_poky = " file://tasks-owl.diff;patch=1 " 6SRC_URI_append_poky = " file://tasks-owl.diff;patch=1 "
7 7
8PR = "r2" 8PR = "r3"
diff --git a/meta/packages/pimlico/tasks_git.bb b/meta/packages/pimlico/tasks_git.bb
index c80639e671..1ab8cd18cd 100644
--- a/meta/packages/pimlico/tasks_git.bb
+++ b/meta/packages/pimlico/tasks_git.bb
@@ -3,4 +3,6 @@ require tasks.inc
3SRC_URI = "git://git.gnome.org/${PN};protocol=git" 3SRC_URI = "git://git.gnome.org/${PN};protocol=git"
4 4
5PV = "0.13+git${SRCPV}" 5PV = "0.13+git${SRCPV}"
6PR = "r1"
7
6S = "${WORKDIR}/git" 8S = "${WORKDIR}/git"