From f026c5cffa2f2938542ffd58db597425842d354b Mon Sep 17 00:00:00 2001
From: Weng Xuetian <wengxt@gmail.com>
Date: Wed, 31 Jan 2018 02:44:59 +0000
Subject: [PATCH] [staging] rebuild inkscape

---
 inkscape/PKGBUILD | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/inkscape/PKGBUILD b/inkscape/PKGBUILD
index 80748e71..d9d6ef67 100644
--- a/inkscape/PKGBUILD
+++ b/inkscape/PKGBUILD
@@ -2,22 +2,24 @@
 
 pkgname=inkscape
 pkgver=0.92.2
-pkgrel=3
-pkgdesc='Vector graphics editor using the SVG file format'
-url='http://inkscape.sourceforge.net/'
+pkgrel=4
+pkgdesc='Professional vector graphics editor'
+url='https://inkscape.org/'
 license=('GPL' 'LGPL')
 arch=('x86_64')
-makedepends=('boost' 'intltool')
 depends=('gc' 'gsl' 'gtkmm' 'gtkspell' 'imagemagick' 'libxslt' 'poppler-glib'
          'popt' 'potrace' 'ttf-dejavu' 'python2' 'desktop-file-utils'
          'hicolor-icon-theme')
+# python is needed for glib-genmarshal (at least with GLib 2.54)
+makedepends=('boost' 'intltool' 'python3')
 optdepends=('pstoedit: latex formulas'
+            'python2-scour: optimized SVG output'
             'texlive-core: latex formulas'
             'python2-numpy: some extensions'
             'python2-lxml: some extensions and filters'
             'uniconvertor: reading/writing to some proprietary formats')
-source=("https://inkscape.global.ssl.fastly.net/media/resources/file/$pkgname-$pkgver.tar.bz2"
-            poppler-0.58.patch)
+source=("https://media.inkscape.org/dl/resources/file/${pkgname}-${pkgver}.tar.bz2"
+        poppler-0.58.patch)
 sha256sums=('a628d0e04c254e9840947e6d866974f92c68ae31631a38b94d9b65e5cd84cfd3'
             '0505f49cf69ad51159cda5aa5f497f001fe9d10f34d59e6ad704a1b1e1dc50c1')
 
@@ -25,7 +27,7 @@ prepare() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 	# https://gitlab.com/inkscape/inkscape/commit/93ccf03162cd2e46d962822d5507865f3451168c
 	patch -Np1 -i ../poppler-0.58.patch
-	
+
 	./autogen.sh
 
 	sed -i 's|/usr/bin/python\>|/usr/bin/python2|g' cxxtest/*.py
@@ -33,7 +35,7 @@ prepare() {
 	sed -i 's|"python" },|"python2" },|g' src/extension/implementation/script.cpp
 	sed -i 's|python -c|python2 -c|g' configure share/extensions/uniconv*.py
 	sed -i 's|"python"|"python2"|g' src/main.cpp
-	
+
 	sed -i 's| abs(| std::fabs(|g' src/ui/tools/flood-tool.cpp
 }
 
@@ -45,7 +47,7 @@ build() {
 		--with-perl \
 		--enable-lcms \
 		--enable-poppler-cairo \
-                --disable-strict-build \
+		--disable-strict-build \
 		--disable-dependency-tracking
 	make
 }
-- 
GitLab