[meta-oe++/master 00/11] fixes and updates

[meta-oe++/master 00/11] fixes and updates

[Andreas Müller]

The following changes since commit 22100f5b136e1be268055f4da14c39d7a32e9023:

  dmidecode: remove (2013-05-19 09:37:34 +0200)

are available in the git repository at:
  git://gitorious.org/schnitzeltony-oe-meta/meta-openembedded.git updates-and-fixes

Andreas Müller (11):
      mm-common: update to 0.9.6
      libsigc++-2.0: update to 2.2.11
      glibmm: merge glibmm.inc into recipe - and stylize a bit
      glibmm: update to 2.36.2
      pangomm: update to 2.34.0
      gtkmm: merge gtkmm.inc into recipe - and cleanup a bit
      atkmm: initial add 2.22.7
      gtkmm: update to 2.24.3
      gtkhtml2: fix build with glib 2.36
      evince: fix build with gcc 4.8
      gnome-system-monitor: fix build after gtkmm update

 .../evince/0001-tiff-fix-compile-warning.patch     |   33 +++++++++++++
 meta-gnome/recipes-gnome/evince/evince_2.32.0.bb   |    7 ++-
 ...0002-src-procman.cpp-include-main-gtkmm.h.patch |   49 ++++++++++++++++++++
 .../gnome-system-monitor_2.28.2.bb                 |    7 ++-
 .../recipes-core/glib-2.0/glibmm/glib-2.32.patch   |   10 ----
 meta-oe/recipes-core/glib-2.0/glibmm_2.28.2.bb     |    9 ----
 .../glib-2.0/{glibmm.inc => glibmm_2.36.2.bb}      |   15 +++---
 ...sigc++-2.0_2.2.9.bb => libsigc++-2.0_2.2.11.bb} |    6 +-
 meta-oe/recipes-core/mm-common/mm-common_0.9.5.bb  |   10 ----
 meta-oe/recipes-core/mm-common/mm-common_0.9.6.bb  |   12 +++++
 meta-oe/recipes-gnome/atk/atkmm_2.22.7.bb          |   19 ++++++++
 meta-oe/recipes-gnome/gtk+/gtkmm_2.20.0.bb         |    7 ---
 .../gtk+/{gtkmm.inc => gtkmm_2.24.3.bb}            |   19 ++------
 ...001-tests-main.c-fix-build-with-glib-2.36.patch |   32 +++++++++++++
 meta-oe/recipes-gnome/gtkhtml2/gtkhtml2_svn.bb     |    3 +-
 .../pango/{pangomm_2.28.2.bb => pangomm_2.34.0.bb} |    8 +--
 16 files changed, 176 insertions(+), 70 deletions(-)
 create mode 100644 meta-gnome/recipes-gnome/evince/evince/0001-tiff-fix-compile-warning.patch
 create mode 100644 meta-gnome/recipes-gnome/gnome-system-monitor/files/0002-src-procman.cpp-include-main-gtkmm.h.patch
 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
 rename meta-oe/recipes-core/glib-2.0/{glibmm.inc => glibmm_2.36.2.bb} (75%)
 rename meta-oe/recipes-core/libsigc++-2.0/{libsigc++-2.0_2.2.9.bb => libsigc++-2.0_2.2.11.bb} (70%)
 delete mode 100644 meta-oe/recipes-core/mm-common/mm-common_0.9.5.bb
 create mode 100644 meta-oe/recipes-core/mm-common/mm-common_0.9.6.bb
 create mode 100644 meta-oe/recipes-gnome/atk/atkmm_2.22.7.bb
 delete mode 100644 meta-oe/recipes-gnome/gtk+/gtkmm_2.20.0.bb
 rename meta-oe/recipes-gnome/gtk+/{gtkmm.inc => gtkmm_2.24.3.bb} (53%)
 create mode 100644 meta-oe/recipes-gnome/gtkhtml2/files/0001-tests-main.c-fix-build-with-glib-2.36.patch
 rename meta-oe/recipes-graphics/pango/{pangomm_2.28.2.bb => pangomm_2.34.0.bb} (76%)

-- 
1.7.4.4

[meta-oe++/master 01/11] mm-common: update to 0.9.6

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 meta-oe/recipes-core/mm-common/mm-common_0.9.5.bb |   10 ----------
 meta-oe/recipes-core/mm-common/mm-common_0.9.6.bb |   12 ++++++++++++
 2 files changed, 12 insertions(+), 10 deletions(-)
 delete mode 100644 meta-oe/recipes-core/mm-common/mm-common_0.9.5.bb
 create mode 100644 meta-oe/recipes-core/mm-common/mm-common_0.9.6.bb

