diff options
author | Zhai Edwin <edwin.zhai@intel.com> | 2010-11-22 14:26:56 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-01-27 21:52:01 +0000 |
commit | 7c9c78bebd074d72270adaa8baed860bf554ad82 (patch) | |
tree | e28a5c7033d9ee973c96674e733c592f9724be0a /meta/recipes-gnome/gtk+/gtk+_2.20.1.bb | |
parent | 8a6e8623b43a5b38546e0a8c96f473dba9b31eee (diff) | |
download | poky-7c9c78bebd074d72270adaa8baed860bf554ad82.tar.gz |
gtk+: Update to 2.22.1
Remove disable-gio-png-sniff-test.diff as it alreay in upstream. gdk-pixbuf in
gtk+ is separated as another stand-alone package, so remove it.
In future need only pick up stable version(even number like 2.20.x, 2.22.x).
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
Diffstat (limited to 'meta/recipes-gnome/gtk+/gtk+_2.20.1.bb')
-rw-r--r-- | meta/recipes-gnome/gtk+/gtk+_2.20.1.bb | 61 |
1 files changed, 0 insertions, 61 deletions
diff --git a/meta/recipes-gnome/gtk+/gtk+_2.20.1.bb b/meta/recipes-gnome/gtk+/gtk+_2.20.1.bb deleted file mode 100644 index 80be21cd4e..0000000000 --- a/meta/recipes-gnome/gtk+/gtk+_2.20.1.bb +++ /dev/null | |||
@@ -1,61 +0,0 @@ | |||
1 | require gtk+.inc | ||
2 | |||
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ | ||
4 | file://gtk/gtk.h;endline=27;md5=c59e0b4490dd135a5726ebf851f9b17f \ | ||
5 | file://gdk/gdk.h;endline=27;md5=07db285ec208fb3e0bf7d861b0614202 \ | ||
6 | file://tests/testgtk.c;endline=27;md5=262db5db5f776f9863e56df31423e24c" | ||
7 | PR = "r2" | ||
8 | |||
9 | SRC_URI = "http://download.gnome.org/sources/gtk+/2.20/gtk+-${PV}.tar.bz2 \ | ||
10 | file://xsettings.patch;patch=1 \ | ||
11 | file://run-iconcache.patch;patch=1 \ | ||
12 | file://hardcoded_libtool.patch;patch=1 \ | ||
13 | file://no-demos.patch;patch=1 \ | ||
14 | file://cellrenderer-cairo.patch;patch=1;pnum=0 \ | ||
15 | file://toggle-font.diff;patch=1;pnum=0 \ | ||
16 | file://0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch;patch=1 \ | ||
17 | # TO MERGE | ||
18 | # file://entry-cairo.patch;patch=1;pnum=0 \ | ||
19 | # file://filesystem-volumes.patch;patch=1 \ | ||
20 | # file://filechooser-props.patch;patch=1 \ | ||
21 | # file://filechooser-default.patch;patch=1 \ | ||
22 | # file://filechooser-sizefix.patch;patch=1 \ | ||
23 | # temporary | ||
24 | # file://gtklabel-resize-patch;patch=1 \ | ||
25 | # file://menu-deactivate.patch;patch=1 \ | ||
26 | # file://combo-arrow-size.patch;patch=1;pnum=0 \ | ||
27 | file://disable-gio-png-sniff-test.diff;patch=1 \ | ||
28 | file://configurefix.patch;patch=1 \ | ||
29 | " | ||
30 | |||
31 | SRC_URI[md5sum] = "53e6f3a93bd22934878fc4a4a34c68aa" | ||
32 | SRC_URI[sha256sum] = "0e081731d21e34ff45c82199490c2889504fa8b3c7e117c043e82ababaec0f65" | ||
33 | |||
34 | EXTRA_OECONF = "--without-libtiff --without-libjasper --disable-xkb --disable-glibtest --disable-cups" | ||
35 | |||
36 | LIBV = "2.10.0" | ||
37 | |||
38 | PACKAGES_DYNAMIC += "gdk-pixbuf-loader-* gtk-immodule-* gtk-printbackend-*" | ||
39 | |||
40 | #-fomit-frame-pointer in default FULL_OPTIMIZATION will cause matchbox-panel segfault on atom-pc & emenlow | ||
41 | FULL_OPTIMIZATION_emenlow = "-fexpensive-optimizations -frename-registers -O2 -ggdb -feliminate-unused-debug-types" | ||
42 | FULL_OPTIMIZATION_atom-pc = "-fexpensive-optimizations -frename-registers -O2 -ggdb -feliminate-unused-debug-types" | ||
43 | |||
44 | python populate_packages_prepend () { | ||
45 | import os.path | ||
46 | |||
47 | prologue = bb.data.getVar("postinst_prologue", d, 1) | ||
48 | postinst_pixbufloader = bb.data.getVar("postinst_pixbufloader", d, 1) | ||
49 | |||
50 | gtk_libdir = bb.data.expand('${libdir}/gtk-2.0/${LIBV}', d) | ||
51 | loaders_root = os.path.join(gtk_libdir, 'loaders') | ||
52 | immodules_root = os.path.join(gtk_libdir, 'immodules') | ||
53 | printmodules_root = os.path.join(gtk_libdir, 'printbackends'); | ||
54 | |||
55 | do_split_packages(d, loaders_root, '^libpixbufloader-(.*)\.so$', 'gdk-pixbuf-loader-%s', 'GDK pixbuf loader for %s', postinst_pixbufloader) | ||
56 | 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') | ||
57 | do_split_packages(d, printmodules_root, '^libprintbackend-(.*)\.so$', 'gtk-printbackend-%s', 'GTK printbackend module for %s') | ||
58 | |||
59 | if (bb.data.getVar('DEBIAN_NAMES', d, 1)): | ||
60 | bb.data.setVar('PKG_${PN}', 'libgtk-2.0', d) | ||
61 | } | ||