[arch-commits] Commit in gnumeric/trunk (3 files)

Wed Mar 13 16:25:28 UTC 2013

Date: Wednesday, March 13, 2013 @ 17:25:28
  Author: jgc
Revision: 179970

Add patch to fix compilation with automake 1.13
Revert Werror changes done in 1.12.1. These flags leak into configure checks, causing locale files to get installed in /usr/lib instead of /usr/share.
Enable introspection, didn't build in 1.12.0, works in 1.12.1.

upgpkg: gnumeric 1.12.1-1

Added:
  gnumeric/trunk/gnumeric-1.12.1-automake-1.13.patch
  gnumeric/trunk/revert-warnings.patch
Modified:
  gnumeric/trunk/PKGBUILD

-------------------------------------+
 PKGBUILD                            |   18 ++++-
 gnumeric-1.12.1-automake-1.13.patch |  104 ++++++++++++++++++++++++++++++++++
 revert-warnings.patch               |   11 +++
 3 files changed, 128 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================

--- PKGBUILD	2013-03-13 15:12:30 UTC (rev 179969)
+++ PKGBUILD	2013-03-13 16:25:28 UTC (rev 179970)
@@ -3,30 +3,38 @@
 # Contributor: Kritoke <typeolinux at yahoo.com>
 
 pkgname=gnumeric
-pkgver=1.12.0
+pkgver=1.12.1
 pkgrel=1
 pkgdesc="A GNOME Spreadsheet Program"
 arch=('i686' 'x86_64')
 url="http://www.gnome.org/projects/gnumeric/"
 license=('GPL')
 depends=('goffice' 'desktop-file-utils' 'hicolor-icon-theme')
-makedepends=('intltool' 'psiconv' 'pygobject-devel' 'gnome-doc-utils')
+makedepends=('intltool' 'psiconv' 'pygobject-devel' 'gnome-doc-utils' 'gobject-introspection')
 optdepends=('python2-gobject: for python plugin support'
             'perl: for perl plugin support'
             'psiconv: for Psion 5 file support'
             'yelp: for viewing the help manual')
 install=gnumeric.install
 options=('!libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('037b53d909e5d1454b2afda8c4fb1e7838e260343e36d4e36245f4a5d0e04111')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz
+        gnumeric-1.12.1-automake-1.13.patch
+        revert-warnings.patch)
+sha256sums=('0f5a7af3acae7db643eb00e8b4fca6a9e90162259c6a73e4214cfa8c96cc3901'
+            '1eb57b931023d961e9d0f3675fe96b5559270fa38c97401cb06fc7aed9c8e275'
+            'bcafca016b809000c2a5bf911e2e3dfa4de28f9e541d9964574cac5c7ce09e53')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i ../gnumeric-1.12.1-automake-1.13.patch
+  patch -Np0 -i ../revert-warnings.patch
+
   # Remove invalid mime type. (FS#26338)
   sed -i -e 's/zz-application\/zz-winassoc-xls;//' gnumeric.desktop.in
 
+  autoreconf -fi
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-    --enable-ssindex --disable-schemas-compile
+    --enable-ssindex --disable-schemas-compile --enable-introspection --enable-compile-warnings=no
   make
 }
 