diff --git a/meta-oe/recipes-core/mm-common/mm-common_0.9.5.bb b/meta-oe/recipes-core/mm-common/mm-common_0.9.5.bb
deleted file mode 100644
index c49b4c8..0000000
--- a/meta-oe/recipes-core/mm-common/mm-common_0.9.5.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-inherit gnomebase
-
-SRC_URI[archive.md5sum] = "4a4dad67fc8d7e0c529f3a8c6ba4d8b2"
-SRC_URI[archive.sha256sum] = "9c602dba89d264a4719db996b9b169716df2d4d10bcd24e56fc3572865a5cb8b"
-
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
-
-BBCLASSEXTEND = "native"
-
diff --git a/meta-oe/recipes-core/mm-common/mm-common_0.9.6.bb b/meta-oe/recipes-core/mm-common/mm-common_0.9.6.bb
new file mode 100644
index 0000000..f7e2507
--- /dev/null
+++ b/meta-oe/recipes-core/mm-common/mm-common_0.9.6.bb
@@ -0,0 +1,12 @@
+inherit gnomebase
+
+GNOME_COMPRESS_TYPE="xz"
+
+SRC_URI[archive.md5sum] = "3b23749ab39441c392c016ce74632678"
+SRC_URI[archive.sha256sum] = "7c37158a1f37604705a9b9305d3b335fb8256f5de701c8801269dde4e2ce7dde"
+
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
+
+BBCLASSEXTEND = "native"
+
-- 
1.7.4.4

[meta-oe++/master 02/11] libsigc++-2.0: update to 2.2.11

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 ...sigc++-2.0_2.2.9.bb => libsigc++-2.0_2.2.11.bb} |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
 rename meta-oe/recipes-core/libsigc++-2.0/{libsigc++-2.0_2.2.9.bb => libsigc++-2.0_2.2.11.bb} (70%)

diff --git a/meta-oe/recipes-core/libsigc++-2.0/libsigc++-2.0_2.2.9.bb b/meta-oe/recipes-core/libsigc++-2.0/libsigc++-2.0_2.2.11.bb
similarity index 70%
rename from meta-oe/recipes-core/libsigc++-2.0/libsigc++-2.0_2.2.9.bb
rename to meta-oe/recipes-core/libsigc++-2.0/libsigc++-2.0_2.2.11.bb
index bcf69b8..fe3c891 100644
--- a/meta-oe/recipes-core/libsigc++-2.0/libsigc++-2.0_2.2.9.bb
+++ b/meta-oe/recipes-core/libsigc++-2.0/libsigc++-2.0_2.2.11.bb
@@ -5,9 +5,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d8045f3b8f929c1cb29a1e3fd737b499"
 
 DEPENDS = "mm-common"
 
-SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/libsigc++/2.2/libsigc++-${PV}.tar.gz;name=archive"
-SRC_URI[archive.md5sum] = "9d202af538d912fdacc9b89c84a1ef24"
-SRC_URI[archive.sha256sum] = "ef60d60403b6401e2bee97b6e3e1c3a464fdb6410285e0055eb1525b9fcc4473"
+SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/libsigc++/2.2/libsigc++-${PV}.tar.xz"
+SRC_URI[md5sum] = "815d0c6d61601f51bbcaeef6826606b0"
+SRC_URI[sha256sum] = "9834045f74f56752c2c6b3cdc195c30ab8314ad22dc8e626d6f67f940f1e4957"
 
 S = "${WORKDIR}/libsigc++-${PV}"
 
-- 
1.7.4.4

[meta-oe++/master 03/11] glibmm: merge glibmm.inc into recipe - and stylize a bit

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 meta-oe/recipes-core/glib-2.0/glibmm.inc       |   28 -----------------------
 meta-oe/recipes-core/glib-2.0/glibmm_2.28.2.bb |   29 +++++++++++++++++++++--
 2 files changed, 26 insertions(+), 31 deletions(-)
 delete mode 100644 meta-oe/recipes-core/glib-2.0/glibmm.inc

diff --git a/meta-oe/recipes-core/glib-2.0/glibmm.inc b/meta-oe/recipes-core/glib-2.0/glibmm.inc
deleted file mode 100644
index bdb6ff8..0000000
--- a/meta-oe/recipes-core/glib-2.0/glibmm.inc
+++ /dev/null
@@ -1,28 +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"
-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;name=archive"
-
-inherit autotools pkgconfig
-
-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/"
-
-LIBV = "2.4.0"
-
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 c864153..0bdaa80 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,9 +1,32 @@
-require glibmm.inc
+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"
 
-SRC_URI += " file://remove-examples.patch \
-             file://glib-2.32.patch"
+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/"
-- 
1.7.4.4

[meta-oe++/master 04/11] glibmm: update to 2.36.2

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 .../recipes-core/glib-2.0/glibmm/glib-2.32.patch   |   10 ----------
 .../{glibmm_2.28.2.bb => glibmm_2.36.2.bb}         |    9 +++------
 2 files changed, 3 insertions(+), 16 deletions(-)
 delete mode 100644 meta-oe/recipes-core/glib-2.0/glibmm/glib-2.32.patch
 rename meta-oe/recipes-core/glib-2.0/{glibmm_2.28.2.bb => glibmm_2.36.2.bb} (81%)

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 50b7367..0000000
--- 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
similarity index 81%
rename from meta-oe/recipes-core/glib-2.0/glibmm_2.28.2.bb
rename to meta-oe/recipes-core/glib-2.0/glibmm_2.36.2.bb
index 0bdaa80..9735d6a 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
-- 
1.7.4.4

