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 | openembedded-core-86e45a8c0c7a2430da209c650947f8cff3f8cc6b.tar.gz openembedded-core-86e45a8c0c7a2430da209c650947f8cff3f8cc6b.tar.bz2 openembedded-core-86e45a8c0c7a2430da209c650947f8cff3f8cc6b.tar.xz openembedded-core-86e45a8c0c7a2430da209c650947f8cff3f8cc6b.zip | |
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 d3ecf29ce..d00752b9c 100644 --- a/meta/packages/pimlico/contacts_0.9.bb +++ b/meta/packages/pimlico/contacts_0.9.bb @@ -1,6 +1,6 @@ require contacts.inc -PR="r0" +PR="r1" SRC_URI = "http://pimlico-project.org/sources/${PN}/${PN}-${PV}.tar.gz \ 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 a8ec63188..cb452994a 100644 --- a/meta/packages/pimlico/dates_0.4.6.bb +++ b/meta/packages/pimlico/dates_0.4.6.bb @@ -1,5 +1,7 @@ require dates.inc +PR = "r1" + SRC_URI = "http://pimlico-project.org/sources/dates/dates-${PV}.tar.gz \ file://dates-owl-window-menu.patch;patch=1 \ " diff --git a/meta/packages/pimlico/files/contacts-owl-window-menu.patch b/meta/packages/pimlico/files/contacts-owl-window-menu.patch index ff201b832..4b9238b43 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 #include <libgnomevfs/gnome-vfs.h> #endif -+#include "owlwindowmenu.h" ++#include <libowl/owlwindowmenu.h> + #include "bacon-message-connection.h" #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 6bde252ac..a52fd5741 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 @@ #include <gconf/gconf-client.h> +#include <gtk/gtkmenuitem.h> -+#include "owlwindowmenu.h" ++#include <libowl/owlwindowmenu.h> #include "dates_types.h" #include "dates_platform.h" #include "dates_callbacks.h" diff --git a/meta/packages/pimlico/files/tasks-owl.diff b/meta/packages/pimlico/files/tasks-owl.diff index ce1ed9db7..e4078066f 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 #include <libecal/e-cal.h> #include <glib/gi18n.h> #include <gtk/gtk.h> -+#include <owlwindowmenu.h> ++#include <libowl/owlwindowmenu.h> #include <libkoto/ical-util.h> #include <libkoto/koto-actions.h> diff --git a/meta/packages/pimlico/tasks_0.13.bb b/meta/packages/pimlico/tasks_0.13.bb index 736e07624..5d4122294 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 \ file://fix_configure.patch;patch=1;status=merged \ file://tasks-owl.diff;patch=1;pnum=0" -PR = "r1" +PR = "r2" |