From 4ce4bc8a296c80d3ec9b2d52b8dd4e46a18af1d9 Mon Sep 17 00:00:00 2001
From: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
Date: Mon, 18 Nov 2019 23:44:00 -0500
Subject: user/gnumeric: upgrade to 1.12.46

---
 user/gnumeric/APKBUILD | 13 +++++--------
 user/gnumeric/cs.patch | 11 -----------
 2 files changed, 5 insertions(+), 19 deletions(-)
 delete mode 100644 user/gnumeric/cs.patch

(limited to 'user/gnumeric')

diff --git a/user/gnumeric/APKBUILD b/user/gnumeric/APKBUILD
index 283227674..f847f2914 100644
--- a/user/gnumeric/APKBUILD
+++ b/user/gnumeric/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=gnumeric
-pkgver=1.12.45
-pkgrel=1
+pkgver=1.12.46
+pkgrel=0
 pkgdesc="GNOME spreadsheet software"
 url="http://www.gnumeric.org/"
 arch="all"
@@ -11,12 +11,10 @@ options="!check"  # Fails with:
 # no clue.
 license="GPL-2.0-only OR GPL-3.0-only"
 depends=""
-makedepends="byacc gobject-introspection-dev goffice-dev gtk+3.0-dev intltool
+makedepends="byacc gobject-introspection-dev goffice-dev>=0.10.46 gtk+3.0-dev intltool
 	itstool libgda-dev libxml2-utils perl-dev zlib-dev"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
-source="https://ftp.gnome.org/pub/GNOME/sources/gnumeric/1.12/gnumeric-$pkgver.tar.xz
-	cs.patch
-	"
+source="https://ftp.gnome.org/pub/GNOME/sources/gnumeric/1.12/gnumeric-$pkgver.tar.xz"
 
 build() {
 	LIBS="-lintl" YACC=yacc ./configure \
@@ -38,5 +36,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="08933ce52abc15e3e690ceea4e617618db65936a482312af8d9e37f3eaec9946950f97f3967357668c7f66ca3cc568d4492e94aa17fe8432ca42adb8bbcd2508  gnumeric-1.12.45.tar.xz
-24d74cec5a19f3f79a049b02b43369324fbb1432be4945988034a38d813cceeab54da67d3d9eb2eff49d248e449212d0877b20b593a8c1f70cecbdbd635cb517  cs.patch"
+sha512sums="b3b3befe79f3ec8db6d7d9c80a1eed5293f5c0a9ca1d8dd131320eb031952b296147c51df1c775c6f9a0c466912e5523360373ee0b6e453e928929394ab517ea  gnumeric-1.12.46.tar.xz"
diff --git a/user/gnumeric/cs.patch b/user/gnumeric/cs.patch
deleted file mode 100644
index b61f242c2..000000000
--- a/user/gnumeric/cs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gnumeric-1.12.44/doc/cs/cs.po.old	2018-11-03 17:22:50.000000000 +0000
-+++ gnumeric-1.12.44/doc/cs/cs.po	2019-01-10 01:35:07.770000000 +0000
-@@ -24824,7 +24824,7 @@
- msgstr ""
- "Můžete nastavit i několik doplňujících voleb. Jestli chcete omezit počet "
- "iterací optimalizačního algoritmu, tak to můžete udělat v poli "
--"<guilabel>Max. iterací<guilabel> na kartě <guilabel>Volby</guilabel>. "
-+"<guilabel>Max. iterací</guilabel> na kartě <guilabel>Volby</guilabel>. "
- "Obdobně můžete omezit maximální dobu běhu optimalizace v poli <guilabel>Max. "
- "čas (sekundy)</guilabel>. Pokud je některé z těchto nastavení při "
- "optimalizaci překročeno, optimalizace se přeruší a zobrazí se chybové "
-- 
cgit v1.2.3-70-g09d2