summaryrefslogtreecommitdiff
path: root/meta/recipes-gnome
diff options
context:
space:
mode:
authorDmitry Eremin-Solenikov <dbaryshkov@gmail.com>2011-09-21 22:39:54 +0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-09-22 05:10:34 +0100
commita797c4ff1246566b545dc6cab2713a04f24fea6e (patch)
tree26ac25e86c5d7c0e0150eb9789b4d072f39cb51a /meta/recipes-gnome
parent894254c18fe19b6321c790d9a5d93b24868ba6f2 (diff)
downloadopenembedded-core-a797c4ff1246566b545dc6cab2713a04f24fea6e.tar.gz
openembedded-core-a797c4ff1246566b545dc6cab2713a04f24fea6e.tar.bz2
openembedded-core-a797c4ff1246566b545dc6cab2713a04f24fea6e.tar.xz
openembedded-core-a797c4ff1246566b545dc6cab2713a04f24fea6e.zip
gtk+: packaging fixups
1) Package gail modules into libgail package. .la files go into main gtk+-dev package, debug symbols to gtk+-dbg. 2) For completeness add printerbackends .la files to gtk+-dev Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome')
-rw-r--r--meta/recipes-gnome/gtk+/gtk+.inc10
-rw-r--r--meta/recipes-gnome/gtk+/gtk+_2.12.7.bb2
-rw-r--r--meta/recipes-gnome/gtk+/gtk+_2.16.6.bb2
-rw-r--r--meta/recipes-gnome/gtk+/gtk+_2.22.1.bb2
4 files changed, 13 insertions, 3 deletions
diff --git a/meta/recipes-gnome/gtk+/gtk+.inc b/meta/recipes-gnome/gtk+/gtk+.inc
index 886f55d66..0e5c45c92 100644
--- a/meta/recipes-gnome/gtk+/gtk+.inc
+++ b/meta/recipes-gnome/gtk+/gtk+.inc
@@ -15,6 +15,8 @@ DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor \
inherit autotools pkgconfig
+PACKAGES += "libgail"
+
FILES_${PN} = "${bindir}/gtk-update-icon-cache \
${bindir}/gtk-query-immodules-2.0 \
${libdir}/lib*${SOLIBS} \
@@ -24,17 +26,25 @@ FILES_${PN} = "${bindir}/gtk-update-icon-cache \
FILES_${PN}-dev += " \
${datadir}/gtk-2.0/include \
${libdir}/gtk-2.0/include \
+ ${libdir}/gtk-2.0/modules/*.la \
${libdir}/gtk-2.0/${LIBV}/loaders/*.la \
${libdir}/gtk-2.0/${LIBV}/immodules/*.la \
+ ${libdir}/gtk-2.0/${LIBV}/printbackends/*.la \
${libdir}/gtk-2.0/${LIBV}/engines/*.la \
${bindir}/gtk-builder-convert"
FILES_${PN}-dbg += " \
+ ${libdir}/gtk-2.0/modules/.debug/* \
${libdir}/gtk-2.0/${LIBV}/loaders/.debug/* \
${libdir}/gtk-2.0/${LIBV}/immodules/.debug/* \
${libdir}/gtk-2.0/${LIBV}/engines/.debug/* \
${libdir}/gtk-2.0/${LIBV}/printbackends/.debug/*"
+FILES_libgail = " \
+ ${libdir}/gtk-2.0/modules/libgail.so \
+ ${libdir}/gtk-2.0/modules/libferret.so \
+ "
+
GTKBASE_RRECOMMENDS ?= "liberation-fonts gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm shared-mime-info"
GTKGLIBC_RRECOMMENDS ?= "${GTKBASE_RRECOMMENDS} glibc-gconv-iso8859-1"
diff --git a/meta/recipes-gnome/gtk+/gtk+_2.12.7.bb b/meta/recipes-gnome/gtk+/gtk+_2.12.7.bb
index 00c4ee8ea..118bf7483 100644
--- a/meta/recipes-gnome/gtk+/gtk+_2.12.7.bb
+++ b/meta/recipes-gnome/gtk+/gtk+_2.12.7.bb
@@ -1,6 +1,6 @@
require gtk+.inc
-PR = "r12"
+PR = "r13"
SRC_URI = "http://download.gnome.org/sources/gtk+/2.12/gtk+-${PV}.tar.bz2 \
file://xsettings.patch \
diff --git a/meta/recipes-gnome/gtk+/gtk+_2.16.6.bb b/meta/recipes-gnome/gtk+/gtk+_2.16.6.bb
index 09b917f13..47a46608c 100644
--- a/meta/recipes-gnome/gtk+/gtk+_2.16.6.bb
+++ b/meta/recipes-gnome/gtk+/gtk+_2.16.6.bb
@@ -1,6 +1,6 @@
require gtk+.inc
-PR = "r8"
+PR = "r9"
SRC_URI = "http://download.gnome.org/sources/gtk+/2.16/gtk+-${PV}.tar.bz2 \
file://xsettings.patch \
diff --git a/meta/recipes-gnome/gtk+/gtk+_2.22.1.bb b/meta/recipes-gnome/gtk+/gtk+_2.22.1.bb
index ba90e0ee5..a52250d38 100644
--- a/meta/recipes-gnome/gtk+/gtk+_2.22.1.bb
+++ b/meta/recipes-gnome/gtk+/gtk+_2.22.1.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
file://gtk/gtk.h;endline=27;md5=c59e0b4490dd135a5726ebf851f9b17f \
file://gdk/gdk.h;endline=27;md5=07db285ec208fb3e0bf7d861b0614202 \
file://tests/testgtk.c;endline=27;md5=262db5db5f776f9863e56df31423e24c"
-PR = "r3"
+PR = "r4"
SRC_URI = "http://download.gnome.org/sources/gtk+/2.22/gtk+-${PV}.tar.bz2 \
file://xsettings.patch \