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/run-iconcache.patch | |
| 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/run-iconcache.patch')
| -rw-r--r-- | meta/recipes-gnome/gtk+/gtk+-2.24.24/run-iconcache.patch | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.24.24/run-iconcache.patch b/meta/recipes-gnome/gtk+/gtk+-2.24.24/run-iconcache.patch deleted file mode 100644 index a4e2254c59..0000000000 --- a/meta/recipes-gnome/gtk+/gtk+-2.24.24/run-iconcache.patch +++ /dev/null | |||
| @@ -1,24 +0,0 @@ | |||
| 1 | Upstream-Status: Inappropriate [configuration] | ||
| 2 | |||
| 3 | diff -Nurd gtk+-2.24.24/gtk/Makefile.am gtk+-2.24.24/gtk/Makefile.am | ||
| 4 | --- gtk+-2.24.24/gtk/Makefile.am 2014-06-23 18:08:14.000000000 +0300 | ||
| 5 | +++ gtk+-2.24.24/gtk/Makefile.am 2014-09-03 23:45:12.669307700 +0300 | ||
| 6 | @@ -1391,12 +1391,12 @@ | ||
| 7 | ./gtk-update-icon-cache | ||
| 8 | endif | ||
| 9 | |||
| 10 | -gtkbuiltincache.h: @REBUILD@ stamp-icons | ||
| 11 | - $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT) $(GTK_UPDATE_ICON_CACHE_MANIFEST) | ||
| 12 | - $(gtk_update_icon_cache_program) --force --ignore-theme-index \ | ||
| 13 | - --include-image-data \ | ||
| 14 | - --source builtin_icons stock-icons > gtkbuiltincache.h.tmp && \ | ||
| 15 | - mv gtkbuiltincache.h.tmp gtkbuiltincache.h | ||
| 16 | +#gtkbuiltincache.h: @REBUILD@ stamp-icons | ||
| 17 | +# $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT) $(GTK_UPDATE_ICON_CACHE_MANIFEST) | ||
| 18 | +# $(gtk_update_icon_cache_program) --force --ignore-theme-index \ | ||
| 19 | +# --include-image-data \ | ||
| 20 | +# --source builtin_icons stock-icons > gtkbuiltincache.h.tmp && \ | ||
| 21 | +# mv gtkbuiltincache.h.tmp gtkbuiltincache.h | ||
| 22 | |||
| 23 | EXTRA_DIST += \ | ||
| 24 | $(STOCK_ICONS) \ | ||