Patchwork [meta-oe,meta-efl,meta-gpe,3/5] glibmm: fix build with glib-2.32

login
register
mail settings
Submitter Martin Jansa
Date May 7, 2012, 7:05 p.m.
Message ID <a1a9409931cc180e3ff61597d133be71e97a8467.1336417488.git.Martin.Jansa@gmail.com>
Download mbox | patch
Permalink /patch/27225/
State Accepted
Commit a1a9409931cc180e3ff61597d133be71e97a8467
Headers show

Comments

Martin Jansa - May 7, 2012, 7:05 p.m.
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../recipes-core/glib-2.0/glibmm/glib-2.32.patch   |   10 ++++++++++
 meta-oe/recipes-core/glib-2.0/glibmm_2.28.2.bb     |    7 +++----
 2 files changed, 13 insertions(+), 4 deletions(-)
 create mode 100644 meta-oe/recipes-core/glib-2.0/glibmm/glib-2.32.patch

Patch

diff --git a/meta-oe/recipes-core/glib-2.0/glibmm/glib-2.32.patch b/meta-oe/recipes-core/glib-2.0/glibmm/glib-2.32.patch
new file mode 100644
index 0000000..50b7367
--- /dev/null
+++ b/meta-oe/recipes-core/glib-2.0/glibmm/glib-2.32.patch
@@ -0,0 +1,10 @@ 
+--- glibmm-2.28.2.orig/glib/glibmm/varianttype.cc	2011-06-09 20:29:48.000000000 +0200
++++ glibmm-2.28.2/glib/glibmm/varianttype.cc	2012-05-06 08:15:32.760680295 +0200
+@@ -23,7 +23,6 @@
+ 
+ #include <glibmm/varianttype.h>
+ #include <glibmm/utility.h>
+-#include <glib/gvarianttype.h>
+ 
+ namespace Glib
+ {
diff --git a/meta-oe/recipes-core/glib-2.0/glibmm_2.28.2.bb b/meta-oe/recipes-core/glib-2.0/glibmm_2.28.2.bb
index 7e77a1c..6604091 100644
--- a/meta-oe/recipes-core/glib-2.0/glibmm_2.28.2.bb
+++ b/meta-oe/recipes-core/glib-2.0/glibmm_2.28.2.bb
@@ -1,10 +1,9 @@ 
 require glibmm.inc
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI[archive.md5sum] = "cf33d1861d09fb2952a6a1d69e0502e3"
 SRC_URI[archive.sha256sum] = "7b67178363f8494c94f8b3dd704a4c8db7ad75a253fc84a4ad229e5e179ec192"
 
-SRC_URI += " file://remove-examples.patch"
-
-
+SRC_URI += " file://remove-examples.patch \
+             file://glib-2.32.patch"