fix python2 dependencies in favour of python(3) and fix url

2 files changed, 18 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 12a433dd3db6..3c027514eb9f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 pkgbase = inkscape-git
 	pkgdesc = An Open Source vector graphics editor, using SVG file format, from git master
-	pkgver = 1.0+devel.r4321.g083f7eab9b
+	pkgver = 1.0+devel.r4386.g0a5dc27633
 	pkgrel = 1
 	epoch = 1
-	url = https://launchpad.net/inkscape
+	url = https://gitlab.com/inkscape/inkscape
 	arch = i686
 	arch = x86_64
 	license = GPL
@@ -15,7 +15,6 @@ pkgbase = inkscape-git
 	makedepends = gettext
 	makedepends = pango
 	makedepends = python
-	makedepends = python2
 	makedepends = fontconfig
 	depends = double-conversion
 	depends = gc
@@ -33,11 +32,11 @@ pkgbase = inkscape-git
 	depends = gtkspell3
 	depends = libsm
 	depends = libmagick6
-	optdepends = python2-numpy: some extensions
-	optdepends = python2-lxml: some extensions and filters
+	optdepends = python-numpy: some extensions
+	optdepends = python-lxml: some extensions and filters
 	optdepends = uniconvertor: reading/writing to some proprietary formats
 	optdepends = ruby: for simplepath extension
-	optdepends = imagemagick6: for some file conversions
+	optdepends = imagemagick: for some file conversions
 	provides = inkscape
 	conflicts = inkscape
 	options = !libtool
diff --git a/PKGBUILD b/PKGBUILD
index 2bbcb038870c..f35a47f3a2c1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,26 +2,26 @@
 # Maintainer: Stefan Husmann <stefan-husmann@t-online.de>
 
 pkgname=inkscape-git
-pkgver=1.0+devel.r4321.g083f7eab9b
+pkgver=1.0+devel.r4386.g0a5dc27633
 pkgrel=1
 epoch=1
 pkgdesc="An Open Source vector graphics editor, using SVG file format, from git master"
-url="https://launchpad.net/inkscape"
+url="https://gitlab.com/inkscape/inkscape"
 arch=('i686' 'x86_64')
 license=('GPL' 'LGPL')
 depends=('double-conversion' 'gc' 'poppler-glib' 'libxslt' 'gsl' 'libyaml' 'potrace' 'gdl>=3.8.0.25'
 	 'gtkmm3' 'libcdr' 'libvisio' 'dbus-glib' 'jemalloc' 'gtkspell3' 'libsm'
 	 'libmagick6')
-optdepends=('python2-numpy: some extensions'
-            'python2-lxml: some extensions and filters'
+optdepends=('python-numpy: some extensions'
+            'python-lxml: some extensions and filters'
             'uniconvertor: reading/writing to some proprietary formats'
 	    'ruby: for simplepath extension'
-	    'imagemagick6: for some file conversions')
-makedepends=('cmake' 'boost' 'intltool' 'git' 'gettext' 'pango' 'python' 'python2' 'fontconfig')
+	    'imagemagick: for some file conversions')
+makedepends=('cmake' 'boost' 'intltool' 'git' 'gettext' 'pango' 'python' 'fontconfig')
 provides=('inkscape')
 conflicts=('inkscape')
 options=('!libtool' '!buildflags')
-source=('inkscape.git::git+https://gitlab.com/inkscape/inkscape')
+source=("inkscape.git::git+$url")
 sha1sums=('SKIP')
 _gitname="inkscape.git"
 
@@ -30,12 +30,12 @@ pkgver() {
   printf %s.%s+devel.r%s.g%s $(grep -oP -e "INKSCAPE_VERSION_(MAJOR|MINOR) +\K[0-9]+" CMakeLists.txt) $(git rev-list $(git describe --tag --abbrev=0)..HEAD --count) $(git log --pretty=format:'%h' -n 1)
 }
 
-prepare() {
-  cd "$_gitname"
-  find share -type f -name "*.py" -exec \
-       sed -i '1s|/usr/bin/env python\>|/usr/bin/env python2|g' {} \;
-  sed -i 's|"python" },|"python2" },|g' src/extension/implementation/script.cpp
-}
+#prepare() {
+#  cd "$_gitname"
+#  find share -type f -name "*.py" -exec \
+#       sed -i '1s|/usr/bin/env python\>|/usr/bin/env python2|g' {} \;
+#  sed -i 's|"python" },|"python2" },|g' src/extension/implementation/script.cpp
+#}
 
 build() {
   cd "$_gitname"