[arch-commits] Commit in lib32-glib2/repos/multilib-x86_64 (3 files)

Laurent Carlier lcarlier at nymeria.archlinux.org
Wed May 15 13:00:36 UTC 2013


    Date: Wednesday, May 15, 2013 @ 15:00:35
  Author: lcarlier
Revision: 90904

archrelease: copy trunk to multilib-x86_64

Added:
  lib32-glib2/repos/multilib-x86_64/PKGBUILD
    (from rev 90903, lib32-glib2/trunk/PKGBUILD)
Deleted:
  lib32-glib2/repos/multilib-x86_64/PKGBUILD
  lib32-glib2/repos/multilib-x86_64/wall.patch

------------+
 PKGBUILD   |   86 ++++++++++++++++++++++++++++++-----------------------------
 wall.patch |   16 ----------
 2 files changed, 44 insertions(+), 58 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2013-05-15 13:00:25 UTC (rev 90903)
+++ PKGBUILD	2013-05-15 13:00:35 UTC (rev 90904)
@@ -1,42 +0,0 @@
-# $Id$
-# Maintainer:  Ionut Biru <ibiru at archlinux.org>
-# Contributor: Pierre Schmitz <pierre at archlinux.de>
-# Contributor: Mikko Seppälä <t-r-a-y at mbnet.fi>
-
-_pkgbasename=glib2
-pkgname=lib32-$_pkgbasename
-pkgver=2.36.1
-pkgrel=3
-pkgdesc="Common C routines used by GTK+ 2.4 and other libs (32-bit)"
-url="http://www.gtk.org/"
-arch=('x86_64')
-license=('LGPL')
-depends=('lib32-pcre' 'lib32-zlib' 'lib32-dbus-core' lib32-libffi $_pkgbasename)
-makedepends=('gcc-multilib' python2)
-options=('!libtool' '!docs')
-source=(http://ftp.gnome.org/pub/GNOME/sources/glib/${pkgver%.*}/glib-${pkgver}.tar.xz)
-sha256sums=('7de37586794e92c024feebe5d306bf5f245fef4803c3666af1ae8dac6ee10b24')
-
-build() {
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-  export CFLAGS+=" -Wall"
-
-  cd "${srcdir}/glib-${pkgver}"
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc --libdir=/usr/lib32 \
-      --enable-static --enable-shared --with-pcre=system --disable-fam
-  make
-}
-
-package() {
-  cd "${srcdir}/glib-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  rm -rf "${pkgdir}"/{etc,usr/{share,include}}
-
-  cd "${pkgdir}"/usr/bin
-  mv gio-querymodules gio-querymodules-32
-  rm -f gdbus glib* gobject-query gsettings gtester*
-  rm -rf "$pkgdir"/usr/lib32/gdbus-2.0
-  find "$pkgdir/usr/bin" -type f -not -name gio-querymodules-32 -delete
-}

Copied: lib32-glib2/repos/multilib-x86_64/PKGBUILD (from rev 90903, lib32-glib2/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2013-05-15 13:00:35 UTC (rev 90904)
@@ -0,0 +1,44 @@
+# $Id$
+# Maintainer:  Ionut Biru <ibiru at archlinux.org>
+# Contributor: Pierre Schmitz <pierre at archlinux.de>
+# Contributor: Mikko Seppälä <t-r-a-y at mbnet.fi>
+
+_pkgbasename=glib2
+pkgname=lib32-$_pkgbasename
+pkgver=2.36.2
+pkgrel=1
+pkgdesc="Common C routines used by GTK+ 2.4 and other libs (32-bit)"
+url="http://www.gtk.org/"
+arch=('x86_64')
+license=('LGPL')
+depends=('lib32-pcre' 'lib32-zlib' 'lib32-dbus-core' lib32-libffi $_pkgbasename)
+makedepends=('gcc-multilib' python2)
+options=('!libtool' '!docs')
+source=(http://ftp.gnome.org/pub/GNOME/sources/glib/${pkgver%.*}/glib-${pkgver}.tar.xz)
+sha256sums=('5ea98451fb57d0ba523a1e836545f0a919b498863056fdd9da69d148c1347f80')
+
+build() {
+  export CC="gcc -m32"
+  export CXX="g++ -m32"
+  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+
+  # workaround FS#34630 https://bugzilla.gnome.org/show_bug.cgi?id=698716
+  export CFLAGS+=" -Wall"
+
+  cd "${srcdir}/glib-${pkgver}"
+  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc --libdir=/usr/lib32 \
+      --enable-static --enable-shared --with-pcre=system --disable-fam
+  make
+}
+
+package() {
+  cd "${srcdir}/glib-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  rm -rf "${pkgdir}"/{etc,usr/{share,include}}
+
+  cd "${pkgdir}"/usr/bin
+  mv gio-querymodules gio-querymodules-32
+  rm -f gdbus glib* gobject-query gsettings gtester*
+  rm -rf "$pkgdir"/usr/lib32/gdbus-2.0
+  find "$pkgdir/usr/bin" -type f -not -name gio-querymodules-32 -delete
+}

Deleted: wall.patch
===================================================================
--- wall.patch	2013-05-15 13:00:25 UTC (rev 90903)
+++ wall.patch	2013-05-15 13:00:35 UTC (rev 90904)
@@ -1,16 +0,0 @@
---- a/configure.ac	2013-04-23 10:59:21.284914117 +0100
-+++ b/configure.ac	2013-04-23 10:58:59.891664217 +0100
-@@ -528,6 +528,13 @@
- m4_ifdef([LT_OUTPUT], [LT_OUTPUT])
- 
- 
-+if test "x$GCC" = "xyes"; then
-+  case " $CFLAGS " in
-+  *[[\ \	]]-Wall[[\ \	]]*) ;;
-+  *) CFLAGS="$CFLAGS -Wall" ;;
-+  esac
-+fi
-+
- AS_IF([test "$glib_native_win32" = "yes"], [
-   if test x$enable_static = xyes -a x$enable_shared = xyes; then
-     AC_MSG_ERROR([Can not build both shared and static at the same time on Windows.])




More information about the arch-commits mailing list