[arch-commits] Commit in gnumeric/repos (16 files)

Evangelos Foutras foutrelis at nymeria.archlinux.org
Sat May 4 15:38:00 EDT 2013


    Date: Saturday, May 4, 2013 @ 21:38:00
  Author: foutrelis
Revision: 184239

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  gnumeric/repos/extra-i686/PKGBUILD
    (from rev 184238, gnumeric/trunk/PKGBUILD)
  gnumeric/repos/extra-i686/gnumeric-1.12.1-automake-1.13.patch
    (from rev 184238, gnumeric/trunk/gnumeric-1.12.1-automake-1.13.patch)
  gnumeric/repos/extra-i686/gnumeric.install
    (from rev 184238, gnumeric/trunk/gnumeric.install)
  gnumeric/repos/extra-i686/revert-warnings.patch
    (from rev 184238, gnumeric/trunk/revert-warnings.patch)
  gnumeric/repos/extra-x86_64/PKGBUILD
    (from rev 184238, gnumeric/trunk/PKGBUILD)
  gnumeric/repos/extra-x86_64/gnumeric-1.12.1-automake-1.13.patch
    (from rev 184238, gnumeric/trunk/gnumeric-1.12.1-automake-1.13.patch)
  gnumeric/repos/extra-x86_64/gnumeric.install
    (from rev 184238, gnumeric/trunk/gnumeric.install)
  gnumeric/repos/extra-x86_64/revert-warnings.patch
    (from rev 184238, gnumeric/trunk/revert-warnings.patch)
Deleted:
  gnumeric/repos/extra-i686/PKGBUILD
  gnumeric/repos/extra-i686/gnumeric-1.12.1-automake-1.13.patch
  gnumeric/repos/extra-i686/gnumeric.install
  gnumeric/repos/extra-i686/revert-warnings.patch
  gnumeric/repos/extra-x86_64/PKGBUILD
  gnumeric/repos/extra-x86_64/gnumeric-1.12.1-automake-1.13.patch
  gnumeric/repos/extra-x86_64/gnumeric.install
  gnumeric/repos/extra-x86_64/revert-warnings.patch

--------------------------------------------------+
 /PKGBUILD                                        |  108 ++++++++++
 /gnumeric-1.12.1-automake-1.13.patch             |  208 +++++++++++++++++++++
 /gnumeric.install                                |   38 +++
 /revert-warnings.patch                           |   22 ++
 extra-i686/PKGBUILD                              |   44 ----
 extra-i686/gnumeric-1.12.1-automake-1.13.patch   |  104 ----------
 extra-i686/gnumeric.install                      |   19 -
 extra-i686/revert-warnings.patch                 |   11 -
 extra-x86_64/PKGBUILD                            |   44 ----
 extra-x86_64/gnumeric-1.12.1-automake-1.13.patch |  104 ----------
 extra-x86_64/gnumeric.install                    |   19 -
 extra-x86_64/revert-warnings.patch               |   11 -
 12 files changed, 376 insertions(+), 356 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2013-05-04 19:37:41 UTC (rev 184238)
+++ extra-i686/PKGBUILD	2013-05-04 19:38:00 UTC (rev 184239)
@@ -1,44 +0,0 @@
-# $Id$
-# Maintainer: Eric Belanger <eric at archlinux.org>
-# Contributor: Kritoke <typeolinux at yahoo.com>
-
-pkgname=gnumeric
-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' '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
-        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-introspection --enable-compile-warnings=no
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}

