summaryrefslogtreecommitdiffstats
path: root/meta/recipes-gnome
diff options
context:
space:
mode:
authorMarko Lindqvist <cazfi74@gmail.com>2014-09-08 12:58:30 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-09-10 11:33:23 +0100
commit3e4cd04d44106adcfe3ebe57a53402f1e7d72c68 (patch)
tree8c1bb7777a475aa4725bd5de04733717f4d8860b /meta/recipes-gnome
parent1f162cdbe61f1b27910c7930fba22b18b1423e0f (diff)
downloadpoky-3e4cd04d44106adcfe3ebe57a53402f1e7d72c68.tar.gz
gtk+2: update to 2.24.24
(From OE-Core rev: 64a433278d525859c661d8a1e50cc0817be12ac3) Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome')
-rw-r--r--meta/recipes-gnome/gtk+/gtk+-2.24.24/0001-GtkButton-do-not-prelight-in-touchscreen-mode.patch (renamed from meta/recipes-gnome/gtk+/gtk+-2.24.22/0001-GtkButton-do-not-prelight-in-touchscreen-mode.patch)0
-rw-r--r--meta/recipes-gnome/gtk+/gtk+-2.24.24/0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch (renamed from meta/recipes-gnome/gtk+/gtk+-2.24.22/0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch)0
-rw-r--r--meta/recipes-gnome/gtk+/gtk+-2.24.24/cellrenderer-cairo.patch (renamed from meta/recipes-gnome/gtk+/gtk+-2.24.22/cellrenderer-cairo.patch)0
-rw-r--r--meta/recipes-gnome/gtk+/gtk+-2.24.24/configure-nm.patch (renamed from meta/recipes-gnome/gtk+/gtk+-2.24.22/configure-nm.patch)0
-rw-r--r--meta/recipes-gnome/gtk+/gtk+-2.24.24/configurefix.patch (renamed from meta/recipes-gnome/gtk+/gtk+-2.24.22/configurefix.patch)0
-rw-r--r--meta/recipes-gnome/gtk+/gtk+-2.24.24/doc-fixes.patch (renamed from meta/recipes-gnome/gtk+/gtk+-2.24.22/doc-fixes.patch)0
-rw-r--r--meta/recipes-gnome/gtk+/gtk+-2.24.24/entry-cairo.patch (renamed from meta/recipes-gnome/gtk+/gtk+-2.24.22/entry-cairo.patch)0
-rw-r--r--meta/recipes-gnome/gtk+/gtk+-2.24.24/hardcoded_libtool.patch (renamed from meta/recipes-gnome/gtk+/gtk+-2.24.22/hardcoded_libtool.patch)0
-rw-r--r--meta/recipes-gnome/gtk+/gtk+-2.24.24/run-iconcache.patch (renamed from meta/recipes-gnome/gtk+/gtk+-2.24.22/run-iconcache.patch)11
-rw-r--r--meta/recipes-gnome/gtk+/gtk+-2.24.24/toggle-font.diff (renamed from meta/recipes-gnome/gtk+/gtk+-2.24.22/toggle-font.diff)0
-rw-r--r--meta/recipes-gnome/gtk+/gtk+-2.24.24/xsettings.patch (renamed from meta/recipes-gnome/gtk+/gtk+-2.24.22/xsettings.patch)0
-rw-r--r--meta/recipes-gnome/gtk+/gtk+_2.24.24.bb (renamed from meta/recipes-gnome/gtk+/gtk+_2.24.22.bb)4
12 files changed, 8 insertions, 7 deletions
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.24.22/0001-GtkButton-do-not-prelight-in-touchscreen-mode.patch b/meta/recipes-gnome/gtk+/gtk+-2.24.24/0001-GtkButton-do-not-prelight-in-touchscreen-mode.patch
index 71e334d897..71e334d897 100644
--- a/meta/recipes-gnome/gtk+/gtk+-2.24.22/0001-GtkButton-do-not-prelight-in-touchscreen-mode.patch
+++ b/meta/recipes-gnome/gtk+/gtk+-2.24.24/0001-GtkButton-do-not-prelight-in-touchscreen-mode.patch
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.24.22/0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch b/meta/recipes-gnome/gtk+/gtk+-2.24.24/0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch
index 354f0ab376..354f0ab376 100644
--- a/meta/recipes-gnome/gtk+/gtk+-2.24.22/0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch
+++ b/meta/recipes-gnome/gtk+/gtk+-2.24.24/0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.24.22/cellrenderer-cairo.patch b/meta/recipes-gnome/gtk+/gtk+-2.24.24/cellrenderer-cairo.patch
index ba893292d6..ba893292d6 100644
--- a/meta/recipes-gnome/gtk+/gtk+-2.24.22/cellrenderer-cairo.patch
+++ b/meta/recipes-gnome/gtk+/gtk+-2.24.24/cellrenderer-cairo.patch
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.24.22/configure-nm.patch b/meta/recipes-gnome/gtk+/gtk+-2.24.24/configure-nm.patch
index d67b797852..d67b797852 100644
--- a/meta/recipes-gnome/gtk+/gtk+-2.24.22/configure-nm.patch
+++ b/meta/recipes-gnome/gtk+/gtk+-2.24.24/configure-nm.patch
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.24.22/configurefix.patch b/meta/recipes-gnome/gtk+/gtk+-2.24.24/configurefix.patch
index 2803691246..2803691246 100644
--- a/meta/recipes-gnome/gtk+/gtk+-2.24.22/configurefix.patch
+++ b/meta/recipes-gnome/gtk+/gtk+-2.24.24/configurefix.patch
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.24.22/doc-fixes.patch b/meta/recipes-gnome/gtk+/gtk+-2.24.24/doc-fixes.patch
index 74e479fd1b..74e479fd1b 100644
--- a/meta/recipes-gnome/gtk+/gtk+-2.24.22/doc-fixes.patch
+++ b/meta/recipes-gnome/gtk+/gtk+-2.24.24/doc-fixes.patch
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.24.22/entry-cairo.patch b/meta/recipes-gnome/gtk+/gtk+-2.24.24/entry-cairo.patch
index 3083b77830..3083b77830 100644
--- a/meta/recipes-gnome/gtk+/gtk+-2.24.22/entry-cairo.patch
+++ b/meta/recipes-gnome/gtk+/gtk+-2.24.24/entry-cairo.patch
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.24.22/hardcoded_libtool.patch b/meta/recipes-gnome/gtk+/gtk+-2.24.24/hardcoded_libtool.patch
index 13ff318768..13ff318768 100644
--- a/meta/recipes-gnome/gtk+/gtk+-2.24.22/hardcoded_libtool.patch
+++ b/meta/recipes-gnome/gtk+/gtk+-2.24.24/hardcoded_libtool.patch
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.24.22/run-iconcache.patch b/meta/recipes-gnome/gtk+/gtk+-2.24.24/run-iconcache.patch
index 597ba32470..a4e2254c59 100644
--- a/meta/recipes-gnome/gtk+/gtk+-2.24.22/run-iconcache.patch
+++ b/meta/recipes-gnome/gtk+/gtk+-2.24.24/run-iconcache.patch
@@ -1,21 +1,22 @@
1Upstream-Status: Inappropriate [configuration] 1Upstream-Status: Inappropriate [configuration]
2 2
3Index: gtk+-2.21.2/gtk/Makefile.am 3diff -Nurd gtk+-2.24.24/gtk/Makefile.am gtk+-2.24.24/gtk/Makefile.am
4=================================================================== 4--- gtk+-2.24.24/gtk/Makefile.am 2014-06-23 18:08:14.000000000 +0300
5--- gtk+-2.21.2.orig/gtk/Makefile.am 2010-06-22 17:21:41.000000000 +0800 5+++ gtk+-2.24.24/gtk/Makefile.am 2014-09-03 23:45:12.669307700 +0300
6+++ gtk+-2.21.2/gtk/Makefile.am 2010-06-22 17:28:12.000000000 +0800 6@@ -1391,12 +1391,12 @@
7@@ -1376,11 +1376,11 @@
8 ./gtk-update-icon-cache 7 ./gtk-update-icon-cache
9 endif 8 endif
10 9
11-gtkbuiltincache.h: @REBUILD@ stamp-icons 10-gtkbuiltincache.h: @REBUILD@ stamp-icons
12- $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT) $(GTK_UPDATE_ICON_CACHE_MANIFEST) 11- $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT) $(GTK_UPDATE_ICON_CACHE_MANIFEST)
13- $(gtk_update_icon_cache_program) --force --ignore-theme-index \ 12- $(gtk_update_icon_cache_program) --force --ignore-theme-index \
13- --include-image-data \
14- --source builtin_icons stock-icons > gtkbuiltincache.h.tmp && \ 14- --source builtin_icons stock-icons > gtkbuiltincache.h.tmp && \
15- mv gtkbuiltincache.h.tmp gtkbuiltincache.h 15- mv gtkbuiltincache.h.tmp gtkbuiltincache.h
16+#gtkbuiltincache.h: @REBUILD@ stamp-icons 16+#gtkbuiltincache.h: @REBUILD@ stamp-icons
17+# $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT) $(GTK_UPDATE_ICON_CACHE_MANIFEST) 17+# $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT) $(GTK_UPDATE_ICON_CACHE_MANIFEST)
18+# $(gtk_update_icon_cache_program) --force --ignore-theme-index \ 18+# $(gtk_update_icon_cache_program) --force --ignore-theme-index \
19+# --include-image-data \
19+# --source builtin_icons stock-icons > gtkbuiltincache.h.tmp && \ 20+# --source builtin_icons stock-icons > gtkbuiltincache.h.tmp && \
20+# mv gtkbuiltincache.h.tmp gtkbuiltincache.h 21+# mv gtkbuiltincache.h.tmp gtkbuiltincache.h
21 22
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.24.22/toggle-font.diff b/meta/recipes-gnome/gtk+/gtk+-2.24.24/toggle-font.diff
index 340d12008b..340d12008b 100644
--- a/meta/recipes-gnome/gtk+/gtk+-2.24.22/toggle-font.diff
+++ b/meta/recipes-gnome/gtk+/gtk+-2.24.24/toggle-font.diff
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.24.22/xsettings.patch b/meta/recipes-gnome/gtk+/gtk+-2.24.24/xsettings.patch
index d0a970ad4d..d0a970ad4d 100644
--- a/meta/recipes-gnome/gtk+/gtk+-2.24.22/xsettings.patch
+++ b/meta/recipes-gnome/gtk+/gtk+-2.24.24/xsettings.patch
diff --git a/meta/recipes-gnome/gtk+/gtk+_2.24.22.bb b/meta/recipes-gnome/gtk+/gtk+_2.24.24.bb
index 98c65a56c6..7d0a0a2a8d 100644
--- a/meta/recipes-gnome/gtk+/gtk+_2.24.22.bb
+++ b/meta/recipes-gnome/gtk+/gtk+_2.24.24.bb
@@ -28,8 +28,8 @@ SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-${PV}.tar.xz \
28# file://combo-arrow-size.patch;striplevel=0 28# file://combo-arrow-size.patch;striplevel=0
29# file://configurefix.patch 29# file://configurefix.patch
30 30
31SRC_URI[md5sum] = "5fbbfb7637bbd571a572a2dae0e736d2" 31SRC_URI[md5sum] = "f80ac8aa95ea8482ad89656d0370752e"
32SRC_URI[sha256sum] = "b114b6e9fb389bf3aa8a6d09576538f58dce740779653084046852fb4140ae7f" 32SRC_URI[sha256sum] = "12ceb2e198c82bfb93eb36348b6e9293c8fdcd60786763d04cfec7ebe7ed3d6d"
33 33
34EXTRA_OECONF = "--enable-xkb --disable-glibtest --disable-cups --disable-xinerama" 34EXTRA_OECONF = "--enable-xkb --disable-glibtest --disable-cups --disable-xinerama"
35 35