Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

inkscape: update to 1.0. #21629

Merged
merged 1 commit into from
May 7, 2020
Merged

inkscape: update to 1.0. #21629

merged 1 commit into from
May 7, 2020

Conversation

Gottox
Copy link
Member

@Gottox Gottox commented May 4, 2020

No description provided.

Copy link
Contributor

@q66 q66 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

works great here

Copy link
Contributor

@q66 q66 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok, got some changes to do actually, will post diff in a min

@q66
Copy link
Contributor

q66 commented May 4, 2020

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

@Gottox
Copy link
Member Author

Gottox commented May 5, 2020

@q66 applied, thanks :)

@q66
Copy link
Contributor

q66 commented May 5, 2020

can you squash that? also is this ready to apply? it looks good to me

@Gottox
Copy link
Member Author

Gottox commented May 7, 2020

squashed, merging

@Gottox Gottox merged commit 5ef39dd into void-linux:master May 7, 2020
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Oct 7, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants