Date: Sunday, January 9, 2022 @ 15:59:27
Author: eworm
Revision: 434054
upgpkg: inkscape 1.1.1-7: fix multiline text rendering
Modified:
inkscape/trunk/PKGBUILD
Deleted:
inkscape/trunk/poppler-21.11.0.patch
---+
PKGBUILD | 23 ---
poppler-21.11.0.patch | 26 --
2 files changed, 16 insertions(+), 33 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2022-01-09 15:16:17 UTC (rev 434053)
+++ PKGBUILD2022-01-09 15:59:27 UTC (rev 434054)
@@ -5,7 +5,7 @@
pkgname=inkscape
pkgver=1.1.1
_tag='3bf5ae0d25c673abe152dedf4789a2d6f0cc60ff' # git rev-parse
INKSCAPE_${pkgver/./_}
-pkgrel=6
+pkgrel=7
pkgdesc='Professional vector graphics editor'
url='https://inkscape.org/'
license=('GPL' 'LGPL')
@@ -43,18 +43,27 @@
)
#source=("https://media.inkscape.org/dl/resources/file/${pkgname}-${pkgver}.tar.bz2";)
-source=("git+https://gitlab.com/inkscape/inkscape.git#tag=${_tag}";
-poppler-21.11.0.patch)
-sha256sums=('SKIP'
-'76bd1cc64ce7abef0f1758a7f05d9ca9e2cf44506318fb8ae9da029543aa1762')
+source=("git+https://gitlab.com/inkscape/inkscape.git#tag=${_tag}";)
+sha256sums=('SKIP')
+_backports=(
+ # Fix build with poppler 21.11.0
+ '5724c21b9cb7b6176a7b36ca24068b148c817e82'
+
+ # Remove mandatory break from end of paragraphs, added in Pango 1.49.
+ 'b3dabef2245d4e4e977ee9d6776be9a134493515'
+)
+
prepare() {
cd "${pkgname}"
git submodule init
git submodule update
- # https://gitlab.com/inkscape/inkscape/-/merge_requests/3622
- patch -Np1 -i ../poppler-21.11.0.patch
+ local _c
+ for _c in "${_backports[@]}"; do
+ git log --oneline -1 "${_c}"
+ git cherry-pick -n "${_c}"
+ done
}
build() {
Deleted: poppler-21.11.0.patch
===
--- poppler-21.11.0.patch 2022-01-09 15:16:17 UTC (rev 434053)
+++ poppler-21.11.0.patch 2022-01-09 15:59:27 UTC (rev 434054)
@@ -1,26 +0,0 @@
-From ff61b5e3df3351d4ab5437181fe6d34729f4cbbb Mon Sep 17 00:00:00 2001
-From: Evangelos Foutras
-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);