summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarko Lindqvist <cazfi74@gmail.com>2013-08-16 11:07:50 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-08-20 15:31:24 +0100
commitf07123eb47d392c0a4afbf881ef1ba5c06cafe3c (patch)
tree333990e18cb88fb0f09f91643e54f02126d9183f
parente13de3efc82ebbb291a8f44b95eb648857aacb0d (diff)
downloadpoky-f07123eb47d392c0a4afbf881ef1ba5c06cafe3c.tar.gz
gtk+: update to upstream version 2.24.20
(From OE-Core rev: 176e5c5bfdeb2529cc40e35870ac49d75439dfeb) Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-gnome/gtk+/gtk+-2.24.20/0001-GtkButton-do-not-prelight-in-touchscreen-mode.patch (renamed from meta/recipes-gnome/gtk+/gtk+-2.24.18/0001-GtkButton-do-not-prelight-in-touchscreen-mode.patch)0
-rw-r--r--meta/recipes-gnome/gtk+/gtk+-2.24.20/0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch (renamed from meta/recipes-gnome/gtk+/gtk+-2.24.18/0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch)0
-rw-r--r--meta/recipes-gnome/gtk+/gtk+-2.24.20/cellrenderer-cairo.patch (renamed from meta/recipes-gnome/gtk+/gtk+-2.24.18/cellrenderer-cairo.patch)0
-rw-r--r--meta/recipes-gnome/gtk+/gtk+-2.24.20/configure-nm.patch (renamed from meta/recipes-gnome/gtk+/gtk+-2.24.18/configure-nm.patch)0
-rw-r--r--meta/recipes-gnome/gtk+/gtk+-2.24.20/configurefix.patch (renamed from meta/recipes-gnome/gtk+/gtk+-2.24.18/configurefix.patch)0
-rw-r--r--meta/recipes-gnome/gtk+/gtk+-2.24.20/doc-fixes.patch (renamed from meta/recipes-gnome/gtk+/gtk+-2.24.18/doc-fixes.patch)0
-rw-r--r--meta/recipes-gnome/gtk+/gtk+-2.24.20/entry-cairo.patch (renamed from meta/recipes-gnome/gtk+/gtk+-2.24.18/entry-cairo.patch)0
-rw-r--r--meta/recipes-gnome/gtk+/gtk+-2.24.20/hardcoded_libtool.patch (renamed from meta/recipes-gnome/gtk+/gtk+-2.24.18/hardcoded_libtool.patch)0
-rw-r--r--meta/recipes-gnome/gtk+/gtk+-2.24.20/no-demos.patch (renamed from meta/recipes-gnome/gtk+/gtk+-2.24.18/no-demos.patch)0
-rw-r--r--meta/recipes-gnome/gtk+/gtk+-2.24.20/run-iconcache.patch (renamed from meta/recipes-gnome/gtk+/gtk+-2.24.18/run-iconcache.patch)0
-rw-r--r--meta/recipes-gnome/gtk+/gtk+-2.24.20/toggle-font.diff (renamed from meta/recipes-gnome/gtk+/gtk+-2.24.18/toggle-font.diff)0
-rw-r--r--meta/recipes-gnome/gtk+/gtk+-2.24.20/xsettings.patch (renamed from meta/recipes-gnome/gtk+/gtk+-2.24.18/xsettings.patch)0
-rw-r--r--meta/recipes-gnome/gtk+/gtk+_2.24.20.bb (renamed from meta/recipes-gnome/gtk+/gtk+_2.24.18.bb)8
13 files changed, 3 insertions, 5 deletions
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.24.18/0001-GtkButton-do-not-prelight-in-touchscreen-mode.patch b/meta/recipes-gnome/gtk+/gtk+-2.24.20/0001-GtkButton-do-not-prelight-in-touchscreen-mode.patch
index 71e334d897..71e334d897 100644
--- a/meta/recipes-gnome/gtk+/gtk+-2.24.18/0001-GtkButton-do-not-prelight-in-touchscreen-mode.patch
+++ b/meta/recipes-gnome/gtk+/gtk+-2.24.20/0001-GtkButton-do-not-prelight-in-touchscreen-mode.patch
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.24.18/0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch b/meta/recipes-gnome/gtk+/gtk+-2.24.20/0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch
index 354f0ab376..354f0ab376 100644
--- a/meta/recipes-gnome/gtk+/gtk+-2.24.18/0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch
+++ b/meta/recipes-gnome/gtk+/gtk+-2.24.20/0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.24.18/cellrenderer-cairo.patch b/meta/recipes-gnome/gtk+/gtk+-2.24.20/cellrenderer-cairo.patch
index ba893292d6..ba893292d6 100644
--- a/meta/recipes-gnome/gtk+/gtk+-2.24.18/cellrenderer-cairo.patch
+++ b/meta/recipes-gnome/gtk+/gtk+-2.24.20/cellrenderer-cairo.patch
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.24.18/configure-nm.patch b/meta/recipes-gnome/gtk+/gtk+-2.24.20/configure-nm.patch
index d67b797852..d67b797852 100644
--- a/meta/recipes-gnome/gtk+/gtk+-2.24.18/configure-nm.patch
+++ b/meta/recipes-gnome/gtk+/gtk+-2.24.20/configure-nm.patch
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.24.18/configurefix.patch b/meta/recipes-gnome/gtk+/gtk+-2.24.20/configurefix.patch
index 2803691246..2803691246 100644
--- a/meta/recipes-gnome/gtk+/gtk+-2.24.18/configurefix.patch
+++ b/meta/recipes-gnome/gtk+/gtk+-2.24.20/configurefix.patch
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.24.18/doc-fixes.patch b/meta/recipes-gnome/gtk+/gtk+-2.24.20/doc-fixes.patch
index 74e479fd1b..74e479fd1b 100644
--- a/meta/recipes-gnome/gtk+/gtk+-2.24.18/doc-fixes.patch
+++ b/meta/recipes-gnome/gtk+/gtk+-2.24.20/doc-fixes.patch
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.24.18/entry-cairo.patch b/meta/recipes-gnome/gtk+/gtk+-2.24.20/entry-cairo.patch
index 3083b77830..3083b77830 100644
--- a/meta/recipes-gnome/gtk+/gtk+-2.24.18/entry-cairo.patch
+++ b/meta/recipes-gnome/gtk+/gtk+-2.24.20/entry-cairo.patch
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.24.18/hardcoded_libtool.patch b/meta/recipes-gnome/gtk+/gtk+-2.24.20/hardcoded_libtool.patch
index 13ff318768..13ff318768 100644
--- a/meta/recipes-gnome/gtk+/gtk+-2.24.18/hardcoded_libtool.patch
+++ b/meta/recipes-gnome/gtk+/gtk+-2.24.20/hardcoded_libtool.patch
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.24.18/no-demos.patch b/meta/recipes-gnome/gtk+/gtk+-2.24.20/no-demos.patch
index abd348ea99..abd348ea99 100644
--- a/meta/recipes-gnome/gtk+/gtk+-2.24.18/no-demos.patch
+++ b/meta/recipes-gnome/gtk+/gtk+-2.24.20/no-demos.patch
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.24.18/run-iconcache.patch b/meta/recipes-gnome/gtk+/gtk+-2.24.20/run-iconcache.patch
index 597ba32470..597ba32470 100644
--- a/meta/recipes-gnome/gtk+/gtk+-2.24.18/run-iconcache.patch
+++ b/meta/recipes-gnome/gtk+/gtk+-2.24.20/run-iconcache.patch
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.24.18/toggle-font.diff b/meta/recipes-gnome/gtk+/gtk+-2.24.20/toggle-font.diff
index 340d12008b..340d12008b 100644
--- a/meta/recipes-gnome/gtk+/gtk+-2.24.18/toggle-font.diff
+++ b/meta/recipes-gnome/gtk+/gtk+-2.24.20/toggle-font.diff
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.24.18/xsettings.patch b/meta/recipes-gnome/gtk+/gtk+-2.24.20/xsettings.patch
index d0a970ad4d..d0a970ad4d 100644
--- a/meta/recipes-gnome/gtk+/gtk+-2.24.18/xsettings.patch
+++ b/meta/recipes-gnome/gtk+/gtk+-2.24.20/xsettings.patch
diff --git a/meta/recipes-gnome/gtk+/gtk+_2.24.18.bb b/meta/recipes-gnome/gtk+/gtk+_2.24.20.bb
index bfcdd64370..baa5c9a748 100644
--- a/meta/recipes-gnome/gtk+/gtk+_2.24.18.bb
+++ b/meta/recipes-gnome/gtk+/gtk+_2.24.20.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
4 file://gtk/gtk.h;endline=27;md5=c59e0b4490dd135a5726ebf851f9b17f \ 4 file://gtk/gtk.h;endline=27;md5=c59e0b4490dd135a5726ebf851f9b17f \
5 file://gdk/gdk.h;endline=27;md5=07db285ec208fb3e0bf7d861b0614202 \ 5 file://gdk/gdk.h;endline=27;md5=07db285ec208fb3e0bf7d861b0614202 \
6 file://tests/testgtk.c;endline=27;md5=262db5db5f776f9863e56df31423e24c" 6 file://tests/testgtk.c;endline=27;md5=262db5db5f776f9863e56df31423e24c"
7SRC_URI = "http://download.gnome.org/sources/gtk+/2.24/gtk+-${PV}.tar.xz \ 7SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-${PV}.tar.xz \
8 file://xsettings.patch \ 8 file://xsettings.patch \
9 file://run-iconcache.patch \ 9 file://run-iconcache.patch \
10 file://configure-nm.patch \ 10 file://configure-nm.patch \
@@ -28,10 +28,8 @@ SRC_URI = "http://download.gnome.org/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
31PR = "r0" 31SRC_URI[md5sum] = "9d7833331d7accd80668e29d7f567ce5"
32 32SRC_URI[sha256sum] = "cc66bcbf9239a7d9861175c681ba95894b55c70dc0b37aad8345c46ecfda0da3"
33SRC_URI[md5sum] = "4309379acdcd8abfb72ea89bce3e7746"
34SRC_URI[sha256sum] = "6c963101272ff53bb5b01d21bfb86cebba5f0a68f31c5e10523c63f07e762385"
35 33
36EXTRA_OECONF = "--without-libtiff --without-libjasper --enable-xkb --disable-glibtest --disable-cups --disable-xinerama" 34EXTRA_OECONF = "--without-libtiff --without-libjasper --enable-xkb --disable-glibtest --disable-cups --disable-xinerama"
37 35