summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/conf/distro/poky.conf2
-rw-r--r--meta/packages/glib-2.0/glib-2.0-2.14.2/configure-libtool.patch (renamed from meta/packages/glib-2.0/glib-2.0-2.14.1/configure-libtool.patch)0
-rw-r--r--meta/packages/glib-2.0/glib-2.0_2.14.2.bb (renamed from meta/packages/glib-2.0/glib-2.0_2.14.1.bb)2
3 files changed, 1 insertions, 3 deletions
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index dcf30830d..b59beeee3 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -163,7 +163,7 @@ PREFERRED_VERSION_gtk-sato-engine ?= "0.1"
PREFERRED_VERSION_matchbox-theme-sato ?= "0.1"
PREFERRED_VERSION_sato-icon-theme ?= "0.1"
-PREFERRED_VERSION_glib-2.0 ?= "2.14.1"
+PREFERRED_VERSION_glib-2.0 ?= "2.14.2"
PREFERRED_VERSION_glib-2.0-native ?= "2.12.4"
PREFERRED_VERSION_atk ?= "1.18.0"
PREFERRED_VERSION_cairo ?= "1.4.10"
diff --git a/meta/packages/glib-2.0/glib-2.0-2.14.1/configure-libtool.patch b/meta/packages/glib-2.0/glib-2.0-2.14.2/configure-libtool.patch
index a52327c8c..a52327c8c 100644
--- a/meta/packages/glib-2.0/glib-2.0-2.14.1/configure-libtool.patch
+++ b/meta/packages/glib-2.0/glib-2.0-2.14.2/configure-libtool.patch
diff --git a/meta/packages/glib-2.0/glib-2.0_2.14.1.bb b/meta/packages/glib-2.0/glib-2.0_2.14.2.bb
index 59d393e9a..995efbd11 100644
--- a/meta/packages/glib-2.0/glib-2.0_2.14.1.bb
+++ b/meta/packages/glib-2.0/glib-2.0_2.14.2.bb
@@ -1,7 +1,5 @@
require glib.inc
-PR = "r1"
-
SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.14/glib-${PV}.tar.bz2 \
file://glibconfig-sysdefs.h \
file://configure-libtool.patch;patch=1"