Copied: gnumeric/repos/extra-i686/PKGBUILD (from rev 184238, gnumeric/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2013-05-04 19:38:00 UTC (rev 184239)
@@ -0,0 +1,54 @@
+# $Id$
+# Maintainer: Eric Belanger <eric at archlinux.org>
+# Contributor: Kritoke <typeolinux at yahoo.com>
+
+pkgname=gnumeric
+pkgver=1.12.2
+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'
+             'gobject-introspection' 'optipng')
+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
+        gnumeric-1.12.1-automake-1.13.patch
+        revert-warnings.patch)
+sha256sums=('d6fda191c1c76be2ede21fe78b8c9f96d39aea82ccfb537775a83bf88d781874'
+            '1eb57b931023d961e9d0f3675fe96b5559270fa38c97401cb06fc7aed9c8e275'
+            'bcafca016b809000c2a5bf911e2e3dfa4de28f9e541d9964574cac5c7ce09e53')
+
+prepare() {
+  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
+
+  # Fix invalid PNG images to work with libpng 1.6
+  # https://bugzilla.gnome.org/show_bug.cgi?id=699683
+  find -name '*.png' -exec optipng -quiet -force -fix {} +
+}
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+    --disable-schemas-compile --enable-introspection
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}

Deleted: extra-i686/gnumeric-1.12.1-automake-1.13.patch
===================================================================
--- extra-i686/gnumeric-1.12.1-automake-1.13.patch	2013-05-04 19:37:41 UTC (rev 184238)
+++ extra-i686/gnumeric-1.12.1-automake-1.13.patch	2013-05-04 19:38:00 UTC (rev 184239)
@@ -1,104 +0,0 @@
-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:

Copied: gnumeric/repos/extra-i686/gnumeric-1.12.1-automake-1.13.patch (from rev 184238, gnumeric/trunk/gnumeric-1.12.1-automake-1.13.patch)
===================================================================
--- extra-i686/gnumeric-1.12.1-automake-1.13.patch	                        (rev 0)
+++ extra-i686/gnumeric-1.12.1-automake-1.13.patch	2013-05-04 19:38:00 UTC (rev 184239)
@@ -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:

Deleted: extra-i686/gnumeric.install
===================================================================
--- extra-i686/gnumeric.install	2013-05-04 19:37:41 UTC (rev 184238)
+++ extra-i686/gnumeric.install	2013-05-04 19:38:00 UTC (rev 184239)
@@ -1,19 +0,0 @@
-post_install() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  update-desktop-database -q
-}
-
-pre_upgrade() {
-  if [ -f usr/share/gconf/schemas/gnumeric.schemas ]; then
-    usr/sbin/gconfpkg --uninstall gnumeric
-  fi
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}

Copied: gnumeric/repos/extra-i686/gnumeric.install (from rev 184238, gnumeric/trunk/gnumeric.install)
===================================================================
--- extra-i686/gnumeric.install	                        (rev 0)
+++ extra-i686/gnumeric.install	2013-05-04 19:38:00 UTC (rev 184239)
@@ -0,0 +1,19 @@
+post_install() {
+  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  update-desktop-database -q
+}
+
+pre_upgrade() {
+  if [ -f usr/share/gconf/schemas/gnumeric.schemas ]; then
+    usr/sbin/gconfpkg --uninstall gnumeric
+  fi
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}

Deleted: extra-i686/revert-warnings.patch
===================================================================
--- extra-i686/revert-warnings.patch	2013-05-04 19:37:41 UTC (rev 184238)
+++ extra-i686/revert-warnings.patch	2013-05-04 19:38:00 UTC (rev 184239)
@@ -1,11 +0,0 @@
---- 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 \

Copied: gnumeric/repos/extra-i686/revert-warnings.patch (from rev 184238, gnumeric/trunk/revert-warnings.patch)
===================================================================
--- extra-i686/revert-warnings.patch	                        (rev 0)
+++ extra-i686/revert-warnings.patch	2013-05-04 19:38:00 UTC (rev 184239)
@@ -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 \

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2013-05-04 19:37:41 UTC (rev 184238)
+++ extra-x86_64/PKGBUILD	2013-05-04 19:38:00 UTC (rev 184239)
@@ -1,44 +0,0 @@
-# $Id$
-# Maintainer: Eric Belanger <eric at archlinux.org>
-# Contributor: Kritoke <typeolinux at yahoo.com>
-
-pkgname=gnumeric
-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' '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
-        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-introspection --enable-compile-warnings=no
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}

