From eee88f3abc0a98e8ce30cf5fb065d7506ab3ddec Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@linux.intel.com>
Date: Thu, 10 Dec 2009 18:07:26 +0000
Subject: glib-2.0: 2.20 -> 2.22

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
---
 .../glib-2.0-2.20.2/configure-libtool.patch        | 34 ----------------------
 .../glib-2.0-2.20.2/glib-gettextize-dir.patch      | 11 -------
 .../glib-2.0-2.22.3/configure-libtool.patch        | 34 ++++++++++++++++++++++
 .../glib-2.0-2.22.3/glib-gettextize-dir.patch      | 11 +++++++
 meta/packages/glib-2.0/glib-2.0-native_2.20.2.bb   | 29 ------------------
 meta/packages/glib-2.0/glib-2.0-native_2.22.3.bb   | 29 ++++++++++++++++++
 meta/packages/glib-2.0/glib-2.0_2.20.2.bb          |  7 -----
 meta/packages/glib-2.0/glib-2.0_2.22.3.bb          |  7 +++++
 8 files changed, 81 insertions(+), 81 deletions(-)
 delete mode 100644 meta/packages/glib-2.0/glib-2.0-2.20.2/configure-libtool.patch
 delete mode 100644 meta/packages/glib-2.0/glib-2.0-2.20.2/glib-gettextize-dir.patch
 create mode 100644 meta/packages/glib-2.0/glib-2.0-2.22.3/configure-libtool.patch
 create mode 100644 meta/packages/glib-2.0/glib-2.0-2.22.3/glib-gettextize-dir.patch
 delete mode 100644 meta/packages/glib-2.0/glib-2.0-native_2.20.2.bb
 create mode 100644 meta/packages/glib-2.0/glib-2.0-native_2.22.3.bb
 delete mode 100644 meta/packages/glib-2.0/glib-2.0_2.20.2.bb
 create mode 100644 meta/packages/glib-2.0/glib-2.0_2.22.3.bb

(limited to 'meta/packages')

