summaryrefslogtreecommitdiffstats
path: root/meta/packages/gtk+
diff options
context:
space:
mode:
authorRoss Burton <ross@openedhand.com>2007-11-27 09:28:46 +0000
committerRoss Burton <ross@openedhand.com>2007-11-27 09:28:46 +0000
commit0c273cb5083013a3c6031177bd760a5500a67c95 (patch)
treee31547bc5a8cd1d45f7062a054a5b007f56a0ea8 /meta/packages/gtk+
parenta14d61f7d38c3ae36f45a93878b0642e59f13009 (diff)
downloadpoky-0c273cb5083013a3c6031177bd760a5500a67c95.tar.gz
gtk+: run pixbufloader backend on target, and update the icon cache afterwards
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3241 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/gtk+')
-rw-r--r--meta/packages/gtk+/gtk+.inc10
-rw-r--r--meta/packages/gtk+/gtk+_2.10.14.bb5
-rw-r--r--meta/packages/gtk+/gtk+_2.12.1.bb4
-rw-r--r--meta/packages/gtk+/gtk+_2.6.10.bb5
4 files changed, 19 insertions, 5 deletions
diff --git a/meta/packages/gtk+/gtk+.inc b/meta/packages/gtk+/gtk+.inc
index b0a4a81450..bddc98072e 100644
--- a/meta/packages/gtk+/gtk+.inc
+++ b/meta/packages/gtk+/gtk+.inc
@@ -59,3 +59,13 @@ if [ "x$D" != "x" ]; then
59fi 59fi
60 60
61} 61}
62
63postinst_pixbufloader() {
64if [ "x$D" != "x" ]; then
65 exit 1
66fi
67
68gdk-pixbuf-query-loaders > /etc/gtk-2.0/gdk-pixbuf.loaders
69
70test -x /usr/bin/gtk-update-icon-cache && gtk-update-icon-cache -q /usr/share/icons/hicolor
71}
diff --git a/meta/packages/gtk+/gtk+_2.10.14.bb b/meta/packages/gtk+/gtk+_2.10.14.bb
index a9e39ab98b..5fdcce31c7 100644
--- a/meta/packages/gtk+/gtk+_2.10.14.bb
+++ b/meta/packages/gtk+/gtk+_2.10.14.bb
@@ -1,7 +1,7 @@
1require gtk+.inc 1require gtk+.inc
2 2
3DEPENDS += "cairo" 3DEPENDS += "cairo"
4PR = "r17" 4PR = "r18"
5 5
6# disable per default - untested and not all patches included. 6# disable per default - untested and not all patches included.
7DEFAULT_PREFERENCE = "-1" 7DEFAULT_PREFERENCE = "-1"
@@ -38,13 +38,14 @@ python populate_packages_prepend () {
38 import os.path 38 import os.path
39 39
40 prologue = bb.data.getVar("postinst_prologue", d, 1) 40 prologue = bb.data.getVar("postinst_prologue", d, 1)
41 postinst_pixbufloader = bb.data.getVar("postinst_pixbufloader", d, 1)
41 42
42 gtk_libdir = bb.data.expand('${libdir}/gtk-2.0/${LIBV}', d) 43 gtk_libdir = bb.data.expand('${libdir}/gtk-2.0/${LIBV}', d)
43 loaders_root = os.path.join(gtk_libdir, 'loaders') 44 loaders_root = os.path.join(gtk_libdir, 'loaders')
44 immodules_root = os.path.join(gtk_libdir, 'immodules') 45 immodules_root = os.path.join(gtk_libdir, 'immodules')
45 printmodules_root = os.path.join(gtk_libdir, 'printbackends'); 46 printmodules_root = os.path.join(gtk_libdir, 'printbackends');
46 47
47 do_split_packages(d, loaders_root, '^libpixbufloader-(.*)\.so$', 'gdk-pixbuf-loader-%s', 'GDK pixbuf loader for %s', prologue + 'gdk-pixbuf-query-loaders > /etc/gtk-2.0/gdk-pixbuf.loaders') 48 do_split_packages(d, loaders_root, '^libpixbufloader-(.*)\.so$', 'gdk-pixbuf-loader-%s', 'GDK pixbuf loader for %s', postinst_pixbufloader)
48 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') 49 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')
49 do_split_packages(d, printmodules_root, '^libprintbackend-(.*)\.so$', 'gtk-printbackend-%s', 'GTK printbackend module for %s') 50 do_split_packages(d, printmodules_root, '^libprintbackend-(.*)\.so$', 'gtk-printbackend-%s', 'GTK printbackend module for %s')
50 51
diff --git a/meta/packages/gtk+/gtk+_2.12.1.bb b/meta/packages/gtk+/gtk+_2.12.1.bb
index 1ad92c8272..a9facbb61a 100644
--- a/meta/packages/gtk+/gtk+_2.12.1.bb
+++ b/meta/packages/gtk+/gtk+_2.12.1.bb
@@ -1,6 +1,7 @@
1require gtk+.inc 1require gtk+.inc
2 2
3DEPENDS += "cairo" 3DEPENDS += "cairo"
4PR = "r1"
4 5
5# disable per default - untested and not all patches included. 6# disable per default - untested and not all patches included.
6DEFAULT_PREFERENCE = "-1" 7DEFAULT_PREFERENCE = "-1"
@@ -32,13 +33,14 @@ python populate_packages_prepend () {
32 import os.path 33 import os.path
33 34
34 prologue = bb.data.getVar("postinst_prologue", d, 1) 35 prologue = bb.data.getVar("postinst_prologue", d, 1)
36 postinst_pixbufloader = bb.data.getVar("postinst_pixbufloader", d, 1)
35 37
36 gtk_libdir = bb.data.expand('${libdir}/gtk-2.0/${LIBV}', d) 38 gtk_libdir = bb.data.expand('${libdir}/gtk-2.0/${LIBV}', d)
37 loaders_root = os.path.join(gtk_libdir, 'loaders') 39 loaders_root = os.path.join(gtk_libdir, 'loaders')
38 immodules_root = os.path.join(gtk_libdir, 'immodules') 40 immodules_root = os.path.join(gtk_libdir, 'immodules')
39 printmodules_root = os.path.join(gtk_libdir, 'printbackends'); 41 printmodules_root = os.path.join(gtk_libdir, 'printbackends');
40 42
41 do_split_packages(d, loaders_root, '^libpixbufloader-(.*)\.so$', 'gdk-pixbuf-loader-%s', 'GDK pixbuf loader for %s', prologue + 'gdk-pixbuf-query-loaders > /etc/gtk-2.0/gdk-pixbuf.loaders') 43 do_split_packages(d, loaders_root, '^libpixbufloader-(.*)\.so$', 'gdk-pixbuf-loader-%s', 'GDK pixbuf loader for %s', postinst_pixbufloader)
42 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') 44 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')
43 do_split_packages(d, printmodules_root, '^libprintbackend-(.*)\.so$', 'gtk-printbackend-%s', 'GTK printbackend module for %s') 45 do_split_packages(d, printmodules_root, '^libprintbackend-(.*)\.so$', 'gtk-printbackend-%s', 'GTK printbackend module for %s')
44 46
diff --git a/meta/packages/gtk+/gtk+_2.6.10.bb b/meta/packages/gtk+/gtk+_2.6.10.bb
index de22bbae75..6196a55cf9 100644
--- a/meta/packages/gtk+/gtk+_2.6.10.bb
+++ b/meta/packages/gtk+/gtk+_2.6.10.bb
@@ -1,6 +1,6 @@
1require gtk+.inc 1require gtk+.inc
2 2
3PR = "r13" 3PR = "r14"
4 4
5SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.6/gtk+-${PV}.tar.bz2 \ 5SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.6/gtk+-${PV}.tar.bz2 \
6 file://no-demos.patch;patch=1 \ 6 file://no-demos.patch;patch=1 \
@@ -40,12 +40,13 @@ python populate_packages_prepend () {
40 import os.path 40 import os.path
41 41
42 prologue = bb.data.getVar("postinst_prologue", d, 1) 42 prologue = bb.data.getVar("postinst_prologue", d, 1)
43 postinst_pixbufloader = bb.data.getVar("postinst_pixbufloader", d, 1)
43 44
44 gtk_libdir = bb.data.expand('${libdir}/gtk-2.0/${LIBV}', d) 45 gtk_libdir = bb.data.expand('${libdir}/gtk-2.0/${LIBV}', d)
45 loaders_root = os.path.join(gtk_libdir, 'loaders') 46 loaders_root = os.path.join(gtk_libdir, 'loaders')
46 immodules_root = os.path.join(gtk_libdir, 'immodules') 47 immodules_root = os.path.join(gtk_libdir, 'immodules')
47 48
48 do_split_packages(d, loaders_root, '^libpixbufloader-(.*)\.so$', 'gdk-pixbuf-loader-%s', 'GDK pixbuf loader for %s', prologue + 'gdk-pixbuf-query-loaders > /etc/gtk-2.0/gdk-pixbuf.loaders') 49 do_split_packages(d, loaders_root, '^libpixbufloader-(.*)\.so$', 'gdk-pixbuf-loader-%s', 'GDK pixbuf loader for %s', postinst_pixbufloader)
49 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') 50 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')
50 51
51 if (bb.data.getVar('DEBIAN_NAMES', d, 1)): 52 if (bb.data.getVar('DEBIAN_NAMES', d, 1)):