From 83c69a5be08e236ea47d08a7134990a8544bbd1f Mon Sep 17 00:00:00 2001
From: Ross Burton <ross@openedhand.com>
Date: Wed, 1 Aug 2007 14:51:48 +0000
Subject: Upgrade glib 2.12.x to 2.12.13

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2290 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 meta/conf/distro/poky.conf                                    |  2 +-
 .../glib-2.0/glib-2.0-2.12.11/configure-libtool.patch         | 11 -----------
 .../glib-2.0/glib-2.0-2.12.13/configure-libtool.patch         | 11 +++++++++++
 meta/packages/glib-2.0/glib-2.0_2.12.11.bb                    |  8 --------
 meta/packages/glib-2.0/glib-2.0_2.12.13.bb                    |  8 ++++++++
 5 files changed, 20 insertions(+), 20 deletions(-)
 delete mode 100644 meta/packages/glib-2.0/glib-2.0-2.12.11/configure-libtool.patch
 create mode 100644 meta/packages/glib-2.0/glib-2.0-2.12.13/configure-libtool.patch
 delete mode 100644 meta/packages/glib-2.0/glib-2.0_2.12.11.bb
 create mode 100644 meta/packages/glib-2.0/glib-2.0_2.12.13.bb

(limited to 'meta')

diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index be075e29f..432cc1309 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -141,7 +141,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.12.11"
+PREFERRED_VERSION_glib-2.0 ?= "2.12.13"
 PREFERRED_VERSION_glib-2.0-native ?= "2.12.4"
 PREFERRED_VERSION_atk ?= "1.10.3"
 PREFERRED_VERSION_cairo ?= "1.4.8"
diff --git a/meta/packages/glib-2.0/glib-2.0-2.12.11/configure-libtool.patch b/meta/packages/glib-2.0/glib-2.0-2.12.11/configure-libtool.patch
deleted file mode 100644
index bfec12eec..000000000
--- a/meta/packages/glib-2.0/glib-2.0-2.12.11/configure-libtool.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- glib-2.12.10/configure.in.orig	2006-06-05 13:34:08.000000000 +0100
-+++ glib-2.12.10/configure.in	2006-06-05 13:34:36.000000000 +0100
-@@ -1174,7 +1174,7 @@
-   G_MODULE_LDFLAGS=
- else
-   export SED
--  G_MODULE_LDFLAGS=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
-+  G_MODULE_LDFLAGS=`(./$host_alias-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
- fi
- dnl G_MODULE_IMPL= don't reset, so cmd-line can override
- G_MODULE_NEED_USCORE=0
diff --git a/meta/packages/glib-2.0/glib-2.0-2.12.13/configure-libtool.patch b/meta/packages/glib-2.0/glib-2.0-2.12.13/configure-libtool.patch
new file mode 100644
index 000000000..bfec12eec
--- /dev/null
+++ b/meta/packages/glib-2.0/glib-2.0-2.12.13/configure-libtool.patch
@@ -0,0 +1,11 @@
+--- glib-2.12.10/configure.in.orig	2006-06-05 13:34:08.000000000 +0100
++++ glib-2.12.10/configure.in	2006-06-05 13:34:36.000000000 +0100
+@@ -1174,7 +1174,7 @@
+   G_MODULE_LDFLAGS=
+ else
+   export SED
+-  G_MODULE_LDFLAGS=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
++  G_MODULE_LDFLAGS=`(./$host_alias-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
+ fi
+ dnl G_MODULE_IMPL= don't reset, so cmd-line can override
+ G_MODULE_NEED_USCORE=0
diff --git a/meta/packages/glib-2.0/glib-2.0_2.12.11.bb b/meta/packages/glib-2.0/glib-2.0_2.12.11.bb
deleted file mode 100644
index 2e5259073..000000000
--- a/meta/packages/glib-2.0/glib-2.0_2.12.11.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require glib.inc
-
-PR = "r2"
-
-SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.12/glib-${PV}.tar.bz2 \
-           file://glibconfig-sysdefs.h \
-           file://configure-libtool.patch;patch=1"
-
diff --git a/meta/packages/glib-2.0/glib-2.0_2.12.13.bb b/meta/packages/glib-2.0/glib-2.0_2.12.13.bb
new file mode 100644
index 000000000..2e5259073
--- /dev/null
+++ b/meta/packages/glib-2.0/glib-2.0_2.12.13.bb
@@ -0,0 +1,8 @@
+require glib.inc
+
+PR = "r2"
+
+SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.12/glib-${PV}.tar.bz2 \
+           file://glibconfig-sysdefs.h \
+           file://configure-libtool.patch;patch=1"
+
-- 
cgit v1.2.3