[arch-commits] Commit in gramps/trunk (PKGBUILD ignore_intltool_errors.patch)

[Jelle van der Waa]

    Date: Sunday, September 20, 2015 @ 18:02:04
  Author: jelle
Revision: 141299

upgpkg: gramps 2:4.2.0-1

python 3.5 rebuild && update to 4.2.0

Added:
  gramps/trunk/ignore_intltool_errors.patch
Modified:
  gramps/trunk/PKGBUILD

------------------------------+
 PKGBUILD                     |   12 +++++++++---
 ignore_intltool_errors.patch |   12 ++++++++++++
 2 files changed, 21 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-09-20 15:37:17 UTC (rev 141298)
+++ PKGBUILD	2015-09-20 16:02:04 UTC (rev 141299)
@@ -5,7 +5,7 @@
 # Contributor: György Balló <ballogy at freestart.hu>
 
 pkgname=gramps
-pkgver=4.1.3
+pkgver=4.2.0
 pkgrel=1
 epoch=2
 pkgdesc="A genealogy program, which helps you track your family tree"
@@ -26,9 +26,15 @@
 #	    'python-pyicu: improves localised sorting'
 #	    'webkitgtk: allows websites to be opened in Gramps'
 install=$pkgname.install
-source=(http://downloads.sourceforge.net/project/gramps/Stable/$pkgver/gramps-$pkgver.tar.gz)
-md5sums=('d9dd8e7cbd97b6275ecbec8d3cd7b21a')
+source=(http://downloads.sourceforge.net/project/gramps/Stable/$pkgver/gramps-$pkgver.tar.gz ignore_intltool_errors.patch)
+md5sums=('2c59c91166740311ce15af4b0b5229e1'
+         '64af41dab4d7fe4765a9d48f27b20350')
 
+prepare() {
+  cd "$srcdir/$pkgname-$pkgver"
+  patch -Np1 -i $srcdir/ignore_intltool_errors.patch
+}
+
 build() {
   cd "$srcdir/$pkgname-$pkgver"
   python setup.py build

Added: ignore_intltool_errors.patch
===================================================================
--- ignore_intltool_errors.patch	                        (rev 0)
+++ ignore_intltool_errors.patch	2015-09-20 16:02:04 UTC (rev 141299)
@@ -0,0 +1,12 @@
+diff -aur gramps-4.2.0/setup.py gramps-4.2.0.new/setup.py
+--- gramps-4.2.0/setup.py	2015-07-29 20:53:06.000000000 +0200
++++ gramps-4.2.0.new/setup.py	2015-09-20 17:58:17.035215951 +0200
+@@ -91,7 +91,7 @@
+         except:
+             return (0,0,0)
+     else:
+-        cmd = 'intltool-update --version | head -1 | cut -d" " -f3'
++        cmd = 'intltool-update --version 2> /dev/null | head -1 | cut -d" " -f3'
+         retcode, version_str = subprocess.getstatusoutput(cmd)
+         if retcode != 0:
+             return None