diff options
| -rw-r--r-- | graphics/inkscape/inkscape.SlackBuild | 10 | ||||
| -rw-r--r-- | graphics/inkscape/inkscape.info | 6 | ||||
| -rw-r--r-- | graphics/inkscape/poppler-21.11.0.patch | 26 |
3 files changed, 9 insertions, 33 deletions
diff --git a/graphics/inkscape/inkscape.SlackBuild b/graphics/inkscape/inkscape.SlackBuild index 986a956eba..9eca4b02be 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.1} -EXTRAVER=${EXTRAVER:-2021-09-20_3bf5ae0d25} +VERSION=${VERSION:-1.1.2} +EXTRAVER=${EXTRAVER:-2022-02-04_0a00cf5339} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -95,7 +95,7 @@ dos2unix -k -q share/extensions/*.py sed -i CMakeScripts/Pod2man.cmake -e "s/SHARE_INSTALL/CMAKE_INSTALL_PREFIX/g" # patch from archlinux -patch -p1 < $CWD/poppler-21.11.0.patch +#patch -p1 < $CWD/poppler-21.11.0.patch mkdir -p build cd build @@ -110,7 +110,6 @@ cd build -DCMAKE_INSTALL_LIBDIR=/usr/lib${LIBDIRSUFFIX} \ -DCMAKE_INSTALL_MANDIR=/usr/man \ -DCMAKE_INSTALL_SYSCONFDIR=/etc \ - -DINKSCAPE_INSTALL_LIBDIR=/usr/lib${LIBDIRSUFFIX} \ -DBUILD_SHARED_LIBS=ON \ -DWITH_DBUS=ON \ -DWITH_GRAPHICS_MAGICK=ON \ @@ -120,6 +119,9 @@ cd build make install DESTDIR=$PKG cd .. +# inkscape no longer uses: (deprecated cmake variable.) +# -DINKSCAPE_INSTALL_LIBDIR=/usr/lib${LIBDIRSUFFIX} \ + # From this version on inkscape install its separate library in # /usr/lib$LIBDIRSUFFIX/$PRGNAM that's not on the binary LD_LIBRARY_PATH # at runtime: just create an handy symlink without moving it in case diff --git a/graphics/inkscape/inkscape.info b/graphics/inkscape/inkscape.info index 710bd53110..af2aa17102 100644 --- a/graphics/inkscape/inkscape.info +++ b/graphics/inkscape/inkscape.info @@ -1,8 +1,8 @@ PRGNAM="inkscape" -VERSION="1.1.1" +VERSION="1.1.2" HOMEPAGE="http://www.inkscape.org/" -DOWNLOAD="https://media.inkscape.org/dl/resources/file/inkscape-1.1.1.tar.xz" -MD5SUM="1852c535a1aec7ca25eca9de110330d7" +DOWNLOAD="https://media.inkscape.org/dl/resources/file/inkscape-1.1.2.tar.xz" +MD5SUM="a486807ffdf89a1d7ce9425dd60555ec" 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 deleted file mode 100644 index dd908756f0..0000000000 --- a/graphics/inkscape/poppler-21.11.0.patch +++ /dev/null @@ -1,26 +0,0 @@ -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); |