aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2012-05-06 08:54:38 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2012-05-06 09:37:09 +0200
commita1a9409931cc180e3ff61597d133be71e97a8467 (patch)
tree20002fe6ffa94d2c10379e8bc43ba02d7647b0ce
parent43bbae5f510e0ab19cf3d799047207242ae0fa23 (diff)
downloadmeta-openembedded-a1a9409931cc180e3ff61597d133be71e97a8467.tar.gz
meta-openembedded-a1a9409931cc180e3ff61597d133be71e97a8467.tar.bz2
meta-openembedded-a1a9409931cc180e3ff61597d133be71e97a8467.zip
glibmm: fix build with glib-2.32
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--meta-oe/recipes-core/glib-2.0/glibmm/glib-2.32.patch10
-rw-r--r--meta-oe/recipes-core/glib-2.0/glibmm_2.28.2.bb7
2 files changed, 13 insertions, 4 deletions
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 000000000..50b7367c5
--- /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 7e77a1c9c..6604091fe 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"