summaryrefslogtreecommitdiffstats
path: root/meta/recipes-gnome/gtk+
diff options
context:
space:
mode:
authorDmitry Eremin-Solenikov <dbaryshkov@gmail.com>2011-09-21 18:39:54 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-09-22 04:12:30 (GMT)
commit28b0653dbdbb846530289f4ba9e6a0f10e17426a (patch)
treee03aba0994f922a35b1fc6f7a4ad1ddbd12a3fec /meta/recipes-gnome/gtk+
parent1e3644cdd33919f92d4664f1ee6ff54ae97daf97 (diff)
downloadpoky-28b0653dbdbb846530289f4ba9e6a0f10e17426a.tar.gz
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 (From OE-Core rev: a797c4ff1246566b545dc6cab2713a04f24fea6e) Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome/gtk+')
-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 886f55d..0e5c45c 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 \
15 15
16inherit autotools pkgconfig 16inherit autotools pkgconfig
17 17
18PACKAGES += "libgail"
19
18FILES_${PN} = "${bindir}/gtk-update-icon-cache \ 20FILES_${PN} = "${bindir}/gtk-update-icon-cache \
19 ${bindir}/gtk-query-immodules-2.0 \ 21 ${bindir}/gtk-query-immodules-2.0 \
20 ${libdir}/lib*${SOLIBS} \ 22 ${libdir}/lib*${SOLIBS} \
@@ -24,17 +26,25 @@ FILES_${PN} = "${bindir}/gtk-update-icon-cache \
24FILES_${PN}-dev += " \ 26FILES_${PN}-dev += " \
25 ${datadir}/gtk-2.0/include \ 27 ${datadir}/gtk-2.0/include \
26 ${libdir}/gtk-2.0/include \ 28 ${libdir}/gtk-2.0/include \
29 ${libdir}/gtk-2.0/modules/*.la \
27 ${libdir}/gtk-2.0/${LIBV}/loaders/*.la \ 30 ${libdir}/gtk-2.0/${LIBV}/loaders/*.la \
28 ${libdir}/gtk-2.0/${LIBV}/immodules/*.la \ 31 ${libdir}/gtk-2.0/${LIBV}/immodules/*.la \
32 ${libdir}/gtk-2.0/${LIBV}/printbackends/*.la \
29 ${libdir}/gtk-2.0/${LIBV}/engines/*.la \ 33 ${libdir}/gtk-2.0/${LIBV}/engines/*.la \
30 ${bindir}/gtk-builder-convert" 34 ${bindir}/gtk-builder-convert"
31 35
32FILES_${PN}-dbg += " \ 36FILES_${PN}-dbg += " \
37 ${libdir}/gtk-2.0/modules/.debug/* \
33 ${libdir}/gtk-2.0/${LIBV}/loaders/.debug/* \ 38 ${libdir}/gtk-2.0/${LIBV}/loaders/.debug/* \
34 ${libdir}/gtk-2.0/${LIBV}/immodules/.debug/* \ 39 ${libdir}/gtk-2.0/${LIBV}/immodules/.debug/* \
35 ${libdir}/gtk-2.0/${LIBV}/engines/.debug/* \ 40 ${libdir}/gtk-2.0/${LIBV}/engines/.debug/* \
36 ${libdir}/gtk-2.0/${LIBV}/printbackends/.debug/*" 41 ${libdir}/gtk-2.0/${LIBV}/printbackends/.debug/*"
37 42
43FILES_libgail = " \
44 ${libdir}/gtk-2.0/modules/libgail.so \
45 ${libdir}/gtk-2.0/modules/libferret.so \
46 "
47
38GTKBASE_RRECOMMENDS ?= "liberation-fonts gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm shared-mime-info" 48GTKBASE_RRECOMMENDS ?= "liberation-fonts gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm shared-mime-info"
39GTKGLIBC_RRECOMMENDS ?= "${GTKBASE_RRECOMMENDS} glibc-gconv-iso8859-1" 49GTKGLIBC_RRECOMMENDS ?= "${GTKBASE_RRECOMMENDS} glibc-gconv-iso8859-1"
40 50
diff --git a/meta/recipes-gnome/gtk+/gtk+_2.12.7.bb b/meta/recipes-gnome/gtk+/gtk+_2.12.7.bb
index 00c4ee8..118bf74 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 @@
1require gtk+.inc 1require gtk+.inc
2 2
3PR = "r12" 3PR = "r13"
4 4
5SRC_URI = "http://download.gnome.org/sources/gtk+/2.12/gtk+-${PV}.tar.bz2 \ 5SRC_URI = "http://download.gnome.org/sources/gtk+/2.12/gtk+-${PV}.tar.bz2 \
6 file://xsettings.patch \ 6 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 09b917f..47a4660 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 @@
1require gtk+.inc 1require gtk+.inc
2 2
3PR = "r8" 3PR = "r9"
4 4
5SRC_URI = "http://download.gnome.org/sources/gtk+/2.16/gtk+-${PV}.tar.bz2 \ 5SRC_URI = "http://download.gnome.org/sources/gtk+/2.16/gtk+-${PV}.tar.bz2 \
6 file://xsettings.patch \ 6 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 ba90e0e..a52250d 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 \
4 file://gtk/gtk.h;endline=27;md5=c59e0b4490dd135a5726ebf851f9b17f \ 4 file://gtk/gtk.h;endline=27;md5=c59e0b4490dd135a5726ebf851f9b17f \
5 file://gdk/gdk.h;endline=27;md5=07db285ec208fb3e0bf7d861b0614202 \ 5 file://gdk/gdk.h;endline=27;md5=07db285ec208fb3e0bf7d861b0614202 \
6 file://tests/testgtk.c;endline=27;md5=262db5db5f776f9863e56df31423e24c" 6 file://tests/testgtk.c;endline=27;md5=262db5db5f776f9863e56df31423e24c"
7PR = "r3" 7PR = "r4"
8 8
9SRC_URI = "http://download.gnome.org/sources/gtk+/2.22/gtk+-${PV}.tar.bz2 \ 9SRC_URI = "http://download.gnome.org/sources/gtk+/2.22/gtk+-${PV}.tar.bz2 \
10 file://xsettings.patch \ 10 file://xsettings.patch \