summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurentiu Palcu <laurentiu.palcu@intel.com>2013-02-12 18:12:46 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-02-13 16:52:30 +0000
commitf3df2542dd65cd6be3ca611fdf1ae7b0845d0f08 (patch)
tree557d364f816eb76e54a6ca6dd7f88aad698c6361
parent6cec82faf6d7bafaca31938521c885d1b14040b5 (diff)
downloadpoky-f3df2542dd65cd6be3ca611fdf1ae7b0845d0f08.tar.gz
gtk+: use gtk-immodules-cache class
In order to have the proper postinst/postrm scriptlets generated for gtk+ immodules packages, use the already existing class. [YOCTO #3853] (From OE-Core rev: 1c5646dde09008662f064ce7e7400c4d68775278) Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-gnome/gtk+/gtk+.inc8
-rw-r--r--meta/recipes-gnome/gtk+/gtk+3_3.4.4.bb12
-rw-r--r--meta/recipes-gnome/gtk+/gtk+_2.24.14.bb4
3 files changed, 4 insertions, 20 deletions
diff --git a/meta/recipes-gnome/gtk+/gtk+.inc b/meta/recipes-gnome/gtk+/gtk+.inc
index d8adc11f39..8c2b977658 100644
--- a/meta/recipes-gnome/gtk+/gtk+.inc
+++ b/meta/recipes-gnome/gtk+/gtk+.inc
@@ -18,7 +18,7 @@ PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
18 18
19PACKAGECONFIG[x11] = "--with-x=yes --with-gdktarget=x11,--with-x=no,${X11DEPENDS}" 19PACKAGECONFIG[x11] = "--with-x=yes --with-gdktarget=x11,--with-x=no,${X11DEPENDS}"
20 20
21inherit autotools gtk-doc pkgconfig update-alternatives 21inherit autotools gtk-doc pkgconfig update-alternatives gtk-immodules-cache
22 22
23PACKAGES += "libgail gtk-demo" 23PACKAGES += "libgail gtk-demo"
24 24
@@ -94,9 +94,3 @@ gtk_sysroot_preprocess () {
94 fi 94 fi
95} 95}
96 96
97postinst_prologue() {
98if [ "x$D" != "x" ]; then
99 exit 1
100fi
101
102}
diff --git a/meta/recipes-gnome/gtk+/gtk+3_3.4.4.bb b/meta/recipes-gnome/gtk+/gtk+3_3.4.4.bb
index e6243877dd..e2a7ef7da0 100644
--- a/meta/recipes-gnome/gtk+/gtk+3_3.4.4.bb
+++ b/meta/recipes-gnome/gtk+/gtk+3_3.4.4.bb
@@ -21,7 +21,7 @@ SRC_URI = "http://download.gnome.org/sources/gtk+/3.4/gtk+-${PV}.tar.xz \
21SRC_URI[md5sum] = "1b2cf29502a6394e8d4b30f7f5bb9131" 21SRC_URI[md5sum] = "1b2cf29502a6394e8d4b30f7f5bb9131"
22SRC_URI[sha256sum] = "f154e460075034da4c0ce89c320025dcd459da2a1fdf32d92a09522eaca242c7" 22SRC_URI[sha256sum] = "f154e460075034da4c0ce89c320025dcd459da2a1fdf32d92a09522eaca242c7"
23 23
24inherit autotools pkgconfig gtk-doc update-alternatives 24inherit autotools pkgconfig gtk-doc update-alternatives gtk-immodules-cache
25 25
26S = "${WORKDIR}/gtk+-${PV}" 26S = "${WORKDIR}/gtk+-${PV}"
27 27
@@ -90,22 +90,14 @@ ALTERNATIVE_TARGET[gtk-update-icon-cache] = "${bindir}/gtk-update-icon-cache-3.0
90python populate_packages_prepend () { 90python populate_packages_prepend () {
91 import os.path 91 import os.path
92 92
93 prologue = d.getVar("postinst_prologue", 1)
94
95 gtk_libdir = d.expand('${libdir}/gtk-3.0/${LIBV}') 93 gtk_libdir = d.expand('${libdir}/gtk-3.0/${LIBV}')
96 immodules_root = os.path.join(gtk_libdir, 'immodules') 94 immodules_root = os.path.join(gtk_libdir, 'immodules')
97 printmodules_root = os.path.join(gtk_libdir, 'printbackends'); 95 printmodules_root = os.path.join(gtk_libdir, 'printbackends');
98 96
99 do_split_packages(d, immodules_root, '^im-(.*)\.so$', 'gtk3-immodule-%s', 'GTK input module for %s', prologue + 'gtk-query-immodules-3.0 > /etc/gtk-3.0/gtk.immodules') 97 d.setVar('GTKIMMODULES_PACKAGES', ' '.join(do_split_packages(d, immodules_root, '^im-(.*)\.so$', 'gtk3-immodule-%s', 'GTK input module for %s')))
100 do_split_packages(d, printmodules_root, '^libprintbackend-(.*)\.so$', 'gtk3-printbackend-%s', 'GTK printbackend module for %s') 98 do_split_packages(d, printmodules_root, '^libprintbackend-(.*)\.so$', 'gtk3-printbackend-%s', 'GTK printbackend module for %s')
101 99
102 if (d.getVar('DEBIAN_NAMES', 1)): 100 if (d.getVar('DEBIAN_NAMES', 1)):
103 d.setVar('PKG_${PN}', 'libgtk-3.0') 101 d.setVar('PKG_${PN}', 'libgtk-3.0')
104} 102}
105 103
106postinst_prologue() {
107if [ "x$D" != "x" ]; then
108 exit 1
109fi
110
111}
diff --git a/meta/recipes-gnome/gtk+/gtk+_2.24.14.bb b/meta/recipes-gnome/gtk+/gtk+_2.24.14.bb
index fab360dc0c..152072045a 100644
--- a/meta/recipes-gnome/gtk+/gtk+_2.24.14.bb
+++ b/meta/recipes-gnome/gtk+/gtk+_2.24.14.bb
@@ -49,13 +49,11 @@ do_install_append_class-native () {
49} 49}
50 50
51python populate_packages_prepend () { 51python populate_packages_prepend () {
52 prologue = d.getVar("postinst_prologue", True)
53
54 gtk_libdir = d.expand('${libdir}/gtk-2.0/${LIBV}') 52 gtk_libdir = d.expand('${libdir}/gtk-2.0/${LIBV}')
55 immodules_root = os.path.join(gtk_libdir, 'immodules') 53 immodules_root = os.path.join(gtk_libdir, 'immodules')
56 printmodules_root = os.path.join(gtk_libdir, 'printbackends'); 54 printmodules_root = os.path.join(gtk_libdir, 'printbackends');
57 55
58 do_split_packages(d, immodules_root, '^im-(.*)\.so$', 'gtk-immodule-%s', 'GTK input module for %s', prologue + 'gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules') 56 d.setVar('GTKIMMODULES_PACKAGES', ' '.join(do_split_packages(d, immodules_root, '^im-(.*)\.so$', 'gtk-immodule-%s', 'GTK input module for %s')))
59 do_split_packages(d, printmodules_root, '^libprintbackend-(.*)\.so$', 'gtk-printbackend-%s', 'GTK printbackend module for %s') 57 do_split_packages(d, printmodules_root, '^libprintbackend-(.*)\.so$', 'gtk-printbackend-%s', 'GTK printbackend module for %s')
60 58
61 if (d.getVar('DEBIAN_NAMES', True)): 59 if (d.getVar('DEBIAN_NAMES', True)):