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 e59bd322fd..c63aaaa447 100644 --- a/meta/conf/distro/poky-bleeding.conf +++ b/meta/conf/distro/poky-bleeding.conf | |||
@@ -1,5 +1,5 @@ | |||
1 | PREFERRED_VERSION_atk ?= "1.20.0" | 1 | PREFERRED_VERSION_atk ?= "1.20.0" |
2 | PREFERRED_VERSION_gtk+ ?= "2.12.0" | 2 | PREFERRED_VERSION_gtk+ ?= "2.12.1" |
3 | 3 | ||
4 | PREFERRED_VERSION_gnome-keyring ?= "2.20" | 4 | PREFERRED_VERSION_gnome-keyring ?= "2.20" |
5 | PREFERRED_VERSION_gnome-vfs ?= "2.20.0" | 5 | 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 4439e69fb6..4439e69fb6 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 d44c454ce3..d44c454ce3 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 21a4be4da8..19292592d2 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 @@ | |||
7 | - CUPS_LIBS=`cups-config --libs` | 7 | - CUPS_LIBS=`cups-config --libs` |
8 | - | 8 | - |
9 | - CUPS_API_VERSION=`cups-config --api-version` | 9 | - CUPS_API_VERSION=`cups-config --api-version` |
10 | - CUPS_API_MAJOR=`echo -n $CUPS_API_VERSION | awk -F. '{print $1}'` | 10 | - CUPS_API_MAJOR=`echo $ECHO_N $CUPS_API_VERSION | awk -F. '{print $1}'` |
11 | - CUPS_API_MINOR=`echo -n $CUPS_API_VERSION | awk -F. '{print $2}'` | 11 | - CUPS_API_MINOR=`echo $ECHO_N $CUPS_API_VERSION | awk -F. '{print $2}'` |
12 | - | 12 | - |
13 | - if test $CUPS_API_MAJOR -gt 1 -o \ | 13 | - if test $CUPS_API_MAJOR -gt 1 -o \ |
14 | - $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 2; then | 14 | - $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 3313e7f132..3313e7f132 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 df29656343..df29656343 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 6adb0cfef6..6adb0cfef6 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 cfb8849e9f..cfb8849e9f 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 0fc4c48d1a..0fc4c48d1a 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 63828cec63..63828cec63 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 14387b8a2e..14387b8a2e 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 ac15e9ab24..ac15e9ab24 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 a0b50c8cac..a0b50c8cac 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 59ad150b2f..59ad150b2f 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 b63e262d34..b63e262d34 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 1ad92c8272..1ad92c8272 100644 --- a/meta/packages/gtk+/gtk+_2.12.0.bb +++ b/meta/packages/gtk+/gtk+_2.12.1.bb | |||