Copied: gnumeric/repos/extra-x86_64/PKGBUILD (from rev 184238, gnumeric/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2013-05-04 19:38:00 UTC (rev 184239)
@@ -0,0 +1,54 @@
+# $Id$
+# Maintainer: Eric Belanger <eric at archlinux.org>
+# Contributor: Kritoke <typeolinux at yahoo.com>
+
+pkgname=gnumeric
+pkgver=1.12.2
+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'
+             'gobject-introspection' 'optipng')
+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
+        gnumeric-1.12.1-automake-1.13.patch
+        revert-warnings.patch)
+sha256sums=('d6fda191c1c76be2ede21fe78b8c9f96d39aea82ccfb537775a83bf88d781874'
+            '1eb57b931023d961e9d0f3675fe96b5559270fa38c97401cb06fc7aed9c8e275'
+            'bcafca016b809000c2a5bf911e2e3dfa4de28f9e541d9964574cac5c7ce09e53')
+
+prepare() {
+  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
+
+  # Fix invalid PNG images to work with libpng 1.6
+  # https://bugzilla.gnome.org/show_bug.cgi?id=699683
+  find -name '*.png' -exec optipng -quiet -force -fix {} +
+}
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+    --disable-schemas-compile --enable-introspection
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}

Deleted: extra-x86_64/gnumeric-1.12.1-automake-1.13.patch
===================================================================
--- extra-x86_64/gnumeric-1.12.1-automake-1.13.patch	2013-05-04 19:37:41 UTC (rev 184238)
+++ extra-x86_64/gnumeric-1.12.1-automake-1.13.patch	2013-05-04 19:38:00 UTC (rev 184239)
@@ -1,104 +0,0 @@
-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:

Copied: gnumeric/repos/extra-x86_64/gnumeric-1.12.1-automake-1.13.patch (from rev 184238, gnumeric/trunk/gnumeric-1.12.1-automake-1.13.patch)
===================================================================
--- extra-x86_64/gnumeric-1.12.1-automake-1.13.patch	                        (rev 0)
+++ extra-x86_64/gnumeric-1.12.1-automake-1.13.patch	2013-05-04 19:38:00 UTC (rev 184239)
@@ -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:

Deleted: extra-x86_64/gnumeric.install
===================================================================
--- extra-x86_64/gnumeric.install	2013-05-04 19:37:41 UTC (rev 184238)
+++ extra-x86_64/gnumeric.install	2013-05-04 19:38:00 UTC (rev 184239)
@@ -1,19 +0,0 @@
-post_install() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  update-desktop-database -q
-}
-
-pre_upgrade() {
-  if [ -f usr/share/gconf/schemas/gnumeric.schemas ]; then
-    usr/sbin/gconfpkg --uninstall gnumeric
-  fi
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}

Copied: gnumeric/repos/extra-x86_64/gnumeric.install (from rev 184238, gnumeric/trunk/gnumeric.install)
===================================================================
--- extra-x86_64/gnumeric.install	                        (rev 0)
+++ extra-x86_64/gnumeric.install	2013-05-04 19:38:00 UTC (rev 184239)
@@ -0,0 +1,19 @@
+post_install() {
+  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  update-desktop-database -q
+}
+
+pre_upgrade() {
+  if [ -f usr/share/gconf/schemas/gnumeric.schemas ]; then
+    usr/sbin/gconfpkg --uninstall gnumeric
+  fi
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}

Deleted: extra-x86_64/revert-warnings.patch
===================================================================
--- extra-x86_64/revert-warnings.patch	2013-05-04 19:37:41 UTC (rev 184238)
+++ extra-x86_64/revert-warnings.patch	2013-05-04 19:38:00 UTC (rev 184239)
@@ -1,11 +0,0 @@
---- 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 \

Copied: gnumeric/repos/extra-x86_64/revert-warnings.patch (from rev 184238, gnumeric/trunk/revert-warnings.patch)
===================================================================
--- extra-x86_64/revert-warnings.patch	                        (rev 0)
+++ extra-x86_64/revert-warnings.patch	2013-05-04 19:38:00 UTC (rev 184239)
@@ -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 \



More information about the arch-commits mailing list