update with many PKGBUILD changes

3 files changed, 15 insertions, 33 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2e2e962a899f..1089c28fde53 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Mon Dec 28 23:12:46 UTC 2015
+# Thu Feb 11 18:08:42 UTC 2016
 pkgbase = gnumeric-minimal
 	pkgdesc = A GNOME-less spreadsheet program
-	pkgver = 1.12.26
+	pkgver = 1.12.27
 	pkgrel = 1
 	url = http://www.gnome.org/projects/gnumeric/
 	install = gnumeric-minimal.install
@@ -15,10 +15,10 @@ pkgbase = gnumeric-minimal
 	provides = gnumeric
 	conflicts = gnumeric
 	options = !makeflags
-	source = http://ftp.gnome.org/pub/gnome/sources/gnumeric/1.12/gnumeric-1.12.26.tar.xz
-	source = nested_decl.patch
-	md5sums = 0b8b9f3240e89abff4830c3fd5799340
-	md5sums = 4368ba37f04c0674ed3cba9a82881700
+	source = http://ftp.gnome.org/pub/gnome/sources/gnumeric/1.12/gnumeric-1.12.27.tar.xz
+	source = revert-warnings.patch::https://projects.archlinux.de/svntogit/packages.git/plain/trunk/revert-warnings.patch?h=packages/gnumeric
+	sha256sums = 383a5b6eca17f0a5a0b552edcc10320fa719d10c69c7b6fb29d5a11808f1d1c9
+	sha256sums = bcafca016b809000c2a5bf911e2e3dfa4de28f9e541d9964574cac5c7ce09e53
 
 pkgname = gnumeric-minimal
 
diff --git a/PKGBUILD b/PKGBUILD
index 34876d62b5e0..4215a0402775 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=gnumeric-minimal
 _pkgname=gnumeric
-pkgver=1.12.26
+pkgver=1.12.27
 pkgrel=1
 pkgdesc="A GNOME-less spreadsheet program"
 arch=('i686' 'x86_64')
@@ -16,27 +16,21 @@ install=gnumeric-minimal.install
 conflicts=('gnumeric')
 provides=('gnumeric')
 options=('libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/${_pkgname}/${pkgver%.*}/${_pkgname}-${pkgver}.tar.xz nested_decl.patch)
+source=(http://ftp.gnome.org/pub/gnome/sources/${_pkgname}/${pkgver%.*}/${_pkgname}-${pkgver}.tar.xz revert-warnings.patch::https://projects.archlinux.de/svntogit/packages.git/plain/trunk/revert-warnings.patch?h=packages/gnumeric)
+sha256sums=('383a5b6eca17f0a5a0b552edcc10320fa719d10c69c7b6fb29d5a11808f1d1c9'
+            'bcafca016b809000c2a5bf911e2e3dfa4de28f9e541d9964574cac5c7ce09e53')
 options=('!makeflags')
-md5sums=('0b8b9f3240e89abff4830c3fd5799340'
-         '4368ba37f04c0674ed3cba9a82881700')
 
 prepare() {
-  cd "${srcdir}/${_pkgname}-${pkgver}"
-
-  # Create a dummy file to trick gnumeric into building without docs
-  # Got this from the gnumeric SlackBuild
-  touch doc/C/gnumeric-C.omf.out
-  
+  cd "${srcdir}/"${_pkgname}-${pkgver}
+  patch -Np0 -i "${srcdir}"/revert-warnings.patch
   # Remove invalid mime type. (FS#26338)
   sed -i -e 's/zz-application\/zz-winassoc-xls;//' gnumeric.desktop.in
-  sed -i 's+-Werror=implicit-function-declaration++' configure
-  sed -i 's+-Werror=nested.externs++' configure
 }
 
 build() {
-  cd "${srcdir}/${_pkgname}-${pkgver}"
-
+  cd "${srcdir}"/${_pkgname}-${pkgver}
+  autoreconf -fi
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
               --disable-schemas-install --disable-ssindex \
               --without-gnome --without-psiconv --without-perl \
@@ -45,7 +39,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/${_pkgname}-${pkgver}"
+  cd "${srcdir}"/${_pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
 
   rm -rf "${pkgdir}/etc/gconf"
diff --git a/nested_decl.patch b/nested_decl.patch
deleted file mode 100644
index 1ae191f8e644..000000000000
--- a/nested_decl.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru gnumeric-1.12.1.old/configure.ac gnumeric-1.12.1/configure.ac
---- gnumeric-1.12.1.old/configure	2013-03-02 00:00:37.000000000 +0100
-+++ gnumeric-1.12.1/configure	2013-03-09 22:03:58.000000000 +0100
-@@ -269,7 +269,7 @@
- 			 -Wchar-subscripts -Wwrite-strings \
- 			 -Wdeclaration-after-statement -Wnested-externs \
- 			 -Wmissing-noreturn \
--			 -Werror=missing-prototypes -Werror=nested-externs \
-+			 -Werror=missing-prototypes \
- 			 -Werror=implicit-function-declaration \
- 			 -Wmissing-declarations -Wno-pointer-sign \
- 			 -Werror=format-security -Wbitwise -Wcast-to-as \