Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/bitcoin/PKGBUILD
	community/calc/PKGBUILD
	community/fcitx/PKGBUILD
	community/gloobus-preview/PKGBUILD
	community/linux-tools/PKGBUILD
	community/smc/PKGBUILD
	extra/elfutils/PKGBUILD
	extra/freenx/PKGBUILD
	extra/gnome-alsamixer/PKGBUILD
	extra/gvfs/PKGBUILD
	extra/kdenetwork/PKGBUILD
	extra/kdepim/PKGBUILD
	extra/kdesdk-kate/PKGBUILD
	extra/lcms2/PKGBUILD
	extra/libmspack/PKGBUILD
	extra/libtheora/PKGBUILD
	extra/mesa/PKGBUILD
	extra/nx-common/PKGBUILD
	extra/opennx/PKGBUILD
	extra/perl-tk/PKGBUILD
	extra/qt4/PKGBUILD
	extra/soprano/PKGBUILD
	extra/wireshark/PKGBUILD
	extra/xmlsec/PKGBUILD
	extra/xorg-server/PKGBUILD
	libre/audacious-plugins-libre/PKGBUILD
	libre/ipsec-tools-libre/PKGBUILD
	libre/tomoyo-tools-libre/PKGBUILD
	pcr/amsynth/PKGBUILD

2 files changed, 5 insertions, 117 deletions

diff --git a/extra/gnumeric/PKGBUILD b/extra/gnumeric/PKGBUILD
index 52c40c691..40b638520 100644
--- a/extra/gnumeric/PKGBUILD
+++ b/extra/gnumeric/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 186380 2013-05-26 09:24:31Z bluewind $
+# $Id: PKGBUILD 188945 2013-06-26 11:13:30Z foutrelis $
 # Maintainer: Eric Belanger <eric@archlinux.org>
 # Contributor: Kritoke <typeolinux@yahoo.com>
 
 pkgname=gnumeric
-pkgver=1.12.2
-pkgrel=2
+pkgver=1.12.3
+pkgrel=1
 pkgdesc="A GNOME Spreadsheet Program"
 arch=('i686' 'x86_64' 'mips64el')
 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')
+             'gobject-introspection')
 optdepends=('python2-gobject: for python plugin support'
             'perl: for perl plugin support'
             'psiconv: for Psion 5 file support'
@@ -19,27 +19,19 @@ optdepends=('python2-gobject: for python plugin support'
 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'
+sha256sums=('b332e6785077a2e7febf26a6ccac73e9ae1813c365bc3bf851fb27a5477713a6'
             '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
-  # XXX: PNGs have been fixed upsteam; remove when gnumeric 1.12.3 is out
-  find -name '*.png' -exec optipng -quiet -force -fix {} +
 }
 
 build() {
diff --git a/extra/gnumeric/gnumeric-1.12.1-automake-1.13.patch b/extra/gnumeric/gnumeric-1.12.1-automake-1.13.patch
deleted file mode 100644
index 1ae1fb955..000000000
--- a/extra/gnumeric/gnumeric-1.12.1-automake-1.13.patch
+++ /dev/null
@@ -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: