From 1bb2b83636abe0422be50d63cabcc5d5b6296866 Mon Sep 17 00:00:00 2001
From: Ross Burton <ross@openedhand.com>
Date: Fri, 9 Mar 2007 07:36:51 +0000
Subject: Upgrade to new GLib

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

diff --git a/meta/conf/distro/poky-bleeding.conf b/meta/conf/distro/poky-bleeding.conf
index 93c5b54ef..1f88b548a 100644
--- a/meta/conf/distro/poky-bleeding.conf
+++ b/meta/conf/distro/poky-bleeding.conf
@@ -1,4 +1,4 @@
-PREFERRED_VERSION_glib-2.0 ?= "2.12.10"
+PREFERRED_VERSION_glib-2.0 ?= "2.12.11"
 PREFERRED_VERSION_glib-2.0-native ?= "2.12.4"
 
 PREFERRED_VERSION_cairo ?= "1.4.0"
diff --git a/meta/packages/glib-2.0/glib-2.0-2.12.10/configure-libtool.patch b/meta/packages/glib-2.0/glib-2.0-2.12.10/configure-libtool.patch
deleted file mode 100644
index bfec12eec..000000000
--- a/meta/packages/glib-2.0/glib-2.0-2.12.10/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.11/configure-libtool.patch b/meta/packages/glib-2.0/glib-2.0-2.12.11/configure-libtool.patch
new file mode 100644
index 000000000..bfec12eec
--- /dev/null
+++ b/meta/packages/glib-2.0/glib-2.0-2.12.11/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.10.bb b/meta/packages/glib-2.0/glib-2.0_2.12.10.bb
deleted file mode 100644
index 4d8e59b35..000000000
--- a/meta/packages/glib-2.0/glib-2.0_2.12.10.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require glib.inc
-
-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.11.bb b/meta/packages/glib-2.0/glib-2.0_2.12.11.bb
new file mode 100644
index 000000000..4d8e59b35
--- /dev/null
+++ b/meta/packages/glib-2.0/glib-2.0_2.12.11.bb
@@ -0,0 +1,6 @@
+require glib.inc
+
+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