diff options
author | Ross Burton <ross.burton@intel.com> | 2014-12-19 19:52:36 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-12-31 08:14:25 +0000 |
commit | 9e64b6d96c0434d91150c3b4829046e6d70b0e00 (patch) | |
tree | 7f47b0697fcff0c2244841308df33f7d6ce73159 /meta/recipes-gnome/gtk+/gtk+_2.24.24.bb | |
parent | db8bf52277c1596e0703cee21ff52cad04365eb7 (diff) | |
download | poky-9e64b6d96c0434d91150c3b4829046e6d70b0e00.tar.gz |
gtk+: upgrade to 2.24.25
Remove patches that are no longer needed:
* GtkButton-do-no-prelight: merged upstream
* Duplicate-the-exec-string: upstream decided this behaviour is incorrect
* cellrenderer-cairo: Cairo isn't the performance bottleneck it once was, drop
* configure-nm: resolved upstrea
* configurefix.patch: not applied
* run-iconcache: not needed when building tarballs, and if gtk-update-icon-cache
is needed at build time (e.g. user is customising default icon theme) then
they can add a dependency on gtk-update-icon-cache-native.
Also remove mention of patches that have been commented out for a long time.
(From OE-Core rev: 9299b5d2e5f82cf0e3f66ca49dedbe2c8b18bb44)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome/gtk+/gtk+_2.24.24.bb')
-rw-r--r-- | meta/recipes-gnome/gtk+/gtk+_2.24.24.bb | 50 |
1 files changed, 0 insertions, 50 deletions
diff --git a/meta/recipes-gnome/gtk+/gtk+_2.24.24.bb b/meta/recipes-gnome/gtk+/gtk+_2.24.24.bb deleted file mode 100644 index 7d0a0a2a8d..0000000000 --- a/meta/recipes-gnome/gtk+/gtk+_2.24.24.bb +++ /dev/null | |||
@@ -1,50 +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 | SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-${PV}.tar.xz \ | ||
8 | file://xsettings.patch \ | ||
9 | file://run-iconcache.patch \ | ||
10 | file://configure-nm.patch \ | ||
11 | file://hardcoded_libtool.patch \ | ||
12 | file://cellrenderer-cairo.patch;striplevel=0 \ | ||
13 | file://toggle-font.diff;striplevel=0 \ | ||
14 | file://0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch \ | ||
15 | file://doc-fixes.patch \ | ||
16 | file://0001-GtkButton-do-not-prelight-in-touchscreen-mode.patch \ | ||
17 | " | ||
18 | |||
19 | # TO MERGE | ||
20 | # file://entry-cairo.patch;striplevel=0 | ||
21 | # file://filesystem-volumes.patch | ||
22 | # file://filechooser-props.patch | ||
23 | # file://filechooser-default.patch | ||
24 | # file://filechooser-sizefix.patch | ||
25 | # temporary | ||
26 | # file://gtklabel-resize-patch | ||
27 | # file://menu-deactivate.patch | ||
28 | # file://combo-arrow-size.patch;striplevel=0 | ||
29 | # file://configurefix.patch | ||
30 | |||
31 | SRC_URI[md5sum] = "f80ac8aa95ea8482ad89656d0370752e" | ||
32 | SRC_URI[sha256sum] = "12ceb2e198c82bfb93eb36348b6e9293c8fdcd60786763d04cfec7ebe7ed3d6d" | ||
33 | |||
34 | EXTRA_OECONF = "--enable-xkb --disable-glibtest --disable-cups --disable-xinerama" | ||
35 | |||
36 | LIBV = "2.10.0" | ||
37 | |||
38 | PACKAGES_DYNAMIC += "^gtk-immodule-.* ^gtk-printbackend-.*" | ||
39 | |||
40 | python populate_packages_prepend () { | ||
41 | gtk_libdir = d.expand('${libdir}/gtk-2.0/${LIBV}') | ||
42 | immodules_root = os.path.join(gtk_libdir, 'immodules') | ||
43 | printmodules_root = os.path.join(gtk_libdir, 'printbackends'); | ||
44 | |||
45 | d.setVar('GTKIMMODULES_PACKAGES', ' '.join(do_split_packages(d, immodules_root, '^im-(.*)\.so$', 'gtk-immodule-%s', 'GTK input module for %s'))) | ||
46 | do_split_packages(d, printmodules_root, '^libprintbackend-(.*)\.so$', 'gtk-printbackend-%s', 'GTK printbackend module for %s') | ||
47 | |||
48 | if (d.getVar('DEBIAN_NAMES', True)): | ||
49 | d.setVar('PKG_${PN}', '${MLPREFIX}libgtk-2.0') | ||
50 | } | ||