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

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


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

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

Added:
  gnumeric/repos/extra-i686/PKGBUILD
    (from rev 288100, gnumeric/trunk/PKGBUILD)
  gnumeric/repos/extra-i686/gnumeric-1.12.33-docbook.patch
    (from rev 288100, gnumeric/trunk/gnumeric-1.12.33-docbook.patch)
  gnumeric/repos/extra-i686/revert-warnings.patch
    (from rev 288100, gnumeric/trunk/revert-warnings.patch)
  gnumeric/repos/extra-x86_64/PKGBUILD
    (from rev 288100, gnumeric/trunk/PKGBUILD)
  gnumeric/repos/extra-x86_64/gnumeric-1.12.33-docbook.patch
    (from rev 288100, gnumeric/trunk/gnumeric-1.12.33-docbook.patch)
  gnumeric/repos/extra-x86_64/revert-warnings.patch
    (from rev 288100, gnumeric/trunk/revert-warnings.patch)
Deleted:
  gnumeric/repos/extra-i686/PKGBUILD
  gnumeric/repos/extra-i686/revert-warnings.patch
  gnumeric/repos/extra-x86_64/PKGBUILD
  gnumeric/repos/extra-x86_64/revert-warnings.patch

---------------------------------------------+
 /PKGBUILD                                   |  110 ++++++++++++++++++++++++++
 /revert-warnings.patch                      |   22 +++++
 extra-i686/PKGBUILD                         |   51 ------------
 extra-i686/gnumeric-1.12.33-docbook.patch   |   24 +++++
 extra-i686/revert-warnings.patch            |   11 --
 extra-x86_64/PKGBUILD                       |   51 ------------
 extra-x86_64/gnumeric-1.12.33-docbook.patch |   24 +++++
 extra-x86_64/revert-warnings.patch          |   11 --
 8 files changed, 180 insertions(+), 124 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2017-02-05 20:29:23 UTC (rev 288100)
+++ extra-i686/PKGBUILD	2017-02-05 20:29:29 UTC (rev 288101)
@@ -1,51 +0,0 @@
-# $Id$
-# Maintainer: Eric Belanger <eric at archlinux.org>
-# Contributor: Kritoke <typeolinux at yahoo.com>
-
-pkgname=gnumeric
-pkgver=1.12.32
-pkgrel=1
-pkgdesc="A GNOME Spreadsheet Program"
-arch=('i686' 'x86_64')
-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)
-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
-source=("git://git.gnome.org/gnumeric#commit=$_commit"
-        git://git.gnome.org/gnome-common#commit=6684e2fa5d5a4c72c9bf116f74688c0b47f350cf
-        revert-warnings.patch)
-sha256sums=('SKIP'
-            'SKIP'
-            'bcafca016b809000c2a5bf911e2e3dfa4de28f9e541d9964574cac5c7ce09e53')
-
-pkgver() {
-  cd $pkgname
-  git describe --tags | sed 's/^GNUMERIC_//;s/_/./g;s/-/+/g'
-}
-
-prepare() {
-  cd $pkgname
-  cp ../gnome-common/doc-build/{omf,xmldocs}.make .
-  patch -Np0 -i ../revert-warnings.patch
-  NOCONFIGURE=1 ./autogen.sh
-}
-
-build() {
-  cd $pkgname
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-    --disable-schemas-compile --enable-introspection
-
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-  make
-}
-
-package() {
-  cd $pkgname
-  make DESTDIR="${pkgdir}" install
-}

