diff options
| author | Graeme Gregory <dp@xora.org.uk> | 2006-08-01 14:04:57 +0000 |
|---|---|---|
| committer | Graeme Gregory <dp@xora.org.uk> | 2006-08-01 14:04:57 +0000 |
| commit | 675125bf83623856838043c72e5848776e048df4 (patch) | |
| tree | 46749c8389e73a2e3793c6f1d1f89df6a38f6bf9 | |
| parent | bb2220e707790017b62a3c4cfe3b9653e97f0507 (diff) | |
| parent | a6603ccbbca523cb1a3922de46e1553d41b421c0 (diff) | |
merge of '10a55acff544b045f87ede432759d7fbae98904b'
and '71fb6bfd56d55587183a72957f4c5cad49b369fc'
| -rw-r--r-- | packages/gtk+/gtk+_2.10.0.bb | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/packages/gtk+/gtk+_2.10.0.bb b/packages/gtk+/gtk+_2.10.0.bb index 195140ea92..51cf19d125 100644 --- a/packages/gtk+/gtk+_2.10.0.bb +++ b/packages/gtk+/gtk+_2.10.0.bb @@ -5,8 +5,8 @@ HOMEPAGE = "http://www.gtk.org" SECTION = "libs" PRIORITY = "optional" MAINTAINER = "Philip Blundell <pb@handhelds.org>" -DEPENDS = "glib-2.0 pango atk jpeg libpng xext libxcursor gtk-doc libgcrypt cairo cups" -PR = "r1" +DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt cairo cups" +PR = "r2" # disable per default - untested and not all patches included. DEFAULT_PREFERENCE = "-1" @@ -35,11 +35,12 @@ FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \ ${bindir}/gtk-query-immodules-2.0 \ ${libdir}/lib*.so.* \ ${datadir}/themes ${sysconfdir} \ - ${libdir}/gtk-2.0/${LIBV}/engines/libpixmap.so \ - ${libdir}/gtk-2.0/${LIBV}/printbackends/lib*.so" + ${libdir}/gtk-2.0/${LIBV}/engines/libpixmap.so" FILES_${PN}-dev += "${datadir}/gtk-2.0/include ${libdir}/gtk-2.0/include ${bindir}/gdk-pixbuf-csource" RRECOMMENDS_${PN} = "glibc-gconv-iso8859-1" +RRECOMMENDS_${PN}_angstrom = "glibc-gconv-iso8859-1 gdk-pixbuf-loader-png gdk-pixbuf-loader-jpg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm" +RRECOMMENDS_${PN}_openzaurus = "glibc-gconv-iso8859-1 gdk-pixbuf-loader-png gdk-pixbuf-loader-jpg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm" EXTRA_OECONF = "--without-libtiff --disable-xkb --disable-glibtest --enable-display-migration" @@ -70,6 +71,8 @@ fi } +PACKAGES_DYNAMIC = "gdk-pixbuf-loader-* gtk-immodule-* gtk-printbackend-*" + python populate_packages_prepend () { import os.path @@ -78,9 +81,11 @@ python populate_packages_prepend () { gtk_libdir = bb.data.expand('${libdir}/gtk-2.0/${LIBV}', d) loaders_root = os.path.join(gtk_libdir, 'loaders') immodules_root = os.path.join(gtk_libdir, 'immodules') + printmodules_root = os.path.join(gtk_libdir, 'printbackends'); 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') do_split_packages(d, immodules_root, '^im-(.*)\.so$', 'gtk-immodule-%s', 'GTK input module for %s', prologue + 'gtk-query-immodules > /etc/gtk-2.0/gtk.immodules') + do_split_packages(d, printmodules_root, '^libprintbackend-(.*)\.so$', 'gtk-printbackend-%s', 'GTK printbackend module for %s') if (bb.data.getVar('DEBIAN_NAMES', d, 1)): bb.data.setVar('PKG_${PN}', 'libgtk-2.0', d) |