[arch-commits] Commit in inkscape/trunk (PKGBUILD PKGBUILD-1.0rc1 python2.diff)
Gaëtan Bisson
bisson at archlinux.org
Sat May 2 07:14:38 UTC 2020
Date: Saturday, May 2, 2020 @ 07:14:38
Author: bisson
Revision: 382125
upstream update
Modified:
inkscape/trunk/PKGBUILD
Deleted:
inkscape/trunk/PKGBUILD-1.0rc1
inkscape/trunk/python2.diff
-----------------+
PKGBUILD | 72 ++++++++++++++++---------------
PKGBUILD-1.0rc1 | 65 ----------------------------
python2.diff | 123 ------------------------------------------------------
3 files changed, 38 insertions(+), 222 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2020-05-02 06:52:02 UTC (rev 382124)
+++ PKGBUILD 2020-05-02 07:14:38 UTC (rev 382125)
@@ -3,63 +3,67 @@
# Contributor: tobias <tobias at archlinux.org>
pkgname=inkscape
-pkgver=0.92.5
-pkgrel=2
+pkgver=1.0
+_commit=4035a4fb499b37632e8788731a2d3425d5a6bc2a
+pkgrel=1
pkgdesc='Professional vector graphics editor'
url='https://inkscape.org/'
license=('GPL' 'LGPL')
arch=('x86_64')
+makedepends=('cmake' 'boost' 'git')
+
depends=(
- 'gc' 'gsl' 'gtkmm' 'gtkspell' 'libmagick6' 'libxslt' 'poppler-glib' 'popt'
- 'potrace' 'ttf-dejavu' 'python2' 'libcdr' 'desktop-file-utils' 'hicolor-icon-theme'
+ 'dbus-glib'
+ 'double-conversion'
+ 'gc'
+ 'gdl'
+ 'gsl'
+ 'gtkmm3'
+ 'gtkspell3'
+ 'libcdr'
+ 'libjpeg-turbo'
+ 'libmagick6'
+ 'libvisio'
+ 'libxslt'
+ 'poppler-glib'
+ 'potrace'
+ 'python'
+ 'ttf-dejavu'
)
-# 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'
+ 'python-lxml: some extensions'
+ 'python-numpy: some extensions'
+ '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.
+#source=("https://media.inkscape.org/dl/resources/file/${pkgname}-${pkgver}.tar.bz2")
+source=("git+https://gitlab.com/inkscape/inkscape.git#commit=${_commit}")
+sha256sums=('SKIP')
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
+ cd "${srcdir}"
+ cd "${pkgname}"
+ git submodule init
+ git submodule update
}
build() {
+ cd "${srcdir}"
+ mkdir -p build
export PKG_CONFIG_PATH='/usr/lib/imagemagick6/pkgconfig'
-
- cmake -H${pkgbase}-${pkgver} -Bbuild \
+ cmake -H${pkgname} -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
+ -DWITH_DBUS=ON \
+
cmake --build build
}
package() {
+ cd "${srcdir}"
DESTDIR="${pkgdir}" cmake --build build --target install
-
- rm "${pkgdir}"/usr/lib/inkscape/*_LIB.a
}
-
-# vim:set sw=0 noet:
Deleted: PKGBUILD-1.0rc1
===================================================================
--- PKGBUILD-1.0rc1 2020-05-02 06:52:02 UTC (rev 382124)
+++ PKGBUILD-1.0rc1 2020-05-02 07:14:38 UTC (rev 382125)
@@ -1,65 +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=1.0rc1
-_magic=18046
-_fullver=inkscape-1.0rc1_2020-04-09_09960d6f05
-pkgrel=1
-pkgdesc='Professional vector graphics editor'
-url='https://inkscape.org/'
-license=('GPL' 'LGPL')
-arch=('x86_64')
-makedepends=('cmake' 'boost')
-
-depends=(
- 'dbus-glib'
- 'double-conversion'
- 'gc'
- 'gdl'
- 'gsl'
- 'gtkmm3'
- 'gtkspell3'
- 'libcdr'
- 'libjpeg-turbo'
- 'libmagick6'
- 'libvisio'
- 'libxslt'
- 'poppler-glib'
- 'potrace'
- 'python'
- 'ttf-dejavu'
-)
-
-optdepends=(
- 'gvfs: import clip art'
- 'pstoedit: latex formulas'
- 'python-lxml: some extensions'
- 'python-numpy: some extensions'
- 'scour: optimized SVG output, some extensions'
- 'texlive-core: latex formulas'
-)
-
-#source=("https://media.inkscape.org/dl/resources/file/${pkgname}-${pkgver}.tar.bz2")
-source=("https://inkscape.org/gallery/item/${_magic}/${_fullver}.tar.xz")
-sha256sums=('e0ddad9c7281744318f4ff02f98c62b400a6a96dad17885bd211dec1ca732432')
-
-build() {
- mkdir -p build
- export PKG_CONFIG_PATH='/usr/lib/imagemagick6/pkgconfig'
- cmake -H${_fullver} -Bbuild \
- -DCMAKE_BUILD_TYPE=None \
- -DCMAKE_INSTALL_PREFIX:PATH=/usr \
- -DSHARE_INSTALL_PREFIX:PATH=/usr/share \
- -DINCLUDE_INSTALL_DIR:PATH=/usr/include \
- -DSYSCONF_INSTALL_DIR:PATH=/etc \
- -DLIB_INSTALL_DIR:PATH=/usr/lib \
- -DWITH_DBUS=ON \
-
- cmake --build build
-}
-
-package() {
- DESTDIR="${pkgdir}" cmake --build build --target install
-}
Deleted: python2.diff
===================================================================
--- python2.diff 2020-05-02 06:52:02 UTC (rev 382124)
+++ python2.diff 2020-05-02 07:14:38 UTC (rev 382125)
@@ -1,123 +0,0 @@
-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