[meta-oe++/master 05/11] pangomm: update to 2.34.0

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 .../pango/{pangomm_2.28.2.bb => pangomm_2.34.0.bb} |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)
 rename meta-oe/recipes-graphics/pango/{pangomm_2.28.2.bb => pangomm_2.34.0.bb} (76%)

diff --git a/meta-oe/recipes-graphics/pango/pangomm_2.28.2.bb b/meta-oe/recipes-graphics/pango/pangomm_2.34.0.bb
similarity index 76%
rename from meta-oe/recipes-graphics/pango/pangomm_2.28.2.bb
rename to meta-oe/recipes-graphics/pango/pangomm_2.34.0.bb
index 4419113..4f293ff 100644
--- a/meta-oe/recipes-graphics/pango/pangomm_2.28.2.bb
+++ b/meta-oe/recipes-graphics/pango/pangomm_2.34.0.bb
@@ -4,15 +4,13 @@ LICENSE = "LGPLv2.1 & GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d8045f3b8f929c1cb29a1e3fd737b499 \
                     file://COPYING.tools;md5=751419260aa954499f7abaabaa882bbe"
 
-PR = "r2"
-
 DEPENDS = "mm-common cairomm glibmm"
 
 SHRT_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}"
 
-SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/pangomm/${SHRT_VER}/pangomm-${PV}.tar.bz2"
-SRC_URI[md5sum] = "005a474863495d3c6267429a80da6cf2"
-SRC_URI[sha256sum] = "ec1d97245eada5cf18d0e7af3f6e31498f25623b4a354589d631d2dff92fd88f"
+SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/pangomm/${SHRT_VER}/pangomm-${PV}.tar.xz"
+SRC_URI[md5sum] = "2c702caede167323c9ed9eed2b933098"
+SRC_URI[sha256sum] = "0e82bbff62f626692a00f3772d8b17169a1842b8cc54d5f2ddb1fec2cede9e41"
 
 inherit autotools
 
-- 
1.7.4.4

[meta-oe++/master 06/11] gtkmm: merge gtkmm.inc into recipe - and cleanup a bit

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 meta-oe/recipes-gnome/gtk+/gtkmm.inc       |   29 ----------------------------
 meta-oe/recipes-gnome/gtk+/gtkmm_2.20.0.bb |   28 +++++++++++++++++++++++++-
 2 files changed, 26 insertions(+), 31 deletions(-)
 delete mode 100644 meta-oe/recipes-gnome/gtk+/gtkmm.inc

diff --git a/meta-oe/recipes-gnome/gtk+/gtkmm.inc b/meta-oe/recipes-gnome/gtk+/gtkmm.inc
deleted file mode 100644
index fe72a73..0000000
--- a/meta-oe/recipes-gnome/gtk+/gtkmm.inc
+++ /dev/null
@@ -1,29 +0,0 @@
-DESCRIPTION = "C++ bindings for the GTK+ toolkit."
-HOMEPAGE = "http://www.gtkmm.org/"
-SECTION = "libs"
-
-LICENSE = "LGPLv2.1 & GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=d8045f3b8f929c1cb29a1e3fd737b499 \
-                    file://COPYING.tools;md5=751419260aa954499f7abaabaa882bbe"
-
-DEPENDS = "atk pangomm glibmm gtk+ cairomm"
-
-inherit gnome autotools pkgconfig
-
-INC_PR = "r0"
-
-EXTRA_OECONF = " --disable-documentation "
-
-LIBV = "2.4.0"
-
-do_install_append () {
-    install -d ${D}${includedir}/gtkmm-2.4
-    install -m 0644 gdk/gdkmmconfig.h ${D}${includedir}/gtkmm-2.4
-    install -m 0644 gtk/gtkmmconfig.h ${D}${includedir}/gtkmm-2.4
-}
-
-PACKAGES =+ "${PN}-demo"
-
-FILES_${PN} = "${libdir}/lib*.so.*"
-FILES_${PN}-dev += "${libdir}/*/include ${libdir}/*/proc/m4"
-FILES_${PN}-demo += "${datadir}/*/demo/"
diff --git a/meta-oe/recipes-gnome/gtk+/gtkmm_2.20.0.bb b/meta-oe/recipes-gnome/gtk+/gtkmm_2.20.0.bb
index 05d7108..340657e 100644
--- a/meta-oe/recipes-gnome/gtk+/gtkmm_2.20.0.bb
+++ b/meta-oe/recipes-gnome/gtk+/gtkmm_2.20.0.bb
@@ -1,7 +1,31 @@
-require gtkmm.inc
+DESCRIPTION = "C++ bindings for the GTK+ toolkit."
+HOMEPAGE = "http://www.gtkmm.org/"
+SECTION = "libs"
 
-PR = "${INC_PR}.2"
+LICENSE = "LGPLv2.1 & GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=d8045f3b8f929c1cb29a1e3fd737b499 \
+                    file://COPYING.tools;md5=751419260aa954499f7abaabaa882bbe"
+
+PR = "r1"
+
+DEPENDS = "atk pangomm glibmm gtk+ cairomm"
+
+inherit gnome autotools pkgconfig
 
 SRC_URI[archive.md5sum] = "c0cb0ea5bc1ab511d9b2461083f0445f"
 SRC_URI[archive.sha256sum] = "c1199bbee423d6f0ef9b5e88973c5620a1e1c52f9f1298dffcfa36284a7fd91a"
 
