diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2017-04-10 21:04:57 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2017-04-11 06:48:56 +0000 |
| commit | b3a3f17ad34c33226a0ae2ccdddf9a29a2094f2e (patch) | |
| tree | 037ee19c5bc4ea33bf00f2d46e60858df111c985 | |
| parent | bcaa26c2e110f5b381c84ae313622a3a8391bbb3 (diff) | |
| download | aports-b3a3f17ad34c33226a0ae2ccdddf9a29a2094f2e.tar.bz2 aports-b3a3f17ad34c33226a0ae2ccdddf9a29a2094f2e.tar.xz | |
main/gnumeric: upgrade to 1.12.34
| -rw-r--r-- | main/gnumeric/APKBUILD | 14 | ||||
| -rw-r--r-- | main/gnumeric/gnumeric-1.12.33-destdir.patch | 42 | ||||
| -rw-r--r-- | main/gnumeric/gnumeric-1.12.33-docbook.patch | 24 |
3 files changed, 2 insertions, 78 deletions
diff --git a/main/gnumeric/APKBUILD b/main/gnumeric/APKBUILD index 72b580ded6..d647762a1c 100644 --- a/main/gnumeric/APKBUILD +++ b/main/gnumeric/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=gnumeric -pkgver=1.12.33 +pkgver=1.12.34 pkgrel=0 pkgdesc="A GNOME Spreadsheet Program" url="http://www.gnome.org/projects/gnumeric/" @@ -13,8 +13,6 @@ makedepends="gtk+3.0-dev intltool desktop-file-utils goffice-dev rarian install= subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="http://ftp.gnome.org/pub/gnome/sources/$pkgname/1.12/$pkgname-$pkgver.tar.xz - gnumeric-1.12.33-destdir.patch - gnumeric-1.12.33-docbook.patch " builddir="$srcdir"/$pkgname-$pkgver @@ -47,12 +45,4 @@ package() { make -j1 DESTDIR="$pkgdir" install || return 1 } -md5sums="427e7a972bfe81ccf2c017b710968bef gnumeric-1.12.33.tar.xz -c38369278060da82815781b72edec5cb gnumeric-1.12.33-destdir.patch -3093843382aca463c84d6bb562c4fb7d gnumeric-1.12.33-docbook.patch" -sha256sums="7eade408b6c20d2e8ad557d539e5e2f29705845a2eaa181b38934bb0cad49c0b gnumeric-1.12.33.tar.xz -7118e5108ee906098fcdfd8390ddeb6c7a225f92ab36a1a8bd2c05d5fd902e44 gnumeric-1.12.33-destdir.patch -fb3bf7eb30552b7ae75f7b2dca6326b015bd197dd7e8ec43f8e14ab6de2d4d85 gnumeric-1.12.33-docbook.patch" -sha512sums="75a91cab88fdf7788e5ae3a7ab8e6fc9dd0f362bd2410841870c9e93e40ed84bd99a4f143b19af73300a6ac42f2f37c3331038e842b38bed2fa2aa38205f071b gnumeric-1.12.33.tar.xz -7b2e37d5226172df358ef0af12fda55114f2c64cb05de189d577e84c0b03025e91860d998e29529ab9ffcf639c394a09d64d5400ab283b489dd0303b7959dfa3 gnumeric-1.12.33-destdir.patch -d2f1f232cd8ab92d72a90e7288d2f7653df385bd132766dbf27de56f90af1bf56ef3c545af9decd617dac3571adc36eb0fa4b901ca41feabf35b20dfff919fcb gnumeric-1.12.33-docbook.patch" +sha512sums="59f2b6eb9b43414a4673657b230aeb9beb9dea5e2eec8457719e8d1fbfab0056807cf1946dfb8b9c0dc9ec3194543ac0b7b3d51069099ab9fd8b80121172821d gnumeric-1.12.34.tar.xz" diff --git a/main/gnumeric/gnumeric-1.12.33-destdir.patch b/main/gnumeric/gnumeric-1.12.33-destdir.patch deleted file mode 100644 index 278cab04c5..0000000000 --- a/main/gnumeric/gnumeric-1.12.33-destdir.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -up gnumeric-1.12.33/doc/Makefile.am.destdir gnumeric-1.12.33/doc/Makefile.am ---- gnumeric-1.12.33/doc/Makefile.am.destdir 2017-01-30 21:47:16.000000000 +0100 -+++ gnumeric-1.12.33/doc/Makefile.am 2017-01-31 08:19:26.170304443 +0100 -@@ -527,7 +527,7 @@ HELP_MEDIA= \ - - install-exec-hook: - for d in C $(HELP_LINGUAS); do \ -- helpdir="$(HELP_DIR)/$$d/$(HELP_ID)"; \ -+ helpdir="$(DESTDIR)$(HELP_DIR)/$$d/$(HELP_ID)"; \ - install -d $$helpdir; \ - $(RM) $$helpdir/index.docbook; \ - $(LN_S) gnumeric.xml $$helpdir/index.docbook; \ -@@ -535,7 +535,7 @@ install-exec-hook: - - uninstall-hook: - for d in C $(HELP_LINGUAS); do \ -- helpdir="$(HELP_DIR)/$$d/$(HELP_ID)"; \ -+ helpdir="$(DESTDIR)$(HELP_DIR)/$$d/$(HELP_ID)"; \ - $(RM) $$helpdir/index.docbook; \ - done - -diff -up gnumeric-1.12.33/doc/Makefile.in.destdir gnumeric-1.12.33/doc/Makefile.in ---- gnumeric-1.12.33/doc/Makefile.in.destdir 2017-01-30 21:48:07.000000000 +0100 -+++ gnumeric-1.12.33/doc/Makefile.in 2017-01-31 08:19:42.562456025 +0100 -@@ -1347,7 +1347,7 @@ uninstall-am: uninstall-manpageDATA unin - - install-exec-hook: - for d in C $(HELP_LINGUAS); do \ -- helpdir="$(HELP_DIR)/$$d/$(HELP_ID)"; \ -+ helpdir="$(DESTDIR)$(HELP_DIR)/$$d/$(HELP_ID)"; \ - install -d $$helpdir; \ - $(RM) $$helpdir/index.docbook; \ - $(LN_S) gnumeric.xml $$helpdir/index.docbook; \ -@@ -1355,7 +1355,7 @@ install-exec-hook: - - uninstall-hook: - for d in C $(HELP_LINGUAS); do \ -- helpdir="$(HELP_DIR)/$$d/$(HELP_ID)"; \ -+ helpdir="$(DESTDIR)$(HELP_DIR)/$$d/$(HELP_ID)"; \ - $(RM) $$helpdir/index.docbook; \ - done - diff --git a/main/gnumeric/gnumeric-1.12.33-docbook.patch b/main/gnumeric/gnumeric-1.12.33-docbook.patch deleted file mode 100644 index 8e56bead26..0000000000 --- a/main/gnumeric/gnumeric-1.12.33-docbook.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -up gnumeric-1.12.33/doc/C/gnumeric.xml.docbook gnumeric-1.12.33/doc/C/gnumeric.xml ---- gnumeric-1.12.33/doc/C/gnumeric.xml.docbook 2017-02-01 03:58:38.893646538 +0100 -+++ gnumeric-1.12.33/doc/C/gnumeric.xml 2017-02-01 04:05:40.111116668 +0100 -@@ -47,17 +47,17 @@ - - <!-- For mdash, hellip and friends --> - <!ENTITY % isopub PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN//XML" -- "http://www.oasis-open.org/docbook/xmlcharent/0.3/iso-pub.ent"> -+ "http://www.oasis-open.org/docbook/xml/4.5/ent/isopub.ent"> - %isopub; - - <!-- For nbsp, pound, yen and friends --> - <!ENTITY % isonum PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN//XML" -- "http://www.oasis-open.org/docbook/xmlcharent/0.3/iso-num.ent"> -+ "http://www.oasis-open.org/docbook/xml/4.5/ent/isonum.ent"> - %isonum; - - <!-- Character entity to provide greek letters in simulation chapter --> - <!ENTITY % isogrk1 PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN//XML" -- "http://www.oasis-open.org/docbook/xmlcharent/0.3/iso-grk1.ent"> -+ "http://www.oasis-open.org/docbook/xml/4.5/ent/isogrk1.ent"> - %isogrk1; - - <!ENTITY legal SYSTEM "legal.xml"> |