diff --git a/meta/packages/glib-2.0/glib-2.0-2.20.2/configure-libtool.patch b/meta/packages/glib-2.0/glib-2.0-2.20.2/configure-libtool.patch
deleted file mode 100644
index 3ba79b8986..0000000000
--- a/meta/packages/glib-2.0/glib-2.0-2.20.2/configure-libtool.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-# Poky renames libtool to $host_alias-libtool.
-# ./$host_alias-libtool isn't created until after configure runs with libtool >= 2.2.2
-# so we can't call # it at this point. We can safely assume a version is available 
-# from PATH though
-
---- 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.20.2/glib-gettextize-dir.patch b/meta/packages/glib-2.0/glib-2.0-2.20.2/glib-gettextize-dir.patch
deleted file mode 100644
index efe3325578..0000000000
--- a/meta/packages/glib-2.0/glib-2.0-2.20.2/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
diff --git a/meta/packages/glib-2.0/glib-2.0-2.22.3/configure-libtool.patch b/meta/packages/glib-2.0/glib-2.0-2.22.3/configure-libtool.patch
new file mode 100644
index 0000000000..3ba79b8986
--- /dev/null
+++ b/meta/packages/glib-2.0/glib-2.0-2.22.3/configure-libtool.patch
@@ -0,0 +1,34 @@
+# Poky renames libtool to $host_alias-libtool.
+# ./$host_alias-libtool isn't created until after configure runs with libtool >= 2.2.2
+# so we can't call # it at this point. We can safely assume a version is available 
+# from PATH though
+
+--- 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.22.3/glib-gettextize-dir.patch b/meta/packages/glib-2.0/glib-2.0-2.22.3/glib-gettextize-dir.patch
new file mode 100644
index 0000000000..efe3325578
--- /dev/null
+++ b/meta/packages/glib-2.0/glib-2.0-2.22.3/glib-gettextize-dir.patch
@@ -0,0 +1,11 @@
+--- 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
diff --git a/meta/packages/glib-2.0/glib-2.0-native_2.20.2.bb b/meta/packages/glib-2.0/glib-2.0-native_2.20.2.bb
deleted file mode 100644
index 83d80b40f4..0000000000
--- a/meta/packages/glib-2.0/glib-2.0-native_2.20.2.bb
+++ /dev/null
@@ -1,29 +0,0 @@
-DESCRIPTION = "GLib is a general-purpose utility library, \
-which provides many useful data types, macros, \
-type conversions, string utilities, file utilities, a main \
-loop abstraction, and so on. It works on many \
-UNIX-like platforms, Windows, OS/2 and BeOS."
-LICENSE = "LGPL"
-SECTION = "libs"
-PRIORITY = "optional"
-DEPENDS += "gtk-doc-native"
-PR = "r1"
-
-SRC_URI = "http://download.gnome.org/sources/glib/2.20/glib-${PV}.tar.bz2 \
-           file://glib-gettextize-dir.patch;patch=1 \
-           file://configure-libtool.patch;patch=1 \
-           file://glibconfig-sysdefs.h"
-
-S = "${WORKDIR}/glib-${PV}"
-
-inherit autotools_stage pkgconfig native gettext
-
-acpaths = ""
-do_configure_prepend () {
-	install -m 0644 ${WORKDIR}/glibconfig-sysdefs.h .
-}
-
-do_install_append () {
-	install -d ${D}${includedir}/glib-2.0/glib
-	install -m 0755 ${S}/glibconfig.h ${D}${includedir}/glib-2.0/glibconfig.h
-}
diff --git a/meta/packages/glib-2.0/glib-2.0-native_2.22.3.bb b/meta/packages/glib-2.0/glib-2.0-native_2.22.3.bb
new file mode 100644
index 0000000000..661ad360c6
--- /dev/null
+++ b/meta/packages/glib-2.0/glib-2.0-native_2.22.3.bb
@@ -0,0 +1,29 @@
+DESCRIPTION = "GLib is a general-purpose utility library, \
+which provides many useful data types, macros, \
+type conversions, string utilities, file utilities, a main \
+loop abstraction, and so on. It works on many \
+UNIX-like platforms, Windows, OS/2 and BeOS."
+LICENSE = "LGPL"
+SECTION = "libs"
+PRIORITY = "optional"
+DEPENDS += "gtk-doc-native"
+PR = "r1"
+
+SRC_URI = "http://download.gnome.org/sources/glib/2.22/glib-${PV}.tar.bz2 \
+           file://glib-gettextize-dir.patch;patch=1 \
+           file://configure-libtool.patch;patch=1 \
+           file://glibconfig-sysdefs.h"
+
+S = "${WORKDIR}/glib-${PV}"
+
+inherit autotools_stage pkgconfig native gettext
+
+acpaths = ""
+do_configure_prepend () {
+	install -m 0644 ${WORKDIR}/glibconfig-sysdefs.h .
+}
+
+do_install_append () {
+	install -d ${D}${includedir}/glib-2.0/glib
+	install -m 0755 ${S}/glibconfig.h ${D}${includedir}/glib-2.0/glibconfig.h
+}
diff --git a/meta/packages/glib-2.0/glib-2.0_2.20.2.bb b/meta/packages/glib-2.0/glib-2.0_2.20.2.bb
deleted file mode 100644
index 65e10b45e6..0000000000
--- a/meta/packages/glib-2.0/glib-2.0_2.20.2.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require glib.inc
-
-PR = "r0"
-
-SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.20/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.22.3.bb b/meta/packages/glib-2.0/glib-2.0_2.22.3.bb
new file mode 100644
index 0000000000..eae43de0ed
--- /dev/null
+++ b/meta/packages/glib-2.0/glib-2.0_2.22.3.bb
@@ -0,0 +1,7 @@
+require glib.inc
+
+PR = "r0"
+
+SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.22/glib-${PV}.tar.bz2 \
+           file://glibconfig-sysdefs.h \
+           file://configure-libtool.patch;patch=1"
-- 
cgit v1.2.3