+EXTRA_OECONF = " --disable-documentation "
+
+do_install_append () {
+    install -d ${D}${includedir}/gtkmm-2.4
+    install -m 0644 gdk/gdkmmconfig.h ${D}${includedir}/gtkmm-2.4
+    install -m 0644 gtk/gtkmmconfig.h ${D}${includedir}/gtkmm-2.4
+}
+
+PACKAGES =+ "${PN}-demo"
+
+FILES_${PN} = "${libdir}/lib*.so.*"
+FILES_${PN}-dev += "${libdir}/*/include ${libdir}/*/proc/m4"
+FILES_${PN}-demo += "${datadir}/*/demo/"
+
-- 
1.7.4.4

[meta-oe++/master 07/11] atkmm: initial add 2.22.7

[Andreas Müller]

it is required for the update of gtkmm in the following patch

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 meta-oe/recipes-gnome/atk/atkmm_2.22.7.bb |   19 +++++++++++++++++++
 1 files changed, 19 insertions(+), 0 deletions(-)
 create mode 100644 meta-oe/recipes-gnome/atk/atkmm_2.22.7.bb

diff --git a/meta-oe/recipes-gnome/atk/atkmm_2.22.7.bb b/meta-oe/recipes-gnome/atk/atkmm_2.22.7.bb
new file mode 100644
index 0000000..35ba589
--- /dev/null
+++ b/meta-oe/recipes-gnome/atk/atkmm_2.22.7.bb
@@ -0,0 +1,19 @@
+DESCRIPTION = "C++ bindings for the atk"
+SECTION = "libs"
+
+LICENSE = "LGPLv2.1 & GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1 \
+                    file://COPYING.tools;md5=751419260aa954499f7abaabaa882bbe"
+
+DEPENDS = "atk"
+
+inherit gnome autotools pkgconfig
+
+GNOME_COMPRESS_TYPE = "xz"
+
+SRC_URI[archive.md5sum] = "fec7db3fc47ba2e0c95d130ec865a236"
+SRC_URI[archive.sha256sum] = "bfbf846b409b4c5eb3a52fa32a13d86936021969406b3dcafd4dd05abd70f91b"
+
+EXTRA_OECONF = " --disable-documentation "
+
+FILES_${PN}-dev += "${libdir}/*/include ${libdir}/*/proc/m4"
-- 
1.7.4.4

[meta-oe++/master 08/11] gtkmm: update to 2.24.3

[Andreas Müller]

build test of pavucontrol and gnome-system-monitor which depend on gtkmm

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 meta-oe/recipes-gnome/gtk+/gtkmm_2.20.0.bb |   31 ----------------------------
 meta-oe/recipes-gnome/gtk+/gtkmm_2.24.3.bb |   20 ++++++++++++++++++
 2 files changed, 20 insertions(+), 31 deletions(-)
 delete mode 100644 meta-oe/recipes-gnome/gtk+/gtkmm_2.20.0.bb
 create mode 100644 meta-oe/recipes-gnome/gtk+/gtkmm_2.24.3.bb

diff --git a/meta-oe/recipes-gnome/gtk+/gtkmm_2.20.0.bb b/meta-oe/recipes-gnome/gtk+/gtkmm_2.20.0.bb
deleted file mode 100644
index 340657e..0000000
--- a/meta-oe/recipes-gnome/gtk+/gtkmm_2.20.0.bb
+++ /dev/null
@@ -1,31 +0,0 @@
-DESCRIPTION = "C++ bindings for the GTK+ toolkit."
-HOMEPAGE = "http://www.gtkmm.org/"
-SECTION = "libs"
-
-LICENSE = "LGPLv2.1 & GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=d8045f3b8f929c1cb29a1e3fd737b499 \
-                    file://COPYING.tools;md5=751419260aa954499f7abaabaa882bbe"
-
-PR = "r1"
-
-DEPENDS = "atk pangomm glibmm gtk+ cairomm"
-
-inherit gnome autotools pkgconfig
-
-SRC_URI[archive.md5sum] = "c0cb0ea5bc1ab511d9b2461083f0445f"
-SRC_URI[archive.sha256sum] = "c1199bbee423d6f0ef9b5e88973c5620a1e1c52f9f1298dffcfa36284a7fd91a"
-
-EXTRA_OECONF = " --disable-documentation "
-
-do_install_append () {
-    install -d ${D}${includedir}/gtkmm-2.4
-    install -m 0644 gdk/gdkmmconfig.h ${D}${includedir}/gtkmm-2.4
-    install -m 0644 gtk/gtkmmconfig.h ${D}${includedir}/gtkmm-2.4
-}
-
-PACKAGES =+ "${PN}-demo"
-
-FILES_${PN} = "${libdir}/lib*.so.*"
-FILES_${PN}-dev += "${libdir}/*/include ${libdir}/*/proc/m4"
-FILES_${PN}-demo += "${datadir}/*/demo/"
-
diff --git a/meta-oe/recipes-gnome/gtk+/gtkmm_2.24.3.bb b/meta-oe/recipes-gnome/gtk+/gtkmm_2.24.3.bb
new file mode 100644
index 0000000..2e09071
--- /dev/null
+++ b/meta-oe/recipes-gnome/gtk+/gtkmm_2.24.3.bb
@@ -0,0 +1,20 @@
+DESCRIPTION = "C++ bindings for the GTK+ toolkit."
+HOMEPAGE = "http://www.gtkmm.org/"
+SECTION = "libs"
+
+LICENSE = "LGPLv2.1 & GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=d8045f3b8f929c1cb29a1e3fd737b499 \
+                    file://COPYING.tools;md5=751419260aa954499f7abaabaa882bbe"
+
+DEPENDS = "atkmm pangomm glibmm gtk+ cairomm"
+
+inherit gnome autotools pkgconfig
+
+GNOME_COMPRESS_TYPE = "xz"
+
+SRC_URI[archive.md5sum] = "42fc5a3feeb33ea59b7660200e2a5465"
+SRC_URI[archive.sha256sum] = "c564a438677174b97d69dd70467cb03c933481006398dc9377417aa6abe02a39"
+
+EXTRA_OECONF = " --disable-documentation "
+
+FILES_${PN}-dev += "${libdir}/*/include ${libdir}/*/proc/m4"
-- 
1.7.4.4