Added: gnumeric-1.12.1-automake-1.13.patch
===================================================================
--- gnumeric-1.12.1-automake-1.13.patch	                        (rev 0)
+++ gnumeric-1.12.1-automake-1.13.patch	2013-03-13 16:25:28 UTC (rev 179970)
@@ -0,0 +1,104 @@
+diff -up gnumeric-1.12.0/test/Makefile.am.automake-1_13 gnumeric-1.12.0/test/Makefile.am
+--- gnumeric-1.12.0/test/Makefile.am.automake-1_13	2011-05-18 02:54:24.000000000 +0200
++++ gnumeric-1.12.0/test/Makefile.am	2013-01-05 18:25:56.380686587 +0100
+@@ -25,7 +25,99 @@
+ #
+ # 90xx: Misc stuff.
+ 
+-TESTS = $(sort $(wildcard $(srcdir)/t[0-9][0-9][0-9][0-9]-*.pl))
++TESTS = \
++t1000-statfuns.pl \
++t1001-mathfuns.pl \
++t1002-finfuns.pl \
++t1003-engfuns.pl \
++t1004-textfuns.pl \
++t1005-logfuns.pl \
++t1006-datefuns.pl \
++t1007-dbfuns.pl \
++t1008-infofuns.pl \
++t1009-lookfuns.pl \
++t1010-bitwise.pl \
++t1011-yalta2008.pl \
++t1100-chitest.pl \
++t1101-ftest.pl \
++t1102-ttest.pl \
++t1103-sumif.pl \
++t1104-linest.pl \
++t1800-operators.pl \
++t1900-array.pl \
++t1901-regress.pl \
++t1902-array-intersection.pl \
++t2000-names-insdel.pl \
++t2001-func-help.pl \
++t2002-nonascii-numbers.pl \
++t2003-random-generators.pl \
++t2800-style-optimizer.pl \
++t5900-sc.pl \
++t5901-qpro.pl \
++t5902-applix.pl \
++t5903-sylk.pl \
++t5904-mps.pl \
++t6000-statfuns.pl \
++t6001-mathfuns.pl \
++t6002-objs.pl \
++t6003-lookfuns.pl \
++t6004-chart-tests.pl \
++t6004-finfuns.pl \
++t6100-statfuns-ods.pl \
++t6101-mathfuns-ods.pl \
++t6102-objs-ods.pl \
++t6103-lookfuns-ods.pl \
++t6104-finfuns-ods.pl \
++t7000-goal-seek.pl \
++t7100-solver-blend.pl \
++t7101-solver-afiro.pl \
++t7110-solver-Misra1a.pl \
++t7111-solver-Chwirut2.pl \
++t7112-solver-Chwirut1.pl \
++t7113-solver-Lanczos3.pl \
++t7114-solver-Gauss1.pl \
++t7115-solver-Gauss2.pl \
++t7116-solver-DanWood.pl \
++t7117-solver-Misra1b.pl \
++t7120-solver-Kirby2.pl \
++t7121-solver-Hahn1.pl \
++t7122-solver-Nelson.pl \
++t7123-solver-MGH17.pl \
++t7124-solver-Lanczos1.pl \
++t7125-solver-Lanczos2.pl \
++t7126-solver-Gauss3.pl \
++t7127-solver-Misra1c.pl \
++t7128-solver-Misra1d.pl \
++t7129-solver-Roszman1.pl \
++t7130-solver-ENSO.pl \
++t7140-solver-MGH09.pl \
++t7141-solver-Thurber.pl \
++t7142-solver-BoxBOD.pl \
++t7143-solver-Rat42.pl \
++t7144-solver-MGH10.pl \
++t7145-solver-Eckerle4.pl \
++t7146-solver-Rat43.pl \
++t7147-solver-Bennett5.pl \
++t8000-valgrind.pl \
++t8001-valgrind-xls.pl \
++t8002-valgrind-gnumeric.pl \
++t8003-valgrind-pdf.pl \
++t8004-valgrind-xls-macro.pl \
++t8005-valgrind-chart-fit.pl \
++t8050-valgrind-sstest.pl \
++t8100-null-false.pl \
++t8101-gfree.pl \
++t8102-glade-visible.pl \
++t8103-gtk.pl \
++t8104-glade-parsing.pl \
++t8200-gslice1.pl \
++t8201-gslice2.pl \
++t8202-gslice3.pl \
++t9000-ssindex.pl \
++t9100-number-match.pl \
++t9999-epilogue.pl
++
++
+ SUPPS = common.supp gui.supp t8003-valgrind-pdf.supp
+ 
+ import-db:

Added: revert-warnings.patch
===================================================================
--- revert-warnings.patch	                        (rev 0)
+++ revert-warnings.patch	2013-03-13 16:25:28 UTC (rev 179970)
@@ -0,0 +1,11 @@
+--- configure.ac.orig	2013-03-13 16:09:02.355422066 +0000
++++ configure.ac	2013-03-13 16:09:26.701917153 +0000
+@@ -269,8 +269,6 @@
+ 			 -Wchar-subscripts -Wwrite-strings \
+ 			 -Wdeclaration-after-statement -Wnested-externs \
+ 			 -Wmissing-noreturn \
+-			 -Werror=missing-prototypes -Werror=nested-externs \
+-			 -Werror=implicit-function-declaration \
+ 			 -Wmissing-declarations -Wno-pointer-sign \
+ 			 -Werror=format-security -Wbitwise -Wcast-to-as \
+ 			 -Wdefault-bitfield-sign -Wdo-while -Wparen-string \