Copied: gnumeric/repos/extra-i686/PKGBUILD (from rev 288100, gnumeric/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2017-02-05 20:29:29 UTC (rev 288101)
@@ -0,0 +1,55 @@
+# $Id$
+# Maintainer: Eric Belanger <eric at archlinux.org>
+# Contributor: Kritoke <typeolinux at yahoo.com>
+
+pkgname=gnumeric
+pkgver=1.12.33
+pkgrel=1
+pkgdesc="A GNOME Spreadsheet Program"
+arch=('i686' 'x86_64')
+url="http://www.gnome.org/projects/gnumeric/"
+license=('GPL')
+depends=('goffice')
+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=adeb47c32fdfb3400d79809df63f6506c756c7de  # tags/GNUMERIC_1_12_33^0
+source=("git://git.gnome.org/gnumeric#commit=$_commit"
+        revert-warnings.patch
+        gnumeric-1.12.33-docbook.patch)
+sha256sums=('SKIP'
+            'bcafca016b809000c2a5bf911e2e3dfa4de28f9e541d9964574cac5c7ce09e53'
+            'fb3bf7eb30552b7ae75f7b2dca6326b015bd197dd7e8ec43f8e14ab6de2d4d85')
+
+pkgver() {
+  cd $pkgname
+  git describe --tags | sed 's/^GNUMERIC_//;s/_/./g;s/-/+/g'
+}
+
+prepare() {
+  cd $pkgname
+
+  git cherry-pick -n 798755af32c42e395d167d9d49d14cbe449d2842
+
+  patch -Np0 -i ../revert-warnings.patch
+  patch -Np1 -i ../gnumeric-1.12.33-docbook.patch
+
+  NOCONFIGURE=1 ./autogen.sh
+}
+
+build() {
+  cd $pkgname
+  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+    --disable-schemas-compile --enable-introspection
+
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+  make
+}
+
+package() {
+  cd $pkgname
+  make DESTDIR="${pkgdir}" install
+}

Copied: gnumeric/repos/extra-i686/gnumeric-1.12.33-docbook.patch (from rev 288100, gnumeric/trunk/gnumeric-1.12.33-docbook.patch)
===================================================================
--- extra-i686/gnumeric-1.12.33-docbook.patch	                        (rev 0)
+++ extra-i686/gnumeric-1.12.33-docbook.patch	2017-02-05 20:29:29 UTC (rev 288101)
@@ -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">

Deleted: extra-i686/revert-warnings.patch
===================================================================
--- extra-i686/revert-warnings.patch	2017-02-05 20:29:23 UTC (rev 288100)
+++ extra-i686/revert-warnings.patch	2017-02-05 20:29:29 UTC (rev 288101)
@@ -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 288100, gnumeric/trunk/revert-warnings.patch)
===================================================================
--- extra-i686/revert-warnings.patch	                        (rev 0)
+++ extra-i686/revert-warnings.patch	2017-02-05 20:29:29 UTC (rev 288101)
@@ -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	2017-02-05 20:29:23 UTC (rev 288100)
+++ extra-x86_64/PKGBUILD	2017-02-05 20:29:29 UTC (rev 288101)
@@ -1,51 +0,0 @@
-# $Id$
-# Maintainer: Eric Belanger <eric at archlinux.org>
-# Contributor: Kritoke <typeolinux at yahoo.com>
-
-pkgname=gnumeric
-pkgver=1.12.32
-pkgrel=1
-pkgdesc="A GNOME Spreadsheet Program"
-arch=('i686' 'x86_64')
-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)
-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
-source=("git://git.gnome.org/gnumeric#commit=$_commit"
-        git://git.gnome.org/gnome-common#commit=6684e2fa5d5a4c72c9bf116f74688c0b47f350cf
-        revert-warnings.patch)
-sha256sums=('SKIP'
-            'SKIP'
-            'bcafca016b809000c2a5bf911e2e3dfa4de28f9e541d9964574cac5c7ce09e53')
-
-pkgver() {
-  cd $pkgname
-  git describe --tags | sed 's/^GNUMERIC_//;s/_/./g;s/-/+/g'
-}
-
-prepare() {
-  cd $pkgname
-  cp ../gnome-common/doc-build/{omf,xmldocs}.make .
-  patch -Np0 -i ../revert-warnings.patch
-  NOCONFIGURE=1 ./autogen.sh
-}
-
-build() {
-  cd $pkgname
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-    --disable-schemas-compile --enable-introspection
-
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-  make
-}
-
-package() {
-  cd $pkgname
-  make DESTDIR="${pkgdir}" install
-}

Copied: gnumeric/repos/extra-x86_64/PKGBUILD (from rev 288100, gnumeric/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2017-02-05 20:29:29 UTC (rev 288101)
@@ -0,0 +1,55 @@
+# $Id$
+# Maintainer: Eric Belanger <eric at archlinux.org>
+# Contributor: Kritoke <typeolinux at yahoo.com>
+
+pkgname=gnumeric
+pkgver=1.12.33
+pkgrel=1
+pkgdesc="A GNOME Spreadsheet Program"
+arch=('i686' 'x86_64')
+url="http://www.gnome.org/projects/gnumeric/"
+license=('GPL')
+depends=('goffice')
+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=adeb47c32fdfb3400d79809df63f6506c756c7de  # tags/GNUMERIC_1_12_33^0
+source=("git://git.gnome.org/gnumeric#commit=$_commit"
+        revert-warnings.patch
+        gnumeric-1.12.33-docbook.patch)
+sha256sums=('SKIP'
+            'bcafca016b809000c2a5bf911e2e3dfa4de28f9e541d9964574cac5c7ce09e53'
+            'fb3bf7eb30552b7ae75f7b2dca6326b015bd197dd7e8ec43f8e14ab6de2d4d85')
+
+pkgver() {
+  cd $pkgname
+  git describe --tags | sed 's/^GNUMERIC_//;s/_/./g;s/-/+/g'
+}
+
+prepare() {
+  cd $pkgname
+
+  git cherry-pick -n 798755af32c42e395d167d9d49d14cbe449d2842
+
+  patch -Np0 -i ../revert-warnings.patch
+  patch -Np1 -i ../gnumeric-1.12.33-docbook.patch
+
+  NOCONFIGURE=1 ./autogen.sh
+}
+
+build() {
+  cd $pkgname
+  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+    --disable-schemas-compile --enable-introspection
+
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+  make
+}
+
+package() {
+  cd $pkgname
+  make DESTDIR="${pkgdir}" install
+}

Copied: gnumeric/repos/extra-x86_64/gnumeric-1.12.33-docbook.patch (from rev 288100, gnumeric/trunk/gnumeric-1.12.33-docbook.patch)
===================================================================
--- extra-x86_64/gnumeric-1.12.33-docbook.patch	                        (rev 0)
+++ extra-x86_64/gnumeric-1.12.33-docbook.patch	2017-02-05 20:29:29 UTC (rev 288101)
@@ -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">

Deleted: extra-x86_64/revert-warnings.patch
===================================================================
--- extra-x86_64/revert-warnings.patch	2017-02-05 20:29:23 UTC (rev 288100)
+++ extra-x86_64/revert-warnings.patch	2017-02-05 20:29:29 UTC (rev 288101)
@@ -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 288100, gnumeric/trunk/revert-warnings.patch)
===================================================================
--- extra-x86_64/revert-warnings.patch	                        (rev 0)
+++ extra-x86_64/revert-warnings.patch	2017-02-05 20:29:29 UTC (rev 288101)
@@ -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