[meta-oe++/master 09/11] gtkhtml2: fix build with glib 2.36

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 ...001-tests-main.c-fix-build-with-glib-2.36.patch |   32 ++++++++++++++++++++
 meta-oe/recipes-gnome/gtkhtml2/gtkhtml2_svn.bb     |    3 +-
 2 files changed, 34 insertions(+), 1 deletions(-)
 create mode 100644 meta-oe/recipes-gnome/gtkhtml2/files/0001-tests-main.c-fix-build-with-glib-2.36.patch

diff --git a/meta-oe/recipes-gnome/gtkhtml2/files/0001-tests-main.c-fix-build-with-glib-2.36.patch b/meta-oe/recipes-gnome/gtkhtml2/files/0001-tests-main.c-fix-build-with-glib-2.36.patch
new file mode 100644
index 0000000..b3eb396
--- /dev/null
+++ b/meta-oe/recipes-gnome/gtkhtml2/files/0001-tests-main.c-fix-build-with-glib-2.36.patch
@@ -0,0 +1,32 @@
+From 4b17eed4b8588569d11ec4bd2b6fa3c063830e6e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Thu, 16 May 2013 18:44:50 +0200
+Subject: [PATCH] tests/main.c: fix build with glib 2.36
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: project seems dead
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ tests/main.c |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/tests/main.c b/tests/main.c
+index 61cce82..18165ed 100644
+--- a/tests/main.c
++++ b/tests/main.c
+@@ -30,7 +30,9 @@ main (gint argc, gchar **argv)
+ {
+ 	GtkWidget *browser;
+ 
++#if !GLIB_CHECK_VERSION (2, 36, 0)
+ 	g_thread_init(NULL);
++#endif
+ 
+ 	gtk_init (&argc, &argv);
+ 
+-- 
+1.7.6.5
+
diff --git a/meta-oe/recipes-gnome/gtkhtml2/gtkhtml2_svn.bb b/meta-oe/recipes-gnome/gtkhtml2/gtkhtml2_svn.bb
index 8e9df16..58d41ee 100644
--- a/meta-oe/recipes-gnome/gtkhtml2/gtkhtml2_svn.bb
+++ b/meta-oe/recipes-gnome/gtkhtml2/gtkhtml2_svn.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=55ca817ccb7d5b5b66355690e9abc605"
 
 SRCREV = "1161"
 PV = "2.11.0+svnr${SRCPV}"
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "svn://svn.gnome.org/svn/gtkhtml2/;module=trunk;protocol=http \
            http://git.yoctoproject.org/cgit/cgit.cgi/web-patches/plain/css-stylesheet-user.patch;striplevel=0;name=patch2 \
@@ -14,6 +14,7 @@ SRC_URI = "svn://svn.gnome.org/svn/gtkhtml2/;module=trunk;protocol=http \
            http://git.yoctoproject.org/cgit/cgit.cgi/web-patches/plain/add-end-element-signal.patch;striplevel=0;name=patch4 \
            http://git.yoctoproject.org/cgit/cgit.cgi/web-patches/plain/add-dom-functions.patch;striplevel=0;name=patch5 \
            http://git.yoctoproject.org/cgit/cgit.cgi/web-patches/plain/iain-mem-leak.patch;striplevel=0;name=patch6 \
+           file://0001-tests-main.c-fix-build-with-glib-2.36.patch \
 "
 
 SRC_URI[patch2.md5sum] = "05fc3627ca364095702dc804f41c8391"
-- 
1.7.4.4

[meta-oe++/master 10/11] evince: fix build with gcc 4.8

[Andreas Müller]

warning/errror was:
tiff2ps.c:1131:4: error: format '%u' expects argument of type 'unsigned int', but argument 3 has type 'tsize_t' [-Werror=format=]
    chunk_size, tiled_image ? "tiles" : "strips");
    ^
