summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Müller <schnitzeltony@googlemail.com>2013-05-16 13:23:57 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2013-05-21 12:45:48 +0200
commit2098bb19125155f9f758de053696d08e3ba6f5c8 (patch)
tree2ca051df5f38965b43a3ed33a998e79b7869260f
parentd22928bbb6832f937e92c50c21eac1477340d5a2 (diff)
downloadmeta-openembedded-2098bb19125155f9f758de053696d08e3ba6f5c8.tar.gz
glibmm: update to 2.36.2
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> 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.36.2.bb (renamed from meta-oe/recipes-core/glib-2.0/glibmm_2.28.2.bb)9
2 files changed, 3 insertions, 16 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
deleted file mode 100644
index 50b7367c5..000000000
--- a/meta-oe/recipes-core/glib-2.0/glibmm/glib-2.32.patch
+++ /dev/null
@@ -1,10 +0,0 @@
1--- glibmm-2.28.2.orig/glib/glibmm/varianttype.cc 2011-06-09 20:29:48.000000000 +0200
2+++ glibmm-2.28.2/glib/glibmm/varianttype.cc 2012-05-06 08:15:32.760680295 +0200
3@@ -23,7 +23,6 @@
4
5 #include <glibmm/varianttype.h>
6 #include <glibmm/utility.h>
7-#include <glib/gvarianttype.h>
8
9 namespace Glib
10 {
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.36.2.bb
index 0bdaa80a7..9735d6ac4 100644
--- a/meta-oe/recipes-core/glib-2.0/glibmm_2.28.2.bb
+++ b/meta-oe/recipes-core/glib-2.0/glibmm_2.36.2.bb
@@ -8,17 +8,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d8045f3b8f929c1cb29a1e3fd737b499 \
8DEPENDS = "mm-common glib-2.0 libsigc++-2.0" 8DEPENDS = "mm-common glib-2.0 libsigc++-2.0"
9inherit autotools pkgconfig 9inherit autotools pkgconfig
10 10
11PR = "r3"
12
13SHRT_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}" 11SHRT_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}"
14 12
15SRC_URI = " \ 13SRC_URI = " \
16 ftp://ftp.gnome.org/pub/GNOME/sources/glibmm/${SHRT_VER}/glibmm-${PV}.tar.bz2 \ 14 ftp://ftp.gnome.org/pub/GNOME/sources/glibmm/${SHRT_VER}/glibmm-${PV}.tar.xz \
17 file://remove-examples.patch \ 15 file://remove-examples.patch \
18 file://glib-2.32.patch \
19" 16"
20SRC_URI[archive.md5sum] = "cf33d1861d09fb2952a6a1d69e0502e3" 17SRC_URI[md5sum] = "5c96d566c22c209d7b9cbf2344c469e9"
21SRC_URI[archive.sha256sum] = "7b67178363f8494c94f8b3dd704a4c8db7ad75a253fc84a4ad229e5e179ec192" 18SRC_URI[sha256sum] = "f15b65bf5740257be03c69f2f5ae71436ac3011ebeb02274b2b99b796c6837cf"
22 19
23do_install_append() { 20do_install_append() {
24 install -d ${D}${datadir}/glibmm-2.4 21 install -d ${D}${datadir}/glibmm-2.4