From 70483e47c5e9cece727d0958b53646550ada41cc Mon Sep 17 00:00:00 2001
From: Ross Burton <ross@openedhand.com>
Date: Fri, 14 Mar 2008 09:59:22 +0000
Subject: 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
---
 .../glib-2.0-2.14.6/configure-libtool.patch        | 29 ----------------------
 .../glib-2.0-2.14.6/glib-gettextize-dir.patch      | 11 --------
 2 files changed, 40 deletions(-)
 delete mode 100644 meta/packages/glib-2.0/glib-2.0-2.14.6/configure-libtool.patch
 delete mode 100644 meta/packages/glib-2.0/glib-2.0-2.14.6/glib-gettextize-dir.patch

(limited to 'meta/packages/glib-2.0/glib-2.0-2.14.6')

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.14.6/configure-libtool.patch
deleted file mode 100644
index a52327c8c..000000000
--- a/meta/packages/glib-2.0/glib-2.0-2.14.6/configure-libtool.patch
+++ /dev/null
@@ -1,29 +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
-@@ -1265,7 +1265,7 @@
- 	LDFLAGS="$LDFLAGS $G_MODULE_LDFLAGS"
- dnl *** check for OSF1/5.0 RTLD_GLOBAL brokenness
- 	echo "void glib_plugin_test(void) { }" > plugin.c
--	${SHELL} ./libtool --mode=compile ${CC} -shared \
-+	${SHELL} ./$host_alias-libtool --mode=compile ${CC} -shared \
- 		-export-dynamic -o plugin.o plugin.c 2>&1 >/dev/null
- 	AC_CACHE_CHECK([for RTLD_GLOBAL brokenness],
- 		glib_cv_rtldglobal_broken,[
-@@ -1339,7 +1339,7 @@
- 
- AC_MSG_CHECKING(for the suffix of shared libraries)
- export SED
--shrext_cmds=`./libtool --config | grep '^shrext_cmds='`
-+shrext_cmds=`./$host_alias-libtool --config | grep '^shrext_cmds='`
- eval $shrext_cmds
- module=yes eval std_shrext=$shrext_cmds
- # chop the initial dot
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.14.6/glib-gettextize-dir.patch
deleted file mode 100644
index efe332557..000000000
--- a/meta/packages/glib-2.0/glib-2.0-2.14.6/glib-gettextize-dir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- glib-2.10.3/glib-gettextize.in.old	2006-06-21 12:46:45.000000000 +0100
-+++ glib-2.10.3/glib-gettextize.in	2006-06-21 12:48:14.000000000 +0100
-@@ -49,7 +49,7 @@
-     ;;
- esac
- 
--gettext_dir=$prefix/share/glib-2.0/gettext
-+gettext_dir=@datadir@/glib-2.0/gettext
- 
- while test $# -gt 0; do
-   case "$1" in
-- 
cgit v1.2.3