cc1: some warnings being treated as errors

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 .../evince/0001-tiff-fix-compile-warning.patch     |   33 ++++++++++++++++++++
 meta-gnome/recipes-gnome/evince/evince_2.32.0.bb   |    7 +++-
 2 files changed, 38 insertions(+), 2 deletions(-)
 create mode 100644 meta-gnome/recipes-gnome/evince/evince/0001-tiff-fix-compile-warning.patch

diff --git a/meta-gnome/recipes-gnome/evince/evince/0001-tiff-fix-compile-warning.patch b/meta-gnome/recipes-gnome/evince/evince/0001-tiff-fix-compile-warning.patch
new file mode 100644
index 0000000..ebc8976
--- /dev/null
+++ b/meta-gnome/recipes-gnome/evince/evince/0001-tiff-fix-compile-warning.patch
@@ -0,0 +1,33 @@
+From 00b5e55c90477eeac02bec58f032cb6916a1eb5c Mon Sep 17 00:00:00 2001
+From: Hib Eris <hib@hiberis.nl>
+Date: Mon, 20 Feb 2012 21:36:16 +0100
+Subject: [PATCH] tiff: fix compile warning
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Backport
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ backend/tiff/tiff2ps.c |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/backend/tiff/tiff2ps.c b/backend/tiff/tiff2ps.c
+index c0dc0bf..fc63c2e 100644
+--- a/backend/tiff/tiff2ps.c
++++ b/backend/tiff/tiff2ps.c
+@@ -1127,8 +1127,8 @@ PS_Lvl2page(TIFF2PSContext* ctx, TIFF* tif, uint32 w, uint32 h)
+ 	}
+ 	buf_data = (unsigned char *)_TIFFmalloc(chunk_size);
+ 	if (!buf_data) {
+-		TIFFError(ctx->filename, "Can't alloc %u bytes for %s.",
+-			chunk_size, tiled_image ? "tiles" : "strips");
++		TIFFError(ctx->filename, "Can't alloc %u bytes for %s.",
++			(uint) chunk_size, tiled_image ? "tiles" : "strips");
+ 		return(FALSE);
+ 	}
+ 
+-- 
+1.7.6.5
+
diff --git a/meta-gnome/recipes-gnome/evince/evince_2.32.0.bb b/meta-gnome/recipes-gnome/evince/evince_2.32.0.bb
index f1c3563..6197564 100644
--- a/meta-gnome/recipes-gnome/evince/evince_2.32.0.bb
+++ b/meta-gnome/recipes-gnome/evince/evince_2.32.0.bb
@@ -4,11 +4,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=96f2f8d5ee576a2163977938ea36fa7b"
 SECTION = "x11/office"
 DEPENDS = "gnome-icon-theme gnome-doc-utils-native libgnome-keyring nautilus tiff libxt ghostscript poppler libxml2 gtk+ gconf libglade"
 
-PR = "r4"
+PR = "r5"
 
 inherit gnome pkgconfig gtk-icon-cache gsettings
 
-SRC_URI += "file://cross-compile-fix.patch"
+SRC_URI += " \
+    file://cross-compile-fix.patch \
+    file://0001-tiff-fix-compile-warning.patch \
+"
 
 SRC_URI[archive.md5sum] = "ebc3ce6df8dcbf29cb9492f8dd031319"
 SRC_URI[archive.sha256sum] = "2a4c91ae38f8b5028cebb91b9da9ddc50ea8ae3f3d429df89ba351da2d787ff7"
-- 
1.7.4.4

[meta-oe++/master 11/11] gnome-system-monitor: fix build after gtkmm update

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 ...0002-src-procman.cpp-include-main-gtkmm.h.patch |   49 ++++++++++++++++++++
 .../gnome-system-monitor_2.28.2.bb                 |    7 ++-
 2 files changed, 54 insertions(+), 2 deletions(-)
 create mode 100644 meta-gnome/recipes-gnome/gnome-system-monitor/files/0002-src-procman.cpp-include-main-gtkmm.h.patch

