diff --git a/srcpkgs/inkscape/patches/fix-invalid-nullptr.patch b/srcpkgs/inkscape/patches/fix-invalid-nullptr.patch deleted file mode 100644 index 01599711a8..0000000000 --- a/srcpkgs/inkscape/patches/fix-invalid-nullptr.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- 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/poppler-072.patch b/srcpkgs/inkscape/patches/poppler-072.patch deleted file mode 100644 index 439c84ca0b..0000000000 --- a/srcpkgs/inkscape/patches/poppler-072.patch +++ /dev/null @@ -1,71 +0,0 @@ -Poppler-0.72 renamed getCString() to c_str() - -diff --git a/src/extension/internal/pdfinput/pdf-input.cpp b/src/extension/internal/pdfinput/pdf-input.cpp -index 9621e30..57f8ae7 100644 ---- src/extension/internal/pdfinput/pdf-input.cpp -+++ src/extension/internal/pdfinput/pdf-input.cpp -@@ -319,7 +319,7 @@ PdfImportDialog::PdfImportDialog(PDFDoc *doc, const gchar */*uri*/) - _render_thumb = true; - - // Create PopplerDocument -- Glib::ustring filename = _pdf_doc->getFileName()->getCString(); -+ Glib::ustring filename = _pdf_doc->getFileName()->c_str(); - if (!Glib::path_is_absolute(filename)) { - filename = Glib::build_filename(Glib::get_current_dir(),filename); - } -diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp -index d318447..6d64db0 100644 ---- src/extension/internal/pdfinput/pdf-parser.cpp -+++ src/extension/internal/pdfinput/pdf-parser.cpp -@@ -2381,8 +2381,8 @@ void PdfParser::opSetFont(Object args[], int /*numArgs*/) - } - if (printCommands) { - printf(" font: tag=%s name='%s' %g\n", -- font->getTag()->getCString(), -- font->getName() ? font->getName()->getCString() : "???", -+ font->getTag()->c_str(), -+ font->getName() ? font->getName()->c_str() : "???", - args[1].getNum()); - fflush(stdout); - } -@@ -2639,7 +2639,7 @@ void PdfParser::doShowText(GooString *s) { - double lineX = state->getLineX(); - double lineY = state->getLineY(); - oldParser = parser; -- p = s->getCString(); -+ p = s->c_str(); - len = s->getLength(); - while (len > 0) { - n = font->getNextChar(p, len, &code, -@@ -2694,7 +2694,7 @@ void PdfParser::doShowText(GooString *s) { - - } else { - state->textTransformDelta(0, state->getRise(), &riseX, &riseY); -- p = s->getCString(); -+ p = s->c_str(); - len = s->getLength(); - while (len > 0) { - n = font->getNextChar(p, len, &code, -diff --git a/src/extension/internal/pdfinput/svg-builder.cpp b/src/extension/internal/pdfinput/svg-builder.cpp -index d449d1a..836ca10 100644 ---- src/extension/internal/pdfinput/svg-builder.cpp -+++ src/extension/internal/pdfinput/svg-builder.cpp -@@ -1020,7 +1020,7 @@ void SvgBuilder::updateFont(GfxState *state) { - GfxFont *font = state->getFont(); - // Store original name - if (font->getName()) { -- _font_specification = font->getName()->getCString(); -+ _font_specification = font->getName()->c_str(); - } else { - _font_specification = "Arial"; - } -@@ -1047,7 +1047,7 @@ void SvgBuilder::updateFont(GfxState *state) { - - // Font family - if (font->getFamily()) { // if font family is explicitly given use it. -- sp_repr_css_set_property(_font_style, "font-family", font->getFamily()->getCString()); -+ sp_repr_css_set_property(_font_style, "font-family", font->getFamily()->c_str()); - } else { - int attr_value = 1; - sp_repr_get_int(_preferences, "localFonts", &attr_value); - diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template index e27aceb7d2..4d61cf2849 100644 --- a/srcpkgs/inkscape/template +++ b/srcpkgs/inkscape/template @@ -1,9 +1,12 @@ # Template file for 'inkscape' pkgname=inkscape -version=1.0.1 +version=1.0.2 revision=1 -wrksrc="${pkgname}-INKSCAPE_${version//./_}" +wrksrc="inkscape-${version}_2021-01-15_e86c870879" 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-devel glib-devel perl-XML-Parser tar which xz" makedepends="harfbuzz-devel libsoup-devel gsl-devel pango-devel @@ -11,27 +14,24 @@ makedepends="harfbuzz-devel libsoup-devel gsl-devel pango-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="gtest-devel $depends ImageMagick" short_desc="Vector-based drawing program" maintainer="Orphaned " license="GPL-2.0-only, LGPL-2.1-or-later" homepage="http://inkscape.org/" -_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="0ccb623b2c7872b9edec405874eab3ff279dd209f496b496dd99969fdc3834d3 - 11d573e30d4b0c821e9c59a524c9f98b935dcfdad979066cc65fdf111cf116fe" +# link from https://inkscape.org/release/all/source/archive/ +distfiles="https://inkscape.org/gallery/item/23820/inkscape-${version}.tar.xz" +checksum=da3e230511a08cbf21e86710d161458594fea87867e9157b67ed01a04ea2798a python_version=3 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then makedepends+=" libatomic-devel" fi -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 +post_patch() { + if [ "$XBPS_TARGET_LIBC" = musl ]; then + # disable errors for missing sentinels in glib variadic functions, + # since inkscape uses NULL instead of nullptr + vsed -e "/-Werror=format/d" -i CMakeScripts/DefineDependsandFlags.cmake + fi }