From 12d3b6eaf31db268db42048cf5f4106ab083a110 Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Wed, 17 Nov 2010 00:12:02 +0100 Subject: [PATCH] gtkmm: added gtkmm-demo package There were some unpacked files in /usr/share/gtkmm-2.4/demo/ This patch addes a new package gtkmm-demo and stuffs the files from that demo dir in it Also added INC_PR Signed-off-by: Frans Meulenbroeks --- recipes/gtkmm/gtkmm.inc | 5 +++++ recipes/gtkmm/gtkmm_2.12.7.bb | 2 +- recipes/gtkmm/gtkmm_2.14.1.bb | 2 +- recipes/gtkmm/gtkmm_2.18.1.bb | 2 +- recipes/gtkmm/gtkmm_2.20.0.bb | 2 ++ 5 files changed, 10 insertions(+), 3 deletions(-) diff --git a/recipes/gtkmm/gtkmm.inc b/recipes/gtkmm/gtkmm.inc index f2d12466a6..0cd314b7b4 100644 --- a/recipes/gtkmm/gtkmm.inc +++ b/recipes/gtkmm/gtkmm.inc @@ -7,6 +7,8 @@ DEPENDS = "atk glibmm gtk+ cairomm" inherit gnome autotools pkgconfig flow-lossage +INC_PR = "r2" + LIBV = "2.4.0" do_install_append () { @@ -15,5 +17,8 @@ do_install_append () { 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/recipes/gtkmm/gtkmm_2.12.7.bb b/recipes/gtkmm/gtkmm_2.12.7.bb index 8c179523a4..5406e419b1 100644 --- a/recipes/gtkmm/gtkmm_2.12.7.bb +++ b/recipes/gtkmm/gtkmm_2.12.7.bb @@ -1,6 +1,6 @@ require gtkmm.inc -PR = "r0" +PR = "${INC_PR}.0" # Hack! Remove once gtkmm likes libtool 2x do_configure() { diff --git a/recipes/gtkmm/gtkmm_2.14.1.bb b/recipes/gtkmm/gtkmm_2.14.1.bb index ec9ea23083..0c82fa3d17 100644 --- a/recipes/gtkmm/gtkmm_2.14.1.bb +++ b/recipes/gtkmm/gtkmm_2.14.1.bb @@ -2,7 +2,7 @@ require gtkmm.inc DEPENDS += "pangomm" -PR = "r0" +PR = "${INC_PR}.0" # Hack! Remove once gtkmm likes libtool 2x do_cconfigure() { diff --git a/recipes/gtkmm/gtkmm_2.18.1.bb b/recipes/gtkmm/gtkmm_2.18.1.bb index 13fc95b255..631a59acf7 100644 --- a/recipes/gtkmm/gtkmm_2.18.1.bb +++ b/recipes/gtkmm/gtkmm_2.18.1.bb @@ -2,7 +2,7 @@ require gtkmm.inc DEPENDS += "pangomm" -PR = "r1" +PR = "${INC_PR}.0" EXTRA_OECONF = " --disable-documentation " diff --git a/recipes/gtkmm/gtkmm_2.20.0.bb b/recipes/gtkmm/gtkmm_2.20.0.bb index cc33fc439f..24c40af1ef 100644 --- a/recipes/gtkmm/gtkmm_2.20.0.bb +++ b/recipes/gtkmm/gtkmm_2.20.0.bb @@ -1,5 +1,7 @@ require gtkmm.inc +PR = "${INC_PR}.0" + SRC_URI[archive.md5sum] = "c0cb0ea5bc1ab511d9b2461083f0445f" SRC_URI[archive.sha256sum] = "c1199bbee423d6f0ef9b5e88973c5620a1e1c52f9f1298dffcfa36284a7fd91a" -- 2.39.5