diff --git a/meta-gnome/recipes-gnome/gnome-system-monitor/files/0002-src-procman.cpp-include-main-gtkmm.h.patch b/meta-gnome/recipes-gnome/gnome-system-monitor/files/0002-src-procman.cpp-include-main-gtkmm.h.patch
new file mode 100644
index 0000000..7b67281
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gnome-system-monitor/files/0002-src-procman.cpp-include-main-gtkmm.h.patch
@@ -0,0 +1,49 @@
+From acff719983aa1294148dc4a367c48957f5510eff Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Fri, 17 May 2013 18:25:56 +0200
+Subject: [PATCH] src/procman.cpp: include main gtkmm.h
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+after update of gtkmm build failed with:
+
+In file included from /home/Superandy/tmp/oe-core-eglibc/sysroots/overo/usr/include/gtkmm-2.4/gtkmm/main.h:33:0,
+                 from procman.cpp:26:
+/home/Superandy/tmp/oe-core-eglibc/sysroots/overo/usr/include/gdkmm-2.4/gdkmm/types.h:92:7: error: 'Value' is not a template
+/home/Superandy/tmp/oe-core-eglibc/sysroots/overo/usr/include/gdkmm-2.4/gdkmm/types.h:92:54: error: expected template-name before '<' token
+/home/Superandy/tmp/oe-core-eglibc/sysroots/overo/usr/include/gdkmm-2.4/gdkmm/types.h:92:54: error: expected '{' before '<' token
+/home/Superandy/tmp/oe-core-eglibc/sysroots/overo/usr/include/gdkmm-2.4/gdkmm/types.h:92:54: error: expected unqualified-id before '<' token
+/home/Superandy/tmp/oe-core-eglibc/sysroots/overo/usr/include/gdkmm-2.4/gdkmm/types.h:174:7: error: 'Value' is not a template
+/home/Superandy/tmp/oe-core-eglibc/sysroots/overo/usr/include/gdkmm-2.4/gdkmm/types.h:174:30: error: 'Glib::Value' is not a template type
+/home/Superandy/tmp/oe-core-eglibc/sysroots/overo/usr/include/gdkmm-2.4/gdkmm/types.h:174:58: error: expected template-name before '<' token
+/home/Superandy/tmp/oe-core-eglibc/sysroots/overo/usr/include/gdkmm-2.4/gdkmm/types.h:207:7: error: 'Value' is not a template
+/home/Superandy/tmp/oe-core-eglibc/sysroots/overo/usr/include/gdkmm-2.4/gdkmm/types.h:207:24: error: 'Glib::Value' is not a template type
+/home/Superandy/tmp/oe-core-eglibc/sysroots/overo/usr/include/gdkmm-2.4/gdkmm/types.h:207:51: error: expected template-name before '<' token
+/home/Superandy/tmp/oe-core-eglibc/sysroots/overo/usr/include/gdkmm-2.4/gdkmm/types.h:274:7: error: 'Value' is not a template
+/home/Superandy/tmp/oe-core-eglibc/sysroots/overo/usr/include/gdkmm-2.4/gdkmm/types.h:274:32: error: 'Glib::Value' is not a template type
+<...>
+
+Upstream-Status: Backport
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ src/procman.cpp |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/procman.cpp b/src/procman.cpp
+index b5c0d0a..d9b4b3f 100644
+--- a/src/procman.cpp
++++ b/src/procman.cpp
+@@ -23,7 +23,7 @@
+ 
+ #include <locale.h>
+ 
+-#include <gtkmm/main.h>
++#include <gtkmm.h>
+ #include <giomm/volumemonitor.h>
+ #include <giomm/init.h>
+ #include <glib.h>
+-- 
+1.7.4.4
+
diff --git a/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_2.28.2.bb b/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_2.28.2.bb
index 7764b71..4e0d0da 100644
--- a/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_2.28.2.bb
+++ b/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_2.28.2.bb
@@ -2,14 +2,17 @@ DESCRIPTION = "Gnome system monitor"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
 SECTION = "x11/gnome"
-PR = "r1"
+PR = "r2"
 
 DEPENDS = "libgtop gtkmm glibmm gnome-doc-utils gnome-icon-theme libwnck gtk+ dbus-glib librsvg"
 
 inherit gnome
 SRC_URI[archive.md5sum] = "3f0bca9b0ebc7a365466851cd580d167"
 SRC_URI[archive.sha256sum] = "b628edfd39e3a6b374ce133f367d3568475eb4e981a367f4f9d62a9784e5ae59"
