diff options
-rw-r--r-- | meta/conf/distro/poky-bleeding.conf | 2 | ||||
-rw-r--r-- | meta/packages/gtk+/gtk+-2.12.2/cellrenderer-cairo.patch (renamed from meta/packages/gtk+/gtk+-2.12.1/cellrenderer-cairo.patch) | 0 | ||||
-rw-r--r-- | meta/packages/gtk+/gtk+-2.12.2/combo-arrow-size.patch (renamed from meta/packages/gtk+/gtk+-2.12.1/combo-arrow-size.patch) | 0 | ||||
-rw-r--r-- | meta/packages/gtk+/gtk+-2.12.2/disable-print.patch (renamed from meta/packages/gtk+/gtk+-2.12.1/disable-print.patch) | 6 | ||||
-rw-r--r-- | meta/packages/gtk+/gtk+-2.12.2/entry-cairo.patch (renamed from meta/packages/gtk+/gtk+-2.12.1/entry-cairo.patch) | 0 | ||||
-rw-r--r-- | meta/packages/gtk+/gtk+-2.12.2/gtklabel-resize-patch (renamed from meta/packages/gtk+/gtk+-2.12.1/gtklabel-resize-patch) | 0 | ||||
-rw-r--r-- | meta/packages/gtk+/gtk+-2.12.2/hardcoded_libtool.patch (renamed from meta/packages/gtk+/gtk+-2.12.1/hardcoded_libtool.patch) | 0 | ||||
-rw-r--r-- | meta/packages/gtk+/gtk+-2.12.2/menu-deactivate.patch (renamed from meta/packages/gtk+/gtk+-2.12.1/menu-deactivate.patch) | 0 | ||||
-rw-r--r-- | meta/packages/gtk+/gtk+-2.12.2/no-demos.patch (renamed from meta/packages/gtk+/gtk+-2.12.1/no-demos.patch) | 0 | ||||
-rw-r--r-- | meta/packages/gtk+/gtk+-2.12.2/pangoxft2.10.6.diff (renamed from meta/packages/gtk+/gtk+-2.12.1/pangoxft2.10.6.diff) | 0 | ||||
-rw-r--r-- | meta/packages/gtk+/gtk+-2.12.2/range-no-redraw.patch (renamed from meta/packages/gtk+/gtk+-2.12.1/range-no-redraw.patch) | 0 | ||||
-rw-r--r-- | meta/packages/gtk+/gtk+-2.12.2/run-iconcache.patch (renamed from meta/packages/gtk+/gtk+-2.12.1/run-iconcache.patch) | 0 | ||||
-rw-r--r-- | meta/packages/gtk+/gtk+-2.12.2/scrolled-placement.patch (renamed from meta/packages/gtk+/gtk+-2.12.1/scrolled-placement.patch) | 0 | ||||
-rw-r--r-- | meta/packages/gtk+/gtk+-2.12.2/toggle-font.diff (renamed from meta/packages/gtk+/gtk+-2.12.1/toggle-font.diff) | 0 | ||||
-rw-r--r-- | meta/packages/gtk+/gtk+-2.12.2/xsettings.patch (renamed from meta/packages/gtk+/gtk+-2.12.1/xsettings.patch) | 0 | ||||
-rw-r--r-- | meta/packages/gtk+/gtk+_2.12.2.bb (renamed from meta/packages/gtk+/gtk+_2.12.1.bb) | 0 |
16 files changed, 4 insertions, 4 deletions
diff --git a/meta/conf/distro/poky-bleeding.conf b/meta/conf/distro/poky-bleeding.conf index c63aaaa44..be4e37de1 100644 --- a/meta/conf/distro/poky-bleeding.conf +++ b/meta/conf/distro/poky-bleeding.conf @@ -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" diff --git a/meta/packages/gtk+/gtk+-2.12.1/cellrenderer-cairo.patch b/meta/packages/gtk+/gtk+-2.12.2/cellrenderer-cairo.patch index 4439e69fb..4439e69fb 100644 --- a/meta/packages/gtk+/gtk+-2.12.1/cellrenderer-cairo.patch +++ b/meta/packages/gtk+/gtk+-2.12.2/cellrenderer-cairo.patch diff --git a/meta/packages/gtk+/gtk+-2.12.1/combo-arrow-size.patch b/meta/packages/gtk+/gtk+-2.12.2/combo-arrow-size.patch index d44c454ce..d44c454ce 100644 --- a/meta/packages/gtk+/gtk+-2.12.1/combo-arrow-size.patch +++ b/meta/packages/gtk+/gtk+-2.12.2/combo-arrow-size.patch diff --git a/meta/packages/gtk+/gtk+-2.12.1/disable-print.patch b/meta/packages/gtk+/gtk+-2.12.2/disable-print.patch index 19292592d..13cbd91d7 100644 --- a/meta/packages/gtk+/gtk+-2.12.1/disable-print.patch +++ b/meta/packages/gtk+/gtk+-2.12.2/disable-print.patch @@ -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}'` - diff --git a/meta/packages/gtk+/gtk+-2.12.1/entry-cairo.patch b/meta/packages/gtk+/gtk+-2.12.2/entry-cairo.patch index 3313e7f13..3313e7f13 100644 --- a/meta/packages/gtk+/gtk+-2.12.1/entry-cairo.patch +++ b/meta/packages/gtk+/gtk+-2.12.2/entry-cairo.patch diff --git a/meta/packages/gtk+/gtk+-2.12.1/gtklabel-resize-patch b/meta/packages/gtk+/gtk+-2.12.2/gtklabel-resize-patch index df2965634..df2965634 100644 --- a/meta/packages/gtk+/gtk+-2.12.1/gtklabel-resize-patch +++ b/meta/packages/gtk+/gtk+-2.12.2/gtklabel-resize-patch diff --git a/meta/packages/gtk+/gtk+-2.12.1/hardcoded_libtool.patch b/meta/packages/gtk+/gtk+-2.12.2/hardcoded_libtool.patch index 6adb0cfef..6adb0cfef 100644 --- a/meta/packages/gtk+/gtk+-2.12.1/hardcoded_libtool.patch +++ b/meta/packages/gtk+/gtk+-2.12.2/hardcoded_libtool.patch diff --git a/meta/packages/gtk+/gtk+-2.12.1/menu-deactivate.patch b/meta/packages/gtk+/gtk+-2.12.2/menu-deactivate.patch index cfb8849e9..cfb8849e9 100644 --- a/meta/packages/gtk+/gtk+-2.12.1/menu-deactivate.patch +++ b/meta/packages/gtk+/gtk+-2.12.2/menu-deactivate.patch diff --git a/meta/packages/gtk+/gtk+-2.12.1/no-demos.patch b/meta/packages/gtk+/gtk+-2.12.2/no-demos.patch index 0fc4c48d1..0fc4c48d1 100644 --- a/meta/packages/gtk+/gtk+-2.12.1/no-demos.patch +++ b/meta/packages/gtk+/gtk+-2.12.2/no-demos.patch diff --git a/meta/packages/gtk+/gtk+-2.12.1/pangoxft2.10.6.diff b/meta/packages/gtk+/gtk+-2.12.2/pangoxft2.10.6.diff index 63828cec6..63828cec6 100644 --- a/meta/packages/gtk+/gtk+-2.12.1/pangoxft2.10.6.diff +++ b/meta/packages/gtk+/gtk+-2.12.2/pangoxft2.10.6.diff diff --git a/meta/packages/gtk+/gtk+-2.12.1/range-no-redraw.patch b/meta/packages/gtk+/gtk+-2.12.2/range-no-redraw.patch index 14387b8a2..14387b8a2 100644 --- a/meta/packages/gtk+/gtk+-2.12.1/range-no-redraw.patch +++ b/meta/packages/gtk+/gtk+-2.12.2/range-no-redraw.patch diff --git a/meta/packages/gtk+/gtk+-2.12.1/run-iconcache.patch b/meta/packages/gtk+/gtk+-2.12.2/run-iconcache.patch index ac15e9ab2..ac15e9ab2 100644 --- a/meta/packages/gtk+/gtk+-2.12.1/run-iconcache.patch +++ b/meta/packages/gtk+/gtk+-2.12.2/run-iconcache.patch diff --git a/meta/packages/gtk+/gtk+-2.12.1/scrolled-placement.patch b/meta/packages/gtk+/gtk+-2.12.2/scrolled-placement.patch index a0b50c8ca..a0b50c8ca 100644 --- a/meta/packages/gtk+/gtk+-2.12.1/scrolled-placement.patch +++ b/meta/packages/gtk+/gtk+-2.12.2/scrolled-placement.patch diff --git a/meta/packages/gtk+/gtk+-2.12.1/toggle-font.diff b/meta/packages/gtk+/gtk+-2.12.2/toggle-font.diff index 59ad150b2..59ad150b2 100644 --- a/meta/packages/gtk+/gtk+-2.12.1/toggle-font.diff +++ b/meta/packages/gtk+/gtk+-2.12.2/toggle-font.diff diff --git a/meta/packages/gtk+/gtk+-2.12.1/xsettings.patch b/meta/packages/gtk+/gtk+-2.12.2/xsettings.patch index b63e262d3..b63e262d3 100644 --- a/meta/packages/gtk+/gtk+-2.12.1/xsettings.patch +++ b/meta/packages/gtk+/gtk+-2.12.2/xsettings.patch diff --git a/meta/packages/gtk+/gtk+_2.12.1.bb b/meta/packages/gtk+/gtk+_2.12.2.bb index a9facbb61..a9facbb61 100644 --- a/meta/packages/gtk+/gtk+_2.12.1.bb +++ b/meta/packages/gtk+/gtk+_2.12.2.bb |