summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/conf/distro/poky-bleeding.conf2
-rw-r--r--meta/packages/gtk+/gtk+-2.11.6/disable-print.patch50
-rw-r--r--meta/packages/gtk+/gtk+-2.12.0/cellrenderer-cairo.patch (renamed from meta/packages/gtk+/gtk+-2.11.6/cellrenderer-cairo.patch)0
-rw-r--r--meta/packages/gtk+/gtk+-2.12.0/combo-arrow-size.patch (renamed from meta/packages/gtk+/gtk+-2.11.6/combo-arrow-size.patch)0
-rw-r--r--meta/packages/gtk+/gtk+-2.12.0/disable-print.patch26
-rw-r--r--meta/packages/gtk+/gtk+-2.12.0/entry-cairo.patch (renamed from meta/packages/gtk+/gtk+-2.11.6/entry-cairo.patch)0
-rw-r--r--meta/packages/gtk+/gtk+-2.12.0/gtklabel-resize-patch (renamed from meta/packages/gtk+/gtk+-2.11.6/gtklabel-resize-patch)0
-rw-r--r--meta/packages/gtk+/gtk+-2.12.0/hardcoded_libtool.patch (renamed from meta/packages/gtk+/gtk+-2.11.6/hardcoded_libtool.patch)0
-rw-r--r--meta/packages/gtk+/gtk+-2.12.0/menu-deactivate.patch (renamed from meta/packages/gtk+/gtk+-2.11.6/menu-deactivate.patch)0
-rw-r--r--meta/packages/gtk+/gtk+-2.12.0/no-demos.patch (renamed from meta/packages/gtk+/gtk+-2.11.6/no-demos.patch)0
-rw-r--r--meta/packages/gtk+/gtk+-2.12.0/pangoxft2.10.6.diff (renamed from meta/packages/gtk+/gtk+-2.11.6/pangoxft2.10.6.diff)0
-rw-r--r--meta/packages/gtk+/gtk+-2.12.0/range-no-redraw.patch (renamed from meta/packages/gtk+/gtk+-2.11.6/range-no-redraw.patch)0
-rw-r--r--meta/packages/gtk+/gtk+-2.12.0/run-iconcache.patch (renamed from meta/packages/gtk+/gtk+-2.11.6/run-iconcache.patch)0
-rw-r--r--meta/packages/gtk+/gtk+-2.12.0/scrolled-placement.patch (renamed from meta/packages/gtk+/gtk+-2.11.6/scrolled-placement.patch)13
-rw-r--r--meta/packages/gtk+/gtk+-2.12.0/toggle-font.diff (renamed from meta/packages/gtk+/gtk+-2.11.6/toggle-font.diff)2
-rw-r--r--meta/packages/gtk+/gtk+-2.12.0/xsettings.patch (renamed from meta/packages/gtk+/gtk+-2.11.6/xsettings.patch)0
-rw-r--r--meta/packages/gtk+/gtk+.inc3
-rw-r--r--meta/packages/gtk+/gtk+_2.12.0.bb (renamed from meta/packages/gtk+/gtk+_2.11.6.bb)4
18 files changed, 31 insertions, 69 deletions
diff --git a/meta/conf/distro/poky-bleeding.conf b/meta/conf/distro/poky-bleeding.conf
index c79bbcf915..0ede67e7a2 100644
--- a/meta/conf/distro/poky-bleeding.conf
+++ b/meta/conf/distro/poky-bleeding.conf
@@ -1,5 +1,5 @@
1PREFERRED_VERSION_atk ?= "1.19.6" 1PREFERRED_VERSION_atk ?= "1.19.6"
2PREFERRED_VERSION_gtk+ ?= "2.11.6" 2PREFERRED_VERSION_gtk+ ?= "2.12.0"
3 3
4PREFERRED_VERSION_gnome-keyring ?= "2.19.91" 4PREFERRED_VERSION_gnome-keyring ?= "2.19.91"
5PREFERRED_VERSION_gnome-vfs ?= "2.19.91" 5PREFERRED_VERSION_gnome-vfs ?= "2.19.91"
diff --git a/meta/packages/gtk+/gtk+-2.11.6/disable-print.patch b/meta/packages/gtk+/gtk+-2.11.6/disable-print.patch
deleted file mode 100644
index 1067773f12..0000000000
--- a/meta/packages/gtk+/gtk+-2.11.6/disable-print.patch
+++ /dev/null
@@ -1,50 +0,0 @@
1--- gtk+-2.10.0/configure.in~ 2006-07-05 18:11:44.000000000 +0200
2+++ gtk+-2.10.0/configure.in 2006-07-05 18:11:44.000000000 +0200
3@@ -1539,26 +1539,27 @@
4 # Printing system checks
5 ################################################################
6
7-AC_PATH_PROG(CUPS_CONFIG, cups-config, no)
8-if test "x$CUPS_CONFIG" != "xno"; then
9- CUPS_CFLAGS=`cups-config --cflags | sed 's/-O[0-9]*//' | sed 's/-m[^\t]*//g'`
10- CUPS_LIBS=`cups-config --libs`
11-
12- CUPS_API_VERSION=`cups-config --api-version`
13- CUPS_API_MAJOR=`echo -n $CUPS_API_VERSION | awk -F. '{print $1}'`
14- CUPS_API_MINOR=`echo -n $CUPS_API_VERSION | awk -F. '{print $2}'`
15-
16- if test $CUPS_API_MAJOR -gt 1 -o \
17- $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 2; then
18- AC_DEFINE(HAVE_CUPS_API_1_2)
19- fi
20-
21- AC_SUBST(CUPS_API_MAJOR)
22- AC_SUBST(CUPS_API_MINOR)
23- AC_SUBST(CUPS_CFLAGS)
24- AC_SUBST(CUPS_LIBS)
25-fi
26-AM_CONDITIONAL(HAVE_CUPS, test "x$CUPS_CONFIG" != "xno")
27+#AC_PATH_PROG(CUPS_CONFIG, cups-config, no)
28+#if test "x$CUPS_CONFIG" != "xno"; then
29+# CUPS_CFLAGS=`cups-config --cflags | sed 's/-O[0-9]*//' | sed 's/-m[^\t]*//g'`
30+# CUPS_LIBS=`cups-config --libs`
31+#
32+# CUPS_API_VERSION=`cups-config --api-version`
33+# CUPS_API_MAJOR=`echo -n $CUPS_API_VERSION | awk -F. '{print $1}'`
34+# CUPS_API_MINOR=`echo -n $CUPS_API_VERSION | awk -F. '{print $2}'`
35+#
36+# if test $CUPS_API_MAJOR -gt 1 -o \
37+# $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 2; then
38+# AC_DEFINE(HAVE_CUPS_API_1_2)
39+# fi
40+#
41+# AC_SUBST(CUPS_API_MAJOR)
42+# AC_SUBST(CUPS_API_MINOR)
43+# AC_SUBST(CUPS_CFLAGS)
44+# AC_SUBST(CUPS_LIBS)
45+#fi
46+#AM_CONDITIONAL(HAVE_CUPS, test "x$CUPS_CONFIG" != "xno")
47+AM_CONDITIONAL(HAVE_CUPS,false)
48
49 gtk_save_cppflags="$CPPFLAGS"
50 CPPFLAGS="$CPPFLAGS $GTK_DEP_CFLAGS"
diff --git a/meta/packages/gtk+/gtk+-2.11.6/cellrenderer-cairo.patch b/meta/packages/gtk+/gtk+-2.12.0/cellrenderer-cairo.patch
index 4439e69fb6..4439e69fb6 100644
--- a/meta/packages/gtk+/gtk+-2.11.6/cellrenderer-cairo.patch
+++ b/meta/packages/gtk+/gtk+-2.12.0/cellrenderer-cairo.patch
diff --git a/meta/packages/gtk+/gtk+-2.11.6/combo-arrow-size.patch b/meta/packages/gtk+/gtk+-2.12.0/combo-arrow-size.patch
index d44c454ce3..d44c454ce3 100644
--- a/meta/packages/gtk+/gtk+-2.11.6/combo-arrow-size.patch
+++ b/meta/packages/gtk+/gtk+-2.12.0/combo-arrow-size.patch
diff --git a/meta/packages/gtk+/gtk+-2.12.0/disable-print.patch b/meta/packages/gtk+/gtk+-2.12.0/disable-print.patch
new file mode 100644
index 0000000000..21a4be4da8
--- /dev/null
+++ b/meta/packages/gtk+/gtk+-2.12.0/disable-print.patch
@@ -0,0 +1,26 @@
1--- gtk+-2.12.0/configure.in~ 2006-07-05 18:11:44.000000000 +0200
2+++ gtk+-2.12.0/configure.in 2006-07-05 18:11:44.000000000 +0200
3@@ -1554,22 +1554 @@
4-AC_PATH_PROG(CUPS_CONFIG, cups-config, no)
5-if test "x$CUPS_CONFIG" != "xno"; then
6- CUPS_CFLAGS=`cups-config --cflags | sed 's/-O[0-9]*//' | sed 's/-m[^\t]*//g'`
7- CUPS_LIBS=`cups-config --libs`
8-
9- CUPS_API_VERSION=`cups-config --api-version`
10- CUPS_API_MAJOR=`echo -n $CUPS_API_VERSION | awk -F. '{print $1}'`
11- CUPS_API_MINOR=`echo -n $CUPS_API_VERSION | awk -F. '{print $2}'`
12-
13- if test $CUPS_API_MAJOR -gt 1 -o \
14- $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 2; then
15- AC_DEFINE(HAVE_CUPS_API_1_2)
16- fi
17-
18- AC_SUBST(CUPS_API_MAJOR)
19- AC_SUBST(CUPS_API_MINOR)
20- AC_SUBST(CUPS_CFLAGS)
21- AC_SUBST(CUPS_LIBS)
22-
23- AC_CHECK_HEADER(cups/cups.h,,AC_MSG_ERROR([[*** Sorry, cups-config present but cups/cups.h missing.]]))
24-fi
25-AM_CONDITIONAL(HAVE_CUPS, test "x$CUPS_CONFIG" != "xno")
26+AM_CONDITIONAL(HAVE_CUPS, false)
diff --git a/meta/packages/gtk+/gtk+-2.11.6/entry-cairo.patch b/meta/packages/gtk+/gtk+-2.12.0/entry-cairo.patch
index 3313e7f132..3313e7f132 100644
--- a/meta/packages/gtk+/gtk+-2.11.6/entry-cairo.patch
+++ b/meta/packages/gtk+/gtk+-2.12.0/entry-cairo.patch
diff --git a/meta/packages/gtk+/gtk+-2.11.6/gtklabel-resize-patch b/meta/packages/gtk+/gtk+-2.12.0/gtklabel-resize-patch
index df29656343..df29656343 100644
--- a/meta/packages/gtk+/gtk+-2.11.6/gtklabel-resize-patch
+++ b/meta/packages/gtk+/gtk+-2.12.0/gtklabel-resize-patch
diff --git a/meta/packages/gtk+/gtk+-2.11.6/hardcoded_libtool.patch b/meta/packages/gtk+/gtk+-2.12.0/hardcoded_libtool.patch
index 6adb0cfef6..6adb0cfef6 100644
--- a/meta/packages/gtk+/gtk+-2.11.6/hardcoded_libtool.patch
+++ b/meta/packages/gtk+/gtk+-2.12.0/hardcoded_libtool.patch
diff --git a/meta/packages/gtk+/gtk+-2.11.6/menu-deactivate.patch b/meta/packages/gtk+/gtk+-2.12.0/menu-deactivate.patch
index cfb8849e9f..cfb8849e9f 100644
--- a/meta/packages/gtk+/gtk+-2.11.6/menu-deactivate.patch
+++ b/meta/packages/gtk+/gtk+-2.12.0/menu-deactivate.patch
diff --git a/meta/packages/gtk+/gtk+-2.11.6/no-demos.patch b/meta/packages/gtk+/gtk+-2.12.0/no-demos.patch
index 0fc4c48d1a..0fc4c48d1a 100644
--- a/meta/packages/gtk+/gtk+-2.11.6/no-demos.patch
+++ b/meta/packages/gtk+/gtk+-2.12.0/no-demos.patch
diff --git a/meta/packages/gtk+/gtk+-2.11.6/pangoxft2.10.6.diff b/meta/packages/gtk+/gtk+-2.12.0/pangoxft2.10.6.diff
index 63828cec63..63828cec63 100644
--- a/meta/packages/gtk+/gtk+-2.11.6/pangoxft2.10.6.diff
+++ b/meta/packages/gtk+/gtk+-2.12.0/pangoxft2.10.6.diff
diff --git a/meta/packages/gtk+/gtk+-2.11.6/range-no-redraw.patch b/meta/packages/gtk+/gtk+-2.12.0/range-no-redraw.patch
index 14387b8a2e..14387b8a2e 100644
--- a/meta/packages/gtk+/gtk+-2.11.6/range-no-redraw.patch
+++ b/meta/packages/gtk+/gtk+-2.12.0/range-no-redraw.patch
diff --git a/meta/packages/gtk+/gtk+-2.11.6/run-iconcache.patch b/meta/packages/gtk+/gtk+-2.12.0/run-iconcache.patch
index ac15e9ab24..ac15e9ab24 100644
--- a/meta/packages/gtk+/gtk+-2.11.6/run-iconcache.patch
+++ b/meta/packages/gtk+/gtk+-2.12.0/run-iconcache.patch
diff --git a/meta/packages/gtk+/gtk+-2.11.6/scrolled-placement.patch b/meta/packages/gtk+/gtk+-2.12.0/scrolled-placement.patch
index 09ded531ea..a0b50c8cac 100644
--- a/meta/packages/gtk+/gtk+-2.11.6/scrolled-placement.patch
+++ b/meta/packages/gtk+/gtk+-2.12.0/scrolled-placement.patch
@@ -1,16 +1,3 @@
1Index: gtk/gtkscrolledwindow.c
2===================================================================
3--- gtk/gtkscrolledwindow.c (revision 18493)
4+++ gtk/gtkscrolledwindow.c (working copy)
5@@ -885,7 +885,7 @@
6 if (GTK_IS_SCROLLED_WINDOW (widget))
7 {
8 gtk_scrolled_window_update_real_placement (GTK_SCROLLED_WINDOW (widget));
9- gtk_widget_queue_draw (widget);
10+ gtk_widget_queue_resize (widget);
11 }
12 else if (GTK_IS_CONTAINER (widget))
13 gtk_container_forall (GTK_CONTAINER (widget), traverse_container, NULL);
14Index: gdk/x11/gdksettings.c 1Index: gdk/x11/gdksettings.c
15=================================================================== 2===================================================================
16--- gdk/x11/gdksettings.c (revision 18493) 3--- gdk/x11/gdksettings.c (revision 18493)
diff --git a/meta/packages/gtk+/gtk+-2.11.6/toggle-font.diff b/meta/packages/gtk+/gtk+-2.12.0/toggle-font.diff
index 928da72430..59ad150b2f 100644
--- a/meta/packages/gtk+/gtk+-2.11.6/toggle-font.diff
+++ b/meta/packages/gtk+/gtk+-2.12.0/toggle-font.diff
@@ -8,7 +8,7 @@ Index: gtk/gtkcellrenderertoggle.c
8 8
9+/* This is a hard-coded default which promptly gets overridden by a size 9+/* This is a hard-coded default which promptly gets overridden by a size
10+ calculated from the font size. */ 10+ calculated from the font size. */
11 #define TOGGLE_WIDTH 12 11 #define TOGGLE_WIDTH 13
12 12
13 static guint toggle_cell_signals[LAST_SIGNAL] = { 0 }; 13 static guint toggle_cell_signals[LAST_SIGNAL] = { 0 };
14@@ -80,8 +82,9 @@ 14@@ -80,8 +82,9 @@
diff --git a/meta/packages/gtk+/gtk+-2.11.6/xsettings.patch b/meta/packages/gtk+/gtk+-2.12.0/xsettings.patch
index b63e262d34..b63e262d34 100644
--- a/meta/packages/gtk+/gtk+-2.11.6/xsettings.patch
+++ b/meta/packages/gtk+/gtk+-2.12.0/xsettings.patch
diff --git a/meta/packages/gtk+/gtk+.inc b/meta/packages/gtk+/gtk+.inc
index 8674f39edc..24a4c69692 100644
--- a/meta/packages/gtk+/gtk+.inc
+++ b/meta/packages/gtk+/gtk+.inc
@@ -21,7 +21,8 @@ FILES_${PN}-dev += " \
21 ${libdir}/gtk-2.0/${LIBV}/loaders/*.la \ 21 ${libdir}/gtk-2.0/${LIBV}/loaders/*.la \
22 ${libdir}/gtk-2.0/${LIBV}/immodules/*.la \ 22 ${libdir}/gtk-2.0/${LIBV}/immodules/*.la \
23 ${libdir}/gtk-2.0/${LIBV}/engines/*.la \ 23 ${libdir}/gtk-2.0/${LIBV}/engines/*.la \
24 ${bindir}/gdk-pixbuf-csource" 24 ${bindir}/gdk-pixbuf-csource \
25 ${bindir}/gtk-builder-convert"
25 26
26FILES_${PN}-dbg += " \ 27FILES_${PN}-dbg += " \
27 ${libdir}/gtk-2.0/${LIBV}/loaders/.debug/* \ 28 ${libdir}/gtk-2.0/${LIBV}/loaders/.debug/* \
diff --git a/meta/packages/gtk+/gtk+_2.11.6.bb b/meta/packages/gtk+/gtk+_2.12.0.bb
index 186923b068..1ad92c8272 100644
--- a/meta/packages/gtk+/gtk+_2.11.6.bb
+++ b/meta/packages/gtk+/gtk+_2.12.0.bb
@@ -1,12 +1,11 @@
1require gtk+.inc 1require gtk+.inc
2 2
3DEPENDS += "cairo" 3DEPENDS += "cairo"
4PR = "r3"
5 4
6# disable per default - untested and not all patches included. 5# disable per default - untested and not all patches included.
7DEFAULT_PREFERENCE = "-1" 6DEFAULT_PREFERENCE = "-1"
8 7
9SRC_URI = "http://download.gnome.org/sources/gtk+/2.11/gtk+-${PV}.tar.bz2 \ 8SRC_URI = "http://download.gnome.org/sources/gtk+/2.12/gtk+-${PV}.tar.bz2 \
10 file://xsettings.patch;patch=1 \ 9 file://xsettings.patch;patch=1 \
11 file://run-iconcache.patch;patch=1 \ 10 file://run-iconcache.patch;patch=1 \
12 file://disable-print.patch;patch=1 \ 11 file://disable-print.patch;patch=1 \
@@ -15,7 +14,6 @@ SRC_URI = "http://download.gnome.org/sources/gtk+/2.11/gtk+-${PV}.tar.bz2 \
15 file://cellrenderer-cairo.patch;patch=1;pnum=0 \ 14 file://cellrenderer-cairo.patch;patch=1;pnum=0 \
16 file://entry-cairo.patch;patch=1;pnum=0 \ 15 file://entry-cairo.patch;patch=1;pnum=0 \
17 file://toggle-font.diff;patch=1;pnum=0 \ 16 file://toggle-font.diff;patch=1;pnum=0 \
18 file://range-no-redraw.patch;patch=1;pnum=0 \
19 file://scrolled-placement.patch;patch=1;pnum=0" 17 file://scrolled-placement.patch;patch=1;pnum=0"
20# temporary 18# temporary
21# file://gtklabel-resize-patch;patch=1 \ 19# file://gtklabel-resize-patch;patch=1 \