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

Jan de Groot jgc at archlinux.org
Thu Oct 20 13:58:56 UTC 2016


    Date: Thursday, October 20, 2016 @ 13:58:56
  Author: jgc
Revision: 279044

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

Added:
  gnumeric/repos/extra-i686/PKGBUILD
    (from rev 279043, gnumeric/trunk/PKGBUILD)
  gnumeric/repos/extra-i686/revert-warnings.patch
    (from rev 279043, gnumeric/trunk/revert-warnings.patch)
  gnumeric/repos/extra-x86_64/PKGBUILD
    (from rev 279043, gnumeric/trunk/PKGBUILD)
  gnumeric/repos/extra-x86_64/revert-warnings.patch
    (from rev 279043, 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                          |  102 +++++++++++++++++++++++++++++++++++
 /revert-warnings.patch             |   22 +++++++
 extra-i686/PKGBUILD                |   47 ----------------
 extra-i686/revert-warnings.patch   |   11 ---
 extra-x86_64/PKGBUILD              |   47 ----------------
 extra-x86_64/revert-warnings.patch |   11 ---
 6 files changed, 124 insertions(+), 116 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2016-10-20 13:58:50 UTC (rev 279043)
+++ extra-i686/PKGBUILD	2016-10-20 13:58:56 UTC (rev 279044)
@@ -1,47 +0,0 @@
-# $Id$
-# Maintainer: Eric Belanger <eric at archlinux.org>
-# Contributor: Kritoke <typeolinux at yahoo.com>
-
-pkgname=gnumeric
-pkgver=1.12.31
-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')
-optdepends=('python2-gobject: for python plugin support'
-            'perl: for perl plugin support'
-            'psiconv: for Psion 5 file support'
-            'yelp: for viewing the help manual')
-source=(https://download.gnome.org/sources/${pkgname}/${pkgver:0:4}/${pkgname}-${pkgver}.tar.xz
-        revert-warnings.patch)
-sha256sums=('c8ace78e75c280dced3f15b27c44c7a98e8d21cd8361c6b2599cce191f6d6ae7'
-            'bcafca016b809000c2a5bf911e2e3dfa4de28f9e541d9964574cac5c7ce09e53')
-
-prepare() {
-  cd $pkgname-$pkgver
-
-  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
-}
-
-build() {
-  cd $pkgname-$pkgver
-  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-$pkgver
-  make DESTDIR="${pkgdir}" install
-}

Copied: gnumeric/repos/extra-i686/PKGBUILD (from rev 279043, gnumeric/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2016-10-20 13:58:56 UTC (rev 279044)
@@ -0,0 +1,51 @@
+# $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
+}

Deleted: extra-i686/revert-warnings.patch
===================================================================
--- extra-i686/revert-warnings.patch	2016-10-20 13:58:50 UTC (rev 279043)
+++ extra-i686/revert-warnings.patch	2016-10-20 13:58:56 UTC (rev 279044)
@@ -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 279043, gnumeric/trunk/revert-warnings.patch)
===================================================================
--- extra-i686/revert-warnings.patch	                        (rev 0)
+++ extra-i686/revert-warnings.patch	2016-10-20 13:58:56 UTC (rev 279044)
@@ -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	2016-10-20 13:58:50 UTC (rev 279043)
+++ extra-x86_64/PKGBUILD	2016-10-20 13:58:56 UTC (rev 279044)
@@ -1,47 +0,0 @@
-# $Id$
-# Maintainer: Eric Belanger <eric at archlinux.org>
-# Contributor: Kritoke <typeolinux at yahoo.com>
-
-pkgname=gnumeric
-pkgver=1.12.31
-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')
-optdepends=('python2-gobject: for python plugin support'
-            'perl: for perl plugin support'
-            'psiconv: for Psion 5 file support'
-            'yelp: for viewing the help manual')
-source=(https://download.gnome.org/sources/${pkgname}/${pkgver:0:4}/${pkgname}-${pkgver}.tar.xz
-        revert-warnings.patch)
-sha256sums=('c8ace78e75c280dced3f15b27c44c7a98e8d21cd8361c6b2599cce191f6d6ae7'
-            'bcafca016b809000c2a5bf911e2e3dfa4de28f9e541d9964574cac5c7ce09e53')
-
-prepare() {
-  cd $pkgname-$pkgver
-
-  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
-}
-
-build() {
-  cd $pkgname-$pkgver
-  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-$pkgver
-  make DESTDIR="${pkgdir}" install
-}

Copied: gnumeric/repos/extra-x86_64/PKGBUILD (from rev 279043, gnumeric/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2016-10-20 13:58:56 UTC (rev 279044)
@@ -0,0 +1,51 @@
+# $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
+}

Deleted: extra-x86_64/revert-warnings.patch
===================================================================
--- extra-x86_64/revert-warnings.patch	2016-10-20 13:58:50 UTC (rev 279043)
+++ extra-x86_64/revert-warnings.patch	2016-10-20 13:58:56 UTC (rev 279044)
@@ -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 279043, gnumeric/trunk/revert-warnings.patch)
===================================================================
--- extra-x86_64/revert-warnings.patch	                        (rev 0)
+++ extra-x86_64/revert-warnings.patch	2016-10-20 13:58:56 UTC (rev 279044)
@@ -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