]> code.ossystems Code Review - openembedded-core.git/commitdiff
gtk+: upgrade 2.12 to 2.12.2
authorRoss Burton <ross@openedhand.com>
Tue, 27 Nov 2007 10:25:12 +0000 (10:25 +0000)
committerRoss Burton <ross@openedhand.com>
Tue, 27 Nov 2007 10:25:12 +0000 (10:25 +0000)
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3242 311d38ba-8fff-0310-9ca6-ca027cbcb966

16 files changed:
meta/conf/distro/poky-bleeding.conf
meta/packages/gtk+/gtk+-2.12.2/cellrenderer-cairo.patch [moved from meta/packages/gtk+/gtk+-2.12.1/cellrenderer-cairo.patch with 100% similarity]
meta/packages/gtk+/gtk+-2.12.2/combo-arrow-size.patch [moved from meta/packages/gtk+/gtk+-2.12.1/combo-arrow-size.patch with 100% similarity]
meta/packages/gtk+/gtk+-2.12.2/disable-print.patch [moved from meta/packages/gtk+/gtk+-2.12.1/disable-print.patch with 83% similarity]
meta/packages/gtk+/gtk+-2.12.2/entry-cairo.patch [moved from meta/packages/gtk+/gtk+-2.12.1/entry-cairo.patch with 100% similarity]
meta/packages/gtk+/gtk+-2.12.2/gtklabel-resize-patch [moved from meta/packages/gtk+/gtk+-2.12.1/gtklabel-resize-patch with 100% similarity]
meta/packages/gtk+/gtk+-2.12.2/hardcoded_libtool.patch [moved from meta/packages/gtk+/gtk+-2.12.1/hardcoded_libtool.patch with 100% similarity]
meta/packages/gtk+/gtk+-2.12.2/menu-deactivate.patch [moved from meta/packages/gtk+/gtk+-2.12.1/menu-deactivate.patch with 100% similarity]
meta/packages/gtk+/gtk+-2.12.2/no-demos.patch [moved from meta/packages/gtk+/gtk+-2.12.1/no-demos.patch with 100% similarity]
meta/packages/gtk+/gtk+-2.12.2/pangoxft2.10.6.diff [moved from meta/packages/gtk+/gtk+-2.12.1/pangoxft2.10.6.diff with 100% similarity]
meta/packages/gtk+/gtk+-2.12.2/range-no-redraw.patch [moved from meta/packages/gtk+/gtk+-2.12.1/range-no-redraw.patch with 100% similarity]
meta/packages/gtk+/gtk+-2.12.2/run-iconcache.patch [moved from meta/packages/gtk+/gtk+-2.12.1/run-iconcache.patch with 100% similarity]
meta/packages/gtk+/gtk+-2.12.2/scrolled-placement.patch [moved from meta/packages/gtk+/gtk+-2.12.1/scrolled-placement.patch with 100% similarity]
meta/packages/gtk+/gtk+-2.12.2/toggle-font.diff [moved from meta/packages/gtk+/gtk+-2.12.1/toggle-font.diff with 100% similarity]
meta/packages/gtk+/gtk+-2.12.2/xsettings.patch [moved from meta/packages/gtk+/gtk+-2.12.1/xsettings.patch with 100% similarity]
meta/packages/gtk+/gtk+_2.12.2.bb [moved from meta/packages/gtk+/gtk+_2.12.1.bb with 100% similarity]

index c63aaaa447073d26541db46027cc1e196dd391d4..be4e37de1f5911f16d33e152171cd2f95517b724 100644 (file)
@@ -1,5 +1,5 @@
 PREFERRED_VERSION_atk ?= "1.20.0"
-PREFERRED_VERSION_gtk+ ?= "2.12.1"
+PREFERRED_VERSION_gtk+ ?= "2.12.2"
 
 PREFERRED_VERSION_gnome-keyring ?= "2.20"
 PREFERRED_VERSION_gnome-vfs ?= "2.20.0"
similarity index 83%
rename from meta/packages/gtk+/gtk+-2.12.1/disable-print.patch
rename to meta/packages/gtk+/gtk+-2.12.2/disable-print.patch
index 19292592d20d21bb9035a815f83f28fa465068b5..13cbd91d7798ecef28a8811fb3683e307ad5a117 100644 (file)
@@ -3,10 +3,10 @@
 @@ -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_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_VERSION=`$CUPS_CONFIG --api-version`
 -  CUPS_API_MAJOR=`echo $ECHO_N $CUPS_API_VERSION | awk -F. '{print $1}'`
 -  CUPS_API_MINOR=`echo $ECHO_N $CUPS_API_VERSION | awk -F. '{print $2}'`
 -