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

[Balló György]

    Date: Saturday, January 20, 2018 @ 19:25:14
  Author: bgyorgy
Revision: 284404

upgpkg: gramps 2:4.2.6-2

Adopt the package, fix dependencies

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-01-20 19:24:38 UTC (rev 284403)
+++ PKGBUILD	2018-01-20 19:25:14 UTC (rev 284404)
@@ -1,40 +1,37 @@
 # $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Maintainer: William Rea <sillywilly at gmail.com>
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: William Rea <sillywilly at gmail.com>
 # Contributor: Cory Farmer <rbgkofi at ameritech.net>
 # Contributor: György Balló <ballogy at freestart.hu>
 
 pkgname=gramps
+pkgver=4.2.6
+pkgrel=2
 epoch=2
-pkgver=4.2.6
-pkgrel=1
-pkgdesc="A genealogy program, which helps you track your family tree"
+pkgdesc="Genealogy program, which helps you track your family tree"
 arch=('any')
-url="http://gramps-project.org/"
+url="https://gramps-project.org/"
 license=('GPL')
-depends=('goocanvas' 'gtk3' 'python-gobject' 'librsvg' 'xdg-utils' 
-	 'python-bsddb' 'desktop-file-utils'
-	 'shared-mime-info' 'python-cairo')
+depends=('gtk3' 'python-bsddb' 'python-cairo' 'python-gobject' 'xdg-utils')
 makedepends=('intltool')
-optdepends=('graphviz: enable creation of graphs (required for tree reports)'
-	    'gtkspell3: enable spell checking in the notes'
-	    'rcs: manage multiple revisions of your family trees'
-	    'python-pillow: crop and convert images to JPG'
-	    'libgexiv2: manage Exif metadata embedded in your media'
-	    'python-pyicu: improves localised sorting'
-	    'osm-gps-map: Geography feature'
-	    'ttf-freefont: more font support in the reports')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/gramps-project/gramps/archive/v$pkgver.tar.gz")
+optdepends=('osm-gps-map: show maps in the geography view'
+            'graphviz: enable creation of graphs (required for tree reports)'
+            'python-pyicu: improves localised sorting'
+            'gtkspell3: enable spell checking in the notes'
+            'rcs: manage multiple revisions of your family trees'
+            'python-pillow: crop and convert images to JPG'
+            'libgexiv2: manage Exif metadata embedded in your media')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/gramps-project/$pkgname/archive/v$pkgver.tar.gz")
 sha256sums=('6f6f2afe745179e2e66f216f25ca2ba4bf4d5f6bd3b553bbb2946df0636a0bed')
 
 build() {
-  cd "$srcdir/gramps-$pkgver"
-  python setup.py build
+  cd $pkgname-$pkgver
+  python3 setup.py build
 }
 
 package() {
-_pyver=`pacman -Q python | cut -f2 -d' ' | cut -f1,2 -d.`
-  cd "$srcdir/gramps-$pkgver"
-  python setup.py install --root="$pkgdir"
-  echo -n '/usr/share' >"$pkgdir"/usr/lib/python${_pyver}/site-packages/gramps/gen/utils/resource-path
+  cd $pkgname-$pkgver
+  python3 setup.py install --root "$pkgdir" --optimize=1
+  echo -n '/usr/share' >"$pkgdir"/usr/lib/python*/site-packages/gramps/gen/utils/resource-path
 }

Deleted: ignore_intltool_errors.patch
===================================================================
--- ignore_intltool_errors.patch	2018-01-20 19:24:38 UTC (rev 284403)
+++ ignore_intltool_errors.patch	2018-01-20 19:25:14 UTC (rev 284404)
@@ -1,12 +0,0 @@
-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