From 7d0b0cc67d4b250db346348d849ffbec767fdd3e Mon Sep 17 00:00:00 2001 From: Alex Lohr Date: Thu, 27 May 2021 17:09:08 +0200 Subject: [PATCH] inkscape: update to 1.1 --- srcpkgs/inkscape/patches/glib-extern-C.patch | 65 -------------------- srcpkgs/inkscape/template | 20 +++--- 2 files changed, 11 insertions(+), 74 deletions(-) delete mode 100644 srcpkgs/inkscape/patches/glib-extern-C.patch diff --git a/srcpkgs/inkscape/patches/glib-extern-C.patch b/srcpkgs/inkscape/patches/glib-extern-C.patch deleted file mode 100644 index b959bcd76fdc..000000000000 --- a/srcpkgs/inkscape/patches/glib-extern-C.patch +++ /dev/null @@ -1,65 +0,0 @@ -From eb24388f1730918edd9565d9e5d09340ec0b3b08 Mon Sep 17 00:00:00 2001 -From: Harald van Dijk -Date: Wed, 17 Feb 2021 09:13:49 +0000 -Subject: [PATCH] Fix build with glib 2.67.3. - -As of glib 2.67.3, can no longer be included in extern "C" -blocks. It was indirectly included by both "types.h" and "color.h". -"types.h" already does not need to be wrapped in an extern "C" block, -"color.h" does but can be modified not to, so with that changed they can -be moved out. ---- - src/3rdparty/autotrace/autotrace.h | 6 +++--- - src/3rdparty/autotrace/color.h | 7 +++++++ - 2 files changed, 10 insertions(+), 3 deletions(-) - -diff --git a/src/3rdparty/autotrace/autotrace.h b/src/3rdparty/autotrace/autotrace.h -index 2ce6f272a9..e56be9a74c 100644 ---- a/src/3rdparty/autotrace/autotrace.h -+++ b/src/3rdparty/autotrace/autotrace.h -@@ -23,6 +23,9 @@ - - #include - -+#include "types.h" -+#include "color.h" -+ - #ifdef __cplusplus - extern "C" { - #endif /* __cplusplus */ -@@ -35,9 +38,6 @@ extern "C" { - * Typedefs - * ===================================================================== */ - --#include "types.h" --#include "color.h" -- - /* Third degree is the highest we deal with. */ - enum _at_polynomial_degree { - AT_LINEARTYPE = 1, -diff --git a/src/3rdparty/autotrace/color.h b/src/3rdparty/autotrace/color.h -index e50ab30ae0..88651db9f7 100644 ---- a/src/3rdparty/autotrace/color.h -+++ b/src/3rdparty/autotrace/color.h -@@ -24,6 +24,10 @@ - #include - #include - -+#ifdef __cplusplus -+extern "C" { -+#endif /* __cplusplus */ -+ - typedef struct _at_color at_color; - struct _at_color { - guint8 r; -@@ -43,4 +47,7 @@ void at_color_free(at_color * color); - GType at_color_get_type(void); - #define AT_TYPE_COLOR (at_color_get_type ()) - -+#ifdef __cplusplus -+} -+#endif /* __cplusplus */ - #endif /* not AT_COLOR_H */ --- -GitLab - diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template index 6339519c22f9..50e62403a534 100644 --- a/srcpkgs/inkscape/template +++ b/srcpkgs/inkscape/template @@ -1,27 +1,26 @@ # Template file for 'inkscape' pkgname=inkscape -version=1.0.2 -revision=3 -wrksrc="inkscape-${version}_2021-01-15_e86c870879" +version=1.1 +revision=1 +wrksrc="${pkgname}-${version}_2021-05-24_c4e8f9ed74" build_style=cmake # builds executables then runs checks # FIXME: some tests still fail on musl make_check_target=check hostmakedepends="automake pkg-config libtool intltool gettext - glib-devel perl-XML-Parser tar which xz" -makedepends="harfbuzz-devel libsoup-devel gsl-devel pango-devel + glib-devel perl-XML-Parser which" +makedepends="harfbuzz-devel libsoup-devel gsl-devel pango-devel libatomic_ops-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" checkdepends="$depends gtest-devel ImageMagick cantarell-fonts" short_desc="Vector-based drawing program" -maintainer="Orphaned " +maintainer="Alex Lohr " license="GPL-2.0-only, LGPL-2.1-or-later" homepage="http://inkscape.org/" -# link from https://inkscape.org/release/all/source/archive/ -distfiles="https://inkscape.org/gallery/item/23820/inkscape-${version}.tar.xz" -checksum=da3e230511a08cbf21e86710d161458594fea87867e9157b67ed01a04ea2798a +distfiles="https://media.inkscape.org/dl/resources/file/inkscape-${version}.tar.xz" +checksum=71e6e8ce3fdf702f59dbc4a276665eb982eb7822b029bbdbeced2df4301795e6 python_version=3 patch_args=-Np1 @@ -35,4 +34,7 @@ post_patch() { # since inkscape uses NULL instead of nullptr vsed -e "/-Werror=format/d" -i CMakeScripts/DefineDependsandFlags.cmake fi + # make test font available under the name it is used with + cd testfiles/rendering_tests/fonts/ + ln -s GeomTest-Regular.otf GeomTest.otf }