Patchwork [meta-oe,meta-efl,3/6] libgpewidget: fix build with glib-2.32

login
register
mail settings
Submitter Martin Jansa
Date April 30, 2012, 6:31 a.m.
Message ID <3ab85cdf1c9217ff1a9f0055aba7faa8f159191a.1335766581.git.Martin.Jansa@gmail.com>
Download mbox | patch
Permalink /patch/26593/
State Accepted
Commit 67f9414daf6b33b429fdc12d355c56e2369cd2c5
Headers show

Comments

Martin Jansa - April 30, 2012, 6:31 a.m.
* SRC_URI needs to be after inherit gpe
  and pkgconfig.patch wasn't ever used

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../libgpewidget/libgpewidget/glib-2.32.patch      |   11 +++++++++++
 .../libgpewidget/libgpewidget_0.117.bb             |   10 ++++++----
 2 files changed, 17 insertions(+), 4 deletions(-)
 create mode 100644 meta-gpe/recipes-graphics/libgpewidget/libgpewidget/glib-2.32.patch

Patch

diff --git a/meta-gpe/recipes-graphics/libgpewidget/libgpewidget/glib-2.32.patch b/meta-gpe/recipes-graphics/libgpewidget/libgpewidget/glib-2.32.patch
new file mode 100644
index 0000000..f590caa
--- /dev/null
+++ b/meta-gpe/recipes-graphics/libgpewidget/libgpewidget/glib-2.32.patch
@@ -0,0 +1,11 @@ 
+diff -uNr libgpewidget-0.117.orig/gpehelp.c libgpewidget-0.117/gpehelp.c
+--- libgpewidget-0.117.orig/gpehelp.c	2006-10-12 12:20:33.000000000 +0200
++++ libgpewidget-0.117/gpehelp.c	2012-04-30 07:45:57.813293792 +0200
+@@ -33,7 +33,6 @@
+ #include <gdk-pixbuf/gdk-pixbuf.h>
+ #include <gdk/gdk.h>
+ #include <glib.h>
+-#include <glib/gkeyfile.h>
+ 
+ 
+ /* helper function definitions*/
diff --git a/meta-gpe/recipes-graphics/libgpewidget/libgpewidget_0.117.bb b/meta-gpe/recipes-graphics/libgpewidget/libgpewidget_0.117.bb
index c4497de..e8abc43 100644
--- a/meta-gpe/recipes-graphics/libgpewidget/libgpewidget_0.117.bb
+++ b/meta-gpe/recipes-graphics/libgpewidget/libgpewidget_0.117.bb
@@ -5,16 +5,18 @@  LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=d8045f3b8f929c1cb29a1e3fd737b499"
 
 DEPENDS = "gtk+ cairo libxinerama libxcomposite libxrender gtk-doc"
-PR = "r1"
+PR = "r2"
 
-SRC_URI += "file://pkgconfig.patch;striplevel=0"
+inherit gpe pkgconfig autotools
+
+SRC_URI += "file://pkgconfig.patch;striplevel=0 \
+  file://glib-2.32.patch \
+"
 SRC_URI[md5sum] = "b85a839264a35d0faf9a1a38c486e189"
 SRC_URI[sha256sum] = "f96d30c09b0395ea4e146730fd52d9ea303b619bb139051d9f12d3f868a9e18c"
 
 GPE_TARBALL_SUFFIX = "bz2"
 
-inherit gpe pkgconfig autotools
-
 EXTRA_OECONF = "--enable-cairo"
 LDFLAGS += " -L${STAGING_LIBDIR}"