diff options
author | Ross Burton <ross@openedhand.com> | 2007-09-14 12:24:08 +0000 |
---|---|---|
committer | Ross Burton <ross@openedhand.com> | 2007-09-14 12:24:08 +0000 |
commit | 021e69fc7ef8fd0cea9ce725fe99c8059d78a0b9 (patch) | |
tree | 55780aa475dbe0d548abf0f62a9a6adeb64fb7a0 /meta/packages/gtk+ | |
parent | 33f82b3d2f994d2c32d77b05ef496c502b2821bb (diff) | |
download | ast2050-yocto-poky-021e69fc7ef8fd0cea9ce725fe99c8059d78a0b9.zip ast2050-yocto-poky-021e69fc7ef8fd0cea9ce725fe99c8059d78a0b9.tar.gz |
Upgrade GTK+ 2.11 to 2.12.0
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2736 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/gtk+')
-rw-r--r-- | meta/packages/gtk+/gtk+-2.11.6/disable-print.patch | 50 | ||||
-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.patch | 26 | ||||
-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+.inc | 3 | ||||
-rw-r--r-- | meta/packages/gtk+/gtk+_2.12.0.bb (renamed from meta/packages/gtk+/gtk+_2.11.6.bb) | 4 |
17 files changed, 30 insertions, 68 deletions
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 1067773..0000000 --- a/meta/packages/gtk+/gtk+-2.11.6/disable-print.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- gtk+-2.10.0/configure.in~ 2006-07-05 18:11:44.000000000 +0200 -+++ gtk+-2.10.0/configure.in 2006-07-05 18:11:44.000000000 +0200 -@@ -1539,26 +1539,27 @@ - # Printing system checks - ################################################################ - --AC_PATH_PROG(CUPS_CONFIG, cups-config, no) --if test "x$CUPS_CONFIG" != "xno"; then -- CUPS_CFLAGS=`cups-config --cflags | sed 's/-O[0-9]*//' | sed 's/-m[^\t]*//g'` -- CUPS_LIBS=`cups-config --libs` -- -- CUPS_API_VERSION=`cups-config --api-version` -- CUPS_API_MAJOR=`echo -n $CUPS_API_VERSION | awk -F. '{print $1}'` -- CUPS_API_MINOR=`echo -n $CUPS_API_VERSION | awk -F. '{print $2}'` -- -- if test $CUPS_API_MAJOR -gt 1 -o \ -- $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 2; then -- AC_DEFINE(HAVE_CUPS_API_1_2) -- fi -- -- AC_SUBST(CUPS_API_MAJOR) -- AC_SUBST(CUPS_API_MINOR) -- AC_SUBST(CUPS_CFLAGS) -- AC_SUBST(CUPS_LIBS) --fi --AM_CONDITIONAL(HAVE_CUPS, test "x$CUPS_CONFIG" != "xno") -+#AC_PATH_PROG(CUPS_CONFIG, cups-config, no) -+#if test "x$CUPS_CONFIG" != "xno"; then -+# CUPS_CFLAGS=`cups-config --cflags | sed 's/-O[0-9]*//' | sed 's/-m[^\t]*//g'` -+# CUPS_LIBS=`cups-config --libs` -+# -+# CUPS_API_VERSION=`cups-config --api-version` -+# CUPS_API_MAJOR=`echo -n $CUPS_API_VERSION | awk -F. '{print $1}'` -+# CUPS_API_MINOR=`echo -n $CUPS_API_VERSION | awk -F. '{print $2}'` -+# -+# if test $CUPS_API_MAJOR -gt 1 -o \ -+# $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 2; then -+# AC_DEFINE(HAVE_CUPS_API_1_2) -+# fi -+# -+# AC_SUBST(CUPS_API_MAJOR) -+# AC_SUBST(CUPS_API_MINOR) -+# AC_SUBST(CUPS_CFLAGS) -+# AC_SUBST(CUPS_LIBS) -+#fi -+#AM_CONDITIONAL(HAVE_CUPS, test "x$CUPS_CONFIG" != "xno") -+AM_CONDITIONAL(HAVE_CUPS,false) - - gtk_save_cppflags="$CPPFLAGS" - 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 4439e69..4439e69 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 d44c454..d44c454 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 0000000..21a4be4 --- /dev/null +++ b/meta/packages/gtk+/gtk+-2.12.0/disable-print.patch @@ -0,0 +1,26 @@ +--- gtk+-2.12.0/configure.in~ 2006-07-05 18:11:44.000000000 +0200 ++++ gtk+-2.12.0/configure.in 2006-07-05 18:11:44.000000000 +0200 +@@ -1554,22 +1554 @@ +-AC_PATH_PROG(CUPS_CONFIG, cups-config, no) +-if test "x$CUPS_CONFIG" != "xno"; then +- CUPS_CFLAGS=`cups-config --cflags | sed 's/-O[0-9]*//' | sed 's/-m[^\t]*//g'` +- CUPS_LIBS=`cups-config --libs` +- +- CUPS_API_VERSION=`cups-config --api-version` +- CUPS_API_MAJOR=`echo -n $CUPS_API_VERSION | awk -F. '{print $1}'` +- CUPS_API_MINOR=`echo -n $CUPS_API_VERSION | awk -F. '{print $2}'` +- +- if test $CUPS_API_MAJOR -gt 1 -o \ +- $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 2; then +- AC_DEFINE(HAVE_CUPS_API_1_2) +- fi +- +- AC_SUBST(CUPS_API_MAJOR) +- AC_SUBST(CUPS_API_MINOR) +- AC_SUBST(CUPS_CFLAGS) +- AC_SUBST(CUPS_LIBS) +- +- AC_CHECK_HEADER(cups/cups.h,,AC_MSG_ERROR([[*** Sorry, cups-config present but cups/cups.h missing.]])) +-fi +-AM_CONDITIONAL(HAVE_CUPS, test "x$CUPS_CONFIG" != "xno") ++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 3313e7f..3313e7f 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 df29656..df29656 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 6adb0cf..6adb0cf 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 cfb8849..cfb8849 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 0fc4c48..0fc4c48 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 63828ce..63828ce 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 14387b8..14387b8 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 ac15e9a..ac15e9a 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 09ded53..a0b50c8 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 @@ -Index: gtk/gtkscrolledwindow.c -=================================================================== ---- gtk/gtkscrolledwindow.c (revision 18493) -+++ gtk/gtkscrolledwindow.c (working copy) -@@ -885,7 +885,7 @@ - if (GTK_IS_SCROLLED_WINDOW (widget)) - { - gtk_scrolled_window_update_real_placement (GTK_SCROLLED_WINDOW (widget)); -- gtk_widget_queue_draw (widget); -+ gtk_widget_queue_resize (widget); - } - else if (GTK_IS_CONTAINER (widget)) - gtk_container_forall (GTK_CONTAINER (widget), traverse_container, NULL); Index: gdk/x11/gdksettings.c =================================================================== --- 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 928da72..59ad150 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 +/* This is a hard-coded default which promptly gets overridden by a size + calculated from the font size. */ - #define TOGGLE_WIDTH 12 + #define TOGGLE_WIDTH 13 static guint toggle_cell_signals[LAST_SIGNAL] = { 0 }; @@ -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 b63e262..b63e262 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 8674f39..24a4c69 100644 --- a/meta/packages/gtk+/gtk+.inc +++ b/meta/packages/gtk+/gtk+.inc @@ -21,7 +21,8 @@ FILES_${PN}-dev += " \ ${libdir}/gtk-2.0/${LIBV}/loaders/*.la \ ${libdir}/gtk-2.0/${LIBV}/immodules/*.la \ ${libdir}/gtk-2.0/${LIBV}/engines/*.la \ - ${bindir}/gdk-pixbuf-csource" + ${bindir}/gdk-pixbuf-csource \ + ${bindir}/gtk-builder-convert" FILES_${PN}-dbg += " \ ${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 186923b..1ad92c8 100644 --- a/meta/packages/gtk+/gtk+_2.11.6.bb +++ b/meta/packages/gtk+/gtk+_2.12.0.bb @@ -1,12 +1,11 @@ require gtk+.inc DEPENDS += "cairo" -PR = "r3" # disable per default - untested and not all patches included. DEFAULT_PREFERENCE = "-1" -SRC_URI = "http://download.gnome.org/sources/gtk+/2.11/gtk+-${PV}.tar.bz2 \ +SRC_URI = "http://download.gnome.org/sources/gtk+/2.12/gtk+-${PV}.tar.bz2 \ file://xsettings.patch;patch=1 \ file://run-iconcache.patch;patch=1 \ file://disable-print.patch;patch=1 \ @@ -15,7 +14,6 @@ SRC_URI = "http://download.gnome.org/sources/gtk+/2.11/gtk+-${PV}.tar.bz2 \ file://cellrenderer-cairo.patch;patch=1;pnum=0 \ file://entry-cairo.patch;patch=1;pnum=0 \ file://toggle-font.diff;patch=1;pnum=0 \ - file://range-no-redraw.patch;patch=1;pnum=0 \ file://scrolled-placement.patch;patch=1;pnum=0" # temporary # file://gtklabel-resize-patch;patch=1 \ |