From fb360ed0e60f1163ec46f74f173f51cc66fd90a8 Mon Sep 17 00:00:00 2001 From: Hervy Qurrotul Ainur Rozi Date: Mon, 7 Feb 2022 11:09:12 +0700 Subject: [PATCH] inkscape: update to 1.2 --- srcpkgs/inkscape/patches/fix-Werror.patch | 20 ++++++++++++++++++++ srcpkgs/inkscape/template | 16 +++++++++------- 2 files changed, 29 insertions(+), 7 deletions(-) create mode 100644 srcpkgs/inkscape/patches/fix-Werror.patch diff --git a/srcpkgs/inkscape/patches/fix-Werror.patch b/srcpkgs/inkscape/patches/fix-Werror.patch new file mode 100644 index 000000000000..f2751c9ad037 --- /dev/null +++ b/srcpkgs/inkscape/patches/fix-Werror.patch @@ -0,0 +1,20 @@ +diff --git a/community/inkscape/fix-Werror.patch b/community/inkscape/fix-Werror.patch +index a718973d77..cea18d1887 100644 +--- a/community/inkscape/fix-Werror.patch ++++ b/community/inkscape/fix-Werror.patch +@@ -2,12 +2,12 @@ Fix -Werror flags, build fails with them + + --- a/CMakeScripts/DefineDependsandFlags.cmake + +++ b/CMakeScripts/DefineDependsandFlags.cmake +-@@ -32,8 +32,6 @@ ++@@ -39,8 +39,6 @@ + + # Errors for common mistakes + list(APPEND INKSCAPE_CXX_FLAGS "-fstack-protector-strong") + -list(APPEND INKSCAPE_CXX_FLAGS "-Werror=format") # e.g.: printf("%s", std::string("foo")) + -list(APPEND INKSCAPE_CXX_FLAGS "-Werror=format-security") # e.g.: printf(variable); ++ list(APPEND INKSCAPE_CXX_FLAGS "-Werror=ignored-qualifiers") # e.g.: const int foo(); ++ list(APPEND INKSCAPE_CXX_FLAGS "-Werror=return-type") # non-void functions that don't return a value + list(APPEND INKSCAPE_CXX_FLAGS "-Wno-switch") # See !849 for discussion +- list(APPEND INKSCAPE_CXX_FLAGS_DEBUG "-Og") # -Og for _FORTIFY_SOURCE. One could add -Weffc++ here to see approx. 6000 warnings +- list(APPEND INKSCAPE_CXX_FLAGS_DEBUG "-Wcomment") diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template index 45f48ccda0dc..678d860aad8f 100644 --- a/srcpkgs/inkscape/template +++ b/srcpkgs/inkscape/template @@ -1,8 +1,10 @@ # Template file for 'inkscape' pkgname=inkscape -version=1.1.1 -revision=3 -wrksrc="inkscape-${version}_2021-09-20_3bf5ae0d25" +version=1.2 +revision=1 +_pkgdate="2022-05-15" +_pkgcommit="dc2aedaf03" +wrksrc="inkscape-${version}_${_pkgdate}_${_pkgcommit}" build_style=cmake # builds executables then runs checks # some tests still fail on musl: https://gitlab.com/inkscape/inkscape/-/issues/2241 @@ -13,15 +15,15 @@ makedepends="harfbuzz-devel libsoup-devel gsl-devel pango-devel libatomic_ops-de 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-appdirs python3-lxml python3-numpy - python3-scour python3-Pillow" +depends="desktop-file-utils hicolor-icon-theme python3-appdirs python3-cssselect + python3-lxml python3-numpy python3-scour python3-Pillow" checkdepends="$depends gtest-devel ImageMagick cantarell-fonts" short_desc="Vector-based drawing program" maintainer="Alex Lohr " license="GPL-2.0-only, LGPL-2.1-or-later" homepage="http://inkscape.org/" -distfiles="https://media.inkscape.org/dl/resources/file/inkscape-${version}.tar.xz" -checksum=aeca0b9d33b5b1cfa9aa70433bdee6a8c3d020ffafc2e6f0c9a60eed7a7978af +distfiles="https://media.inkscape.org/dl/resources/file/inkscape-${version}_${_pkgdate}_${_pkgcommit}.tar.xz" +checksum=8d9b31142554945664edfefe2d6b55910a5099765f7176a71107c34f1dcde6ad python_version=3 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then