[arch-commits] Commit in lib32-glib2/trunk (PKGBUILD wall.patch)

[Florian Pritz]

    Date: Tuesday, April 23, 2013 @ 15:00:04
  Author: bluewind
Revision: 88828

Remove patch and replace by export

Modified:
  lib32-glib2/trunk/PKGBUILD
Deleted:
  lib32-glib2/trunk/wall.patch

------------+
 PKGBUILD   |   16 ++++------------
 wall.patch |   16 ----------------
 2 files changed, 4 insertions(+), 28 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-04-23 12:24:00 UTC (rev 88827)
+++ PKGBUILD	2013-04-23 13:00:04 UTC (rev 88828)
@@ -6,7 +6,7 @@
 _pkgbasename=glib2
 pkgname=lib32-$_pkgbasename
 pkgver=2.36.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Common C routines used by GTK+ 2.4 and other libs (32-bit)"
 url="http://www.gtk.org/"
 arch=('x86_64')
@@ -14,22 +14,14 @@
 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
-  wall.patch)
-sha256sums=('7de37586794e92c024feebe5d306bf5f245fef4803c3666af1ae8dac6ee10b24'
-            '35ea3634f2c04b953206a0ec2dd224e61fa7468c22f9415fea3f5c734a001020')
-prepare() {
-  cd "${srcdir}/glib-${pkgver}"
+source=(http://ftp.gnome.org/pub/GNOME/sources/glib/${pkgver%.*}/glib-${pkgver}.tar.xz)
+sha256sums=('7de37586794e92c024feebe5d306bf5f245fef4803c3666af1ae8dac6ee10b24')
 
-  # use Wall during the complete build otherwise skype segfaults on startup
-  # FS#34630 https://bugs.archlinux.org/task/34630
-  patch -p1 <"$srcdir/wall.patch"
-}
-
 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 \

Deleted: wall.patch
===================================================================
--- wall.patch	2013-04-23 12:24:00 UTC (rev 88827)
+++ wall.patch	2013-04-23 13:00:04 UTC (rev 88828)
@@ -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.])