Tue Apr 5 14:26:38 UTC 2011

3 files changed, 69 insertions, 0 deletions

diff --git a/multilib/lib32-glib/PKGBUILD b/multilib/lib32-glib/PKGBUILD
new file mode 100644
index 000000000..a863c66f6
--- /dev/null
+++ b/multilib/lib32-glib/PKGBUILD
@@ -0,0 +1,43 @@
+# $Id: PKGBUILD 29612 2010-10-17 13:00:45Z pschmitz $
+
+_pkgbasename=glib
+pkgname=lib32-$_pkgbasename
+pkgver=1.2.10
+pkgrel=11
+pkgdesc="Common C routines used by Gtk+ and other libs (32-bit)"
+arch=('x86_64')
+url="http://www.gtk.org/"
+license=('LGPL')
+depends=('lib32-glibc' "${_pkgbasename}")
+makedepends=('gcc-multilib')
+options=('!libtool' '!docs')
+source=("ftp://ftp.gtk.org/pub/gtk/v1.2/${_pkgbasename}-${pkgver}.tar.gz"
+        'gcc340.patch'
+        'aclocal-fixes.patch')
+md5sums=('6fe30dad87c77b91b632def29dd69ef9'
+         '877b3330e822a4be69a0f8a8c268cfd7'
+         'e52c4b88427b9785bb8049dbdc9ff6fb')
+
+build() {
+	export CC="gcc -m32"
+	export CXX="g++ -m32"
+	export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+
+	cd ${srcdir}/${_pkgbasename}-${pkgver}
+	patch -Np1 -i ../gcc340.patch
+	patch -Np0 -i ../aclocal-fixes.patch
+
+	./configure --prefix=/usr \
+		--mandir=/usr/share/man \
+		--libdir=/usr/lib32 \
+		--infodir=/usr/share/info \
+		--host=x86_64-unknown-linux-gnu \
+		--target=x86_64-unknown-linux-gnu
+	make
+}
+
+package() {
+	cd ${srcdir}/${_pkgbasename}-${pkgver}
+	make DESTDIR=${pkgdir} install
+	rm -rf "${pkgdir}"/usr/{share,include,bin,lib32/glib}
+}
diff --git a/multilib/lib32-glib/aclocal-fixes.patch b/multilib/lib32-glib/aclocal-fixes.patch
new file mode 100644
index 000000000..b064074aa
--- /dev/null
+++ b/multilib/lib32-glib/aclocal-fixes.patch
@@ -0,0 +1,11 @@
+--- glib.m4.orig	2006-03-05 13:13:24.000000000 +0000
++++ glib.m4	2006-03-05 13:13:35.000000000 +0000
+@@ -5,7 +5,7 @@
+ dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if "gmodule" or 
+ dnl gthread is specified in MODULES, pass to glib-config
+ dnl
+-AC_DEFUN(AM_PATH_GLIB,
++AC_DEFUN([AM_PATH_GLIB],
+ [dnl 
+ dnl Get the cflags and libraries from the glib-config script
+ dnl
diff --git a/multilib/lib32-glib/gcc340.patch b/multilib/lib32-glib/gcc340.patch
new file mode 100644
index 000000000..941111ae7
--- /dev/null
+++ b/multilib/lib32-glib/gcc340.patch
@@ -0,0 +1,15 @@
+diff -Naur glib-1.2.10.orig/glib.h glib-1.2.10/glib.h
+--- glib-1.2.10.orig/glib.h	2001-02-27 04:44:38.000000000 +0100
++++ glib-1.2.10/glib.h	2004-05-27 15:50:32.436527848 +0200
+@@ -271,8 +271,10 @@
+ 
+ /* Wrap the gcc __PRETTY_FUNCTION__ and __FUNCTION__ variables with
+  * macros, so we can refer to them as strings unconditionally.
++ *
++ * Unfortunately these are _not_ treated as strings anymore in GCC3.4.
+  */
+-#ifdef	__GNUC__
++#if	defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ < 4)
+ #define	G_GNUC_FUNCTION		__FUNCTION__
+ #define	G_GNUC_PRETTY_FUNCTION	__PRETTY_FUNCTION__
+ #else	/* !__GNUC__ */