glibmm: update to 2.36.2

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

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 @@
---- 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.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 \
 DEPENDS = "mm-common glib-2.0 libsigc++-2.0"
 inherit autotools pkgconfig
 
-PR = "r3"
-
 SHRT_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}"
 
 SRC_URI = " \
-    ftp://ftp.gnome.org/pub/GNOME/sources/glibmm/${SHRT_VER}/glibmm-${PV}.tar.bz2 \
+    ftp://ftp.gnome.org/pub/GNOME/sources/glibmm/${SHRT_VER}/glibmm-${PV}.tar.xz \
     file://remove-examples.patch \
-    file://glib-2.32.patch \
 "
-SRC_URI[archive.md5sum] = "cf33d1861d09fb2952a6a1d69e0502e3"
-SRC_URI[archive.sha256sum] = "7b67178363f8494c94f8b3dd704a4c8db7ad75a253fc84a4ad229e5e179ec192"
+SRC_URI[md5sum] = "5c96d566c22c209d7b9cbf2344c469e9"
+SRC_URI[sha256sum] = "f15b65bf5740257be03c69f2f5ae71436ac3011ebeb02274b2b99b796c6837cf"
 
 do_install_append() {
     install -d ${D}${datadir}/glibmm-2.4