diff options
| author | Rob van Nues <sborg63@disroot.org> | 2021-11-04 15:21:22 +0100 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2021-11-05 22:56:43 +0700 |
| commit | 084e7f70c5ecff5841c1ba4e20939c979b662a19 (patch) | |
| tree | 8f82a55cec8aa0e92a2a03d4ebc793135b04db29 | |
| parent | b9f16f0431b4c4673c4563505d2689b17804854b (diff) | |
graphics/inkscape: Updated for version 1.1.1.
Patch for the newe poppler (ndponce)
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
| -rw-r--r-- | graphics/inkscape/inkscape.SlackBuild | 7 | ||||
| -rw-r--r-- | graphics/inkscape/inkscape.info | 6 | ||||
| -rw-r--r-- | graphics/inkscape/poppler-21.11.0.patch | 26 |
3 files changed, 34 insertions, 5 deletions
diff --git a/graphics/inkscape/inkscape.SlackBuild b/graphics/inkscape/inkscape.SlackBuild index 3c5182be7250..986a956ebaf0 100644 --- a/graphics/inkscape/inkscape.SlackBuild +++ b/graphics/inkscape/inkscape.SlackBuild @@ -25,8 +25,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=inkscape -VERSION=${VERSION:-1.1} -EXTRAVER=${EXTRAVER:-2021-05-24_c4e8f9ed74} +VERSION=${VERSION:-1.1.1} +EXTRAVER=${EXTRAVER:-2021-09-20_3bf5ae0d25} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -94,6 +94,9 @@ dos2unix -k -q share/extensions/*.py # Fix man page location: sed -i CMakeScripts/Pod2man.cmake -e "s/SHARE_INSTALL/CMAKE_INSTALL_PREFIX/g" +# patch from archlinux +patch -p1 < $CWD/poppler-21.11.0.patch + mkdir -p build cd build # imagemagick >= 7.x is unsupported yet, so use GraphicsMagick diff --git a/graphics/inkscape/inkscape.info b/graphics/inkscape/inkscape.info index aede4aa381e5..710bd53110e1 100644 --- a/graphics/inkscape/inkscape.info +++ b/graphics/inkscape/inkscape.info @@ -1,8 +1,8 @@ PRGNAM="inkscape" -VERSION="1.1" +VERSION="1.1.1" HOMEPAGE="http://www.inkscape.org/" -DOWNLOAD="https://media.inkscape.org/dl/resources/file/inkscape-1.1.tar.xz" -MD5SUM="45e38e25fb93c7c91c51b84b9e4cf0ee" +DOWNLOAD="https://media.inkscape.org/dl/resources/file/inkscape-1.1.1.tar.xz" +MD5SUM="1852c535a1aec7ca25eca9de110330d7" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="GraphicsMagick gdl dos2unix double-conversion libcdr lxml numpy potrace pstoedit scour" diff --git a/graphics/inkscape/poppler-21.11.0.patch b/graphics/inkscape/poppler-21.11.0.patch new file mode 100644 index 000000000000..dd908756f047 --- /dev/null +++ b/graphics/inkscape/poppler-21.11.0.patch @@ -0,0 +1,26 @@ +From ff61b5e3df3351d4ab5437181fe6d34729f4cbbb Mon Sep 17 00:00:00 2001 +From: Evangelos Foutras <evangelos@foutrelis.com> +Date: Mon, 1 Nov 2021 21:45:38 +0200 +Subject: [PATCH] Fix build with poppler 21.11.0 + +GfxFont::tag is now of type std::string instead of GooString *. +--- + src/extension/internal/pdfinput/pdf-parser.cpp | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp +index e3d04d544b..feecefa043 100644 +--- a/src/extension/internal/pdfinput/pdf-parser.cpp ++++ b/src/extension/internal/pdfinput/pdf-parser.cpp +@@ -2169,7 +2169,11 @@ void PdfParser::opSetFont(Object args[], int /*numArgs*/) + } + if (printCommands) { + printf(" font: tag=%s name='%s' %g\n", ++#if POPPLER_CHECK_VERSION(21,11,0) ++ font->getTag().c_str(), ++#else + font->getTag()->getCString(), ++#endif + font->getName() ? font->getName()->getCString() : "???", + args[1].getNum()); + fflush(stdout); |