From 70483e47c5e9cece727d0958b53646550ada41cc Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Fri, 14 Mar 2008 09:59:22 +0000 Subject: [PATCH] glib: upgrade from 2.14.6 to 2.16.1 git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3995 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- meta/conf/distro/poky.conf | 4 ++-- .../configure-libtool.patch | 0 .../glib-gettextize-dir.patch | 0 .../{glib-2.0-native_2.14.6.bb => glib-2.0-native_2.16.1.bb} | 2 +- .../glib-2.0/{glib-2.0_2.14.6.bb => glib-2.0_2.16.1.bb} | 2 +- 5 files changed, 4 insertions(+), 4 deletions(-) rename meta/packages/glib-2.0/{glib-2.0-2.14.6 => glib-2.0-2.16.1}/configure-libtool.patch (100%) rename meta/packages/glib-2.0/{glib-2.0-2.14.6 => glib-2.0-2.16.1}/glib-gettextize-dir.patch (100%) rename meta/packages/glib-2.0/{glib-2.0-native_2.14.6.bb => glib-2.0-native_2.16.1.bb} (96%) rename meta/packages/glib-2.0/{glib-2.0_2.14.6.bb => glib-2.0_2.16.1.bb} (68%) diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf index dca40432a9..29fdf6e23d 100644 --- a/meta/conf/distro/poky.conf +++ b/meta/conf/distro/poky.conf @@ -200,8 +200,8 @@ PREFERRED_VERSION_gtk-sato-engine ?= "0.3.1" PREFERRED_VERSION_matchbox-theme-sato ?= "0.1" PREFERRED_VERSION_sato-icon-theme ?= "0.4.1" -PREFERRED_VERSION_glib-2.0 ?= "2.14.6" -PREFERRED_VERSION_glib-2.0-native ?= "2.14.6" +PREFERRED_VERSION_glib-2.0 ?= "2.16.1" +PREFERRED_VERSION_glib-2.0-native ?= "2.16.1" PREFERRED_VERSION_atk ?= "1.20.0" PREFERRED_VERSION_cairo ?= "1.4.14" PREFERRED_VERSION_pango ?= "1.18.3" diff --git a/meta/packages/glib-2.0/glib-2.0-2.14.6/configure-libtool.patch b/meta/packages/glib-2.0/glib-2.0-2.16.1/configure-libtool.patch similarity index 100% rename from meta/packages/glib-2.0/glib-2.0-2.14.6/configure-libtool.patch rename to meta/packages/glib-2.0/glib-2.0-2.16.1/configure-libtool.patch diff --git a/meta/packages/glib-2.0/glib-2.0-2.14.6/glib-gettextize-dir.patch b/meta/packages/glib-2.0/glib-2.0-2.16.1/glib-gettextize-dir.patch similarity index 100% rename from meta/packages/glib-2.0/glib-2.0-2.14.6/glib-gettextize-dir.patch rename to meta/packages/glib-2.0/glib-2.0-2.16.1/glib-gettextize-dir.patch diff --git a/meta/packages/glib-2.0/glib-2.0-native_2.14.6.bb b/meta/packages/glib-2.0/glib-2.0-native_2.16.1.bb similarity index 96% rename from meta/packages/glib-2.0/glib-2.0-native_2.14.6.bb rename to meta/packages/glib-2.0/glib-2.0-native_2.16.1.bb index 0921cb8473..b26480dd01 100644 --- a/meta/packages/glib-2.0/glib-2.0-native_2.14.6.bb +++ b/meta/packages/glib-2.0/glib-2.0-native_2.16.1.bb @@ -9,7 +9,7 @@ PRIORITY = "optional" DEPENDS += "gtk-doc-native" PR="r2" -SRC_URI = "http://download.gnome.org/sources/glib/2.14/glib-${PV}.tar.bz2 \ +SRC_URI = "http://download.gnome.org/sources/glib/2.16/glib-${PV}.tar.bz2 \ file://glib-gettextize-dir.patch;patch=1 \ file://configure-libtool.patch;patch=1 \ file://glibconfig-sysdefs.h" diff --git a/meta/packages/glib-2.0/glib-2.0_2.14.6.bb b/meta/packages/glib-2.0/glib-2.0_2.16.1.bb similarity index 68% rename from meta/packages/glib-2.0/glib-2.0_2.14.6.bb rename to meta/packages/glib-2.0/glib-2.0_2.16.1.bb index 59d393e9a1..7ac48e14ff 100644 --- a/meta/packages/glib-2.0/glib-2.0_2.14.6.bb +++ b/meta/packages/glib-2.0/glib-2.0_2.16.1.bb @@ -2,6 +2,6 @@ require glib.inc PR = "r1" -SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.14/glib-${PV}.tar.bz2 \ +SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.16/glib-${PV}.tar.bz2 \ file://glibconfig-sysdefs.h \ file://configure-libtool.patch;patch=1" -- 2.40.1