Fix the weex package (https://bbs.archlinux.org/viewtopic.php?id=184195)

2 files changed, 20 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e30a75d29200..7c79a9ddfde2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,15 @@
 pkgbase = weex
 	pkgdesc = A non-interactive FTP client for updating web pages
 	pkgver = 2.6.1.5
-	pkgrel = 5
+	pkgrel = 6
 	url = http://weex.sourceforge.net/
 	arch = i686
 	arch = x86_64
 	license = GPL
 	source = http://downloads.sourceforge.net/sourceforge/weex/weex-2.6.1.5.tar.gz
-	source = http://git.sv.gnu.org/gitweb/?p=gnulib.git;a=blob_plain;f=lib/regex.h
 	source = weex-2.6.1.5-formatstring.patch
 	source = weex-2.6.1.5-va_list.patch
 	md5sums = c10192608ab9f715c4c1ea63cf6ad2da
-	md5sums = 63dc5065aa90e787153804229e7da1c2
 	md5sums = a12d955c5a4d6b059395a0da22942114
 	md5sums = 522552e03b82ab5669fd21c558290691
 
diff --git a/PKGBUILD b/PKGBUILD
index 69861392eead..d3eda0195149 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,33 +1,42 @@
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 # Contributor: Giorgio Lando <patroclo7@gmail.com>
+# Contributor: falconindy <d@falconindy.com>
 # Maintainer: Aaron Mueller <mail@aaron-mueller.de>
 
 pkgname=weex
 pkgver=2.6.1.5
-pkgrel=5
+pkgrel=6
 pkgdesc="A non-interactive FTP client for updating web pages"
 arch=(i686 x86_64)
 license=("GPL")
 source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz"
-        "http://git.sv.gnu.org/gitweb/?p=gnulib.git;a=blob_plain;f=lib/regex.h"
         "weex-2.6.1.5-formatstring.patch"
         "weex-2.6.1.5-va_list.patch")
 md5sums=("c10192608ab9f715c4c1ea63cf6ad2da"
-         "63dc5065aa90e787153804229e7da1c2"
          "a12d955c5a4d6b059395a0da22942114"
          "522552e03b82ab5669fd21c558290691")
 url="http://weex.sourceforge.net/"
 
-build() {
-  cd $startdir/src/$pkgname-$pkgver
+prepare() {
+  cd "$pkgname-$pkgver"
 
   patch -Np0 -i ../weex-$pkgver-formatstring.patch
-  [ "$CARCH" == "x86_64" ] && patch -Np0 -i ../weex-$pkgver-va_list.patch
+  [[ $CARCH == x86_64 ]] && patch -Np0 -i ../weex-$pkgver-va_list.patch
+}
+
+build() {
+  cd "$pkgname-$pkgver"
 
-  # Fix the missing header file, hanks to mibli.
-  cp $startdir/src/regex.h $startdir/src/$pkgname-$pkgver/lib_regex.h
+  # work around problems in ancient autotools installation
+  unset CPPFLAGS
+  CFLAGS+=' -D_FORTIFY_SOURCE=2'
 
   ./configure --prefix=/usr
-  make || return 1
-  make prefix=$startdir/pkg/usr install
+  make
+}
+
+package() {
+  cd "$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir" install
 }