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>

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 @@
 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 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 @@
 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 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
  #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 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 @@
  #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 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
  #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 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 \
            file://fix_configure.patch;patch=1;status=merged \
            file://tasks-owl.diff;patch=1;pnum=0"
 
-PR = "r1"
+PR = "r2"