[arch-commits] Commit in gnumeric/trunk (PKGBUILD gnumeric-1.12.33-docbook.patch)

Jan de Groot jgc at archlinux.org
Sun Feb 5 20:29:24 UTC 2017


    Date: Sunday, February 5, 2017 @ 20:29:23
  Author: jgc
Revision: 288100

upgpkg: gnumeric 1.12.33-1

Added:
  gnumeric/trunk/gnumeric-1.12.33-docbook.patch
Modified:
  gnumeric/trunk/PKGBUILD

--------------------------------+
 PKGBUILD                       |   22 +++++++++++++---------
 gnumeric-1.12.33-docbook.patch |   24 ++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-02-05 19:48:44 UTC (rev 288099)
+++ PKGBUILD	2017-02-05 20:29:23 UTC (rev 288100)
@@ -3,7 +3,7 @@
 # Contributor: Kritoke <typeolinux at yahoo.com>
 
 pkgname=gnumeric
-pkgver=1.12.32
+pkgver=1.12.33
 pkgrel=1
 pkgdesc="A GNOME Spreadsheet Program"
 arch=('i686' 'x86_64')
@@ -10,19 +10,19 @@
 url="http://www.gnome.org/projects/gnumeric/"
 license=('GPL')
 depends=('goffice')
-makedepends=('intltool' 'psiconv' 'pygobject-devel'
-             'gobject-introspection' 'rarian' 'python2-gobject' gtk-doc autoconf-archive git)
+makedepends=('intltool' 'psiconv' 'pygobject-devel' docbook-xml
+             'gobject-introspection' 'python2-gobject' gtk-doc autoconf-archive git yelp-tools)
 optdepends=('python2-gobject: for python plugin support'
             'perl: for perl plugin support'
             'psiconv: for Psion 5 file support'
             'yelp: for viewing the help manual')
-_commit=0e34331361ac41a5f09ed10f4df26861be4f1160  # tags/GNUMERIC_1_12_32^0
+_commit=adeb47c32fdfb3400d79809df63f6506c756c7de  # tags/GNUMERIC_1_12_33^0
 source=("git://git.gnome.org/gnumeric#commit=$_commit"
-        git://git.gnome.org/gnome-common#commit=6684e2fa5d5a4c72c9bf116f74688c0b47f350cf
-        revert-warnings.patch)
+        revert-warnings.patch
+        gnumeric-1.12.33-docbook.patch)
 sha256sums=('SKIP'
-            'SKIP'
-            'bcafca016b809000c2a5bf911e2e3dfa4de28f9e541d9964574cac5c7ce09e53')
+            'bcafca016b809000c2a5bf911e2e3dfa4de28f9e541d9964574cac5c7ce09e53'
+            'fb3bf7eb30552b7ae75f7b2dca6326b015bd197dd7e8ec43f8e14ab6de2d4d85')
 
 pkgver() {
   cd $pkgname
@@ -31,8 +31,12 @@
 
 prepare() {
   cd $pkgname
-  cp ../gnome-common/doc-build/{omf,xmldocs}.make .
+
+  git cherry-pick -n 798755af32c42e395d167d9d49d14cbe449d2842
+
   patch -Np0 -i ../revert-warnings.patch
+  patch -Np1 -i ../gnumeric-1.12.33-docbook.patch
+
   NOCONFIGURE=1 ./autogen.sh
 }
 

Added: gnumeric-1.12.33-docbook.patch
===================================================================
--- gnumeric-1.12.33-docbook.patch	                        (rev 0)
+++ gnumeric-1.12.33-docbook.patch	2017-02-05 20:29:23 UTC (rev 288100)
@@ -0,0 +1,24 @@
+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">



More information about the arch-commits mailing list