glibmm: add 2.22.1, fix packaging

cairomm: add 1.8.2
pangomm: add 2.26.0
gtkmm: add 2.18.1

5 files changed, 58 insertions, 3 deletions

diff --git a/recipes/cairo/cairomm_1.8.2.bb b/recipes/cairo/cairomm_1.8.2.bb
new file mode 100644
index 0000000000..11b3e0ebbf
--- /dev/null
+++ b/recipes/cairo/cairomm_1.8.2.bb
@@ -0,0 +1,7 @@
+require cairo.inc
+
+DEPENDS = "cairo"
+DESCRIPTION = "C++ bindings for Cairo graphics library"
+
+SRC_URI = "http://cairographics.org/releases/cairomm-${PV}.tar.gz"
+
diff --git a/recipes/glibmm/glibmm.inc b/recipes/glibmm/glibmm.inc
index c33d3151ae..bb786ff578 100644
--- a/recipes/glibmm/glibmm.inc
+++ b/recipes/glibmm/glibmm.inc
@@ -4,7 +4,6 @@ SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "LGPL"
 DEPENDS = "glib-2.0 libsigc++-2.0"
-PR = "r0"
 SHRT_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}"
 
 SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/glibmm/${SHRT_VER}/glibmm-${PV}.tar.bz2"
@@ -12,7 +11,7 @@ SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/glibmm/${SHRT_VER}/glibmm-${PV}
 inherit autotools pkgconfig flow-lossage
 
 FILES_${PN} = "${libdir}/lib*.so.*"
-FILES_${PN}-dev += "${libdir}/glibmm-2.4/include/"
+FILES_${PN}-dev += "${libdir}/glibmm-2.4/include/ ${libdir}/glibmm-2.4/proc/ ${libdir}/giomm-2.4/include/"
 
 LIBV = "2.4.0"
 
@@ -20,5 +19,5 @@ do_stage () {
 	autotools_stage_all
 
 	install -m 0644 glib/glibmmconfig.h ${STAGING_INCDIR}/glibmm-2.4
-	install -m 0644 scripts/glibmm_check_perl.m4 ${STAGING_DATADIR}/aclocal/
+	install -m 0644 scripts/glibmm_check_perl.m4 ${STAGING_DATADIR}/aclocal/ || true
 }
diff --git a/recipes/glibmm/glibmm_2.22.1.bb b/recipes/glibmm/glibmm_2.22.1.bb
new file mode 100644
index 0000000000..d96a372d26
--- /dev/null
+++ b/recipes/glibmm/glibmm_2.22.1.bb
@@ -0,0 +1,9 @@
+require glibmm.inc
+
+do_configure() {
+	libtoolize --force
+	gnu-configize
+	oe_runconf
+}
+
+
diff --git a/recipes/gtkmm/gtkmm_2.18.1.bb b/recipes/gtkmm/gtkmm_2.18.1.bb
new file mode 100644
index 0000000000..198fbd4f43
--- /dev/null
+++ b/recipes/gtkmm/gtkmm_2.18.1.bb
@@ -0,0 +1,13 @@
+require gtkmm.inc
+
+DEPENDS += "pangomm"
+
+EXTRA_OECONF = " --disable-documentation "
+
+do_configure() {
+    libtoolize --force
+    gnu-configize
+    oe_runconf
+}
+
+
diff --git a/recipes/pango/pangomm_2.26.0.bb b/recipes/pango/pangomm_2.26.0.bb
new file mode 100644
index 0000000000..127daa5d50
--- /dev/null
+++ b/recipes/pango/pangomm_2.26.0.bb
@@ -0,0 +1,27 @@
+DESCRIPTION = "C++ bindings for the pango library."
+SECTION = "libs"
+PRIORITY = "optional"
+LICENSE = "LGPL"
+DEPENDS = "cairomm glibmm"
+SHRT_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}"
+
+SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/pangomm/${SHRT_VER}/pangomm-${PV}.tar.bz2"
+
+inherit autotools flow-lossage
+
+FILES_${PN} = "${libdir}/lib*.so.*"
+FILES_${PN}-dev += "${libdir}/*/include/"
+
+EXTRA_OECONF = " --disable-documentation "
+
+do_configure() {
+    libtoolize --force
+    gnu-configize
+    oe_runconf
+}
+
+AUTOTOOLS_STAGE_PKGCONFIG = "1"
+
+do_stage () {
+	autotools_stage_all
+}