inkscape: upgrade 1.1.1 -> 1.1.2
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
This commit is contained in:
@@ -3,13 +3,10 @@ HOMEPAGE = "https://inkscape.org/"
|
||||
LICENSE = "GPL-3.0-or-later"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=d20d608cfa3a8343d722c2e69a43bbcd"
|
||||
|
||||
PV = "1.1.1"
|
||||
SRC_URI = " \
|
||||
https://inkscape.org/gallery/item/29255/${BP}.tar.xz \
|
||||
file://0001-Fix-build-with-poppler-21-11-0.patch \
|
||||
"
|
||||
SRC_URI[sha256sum] = "aeca0b9d33b5b1cfa9aa70433bdee6a8c3d020ffafc2e6f0c9a60eed7a7978af"
|
||||
S = "${WORKDIR}/${BPN}-1.1.1_2021-09-20_3bf5ae0d25"
|
||||
PV = "1.1.2"
|
||||
SRC_URI = "https://inkscape.org/gallery/item/31668/${BP}.tar.xz"
|
||||
SRC_URI[sha256sum] = "3ffe54a06d0b25a4cd8b6eb424536ef1ed205be13443a39cd437c8c7b89b96d1"
|
||||
S = "${WORKDIR}/${BPN}-${PV}_2022-02-04_0a00cf5339"
|
||||
|
||||
DEPENDS = " \
|
||||
glib-2.0-native \
|
||||
|
||||
@@ -1,32 +0,0 @@
|
||||
From 5724c21b9cb7b6176a7b36ca24068b148c817e82 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 *.
|
||||
|
||||
Upstream-Status: Accepted [https://gitlab.com/inkscape/inkscape/-/commit/5724c21b9cb7b6176a7b36ca24068b148c817e82]
|
||||
---
|
||||
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);
|
||||
--
|
||||
GitLab
|
||||
|
||||
|
||||
Reference in New Issue
Block a user