diff options
author | Enric Balletbo i Serra <eballetbo@gmail.com> | 2009-07-09 20:35:30 +0200 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2009-07-09 21:58:47 +0100 |
commit | 86e45a8c0c7a2430da209c650947f8cff3f8cc6b (patch) | |
tree | 1b19b292f7910effd414a39073827323a92b2c08 /meta/packages/pimlico | |
parent | 915d91845f762bffe28e4ef3af600bec62cd9dc5 (diff) | |
download | poky-86e45a8c0c7a2430da209c650947f8cff3f8cc6b.tar.gz |
libowl: Use autotools_stage instead of broken custom staging function
This patch also fixes claws-mail, leafpad, pcmanfm, pimlico and puzzles
recipes using the proper include for owlwindowmenu.h
Signed-off-by: Enric Balletbo i Serra <eballetbo@gmail.com>
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/packages/pimlico')
-rw-r--r-- | meta/packages/pimlico/contacts_0.9.bb | 2 | ||||
-rw-r--r-- | meta/packages/pimlico/dates_0.4.6.bb | 2 | ||||
-rw-r--r-- | meta/packages/pimlico/files/contacts-owl-window-menu.patch | 2 | ||||
-rw-r--r-- | meta/packages/pimlico/files/dates-owl-window-menu.patch | 2 | ||||
-rw-r--r-- | meta/packages/pimlico/files/tasks-owl.diff | 2 | ||||
-rw-r--r-- | meta/packages/pimlico/tasks_0.13.bb | 2 |
6 files changed, 7 insertions, 5 deletions
diff --git a/meta/packages/pimlico/contacts_0.9.bb b/meta/packages/pimlico/contacts_0.9.bb index d3ecf29ce8..d00752b9c4 100644 --- a/meta/packages/pimlico/contacts_0.9.bb +++ b/meta/packages/pimlico/contacts_0.9.bb | |||
@@ -1,6 +1,6 @@ | |||
1 | require contacts.inc | 1 | require contacts.inc |
2 | 2 | ||
3 | PR="r0" | 3 | PR="r1" |
4 | 4 | ||
5 | SRC_URI = "http://pimlico-project.org/sources/${PN}/${PN}-${PV}.tar.gz \ | 5 | SRC_URI = "http://pimlico-project.org/sources/${PN}/${PN}-${PV}.tar.gz \ |
6 | file://stock_contact.png \ | 6 | file://stock_contact.png \ |
diff --git a/meta/packages/pimlico/dates_0.4.6.bb b/meta/packages/pimlico/dates_0.4.6.bb index a8ec63188b..cb452994ac 100644 --- a/meta/packages/pimlico/dates_0.4.6.bb +++ b/meta/packages/pimlico/dates_0.4.6.bb | |||
@@ -1,5 +1,7 @@ | |||
1 | require dates.inc | 1 | require dates.inc |
2 | 2 | ||
3 | PR = "r1" | ||
4 | |||
3 | SRC_URI = "http://pimlico-project.org/sources/dates/dates-${PV}.tar.gz \ | 5 | SRC_URI = "http://pimlico-project.org/sources/dates/dates-${PV}.tar.gz \ |
4 | file://dates-owl-window-menu.patch;patch=1 \ | 6 | file://dates-owl-window-menu.patch;patch=1 \ |
5 | " | 7 | " |
diff --git a/meta/packages/pimlico/files/contacts-owl-window-menu.patch b/meta/packages/pimlico/files/contacts-owl-window-menu.patch index ff201b8321..4b9238b43a 100644 --- a/meta/packages/pimlico/files/contacts-owl-window-menu.patch +++ b/meta/packages/pimlico/files/contacts-owl-window-menu.patch | |||
@@ -34,7 +34,7 @@ Index: contacts-0.9/src/contacts-main.c | |||
34 | #include <libgnomevfs/gnome-vfs.h> | 34 | #include <libgnomevfs/gnome-vfs.h> |
35 | #endif | 35 | #endif |
36 | 36 | ||
37 | +#include "owlwindowmenu.h" | 37 | +#include <libowl/owlwindowmenu.h> |
38 | + | 38 | + |
39 | #include "bacon-message-connection.h" | 39 | #include "bacon-message-connection.h" |
40 | #include "contacts-defs.h" | 40 | #include "contacts-defs.h" |
diff --git a/meta/packages/pimlico/files/dates-owl-window-menu.patch b/meta/packages/pimlico/files/dates-owl-window-menu.patch index 6bde252ac3..a52fd5741b 100644 --- a/meta/packages/pimlico/files/dates-owl-window-menu.patch +++ b/meta/packages/pimlico/files/dates-owl-window-menu.patch | |||
@@ -58,7 +58,7 @@ | |||
58 | #include <gconf/gconf-client.h> | 58 | #include <gconf/gconf-client.h> |
59 | 59 | ||
60 | +#include <gtk/gtkmenuitem.h> | 60 | +#include <gtk/gtkmenuitem.h> |
61 | +#include "owlwindowmenu.h" | 61 | +#include <libowl/owlwindowmenu.h> |
62 | #include "dates_types.h" | 62 | #include "dates_types.h" |
63 | #include "dates_platform.h" | 63 | #include "dates_platform.h" |
64 | #include "dates_callbacks.h" | 64 | #include "dates_callbacks.h" |
diff --git a/meta/packages/pimlico/files/tasks-owl.diff b/meta/packages/pimlico/files/tasks-owl.diff index ce1ed9db7e..e4078066f5 100644 --- a/meta/packages/pimlico/files/tasks-owl.diff +++ b/meta/packages/pimlico/files/tasks-owl.diff | |||
@@ -32,7 +32,7 @@ Index: src/gtk/main.c | |||
32 | #include <libecal/e-cal.h> | 32 | #include <libecal/e-cal.h> |
33 | #include <glib/gi18n.h> | 33 | #include <glib/gi18n.h> |
34 | #include <gtk/gtk.h> | 34 | #include <gtk/gtk.h> |
35 | +#include <owlwindowmenu.h> | 35 | +#include <libowl/owlwindowmenu.h> |
36 | 36 | ||
37 | #include <libkoto/ical-util.h> | 37 | #include <libkoto/ical-util.h> |
38 | #include <libkoto/koto-actions.h> | 38 | #include <libkoto/koto-actions.h> |
diff --git a/meta/packages/pimlico/tasks_0.13.bb b/meta/packages/pimlico/tasks_0.13.bb index 736e07624c..5d41222944 100644 --- a/meta/packages/pimlico/tasks_0.13.bb +++ b/meta/packages/pimlico/tasks_0.13.bb | |||
@@ -4,4 +4,4 @@ SRC_URI = "http://pimlico-project.org/sources/${PN}/${PN}-${PV}.tar.gz \ | |||
4 | file://fix_configure.patch;patch=1;status=merged \ | 4 | file://fix_configure.patch;patch=1;status=merged \ |
5 | file://tasks-owl.diff;patch=1;pnum=0" | 5 | file://tasks-owl.diff;patch=1;pnum=0" |
6 | 6 | ||
7 | PR = "r1" | 7 | PR = "r2" |