From 2098bb19125155f9f758de053696d08e3ba6f5c8 Mon Sep 17 00:00:00 2001
From: Andreas Müller <schnitzeltony@googlemail.com>
Date: Thu, 16 May 2013 13:23:57 +0200
Subject: glibmm: update to 2.36.2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
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     | 32 ----------------------
 meta-oe/recipes-core/glib-2.0/glibmm_2.36.2.bb     | 29 ++++++++++++++++++++
 3 files changed, 29 insertions(+), 42 deletions(-)
 delete mode 100644 meta-oe/recipes-core/glib-2.0/glibmm/glib-2.32.patch
 delete mode 100644 meta-oe/recipes-core/glib-2.0/glibmm_2.28.2.bb
 create mode 100644 meta-oe/recipes-core/glib-2.0/glibmm_2.36.2.bb

(limited to 'meta-oe/recipes-core')

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.28.2.bb
deleted file mode 100644
index 0bdaa80a7..000000000
--- a/meta-oe/recipes-core/glib-2.0/glibmm_2.28.2.bb
+++ /dev/null
@@ -1,32 +0,0 @@
-DESCRIPTION = "C++ bindings for the glib library."
-HOMEPAGE = "http://www.gtkmm.org/"
-SECTION = "libs"
-LICENSE = "LGPLv2.1 & GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=d8045f3b8f929c1cb29a1e3fd737b499 \
-                    file://COPYING.tools;md5=751419260aa954499f7abaabaa882bbe"
-
-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 \
-    file://remove-examples.patch \
-    file://glib-2.32.patch \
-"
-SRC_URI[archive.md5sum] = "cf33d1861d09fb2952a6a1d69e0502e3"
-SRC_URI[archive.sha256sum] = "7b67178363f8494c94f8b3dd704a4c8db7ad75a253fc84a4ad229e5e179ec192"
-
-do_install_append() {
-    install -d ${D}${datadir}/glibmm-2.4
-    install -d ${D}${datadir}/aclocal
-
-    install -m 0644 glib/glibmmconfig.h ${D}${datadir}/glibmm-2.4/
-    install -m 0644 scripts/glibmm_check_perl.m4 ${D}${datadir}/aclocal/ || true
-}
-
-FILES_${PN} = "${libdir}/lib*.so.*"
-FILES_${PN}-dev += "${datadir}/glibmm-* ${libdir}/glibmm-2.4/include/ ${libdir}/glibmm-2.4/proc/ ${libdir}/giomm-2.4/include/"
diff --git a/meta-oe/recipes-core/glib-2.0/glibmm_2.36.2.bb b/meta-oe/recipes-core/glib-2.0/glibmm_2.36.2.bb
new file mode 100644
index 000000000..9735d6ac4
--- /dev/null
+++ b/meta-oe/recipes-core/glib-2.0/glibmm_2.36.2.bb
@@ -0,0 +1,29 @@
+DESCRIPTION = "C++ bindings for the glib library."
+HOMEPAGE = "http://www.gtkmm.org/"
+SECTION = "libs"
+LICENSE = "LGPLv2.1 & GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=d8045f3b8f929c1cb29a1e3fd737b499 \
+                    file://COPYING.tools;md5=751419260aa954499f7abaabaa882bbe"
+
+DEPENDS = "mm-common glib-2.0 libsigc++-2.0"
+inherit autotools pkgconfig
+
+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.xz \
+    file://remove-examples.patch \
+"
+SRC_URI[md5sum] = "5c96d566c22c209d7b9cbf2344c469e9"
+SRC_URI[sha256sum] = "f15b65bf5740257be03c69f2f5ae71436ac3011ebeb02274b2b99b796c6837cf"
+
+do_install_append() {
+    install -d ${D}${datadir}/glibmm-2.4
+    install -d ${D}${datadir}/aclocal
+
+    install -m 0644 glib/glibmmconfig.h ${D}${datadir}/glibmm-2.4/
+    install -m 0644 scripts/glibmm_check_perl.m4 ${D}${datadir}/aclocal/ || true
+}
+
+FILES_${PN} = "${libdir}/lib*.so.*"
+FILES_${PN}-dev += "${datadir}/glibmm-* ${libdir}/glibmm-2.4/include/ ${libdir}/glibmm-2.4/proc/ ${libdir}/giomm-2.4/include/"
-- 
cgit v1.2.3-54-g00ecf