diff options
-rw-r--r-- | meta/conf/distro/poky-bleeding.conf | 2 | ||||
-rw-r--r-- | meta/packages/gtk+/gtk+-2.12.1/cellrenderer-cairo.patch (renamed from meta/packages/gtk+/gtk+-2.12.0/cellrenderer-cairo.patch) | 0 | ||||
-rw-r--r-- | meta/packages/gtk+/gtk+-2.12.1/combo-arrow-size.patch (renamed from meta/packages/gtk+/gtk+-2.12.0/combo-arrow-size.patch) | 0 | ||||
-rw-r--r-- | meta/packages/gtk+/gtk+-2.12.1/disable-print.patch (renamed from meta/packages/gtk+/gtk+-2.12.0/disable-print.patch) | 4 | ||||
-rw-r--r-- | meta/packages/gtk+/gtk+-2.12.1/entry-cairo.patch (renamed from meta/packages/gtk+/gtk+-2.12.0/entry-cairo.patch) | 0 | ||||
-rw-r--r-- | meta/packages/gtk+/gtk+-2.12.1/gtklabel-resize-patch (renamed from meta/packages/gtk+/gtk+-2.12.0/gtklabel-resize-patch) | 0 | ||||
-rw-r--r-- | meta/packages/gtk+/gtk+-2.12.1/hardcoded_libtool.patch (renamed from meta/packages/gtk+/gtk+-2.12.0/hardcoded_libtool.patch) | 0 | ||||
-rw-r--r-- | meta/packages/gtk+/gtk+-2.12.1/menu-deactivate.patch (renamed from meta/packages/gtk+/gtk+-2.12.0/menu-deactivate.patch) | 0 | ||||
-rw-r--r-- | meta/packages/gtk+/gtk+-2.12.1/no-demos.patch (renamed from meta/packages/gtk+/gtk+-2.12.0/no-demos.patch) | 0 | ||||
-rw-r--r-- | meta/packages/gtk+/gtk+-2.12.1/pangoxft2.10.6.diff (renamed from meta/packages/gtk+/gtk+-2.12.0/pangoxft2.10.6.diff) | 0 | ||||
-rw-r--r-- | meta/packages/gtk+/gtk+-2.12.1/range-no-redraw.patch (renamed from meta/packages/gtk+/gtk+-2.12.0/range-no-redraw.patch) | 0 | ||||
-rw-r--r-- | meta/packages/gtk+/gtk+-2.12.1/run-iconcache.patch (renamed from meta/packages/gtk+/gtk+-2.12.0/run-iconcache.patch) | 0 | ||||
-rw-r--r-- | meta/packages/gtk+/gtk+-2.12.1/scrolled-placement.patch (renamed from meta/packages/gtk+/gtk+-2.12.0/scrolled-placement.patch) | 0 | ||||
-rw-r--r-- | meta/packages/gtk+/gtk+-2.12.1/toggle-font.diff (renamed from meta/packages/gtk+/gtk+-2.12.0/toggle-font.diff) | 0 | ||||
-rw-r--r-- | meta/packages/gtk+/gtk+-2.12.1/xsettings.patch (renamed from meta/packages/gtk+/gtk+-2.12.0/xsettings.patch) | 0 | ||||
-rw-r--r-- | meta/packages/gtk+/gtk+_2.12.1.bb (renamed from meta/packages/gtk+/gtk+_2.12.0.bb) | 0 |
16 files changed, 3 insertions, 3 deletions
diff --git a/meta/conf/distro/poky-bleeding.conf b/meta/conf/distro/poky-bleeding.conf index e59bd322f..c63aaaa44 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.0" +PREFERRED_VERSION_gtk+ ?= "2.12.1" PREFERRED_VERSION_gnome-keyring ?= "2.20" PREFERRED_VERSION_gnome-vfs ?= "2.20.0" diff --git a/meta/packages/gtk+/gtk+-2.12.0/cellrenderer-cairo.patch b/meta/packages/gtk+/gtk+-2.12.1/cellrenderer-cairo.patch index 4439e69fb..4439e69fb 100644 --- a/meta/packages/gtk+/gtk+-2.12.0/cellrenderer-cairo.patch +++ b/meta/packages/gtk+/gtk+-2.12.1/cellrenderer-cairo.patch diff --git a/meta/packages/gtk+/gtk+-2.12.0/combo-arrow-size.patch b/meta/packages/gtk+/gtk+-2.12.1/combo-arrow-size.patch index d44c454ce..d44c454ce 100644 --- a/meta/packages/gtk+/gtk+-2.12.0/combo-arrow-size.patch +++ b/meta/packages/gtk+/gtk+-2.12.1/combo-arrow-size.patch diff --git a/meta/packages/gtk+/gtk+-2.12.0/disable-print.patch b/meta/packages/gtk+/gtk+-2.12.1/disable-print.patch index 21a4be4da..19292592d 100644 --- a/meta/packages/gtk+/gtk+-2.12.0/disable-print.patch +++ b/meta/packages/gtk+/gtk+-2.12.1/disable-print.patch @@ -7,8 +7,8 @@ - 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}'` +- 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}'` - - if test $CUPS_API_MAJOR -gt 1 -o \ - $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 2; then diff --git a/meta/packages/gtk+/gtk+-2.12.0/entry-cairo.patch b/meta/packages/gtk+/gtk+-2.12.1/entry-cairo.patch index 3313e7f13..3313e7f13 100644 --- a/meta/packages/gtk+/gtk+-2.12.0/entry-cairo.patch +++ b/meta/packages/gtk+/gtk+-2.12.1/entry-cairo.patch diff --git a/meta/packages/gtk+/gtk+-2.12.0/gtklabel-resize-patch b/meta/packages/gtk+/gtk+-2.12.1/gtklabel-resize-patch index df2965634..df2965634 100644 --- a/meta/packages/gtk+/gtk+-2.12.0/gtklabel-resize-patch +++ b/meta/packages/gtk+/gtk+-2.12.1/gtklabel-resize-patch diff --git a/meta/packages/gtk+/gtk+-2.12.0/hardcoded_libtool.patch b/meta/packages/gtk+/gtk+-2.12.1/hardcoded_libtool.patch index 6adb0cfef..6adb0cfef 100644 --- a/meta/packages/gtk+/gtk+-2.12.0/hardcoded_libtool.patch +++ b/meta/packages/gtk+/gtk+-2.12.1/hardcoded_libtool.patch diff --git a/meta/packages/gtk+/gtk+-2.12.0/menu-deactivate.patch b/meta/packages/gtk+/gtk+-2.12.1/menu-deactivate.patch index cfb8849e9..cfb8849e9 100644 --- a/meta/packages/gtk+/gtk+-2.12.0/menu-deactivate.patch +++ b/meta/packages/gtk+/gtk+-2.12.1/menu-deactivate.patch diff --git a/meta/packages/gtk+/gtk+-2.12.0/no-demos.patch b/meta/packages/gtk+/gtk+-2.12.1/no-demos.patch index 0fc4c48d1..0fc4c48d1 100644 --- a/meta/packages/gtk+/gtk+-2.12.0/no-demos.patch +++ b/meta/packages/gtk+/gtk+-2.12.1/no-demos.patch diff --git a/meta/packages/gtk+/gtk+-2.12.0/pangoxft2.10.6.diff b/meta/packages/gtk+/gtk+-2.12.1/pangoxft2.10.6.diff index 63828cec6..63828cec6 100644 --- a/meta/packages/gtk+/gtk+-2.12.0/pangoxft2.10.6.diff +++ b/meta/packages/gtk+/gtk+-2.12.1/pangoxft2.10.6.diff diff --git a/meta/packages/gtk+/gtk+-2.12.0/range-no-redraw.patch b/meta/packages/gtk+/gtk+-2.12.1/range-no-redraw.patch index 14387b8a2..14387b8a2 100644 --- a/meta/packages/gtk+/gtk+-2.12.0/range-no-redraw.patch +++ b/meta/packages/gtk+/gtk+-2.12.1/range-no-redraw.patch diff --git a/meta/packages/gtk+/gtk+-2.12.0/run-iconcache.patch b/meta/packages/gtk+/gtk+-2.12.1/run-iconcache.patch index ac15e9ab2..ac15e9ab2 100644 --- a/meta/packages/gtk+/gtk+-2.12.0/run-iconcache.patch +++ b/meta/packages/gtk+/gtk+-2.12.1/run-iconcache.patch diff --git a/meta/packages/gtk+/gtk+-2.12.0/scrolled-placement.patch b/meta/packages/gtk+/gtk+-2.12.1/scrolled-placement.patch index a0b50c8ca..a0b50c8ca 100644 --- a/meta/packages/gtk+/gtk+-2.12.0/scrolled-placement.patch +++ b/meta/packages/gtk+/gtk+-2.12.1/scrolled-placement.patch diff --git a/meta/packages/gtk+/gtk+-2.12.0/toggle-font.diff b/meta/packages/gtk+/gtk+-2.12.1/toggle-font.diff index 59ad150b2..59ad150b2 100644 --- a/meta/packages/gtk+/gtk+-2.12.0/toggle-font.diff +++ b/meta/packages/gtk+/gtk+-2.12.1/toggle-font.diff diff --git a/meta/packages/gtk+/gtk+-2.12.0/xsettings.patch b/meta/packages/gtk+/gtk+-2.12.1/xsettings.patch index b63e262d3..b63e262d3 100644 --- a/meta/packages/gtk+/gtk+-2.12.0/xsettings.patch +++ b/meta/packages/gtk+/gtk+-2.12.1/xsettings.patch diff --git a/meta/packages/gtk+/gtk+_2.12.0.bb b/meta/packages/gtk+/gtk+_2.12.1.bb index 1ad92c827..1ad92c827 100644 --- a/meta/packages/gtk+/gtk+_2.12.0.bb +++ b/meta/packages/gtk+/gtk+_2.12.1.bb |