* [PR PATCH] inkscape: update to 1.0.
@ 2020-05-04 21:02 Gottox
2020-05-04 22:10 ` q66
` (6 more replies)
0 siblings, 7 replies; 8+ messages in thread
From: Gottox @ 2020-05-04 21:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 312 bytes --]
There is a new pull request by Gottox against master on the void-packages repository
https://github.com/Gottox/void-packages inkscape-1.0
https://github.com/void-linux/void-packages/pull/21629
inkscape: update to 1.0.
A patch file from https://github.com/void-linux/void-packages/pull/21629.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-inkscape-1.0-21629.patch --]
[-- Type: text/x-diff, Size: 5120 bytes --]
From 388d885d9e57f5f8e9d0ac5967c2e472f208482d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Mon, 4 May 2020 22:14:52 +0200
Subject: [PATCH] inkscape: update to 1.0.
---
.../patches/fix-invalid-nullptr.patch | 13 +++++++
srcpkgs/inkscape/patches/use-python2.patch | 12 ------
srcpkgs/inkscape/template | 37 +++++++++++--------
3 files changed, 34 insertions(+), 28 deletions(-)
create mode 100644 srcpkgs/inkscape/patches/fix-invalid-nullptr.patch
delete mode 100644 srcpkgs/inkscape/patches/use-python2.patch
diff --git a/srcpkgs/inkscape/patches/fix-invalid-nullptr.patch b/srcpkgs/inkscape/patches/fix-invalid-nullptr.patch
new file mode 100644
index 00000000000..01599711a88
--- /dev/null
+++ b/srcpkgs/inkscape/patches/fix-invalid-nullptr.patch
@@ -0,0 +1,13 @@
+--- src/extension/effect.cpp.orig 2019-12-03 18:54:18.521689345 +0100
++++ src/extension/effect.cpp 2019-12-03 18:53:57.485477512 +0100
+@@ -38,8 +38,8 @@ Effect::Effect (Inkscape::XML::Node *in_
+ : Extension(in_repr, in_imp, base_directory)
+ , _id_noprefs(Glib::ustring(get_id()) + ".noprefs")
+ , _name_noprefs(Glib::ustring(_(get_name())) + _(" (No preferences)"))
+- , _verb(get_id(), get_name(), nullptr, nullptr, this, true)
+- , _verb_nopref(_id_noprefs.c_str(), _name_noprefs.c_str(), nullptr, nullptr, this, false)
++ , _verb(get_id(), get_name(), "", nullptr, this, true)
++ , _verb_nopref(_id_noprefs.c_str(), _name_noprefs.c_str(), "", nullptr, this, false)
+ , _menu_node(nullptr), _workingDialog(true)
+ , _prefDialog(nullptr)
+ {
diff --git a/srcpkgs/inkscape/patches/use-python2.patch b/srcpkgs/inkscape/patches/use-python2.patch
deleted file mode 100644
index 1b69dfa487f..00000000000
--- a/srcpkgs/inkscape/patches/use-python2.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/extension/implementation/script.cpp.orig
-+++ src/extension/implementation/script.cpp
-@@ -88,7 +88,7 @@
- #ifdef WIN32
- {"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 --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template
index 45522048afc..129d8663803 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -1,29 +1,34 @@
# Template file for 'inkscape'
pkgname=inkscape
-version=0.92.5
+version=1.0
revision=1
wrksrc="${pkgname}-INKSCAPE_${version//./_}"
build_style=cmake
-configure_args="--enable-lcms --enable-poppler-cairo
- --without-gnome-vfs --disable-static --disable-strict-build"
-hostmakedepends="pkg-config libtool intltool gettext-devel glib-devel tar which xz"
-makedepends="popt-devel libpng-devel gsl-devel gc-devel gtkmm2-devel libxslt-devel
- lcms2-devel poppler-glib-devel boost-devel libmagick6-devel
- libvisio-devel libwpg-devel libcdr-devel dbus-glib-devel libgomp-devel
- potrace-devel cairomm-devel"
-depends="desktop-file-utils hicolor-icon-theme python-lxml python-numpy python-scour"
+python_version=3
+hostmakedepends="automake pkg-config libtool intltool gettext-devel
+ glib-devel perl-XML-Parser tar which xz"
+makedepends="harfbuzz-devel libsoup-devel gsl-devel pango-devel double-conversion-devel gc-devel libwpd-devel libcdr-devel libvisio-devel poppler-devel libwpd-devel potrace-devel gtkmm-devel gdl-devel gtkspell3-devel aspell-devel libxslt-devel libgomp-devel libwpg-devel poppler-glib-devel"
+depends="desktop-file-utils hicolor-icon-theme python3-lxml python3-numpy python3-scour"
short_desc="Vector-based drawing program"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-only, LGPL-2.1-or-later"
homepage="http://inkscape.org/"
-distfiles="https://gitlab.com/inkscape/inkscape/-/archive/INKSCAPE_${version//./_}/inkscape-INKSCAPE_${version//./_}.tar.bz2"
-checksum=de5de2376585a6b77488eea5d94511c260f561d7477d08afc5edbbea99fee602
-python_version=2 #unverified
-
-# Use c++11 mode and reduce log spam due to gcc6 warnings
-CXXFLAGS="-std=c++11 -Wno-deprecated -Wno-deprecated-declarations -Wno-deprecated-copy"
-CXXFLAGS+=" -Wno-parentheses -Wno-misleading-indentation -Wno-cast-align"
+_extension_rev=7099a364be65e17a76c0d9b7961232788d427d73
+distfiles="https://gitlab.com/inkscape/inkscape/-/archive/INKSCAPE_${version//./_}/inkscape-INKSCAPE_${version//./_}.tar.bz2
+ https://gitlab.com/inkscape/extensions/-/archive/${_extension_rev}/extensions-${_extension_rev}.tar.bz2"
+checksum="673a1d8dfff4993917ac560d73ded4cab6edf8360cb97b99703658b14c03031f
+ 11d573e30d4b0c821e9c59a524c9f98b935dcfdad979066cc65fdf111cf116fe"
case "$XBPS_TARGET_MACHINE" in
arm*|aarch64*) makedepends+=" libatomic_ops-devel" ;;
esac
+
+pre_configure() {
+ rm -r share/extensions || true
+ cp -r ../extensions-${_extension_rev} share/extensions
+
+ case "$XBPS_TARGET_MACHINE" in
+ *-musl) vsed -e "/-Werror=format/d" \
+ -i CMakeScripts/DefineDependsandFlags.cmake ;;
+ esac
+}
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: inkscape: update to 1.0.
2020-05-04 21:02 [PR PATCH] inkscape: update to 1.0 Gottox
@ 2020-05-04 22:10 ` q66
2020-05-05 7:17 ` [PR PATCH] [Updated] " Gottox
` (5 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: q66 @ 2020-05-04 22:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1473 bytes --]
New comment by q66 on void-packages repository
https://github.com/void-linux/void-packages/pull/21629#issuecomment-623734596
Comment:
here:
```
diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template
index 129d866380..cd322cfafa 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -4,7 +4,6 @@ version=1.0
revision=1
wrksrc="${pkgname}-INKSCAPE_${version//./_}"
build_style=cmake
-python_version=3
hostmakedepends="automake pkg-config libtool intltool gettext-devel
glib-devel perl-XML-Parser tar which xz"
makedepends="harfbuzz-devel libsoup-devel gsl-devel pango-devel double-conversion-devel gc-devel libwpd-devel libcdr-devel libvisio-devel poppler-devel libwpd-devel potrace-devel gtkmm-devel gdl-devel gtkspell3-devel aspell-devel libxslt-devel libgomp-devel libwpg-devel poppler-glib-devel"
@@ -18,10 +17,11 @@ distfiles="https://gitlab.com/inkscape/inkscape/-/archive/INKSCAPE_${version//./
https://gitlab.com/inkscape/extensions/-/archive/${_extension_rev}/extensions-${_extension_rev}.tar.bz2"
checksum="673a1d8dfff4993917ac560d73ded4cab6edf8360cb97b99703658b14c03031f
11d573e30d4b0c821e9c59a524c9f98b935dcfdad979066cc65fdf111cf116fe"
+python_version=3
-case "$XBPS_TARGET_MACHINE" in
- arm*|aarch64*) makedepends+=" libatomic_ops-devel" ;;
-esac
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+ makedepends+=" libatomic-devel"
+fi
pre_configure() {
rm -r share/extensions || true
```
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR PATCH] [Updated] inkscape: update to 1.0.
2020-05-04 21:02 [PR PATCH] inkscape: update to 1.0 Gottox
2020-05-04 22:10 ` q66
@ 2020-05-05 7:17 ` Gottox
2020-05-05 7:17 ` Gottox
` (4 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Gottox @ 2020-05-05 7:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 317 bytes --]
There is an updated pull request by Gottox against master on the void-packages repository
https://github.com/Gottox/void-packages inkscape-1.0
https://github.com/void-linux/void-packages/pull/21629
inkscape: update to 1.0.
A patch file from https://github.com/void-linux/void-packages/pull/21629.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-inkscape-1.0-21629.patch --]
[-- Type: text/x-diff, Size: 6732 bytes --]
From 388d885d9e57f5f8e9d0ac5967c2e472f208482d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Mon, 4 May 2020 22:14:52 +0200
Subject: [PATCH 1/2] inkscape: update to 1.0.
---
.../patches/fix-invalid-nullptr.patch | 13 +++++++
srcpkgs/inkscape/patches/use-python2.patch | 12 ------
srcpkgs/inkscape/template | 37 +++++++++++--------
3 files changed, 34 insertions(+), 28 deletions(-)
create mode 100644 srcpkgs/inkscape/patches/fix-invalid-nullptr.patch
delete mode 100644 srcpkgs/inkscape/patches/use-python2.patch
diff --git a/srcpkgs/inkscape/patches/fix-invalid-nullptr.patch b/srcpkgs/inkscape/patches/fix-invalid-nullptr.patch
new file mode 100644
index 00000000000..01599711a88
--- /dev/null
+++ b/srcpkgs/inkscape/patches/fix-invalid-nullptr.patch
@@ -0,0 +1,13 @@
+--- src/extension/effect.cpp.orig 2019-12-03 18:54:18.521689345 +0100
++++ src/extension/effect.cpp 2019-12-03 18:53:57.485477512 +0100
+@@ -38,8 +38,8 @@ Effect::Effect (Inkscape::XML::Node *in_
+ : Extension(in_repr, in_imp, base_directory)
+ , _id_noprefs(Glib::ustring(get_id()) + ".noprefs")
+ , _name_noprefs(Glib::ustring(_(get_name())) + _(" (No preferences)"))
+- , _verb(get_id(), get_name(), nullptr, nullptr, this, true)
+- , _verb_nopref(_id_noprefs.c_str(), _name_noprefs.c_str(), nullptr, nullptr, this, false)
++ , _verb(get_id(), get_name(), "", nullptr, this, true)
++ , _verb_nopref(_id_noprefs.c_str(), _name_noprefs.c_str(), "", nullptr, this, false)
+ , _menu_node(nullptr), _workingDialog(true)
+ , _prefDialog(nullptr)
+ {
diff --git a/srcpkgs/inkscape/patches/use-python2.patch b/srcpkgs/inkscape/patches/use-python2.patch
deleted file mode 100644
index 1b69dfa487f..00000000000
--- a/srcpkgs/inkscape/patches/use-python2.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/extension/implementation/script.cpp.orig
-+++ src/extension/implementation/script.cpp
-@@ -88,7 +88,7 @@
- #ifdef WIN32
- {"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 --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template
index 45522048afc..129d8663803 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -1,29 +1,34 @@
# Template file for 'inkscape'
pkgname=inkscape
-version=0.92.5
+version=1.0
revision=1
wrksrc="${pkgname}-INKSCAPE_${version//./_}"
build_style=cmake
-configure_args="--enable-lcms --enable-poppler-cairo
- --without-gnome-vfs --disable-static --disable-strict-build"
-hostmakedepends="pkg-config libtool intltool gettext-devel glib-devel tar which xz"
-makedepends="popt-devel libpng-devel gsl-devel gc-devel gtkmm2-devel libxslt-devel
- lcms2-devel poppler-glib-devel boost-devel libmagick6-devel
- libvisio-devel libwpg-devel libcdr-devel dbus-glib-devel libgomp-devel
- potrace-devel cairomm-devel"
-depends="desktop-file-utils hicolor-icon-theme python-lxml python-numpy python-scour"
+python_version=3
+hostmakedepends="automake pkg-config libtool intltool gettext-devel
+ glib-devel perl-XML-Parser tar which xz"
+makedepends="harfbuzz-devel libsoup-devel gsl-devel pango-devel double-conversion-devel gc-devel libwpd-devel libcdr-devel libvisio-devel poppler-devel libwpd-devel potrace-devel gtkmm-devel gdl-devel gtkspell3-devel aspell-devel libxslt-devel libgomp-devel libwpg-devel poppler-glib-devel"
+depends="desktop-file-utils hicolor-icon-theme python3-lxml python3-numpy python3-scour"
short_desc="Vector-based drawing program"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-only, LGPL-2.1-or-later"
homepage="http://inkscape.org/"
-distfiles="https://gitlab.com/inkscape/inkscape/-/archive/INKSCAPE_${version//./_}/inkscape-INKSCAPE_${version//./_}.tar.bz2"
-checksum=de5de2376585a6b77488eea5d94511c260f561d7477d08afc5edbbea99fee602
-python_version=2 #unverified
-
-# Use c++11 mode and reduce log spam due to gcc6 warnings
-CXXFLAGS="-std=c++11 -Wno-deprecated -Wno-deprecated-declarations -Wno-deprecated-copy"
-CXXFLAGS+=" -Wno-parentheses -Wno-misleading-indentation -Wno-cast-align"
+_extension_rev=7099a364be65e17a76c0d9b7961232788d427d73
+distfiles="https://gitlab.com/inkscape/inkscape/-/archive/INKSCAPE_${version//./_}/inkscape-INKSCAPE_${version//./_}.tar.bz2
+ https://gitlab.com/inkscape/extensions/-/archive/${_extension_rev}/extensions-${_extension_rev}.tar.bz2"
+checksum="673a1d8dfff4993917ac560d73ded4cab6edf8360cb97b99703658b14c03031f
+ 11d573e30d4b0c821e9c59a524c9f98b935dcfdad979066cc65fdf111cf116fe"
case "$XBPS_TARGET_MACHINE" in
arm*|aarch64*) makedepends+=" libatomic_ops-devel" ;;
esac
+
+pre_configure() {
+ rm -r share/extensions || true
+ cp -r ../extensions-${_extension_rev} share/extensions
+
+ case "$XBPS_TARGET_MACHINE" in
+ *-musl) vsed -e "/-Werror=format/d" \
+ -i CMakeScripts/DefineDependsandFlags.cmake ;;
+ esac
+}
From 38dcc33ef8e5347c2c2ce57845efff544744897f Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Tue, 5 May 2020 09:18:17 +0200
Subject: [PATCH 2/2] inkscape: fix xlint, use explicit atomic check.
---
srcpkgs/inkscape/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template
index 129d8663803..cd322cfafa6 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -4,7 +4,6 @@ version=1.0
revision=1
wrksrc="${pkgname}-INKSCAPE_${version//./_}"
build_style=cmake
-python_version=3
hostmakedepends="automake pkg-config libtool intltool gettext-devel
glib-devel perl-XML-Parser tar which xz"
makedepends="harfbuzz-devel libsoup-devel gsl-devel pango-devel double-conversion-devel gc-devel libwpd-devel libcdr-devel libvisio-devel poppler-devel libwpd-devel potrace-devel gtkmm-devel gdl-devel gtkspell3-devel aspell-devel libxslt-devel libgomp-devel libwpg-devel poppler-glib-devel"
@@ -18,10 +17,11 @@ distfiles="https://gitlab.com/inkscape/inkscape/-/archive/INKSCAPE_${version//./
https://gitlab.com/inkscape/extensions/-/archive/${_extension_rev}/extensions-${_extension_rev}.tar.bz2"
checksum="673a1d8dfff4993917ac560d73ded4cab6edf8360cb97b99703658b14c03031f
11d573e30d4b0c821e9c59a524c9f98b935dcfdad979066cc65fdf111cf116fe"
+python_version=3
-case "$XBPS_TARGET_MACHINE" in
- arm*|aarch64*) makedepends+=" libatomic_ops-devel" ;;
-esac
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+ makedepends+=" libatomic-devel"
+fi
pre_configure() {
rm -r share/extensions || true
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: inkscape: update to 1.0.
2020-05-04 21:02 [PR PATCH] inkscape: update to 1.0 Gottox
2020-05-04 22:10 ` q66
2020-05-05 7:17 ` [PR PATCH] [Updated] " Gottox
@ 2020-05-05 7:17 ` Gottox
2020-05-05 15:07 ` q66
` (3 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Gottox @ 2020-05-05 7:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 163 bytes --]
New comment by Gottox on void-packages repository
https://github.com/void-linux/void-packages/pull/21629#issuecomment-623893694
Comment:
@q66 applied, thanks :)
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: inkscape: update to 1.0.
2020-05-04 21:02 [PR PATCH] inkscape: update to 1.0 Gottox
` (2 preceding siblings ...)
2020-05-05 7:17 ` Gottox
@ 2020-05-05 15:07 ` q66
2020-05-07 7:29 ` [PR PATCH] [Updated] " Gottox
` (2 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: q66 @ 2020-05-05 15:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 206 bytes --]
New comment by q66 on void-packages repository
https://github.com/void-linux/void-packages/pull/21629#issuecomment-624111968
Comment:
can you squash that? also is this ready to apply? it looks good to me
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR PATCH] [Updated] inkscape: update to 1.0.
2020-05-04 21:02 [PR PATCH] inkscape: update to 1.0 Gottox
` (3 preceding siblings ...)
2020-05-05 15:07 ` q66
@ 2020-05-07 7:29 ` Gottox
2020-05-07 7:29 ` Gottox
2020-05-07 7:29 ` [PR PATCH] [Merged]: " Gottox
6 siblings, 0 replies; 8+ messages in thread
From: Gottox @ 2020-05-07 7:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 317 bytes --]
There is an updated pull request by Gottox against master on the void-packages repository
https://github.com/Gottox/void-packages inkscape-1.0
https://github.com/void-linux/void-packages/pull/21629
inkscape: update to 1.0.
A patch file from https://github.com/void-linux/void-packages/pull/21629.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-inkscape-1.0-21629.patch --]
[-- Type: text/x-diff, Size: 5195 bytes --]
From c75e26f0e8fd04901ab3a13f8346182f631bfbcf Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Mon, 4 May 2020 22:14:52 +0200
Subject: [PATCH] inkscape: update to 1.0.
---
.../patches/fix-invalid-nullptr.patch | 13 ++++++
srcpkgs/inkscape/patches/use-python2.patch | 12 ------
srcpkgs/inkscape/template | 41 +++++++++++--------
3 files changed, 36 insertions(+), 30 deletions(-)
create mode 100644 srcpkgs/inkscape/patches/fix-invalid-nullptr.patch
delete mode 100644 srcpkgs/inkscape/patches/use-python2.patch
diff --git a/srcpkgs/inkscape/patches/fix-invalid-nullptr.patch b/srcpkgs/inkscape/patches/fix-invalid-nullptr.patch
new file mode 100644
index 00000000000..01599711a88
--- /dev/null
+++ b/srcpkgs/inkscape/patches/fix-invalid-nullptr.patch
@@ -0,0 +1,13 @@
+--- src/extension/effect.cpp.orig 2019-12-03 18:54:18.521689345 +0100
++++ src/extension/effect.cpp 2019-12-03 18:53:57.485477512 +0100
+@@ -38,8 +38,8 @@ Effect::Effect (Inkscape::XML::Node *in_
+ : Extension(in_repr, in_imp, base_directory)
+ , _id_noprefs(Glib::ustring(get_id()) + ".noprefs")
+ , _name_noprefs(Glib::ustring(_(get_name())) + _(" (No preferences)"))
+- , _verb(get_id(), get_name(), nullptr, nullptr, this, true)
+- , _verb_nopref(_id_noprefs.c_str(), _name_noprefs.c_str(), nullptr, nullptr, this, false)
++ , _verb(get_id(), get_name(), "", nullptr, this, true)
++ , _verb_nopref(_id_noprefs.c_str(), _name_noprefs.c_str(), "", nullptr, this, false)
+ , _menu_node(nullptr), _workingDialog(true)
+ , _prefDialog(nullptr)
+ {
diff --git a/srcpkgs/inkscape/patches/use-python2.patch b/srcpkgs/inkscape/patches/use-python2.patch
deleted file mode 100644
index 1b69dfa487f..00000000000
--- a/srcpkgs/inkscape/patches/use-python2.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/extension/implementation/script.cpp.orig
-+++ src/extension/implementation/script.cpp
-@@ -88,7 +88,7 @@
- #ifdef WIN32
- {"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 --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template
index 45522048afc..cd322cfafa6 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -1,29 +1,34 @@
# Template file for 'inkscape'
pkgname=inkscape
-version=0.92.5
+version=1.0
revision=1
wrksrc="${pkgname}-INKSCAPE_${version//./_}"
build_style=cmake
-configure_args="--enable-lcms --enable-poppler-cairo
- --without-gnome-vfs --disable-static --disable-strict-build"
-hostmakedepends="pkg-config libtool intltool gettext-devel glib-devel tar which xz"
-makedepends="popt-devel libpng-devel gsl-devel gc-devel gtkmm2-devel libxslt-devel
- lcms2-devel poppler-glib-devel boost-devel libmagick6-devel
- libvisio-devel libwpg-devel libcdr-devel dbus-glib-devel libgomp-devel
- potrace-devel cairomm-devel"
-depends="desktop-file-utils hicolor-icon-theme python-lxml python-numpy python-scour"
+hostmakedepends="automake pkg-config libtool intltool gettext-devel
+ glib-devel perl-XML-Parser tar which xz"
+makedepends="harfbuzz-devel libsoup-devel gsl-devel pango-devel double-conversion-devel gc-devel libwpd-devel libcdr-devel libvisio-devel poppler-devel libwpd-devel potrace-devel gtkmm-devel gdl-devel gtkspell3-devel aspell-devel libxslt-devel libgomp-devel libwpg-devel poppler-glib-devel"
+depends="desktop-file-utils hicolor-icon-theme python3-lxml python3-numpy python3-scour"
short_desc="Vector-based drawing program"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-only, LGPL-2.1-or-later"
homepage="http://inkscape.org/"
-distfiles="https://gitlab.com/inkscape/inkscape/-/archive/INKSCAPE_${version//./_}/inkscape-INKSCAPE_${version//./_}.tar.bz2"
-checksum=de5de2376585a6b77488eea5d94511c260f561d7477d08afc5edbbea99fee602
-python_version=2 #unverified
+_extension_rev=7099a364be65e17a76c0d9b7961232788d427d73
+distfiles="https://gitlab.com/inkscape/inkscape/-/archive/INKSCAPE_${version//./_}/inkscape-INKSCAPE_${version//./_}.tar.bz2
+ https://gitlab.com/inkscape/extensions/-/archive/${_extension_rev}/extensions-${_extension_rev}.tar.bz2"
+checksum="673a1d8dfff4993917ac560d73ded4cab6edf8360cb97b99703658b14c03031f
+ 11d573e30d4b0c821e9c59a524c9f98b935dcfdad979066cc65fdf111cf116fe"
+python_version=3
-# Use c++11 mode and reduce log spam due to gcc6 warnings
-CXXFLAGS="-std=c++11 -Wno-deprecated -Wno-deprecated-declarations -Wno-deprecated-copy"
-CXXFLAGS+=" -Wno-parentheses -Wno-misleading-indentation -Wno-cast-align"
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+ makedepends+=" libatomic-devel"
+fi
-case "$XBPS_TARGET_MACHINE" in
- arm*|aarch64*) makedepends+=" libatomic_ops-devel" ;;
-esac
+pre_configure() {
+ rm -r share/extensions || true
+ cp -r ../extensions-${_extension_rev} share/extensions
+
+ case "$XBPS_TARGET_MACHINE" in
+ *-musl) vsed -e "/-Werror=format/d" \
+ -i CMakeScripts/DefineDependsandFlags.cmake ;;
+ esac
+}
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: inkscape: update to 1.0.
2020-05-04 21:02 [PR PATCH] inkscape: update to 1.0 Gottox
` (4 preceding siblings ...)
2020-05-07 7:29 ` [PR PATCH] [Updated] " Gottox
@ 2020-05-07 7:29 ` Gottox
2020-05-07 7:29 ` [PR PATCH] [Merged]: " Gottox
6 siblings, 0 replies; 8+ messages in thread
From: Gottox @ 2020-05-07 7:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 157 bytes --]
New comment by Gottox on void-packages repository
https://github.com/void-linux/void-packages/pull/21629#issuecomment-625081412
Comment:
squashed, merging
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR PATCH] [Merged]: inkscape: update to 1.0.
2020-05-04 21:02 [PR PATCH] inkscape: update to 1.0 Gottox
` (5 preceding siblings ...)
2020-05-07 7:29 ` Gottox
@ 2020-05-07 7:29 ` Gottox
6 siblings, 0 replies; 8+ messages in thread
From: Gottox @ 2020-05-07 7:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 158 bytes --]
There's a merged pull request on the void-packages repository
inkscape: update to 1.0.
https://github.com/void-linux/void-packages/pull/21629
Description:
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2020-05-07 7:29 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-04 21:02 [PR PATCH] inkscape: update to 1.0 Gottox
2020-05-04 22:10 ` q66
2020-05-05 7:17 ` [PR PATCH] [Updated] " Gottox
2020-05-05 7:17 ` Gottox
2020-05-05 15:07 ` q66
2020-05-07 7:29 ` [PR PATCH] [Updated] " Gottox
2020-05-07 7:29 ` Gottox
2020-05-07 7:29 ` [PR PATCH] [Merged]: " Gottox
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).