-SRC_URI += "file://0001-Fix-glib-includes.patch"
+SRC_URI += " \
+    file://0001-Fix-glib-includes.patch \
+    file://0002-src-procman.cpp-include-main-gtkmm.h.patch \
+"
 
 do_configure_prepend() {
     sed -i -e s:help::g ${S}/Makefile.am
-- 
1.7.4.4

Re: [meta-oe++/master 01/11] mm-common: update to 0.9.6

[Khem Raj]

On Sunday, May 19, 2013, Andreas Müller <schnitzeltony@googlemail.com>
wrote:
> Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
> ---
>  meta-oe/recipes-core/mm-common/mm-common_0.9.5.bb |   10 ----------
>  meta-oe/recipes-core/mm-common/mm-common_0.9.6.bb |   12 ++++++++++++
>  2 files changed, 12 insertions(+), 10 deletions(-)
>  delete mode 100644 meta-oe/recipes-core/mm-common/mm-common_0.9.5.bb
>  create mode 100644 meta-oe/recipes-core/mm-common/mm-common_0.9.6.bb
>
> diff --git a/meta-oe/recipes-core/mm-common/mm-common_0.9.5.bbb/meta-oe/recipes-core/mm-common/
mm-common_0.9.5.bb
> deleted file mode 100644
> index c49b4c8..0000000
> --- a/meta-oe/recipes-core/mm-common/mm-common_0.9.5.bb
> +++ /dev/null
> @@ -1,10 +0,0 @@
> -inherit gnomebase
> -
> -SRC_URI[archive.md5sum] = "4a4dad67fc8d7e0c529f3a8c6ba4d8b2"
> -SRC_URI[archive.sha256sum] =
"9c602dba89d264a4719db996b9b169716df2d4d10bcd24e56fc3572865a5cb8b"
> -
> -LICENSE = "GPLv2"
> -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
> -
> -BBCLASSEXTEND = "native"
> -
> diff --git a/meta-oe/recipes-core/mm-common/mm-common_0.9.6.bbb/meta-oe/recipes-core/mm-common/
mm-common_0.9.6.bb
> new file mode 100644
> index 0000000..f7e2507
> --- /dev/null
> +++ b/meta-oe/recipes-core/mm-common/mm-common_0.9.6.bb
> @@ -0,0 +1,12 @@
> +inherit gnomebase
> +
> +GNOME_COMPRESS_TYPE="xz"

Does this mean you need to add dependency on xz-native ?
> +
> +SRC_URI[archive.md5sum] = "3b23749ab39441c392c016ce74632678"
> +SRC_URI[archive.sha256sum] =
"7c37158a1f37604705a9b9305d3b335fb8256f5de701c8801269dde4e2ce7dde"
> +
> +LICENSE = "GPLv2"
> +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
> +
> +BBCLASSEXTEND = "native"
> +
> --
> 1.7.4.4
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>

Re: [meta-oe++/master 03/11] glibmm: merge glibmm.inc into recipe - and stylize a bit

[Khem Raj]

Why merge inc ? Generally its helpful in writing recipes in other layers we
can share common code

On Sunday, May 19, 2013, Andreas Müller <schnitzeltony@googlemail.com>
wrote:
> Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
> ---
>  meta-oe/recipes-core/glib-2.0/glibmm.inc       |   28
-----------------------
>  meta-oe/recipes-core/glib-2.0/glibmm_2.28.2.bb |   29
+++++++++++++++++++++--
>  2 files changed, 26 insertions(+), 31 deletions(-)
>  delete mode 100644 meta-oe/recipes-core/glib-2.0/glibmm.inc
>
> diff --git a/meta-oe/recipes-core/glib-2.0/glibmm.inc
b/meta-oe/recipes-core/glib-2.0/glibmm.inc
> deleted file mode 100644
> index bdb6ff8..0000000
> --- a/meta-oe/recipes-core/glib-2.0/glibmm.inc
> +++ /dev/null
> @@ -1,28 +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"
> -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;name=archive
"
> -
> -inherit autotools pkgconfig
> -
> -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/"
> -
> -LIBV = "2.4.0"
> -
> diff --git a/meta-oe/recipes-core/glib-2.0/glibmm_2.28.2.bbb/meta-oe/recipes-core/glib-2.0/
glibmm_2.28.2.bb
> index c864153..0bdaa80 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,9 +1,32 @@
> -require glibmm.inc
> +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"
>
> -SRC_URI += " file://remove-examples.patch \
> -             file://glib-2.32.patch"
> +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/"
> --
> 1.7.4.4
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>

Re: [meta-oe++/master 01/11] mm-common: update to 0.9.6

[Paul Eggleton]

On Sunday 19 May 2013 12:55:48 Khem Raj wrote:
> > --- /dev/null
> > +++ b/meta-oe/recipes-core/mm-common/mm-common_0.9.6.bb
> > @@ -0,0 +1,12 @@
> > +inherit gnomebase
> > +
> > +GNOME_COMPRESS_TYPE="xz"
> 
> Does this mean you need to add dependency on xz-native ?

No need, base.bbclass does this automatically if .xz is in a SRC_URI entry.

Cheers,
Paul

-- 

Paul Eggleton
Intel Open Source Technology Centre

Re: [meta-oe++/master 03/11] glibmm: merge glibmm.inc into recipe - and stylize a bit

[Andreas Müller]

On Sun, May 19, 2013 at 9:58 PM, Khem Raj <raj.khem@gmail.com> wrote:
> Why merge inc ? Generally its helpful in writing recipes in other layers we
> can share common code
>
Before doing this I have checked: Nothing except glibmm itself
includes glibmm.inc in the layers I use. So for me it looked like a
remnant from classic oe where we had more than one version for many
recipes. So if this code is not really shared I prefer clean recipes
without includes. Do you have a use case for this include - then I
should send V2.

Andreas

Re: [meta-oe++/master 03/11] glibmm: merge glibmm.inc into recipe - and stylize a bit

[Khem Raj]

On Tue, May 21, 2013 at 12:51 AM, Andreas Müller
<schnitzeltony@googlemail.com> wrote:
> On Sun, May 19, 2013 at 9:58 PM, Khem Raj <raj.khem@gmail.com> wrote:
>> Why merge inc ? Generally its helpful in writing recipes in other layers we
>> can share common code
>>
> Before doing this I have checked: Nothing except glibmm itself
> includes glibmm.inc in the layers I use. So for me it looked like a
> remnant from classic oe where we had more than one version for many
> recipes. So if this code is not really shared I prefer clean recipes
> without includes. Do you have a use case for this include - then I
> should send V2.

I think this case looks ok if its lone case. Although keeping .incs do
have advantages.

>
> Andreas
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel