Patchwork [meta-oe] glibmm: Fix compile error with latest glib

login
register
mail settings
Submitter Gary Thomas
Date July 30, 2012, 3:04 p.m.
Message ID <1343660648-20358-1-git-send-email-gary@mlbassoc.com>
Download mbox | patch
Permalink /patch/33305/
State Superseded, archived
Headers show

Comments

Gary Thomas - July 30, 2012, 3:04 p.m.
Internal <glib/XXX.h> files should not be included directly.

Signed-off-by: Gary Thomas <gary@mlbassoc.com>
---
 .../glib-2.0/glibmm/fix-compile-error.patch        |   13 +++++++++++++
 meta-oe/recipes-core/glib-2.0/glibmm_2.28.2.bb     |    5 ++++-
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 meta-oe/recipes-core/glib-2.0/glibmm/fix-compile-error.patch
Koen Kooi - Aug. 7, 2012, 10:22 a.m.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Op 30-07-12 17:04, Gary Thomas schreef:
> Internal <glib/XXX.h> files should not be included directly.
> 
> Signed-off-by: Gary Thomas <gary@mlbassoc.com> --- 
> .../glib-2.0/glibmm/fix-compile-error.patch        |   13 +++++++++++++ 
> meta-oe/recipes-core/glib-2.0/glibmm_2.28.2.bb     |    5 ++++- 2 files
> changed, 17 insertions(+), 1 deletion(-) create mode 100644
> meta-oe/recipes-core/glib-2.0/glibmm/fix-compile-error.patch
> 
> diff --git a/meta-oe/recipes-core/glib-2.0/glibmm/fix-compile-error.patch
> b/meta-oe/recipes-core/glib-2.0/glibmm/fix-compile-error.patch new file
> mode 100644 index 0000000..33c6215 --- /dev/null +++
> b/meta-oe/recipes-core/glib-2.0/glibmm/fix-compile-error.patch @@ -0,0
> +1,13 @@ +Index: glibmm-2.28.2/glib/glibmm/varianttype.cc 
> +=================================================================== +---
> glibmm-2.28.2.orig/glib/glibmm/varianttype.cc ++++
> glibmm-2.28.2/glib/glibmm/varianttype.cc +@@ -23,7 +23,7 @@ + + #include
> <glibmm/varianttype.h> + #include <glibmm/utility.h> +-#include
> <glib/gvarianttype.h> ++#include <glib.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 6604091..7ec0be2
> 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 @@ -6,4 +6,7 @@
> SRC_URI[archive.md5sum] = "cf33d1861d09fb2952a6a1d69e0502e3" 
> SRC_URI[archive.sha256sum] =
> "7b67178363f8494c94f8b3dd704a4c8db7ad75a253fc84a4ad229e5e179ec192"
> 
> SRC_URI += " file://remove-examples.patch \ -
> file://glib-2.32.patch" +             file://fix-compile-error.patch \ 
> +" + +


Missing PR bump

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
Comment: GPGTools - http://gpgtools.org

iD8DBQFQIOxwMkyGM64RGpERAkycAJ4hOFLKhAA8mTFHrfBhqUdoJgEUlwCgiUzJ
zpg2yHjwZv9RFJEdV4DCmE8=
=7PlM
-----END PGP SIGNATURE-----

Patch

diff --git a/meta-oe/recipes-core/glib-2.0/glibmm/fix-compile-error.patch b/meta-oe/recipes-core/glib-2.0/glibmm/fix-compile-error.patch
new file mode 100644
index 0000000..33c6215
--- /dev/null
+++ b/meta-oe/recipes-core/glib-2.0/glibmm/fix-compile-error.patch
@@ -0,0 +1,13 @@ 
+Index: glibmm-2.28.2/glib/glibmm/varianttype.cc
+===================================================================
+--- glibmm-2.28.2.orig/glib/glibmm/varianttype.cc
++++ glibmm-2.28.2/glib/glibmm/varianttype.cc
+@@ -23,7 +23,7 @@
+ 
+ #include <glibmm/varianttype.h>
+ #include <glibmm/utility.h>
+-#include <glib/gvarianttype.h>
++#include <glib.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 6604091..7ec0be2 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
@@ -6,4 +6,7 @@  SRC_URI[archive.md5sum] = "cf33d1861d09fb2952a6a1d69e0502e3"
 SRC_URI[archive.sha256sum] = "7b67178363f8494c94f8b3dd704a4c8db7ad75a253fc84a4ad229e5e179ec192"
 
 SRC_URI += " file://remove-examples.patch \
-             file://glib-2.32.patch"
+             file://fix-compile-error.patch \
+"
+
+