[arch-commits] Commit in inkscape/trunk (4 files)

Jan Steffens heftig at archlinux.org
Mon Apr 13 14:57:40 UTC 2020


    Date: Monday, April 13, 2020 @ 14:57:39
  Author: heftig
Revision: 380280

0.92.5-1

Added:
  inkscape/trunk/PKGBUILD
    (from rev 380279, inkscape/trunk/PKGBUILD.cmake)
  inkscape/trunk/python2.diff
Deleted:
  inkscape/trunk/PKGBUILD
  inkscape/trunk/PKGBUILD.cmake

----------------+
 PKGBUILD       |  139 +++++++++++++++++++++++++------------------------------
 PKGBUILD.cmake |   61 ------------------------
 python2.diff   |  123 ++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 188 insertions(+), 135 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-04-13 14:31:11 UTC (rev 380279)
+++ PKGBUILD	2020-04-13 14:57:39 UTC (rev 380280)
@@ -1,74 +0,0 @@
-# Maintainer: Gaetan Bisson <bisson at archlinux.org>
-# Contributor: Tobias Kieslich <tobias at justdreams.de>
-# Contributor: tobias <tobias at archlinux.org>
-
-pkgname=inkscape
-pkgver=0.92.4
-pkgrel=15
-pkgdesc='Professional vector graphics editor'
-url='https://inkscape.org/'
-license=('GPL' 'LGPL')
-arch=('x86_64')
-depends=('gc' 'gsl' 'gtkmm' 'gtkspell' 'libmagick6' 'libxslt' 'poppler-glib'
-         'popt' 'potrace' 'ttf-dejavu' 'python2' 'libcdr'
-         'desktop-file-utils' 'hicolor-icon-theme')
-# python is needed for glib-genmarshal (at least with GLib 2.54)
-makedepends=('boost' 'intltool' 'python')
-optdepends=('gvfs: import clip art'
-            'pstoedit: latex formulas'
-            'python2-scour: optimized SVG output'
-            'texlive-core: latex formulas'
-            'python2-numpy: some extensions'
-            'python2-lxml: some extensions'
-            'python2-scour: some extensions')
-source=("https://media.inkscape.org/dl/resources/file/${pkgname}-${pkgver}.tar.bz2")
-sha256sums=('57ec2da8177b36614a513e2822efd73af721e690f7ddc6bd0a5fbb1525b4515e')
-
-# NB: Some CDN nodes appear to be distributing an outdated version of this file.
-
-prepare() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	./autogen.sh
-
-	sed -i 's|/usr/bin/python\>|/usr/bin/python2|g' cxxtest/*.py
-	sed -i 's|/usr/bin/env python\>|/usr/bin/env python2|g' share/*/{test/,}*.py
-	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
-       # Fix build with poppler 0.71
-        sed -e 's|gTrue|true|g' -e 's|gFalse|false|g' -e 's|GBool|bool|g' -i src/extension/internal/pdfinput/pdf-parser.*
-       # Fix build with poppler 0.72
-        sed -e 's|getCString|c_str|g' -i src/extension/internal/pdfinput/*
-       # Fix build with poppler 0.76
-        sed -e 's|new Lexer(xref, obj)|obj|g' -i src/extension/internal/pdfinput/pdf-parser.cpp
-       # Fix build with poppler 0.82
-        sed -e 's|Unicode \*u|Unicode const *u|g' -i src/extension/internal/pdfinput/*
-       # Fix build with poppler 0.83
-        sed -e 's|(GfxPath|(const GfxPath|g' -e 's|GfxSubpath|const GfxSubpath|g' \
-          -e 's|new GlobalParams()|std::unique_ptr<GlobalParams>(new GlobalParams())|g' \
-          -e 's|new GlobalParams(poppler_datadir)|std::unique_ptr<GlobalParams>(new GlobalParams(poppler_datadir))|g' \
-          -i src/extension/internal/pdfinput/*.cpp
-}
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	export PKG_CONFIG_PATH='/usr/lib/imagemagick6/pkgconfig'
-	export FREETYPE_CONFIG="/usr/bin/pkg-config freetype2"
-
-	./configure \
-		--prefix=/usr \
-		--with-python \
-		--with-perl \
-		--enable-lcms \
-		--enable-poppler-cairo \
-		--disable-strict-build \
-		--disable-dependency-tracking
-	make
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make DESTDIR="${pkgdir}" install
-}

Copied: inkscape/trunk/PKGBUILD (from rev 380279, inkscape/trunk/PKGBUILD.cmake)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-04-13 14:57:39 UTC (rev 380280)
@@ -0,0 +1,65 @@
+# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+# Contributor: Tobias Kieslich <tobias at justdreams.de>
+# Contributor: tobias <tobias at archlinux.org>
+
+pkgname=inkscape
+pkgver=0.92.5
+pkgrel=1
+pkgdesc='Professional vector graphics editor'
+url='https://inkscape.org/'
+license=('GPL' 'LGPL')
+arch=('x86_64')
+depends=(
+	'gc' 'gsl' 'gtkmm' 'gtkspell' 'libmagick6' 'libxslt' 'poppler-glib' 'popt'
+	'potrace' 'ttf-dejavu' 'python2' 'libcdr' 'desktop-file-utils' 'hicolor-icon-theme'
+)
+# python is needed for glib-genmarshal
+makedepends=('boost' 'intltool' 'python' 'cmake')
+optdepends=(
+	'gvfs: import clip art'
+	'pstoedit: latex formulas'
+	'python2-scour: optimized SVG output, some extensions'
+	'texlive-core: latex formulas'
+	'python2-numpy: some extensions'
+	'python2-lxml: some extensions'
+)
+source=(
+	"https://media.inkscape.org/dl/resources/file/${pkgname}-${pkgver}.tar.bz2"
+	python2.diff
+)
+sha256sums=('81ee7f69e2bd64a97343d8395a4a7a7905b21b861566ed5e5d9179178d519a0b'
+            '3b9697236c17ed36756f344ace23e71c1b73537fb9e394b6448b2c13fcca0cc8')
+
+# NB: Some CDN nodes appear to be distributing an outdated version of this file.
+
+prepare() {
+	cd ${pkgname}-${pkgver}
+
+    # Fix python2 shebangs
+	sed -e '1s|python$|&2|' \
+	    -i cxxtest/*.py share/*/{test/,}*.py
+
+	# Non-shebang python2 changes
+	patch -Np1 -i ../python2.diff
+}
+
+build() {
+	export PKG_CONFIG_PATH='/usr/lib/imagemagick6/pkgconfig'
+
+	cmake -H${pkgbase}-${pkgver} -Bbuild \
+		-DCMAKE_BUILD_TYPE=None \
+		-DCMAKE_INSTALL_PREFIX:PATH=/usr \
+		-DINCLUDE_INSTALL_DIR:PATH=/usr/include \
+		-DLIB_INSTALL_DIR:PATH=/usr/lib \
+		-DSYSCONF_INSTALL_DIR:PATH=/etc \
+		-DSHARE_INSTALL_PREFIX:PATH=/usr/share
+	cmake --build build
+}
+
+package() {
+	DESTDIR="${pkgdir}" cmake --build build --target install
+
+	rm "${pkgdir}"/usr/lib/inkscape/*_LIB.a
+}
+
+# vim:set sw=0 noet:

Deleted: PKGBUILD.cmake
===================================================================
--- PKGBUILD.cmake	2020-04-13 14:31:11 UTC (rev 380279)
+++ PKGBUILD.cmake	2020-04-13 14:57:39 UTC (rev 380280)
@@ -1,61 +0,0 @@
-# $Id: PKGBUILD 305444 2017-09-13 20:29:19Z andyrtr $
-# Maintainer: Gaetan Bisson <bisson at archlinux.org>
-# Contributor: Tobias Kieslich <tobias at justdreams.de>
-# Contributor: tobias <tobias at archlinux.org>
-
-pkgname=inkscape
-pkgver=0.92.2
-pkgrel=3
-pkgdesc='Professional vector graphics editor'
-url='https://inkscape.org/'
-license=('GPL' 'LGPL')
-arch=('x86_64')
-makedepends=('boost' 'intltool' 'cmake')
-depends=('gc' 'gsl' 'gtkmm' 'gtkspell' 'imagemagick' 'libxslt' 'poppler-glib'
-         'popt' 'potrace' 'ttf-dejavu' 'python' 'libcdr' 'libvisio' 'libwpg'
-         'desktop-file-utils' 'hicolor-icon-theme')
-optdepends=('gvfs: import clip art'
-            'pstoedit: latex formulas'
-            'scour: optimized SVG output'
-            'texlive-core: latex formulas'
-            'python-numpy: some extensions'
-            'python-lxml: some extensions and filters'
-            'uniconvertor: reading/writing to some proprietary formats')
-source=("https://media.inkscape.org/dl/resources/file/${pkgname}-${pkgver}.tar.bz2"
-        poppler-0.58.patch)
-sha256sums=('a628d0e04c254e9840947e6d866974f92c68ae31631a38b94d9b65e5cd84cfd3'
-            'af6796619a74b392432c72abdb703971fbcaf1c8ff196ce5bb37505914d38f5a')
-
-# NB: Some CDN nodes appear to be distributing an outdated version of this file.
-
-prepare() {
-	cd ${pkgname}-${pkgver}
-
-	mkdir ../build
-
-	# https://gitlab.com/inkscape/inkscape/commit/93ccf03162cd2e46d962822d5507865f3451168c
-	patch -Np1 -i ../poppler-0.58.patch
-}
-
-build() {
-	cd build
-	cmake ../${pkgbase}-${pkgver} \
-	  -DCMAKE_BUILD_TYPE=Release \
-	  -DCMAKE_INSTALL_PREFIX:PATH=/usr \
-	  -DINCLUDE_INSTALL_DIR:PATH=/usr/include \
-	  -DLIB_INSTALL_DIR:PATH=/usr/lib \
-	  -DSYSCONF_INSTALL_DIR:PATH=/etc \
-	  -DSHARE_INSTALL_PREFIX:PATH=/usr/share \
-	  -DCMAKE_ENABLE_LCMS=ON \
-	  -DCMAKE_ENABLE_POPPLER_CAIRO=ON \
-	  -DCMAKE_WITH_NLS=ON
-	make
-}
-
-package() {
-	cd build
-	make DESTDIR="${pkgdir}" install
-
-	# cleanup
-	rm $pkgdir/usr/include/*.a
-}

Added: python2.diff
===================================================================
--- python2.diff	                        (rev 0)
+++ python2.diff	2020-04-13 14:57:39 UTC (rev 380280)
@@ -0,0 +1,123 @@
+diff -u -r inkscape-0.92.5/share/extensions/uniconv-ext.py inkscape-0.92.5-python2/share/extensions/uniconv-ext.py
+--- inkscape-0.92.5/share/extensions/uniconv-ext.py	2020-04-09 21:37:16.000000000 +0000
++++ inkscape-0.92.5-python2/share/extensions/uniconv-ext.py	2020-04-13 13:46:07.038597950 +0000
+@@ -58,7 +58,7 @@
+                      'https://sk1project.net/modules.php?name=Products&product=uniconvertor&op=download\n'+\
+                      'and install into your Inkscape\'s Python location\n'))
+         sys.exit(1)
+-    cmd = 'python -c "import uniconvertor; uniconvertor.uniconv_run()"'
++    cmd = 'python2 -c "import uniconvertor; uniconvertor.uniconv_run()"'
+ 
+ run((cmd+' "%s" "%%s"') % sys.argv[1].replace("%","%%"), "UniConvertor")
+ 
+diff -u -r inkscape-0.92.5/share/extensions/uniconv_output.py inkscape-0.92.5-python2/share/extensions/uniconv_output.py
+--- inkscape-0.92.5/share/extensions/uniconv_output.py	2020-04-09 21:37:16.000000000 +0000
++++ inkscape-0.92.5-python2/share/extensions/uniconv_output.py	2020-04-13 13:46:14.225378534 +0000
+@@ -126,7 +126,7 @@
+                          'https://sk1project.net/modules.php?name=Products&product=uniconvertor&op=download\n'+\
+                          'and install into your Inkscape\'s Python location\n'))
+             sys.exit(1)
+-        cmd = 'python -c "import uniconvertor; uniconvertor.uniconv_run();"'
++        cmd = 'python2 -c "import uniconvertor; uniconvertor.uniconv_run();"'
+ 
+     return cmd
+ 
+diff -u -r inkscape-0.92.5/share/filters/CMakeLists.txt inkscape-0.92.5-python2/share/filters/CMakeLists.txt
+--- inkscape-0.92.5/share/filters/CMakeLists.txt	2020-04-09 21:37:16.000000000 +0000
++++ inkscape-0.92.5-python2/share/filters/CMakeLists.txt	2020-04-13 13:52:42.971451750 +0000
+@@ -1,6 +1,6 @@
+ add_custom_command(
+   OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/filters.svg.h
+-  COMMAND python ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${CMAKE_CURRENT_SOURCE_DIR}/filters.svg > ${CMAKE_CURRENT_SOURCE_DIR}/filters.svg.h
++  COMMAND python2 ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${CMAKE_CURRENT_SOURCE_DIR}/filters.svg > ${CMAKE_CURRENT_SOURCE_DIR}/filters.svg.h
+   MAIN_DEPENDENCY ${CMAKE_CURRENT_SOURCE_DIR}/filters.svg
+   DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py
+ )
+diff -u -r inkscape-0.92.5/share/palettes/CMakeLists.txt inkscape-0.92.5-python2/share/palettes/CMakeLists.txt
+--- inkscape-0.92.5/share/palettes/CMakeLists.txt	2020-04-09 21:37:16.000000000 +0000
++++ inkscape-0.92.5-python2/share/palettes/CMakeLists.txt	2020-04-13 13:52:27.677882059 +0000
+@@ -2,7 +2,7 @@
+ 
+ add_custom_command(
+   OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/palettes.h
+-  COMMAND python ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${I18N_FILES} > ${CMAKE_CURRENT_SOURCE_DIR}/palettes.h
++  COMMAND python2 ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${I18N_FILES} > ${CMAKE_CURRENT_SOURCE_DIR}/palettes.h
+   WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+   DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${I18N_FILES}
+ )
+diff -u -r inkscape-0.92.5/share/patterns/CMakeLists.txt inkscape-0.92.5-python2/share/patterns/CMakeLists.txt
+--- inkscape-0.92.5/share/patterns/CMakeLists.txt	2020-04-09 21:37:16.000000000 +0000
++++ inkscape-0.92.5-python2/share/patterns/CMakeLists.txt	2020-04-13 13:52:30.824597371 +0000
+@@ -1,6 +1,6 @@
+ add_custom_command(
+   OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/patterns.svg.h
+-  COMMAND python ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${CMAKE_CURRENT_SOURCE_DIR}/patterns.svg > ${CMAKE_CURRENT_SOURCE_DIR}/patterns.svg.h
++  COMMAND python2 ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${CMAKE_CURRENT_SOURCE_DIR}/patterns.svg > ${CMAKE_CURRENT_SOURCE_DIR}/patterns.svg.h
+   MAIN_DEPENDENCY ${CMAKE_CURRENT_SOURCE_DIR}/patterns.svg
+   DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py
+ )
+diff -u -r inkscape-0.92.5/share/symbols/CMakeLists.txt inkscape-0.92.5-python2/share/symbols/CMakeLists.txt
+--- inkscape-0.92.5/share/symbols/CMakeLists.txt	2020-04-09 21:37:16.000000000 +0000
++++ inkscape-0.92.5-python2/share/symbols/CMakeLists.txt	2020-04-13 13:52:33.297968934 +0000
+@@ -2,7 +2,7 @@
+ 
+ add_custom_command(
+   OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/symbols.h
+-  COMMAND python ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${_FILES} > ${CMAKE_CURRENT_SOURCE_DIR}/symbols.h
++  COMMAND python2 ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${_FILES} > ${CMAKE_CURRENT_SOURCE_DIR}/symbols.h
+   WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+   DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${_FILES}
+ )
+diff -u -r inkscape-0.92.5/share/templates/CMakeLists.txt inkscape-0.92.5-python2/share/templates/CMakeLists.txt
+--- inkscape-0.92.5/share/templates/CMakeLists.txt	2020-04-09 21:37:16.000000000 +0000
++++ inkscape-0.92.5-python2/share/templates/CMakeLists.txt	2020-04-13 13:52:37.261363522 +0000
+@@ -2,7 +2,7 @@
+ 
+ add_custom_command(
+   OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/templates.h
+-  COMMAND python ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${_FILES} > ${CMAKE_CURRENT_SOURCE_DIR}/templates.h
++  COMMAND python2 ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${_FILES} > ${CMAKE_CURRENT_SOURCE_DIR}/templates.h
+   WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+   DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${_FILES}
+ )
+diff -u -r inkscape-0.92.5/src/extension/implementation/script.cpp inkscape-0.92.5-python2/src/extension/implementation/script.cpp
+--- inkscape-0.92.5/src/extension/implementation/script.cpp	2020-04-13 13:44:57.737495376 +0000
++++ inkscape-0.92.5-python2/src/extension/implementation/script.cpp	2020-04-13 13:45:24.331252716 +0000
+@@ -88,7 +88,7 @@
+         {"python", "python-interpreter", "pythonw" },
+ #else
+         {"perl",   "perl-interpreter",   "perl"   },
+-        {"python", "python-interpreter", "python" },
++        {"python", "python-interpreter", "python2" },
+ #endif
+         {"ruby",   "ruby-interpreter",   "ruby"   },
+         {"shell",  "shell-interpreter",  "sh"     },
+diff -u -r inkscape-0.92.5/src/main.cpp inkscape-0.92.5-python2/src/main.cpp
+--- inkscape-0.92.5/src/main.cpp	2020-04-09 21:37:16.000000000 +0000
++++ inkscape-0.92.5-python2/src/main.cpp	2020-04-13 13:46:56.519380781 +0000
+@@ -569,11 +569,11 @@
+     gchar const *path = g_getenv("PATH");
+     gchar const *pythonpath = g_getenv("PYTHONPATH");
+ 
+-    gchar *python = g_build_filename(exe, "python", NULL);
+-    gchar *scripts = g_build_filename(exe, "python", "Scripts", NULL);
+-    gchar *perl = g_build_filename(exe, "python", NULL);
+-    gchar *pythonlib = g_build_filename(exe, "python", "Lib", NULL);
+-    gchar *pythondll = g_build_filename(exe, "python", "DLLs", NULL);
++    gchar *python = g_build_filename(exe, "python2", NULL);
++    gchar *scripts = g_build_filename(exe, "python2", "Scripts", NULL);
++    gchar *perl = g_build_filename(exe, "python2", NULL);
++    gchar *pythonlib = g_build_filename(exe, "python2", "Lib", NULL);
++    gchar *pythondll = g_build_filename(exe, "python2", "DLLs", NULL);
+ 
+     // Python 2.x needs short paths in PYTHONPATH.
+     // Otherwise it doesn't work when Inkscape is installed in Unicode directories.
+@@ -605,7 +605,7 @@
+     printf("PATH = %s\n\n", g_getenv("PATH"));
+     printf("PYTHONPATH = %s\n\n", g_getenv("PYTHONPATH"));
+ 
+-    gchar *p = g_find_program_in_path("python");
++    gchar *p = g_find_program_in_path("python2");
+     if (p) {
+         printf("python in %s\n\n", p);
+         g_free(p);


More information about the arch-commits mailing list