<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/2e5899d9e0ef579150c82f9d45eca86018e3fb70">https://github.com/macports/macports-ports/commit/2e5899d9e0ef579150c82f9d45eca86018e3fb70</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 2e5899d9e0e inkscape: update to 1.2
</span>2e5899d9e0e is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 2e5899d9e0ef579150c82f9d45eca86018e3fb70
</span>Author: Evan Miller <emmiller@gmail.com>
AuthorDate: Sat May 21 08:07:08 2022 -0400
<span style='display:block; white-space:pre;color:#404040;'> inkscape: update to 1.2
</span>---
graphics/inkscape/Portfile | 30 +++---
graphics/inkscape/files/poppler-22.03.0.patch | 17 ---
graphics/inkscape/files/poppler-22.04.0.patch | 150 --------------------------
3 files changed, 15 insertions(+), 182 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/inkscape/Portfile b/graphics/inkscape/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f1b850972d5..034e349951e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/inkscape/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/inkscape/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,8 +10,10 @@ name inkscape
</span> conflicts inkscape-devel
set my_name inkscape
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.1.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set version_date 2022-05-15
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set version_hash dc2aedaf03
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> license GPL-3+
maintainers {mascguy @mascguy} openmaintainer
categories graphics gnome
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,15 +26,15 @@ long_description Inkscape is an multi-platform, Open-Source Vector Graphics E
</span> ${description}
homepage https://inkscape.org/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites https://inkscape.org/en/gallery/item/31668
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites https://inkscape.org/gallery/item/33449
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-distname ${my_name}-${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distname ${my_name}-${version}_${version_date}_${version_hash}
</span> dist_subdir ${my_name}
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 721d41c1c344dc17f8eb38bd45bc3b3bf85f5b88 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 3ffe54a06d0b25a4cd8b6eb424536ef1ed205be13443a39cd437c8c7b89b96d1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 34222832
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 ecb3807407c084397f8b7df6cdbf4a39d9fe0fe5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 8d9b31142554945664edfefe2d6b55910a5099765f7176a71107c34f1dcde6ad \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 39157952
</span>
set python_major 3
set python_minor 10
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -71,13 +73,12 @@ depends_lib-append port:desktop-file-utils \
</span> port:libwpg-0.3 \
port:lib2geom \
port:potrace \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:python${python_version} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:python${python_version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_run-append port:py${python_version}-cssselect \
</span> port:py${python_version}-lxml \
port:py${python_version}-numpy
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles poppler-22.03.0.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- poppler-22.04.0.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> post-patch {
reinplace "s|\"python-interpreter\", *\{\"python3\"|\"python-interpreter\", \{\"python${python_major}.${python_minor}\"|g" ${worksrcpath}/src/extension/implementation/script.cpp
reinplace "s|COMMAND python3 |COMMAND ${prefix}/bin/python${python_major}.${python_minor} |g" \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -86,16 +87,15 @@ post-patch {
</span> ${worksrcpath}/share/palettes/CMakeLists.txt \
${worksrcpath}/share/symbols/CMakeLists.txt \
${worksrcpath}/share/templates/CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|^#include \"Object.h\"|#include \"${prefix}/include/poppler/Object.h\"|" ${worksrcpath}/src/extension/internal/pdfinput/pdf-parser.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|^#include \"Object.h\"|#include \"${prefix}/include/poppler/Object.h\"|" ${worksrcpath}/src/extension/internal/pdfinput/pdf-parser.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|^#include \"Object.h\"|#include <poppler/Object.h>|" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/src/extension/internal/pdfinput/pdf-parser.cpp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/src/extension/internal/pdfinput/pdf-parser.h
</span> reinplace "s|\"\$\{CMAKE_INSTALL_LIBDIR\}/inkscape\"|\$\{CMAKE_INSTALL_LIBDIR\}|" ${worksrcpath}/src/CMakeLists.txt
}
compiler.cxx_standard 2017
configure.args-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DWITH_DBUS:BOOL=ON \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DWITH_GNOME_VFS=OFF \
</span> -DWITH_OPENMP=OFF \
-DWITH_MANPAGE_COMPRESSION=OFF
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/inkscape/files/poppler-22.03.0.patch b/graphics/inkscape/files/poppler-22.03.0.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 9a1bac45b2b..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/inkscape/files/poppler-22.03.0.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,17 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/extension/internal/pdfinput/pdf-input.cpp.orig 2022-03-10 11:01:31.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/extension/internal/pdfinput/pdf-input.cpp 2022-03-10 11:05:41.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -666,10 +666,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // PDFDoc is from poppler. PDFDoc is used for preview and for native import.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- std::shared_ptr<PDFDoc> pdf_doc;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- // poppler does not use glib g_open. So on win32 we must use unicode call. code was copied from
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- // glib gstdio.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if POPPLER_CHECK_VERSION(22, 3, 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ pdf_doc = std::make_shared<PDFDoc>(std::make_unique<GooString>(uri)); // TODO: Could ask for password
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GooString *filename_goo = new GooString(uri);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pdf_doc = std::make_shared<PDFDoc>(filename_goo, nullptr, nullptr, nullptr); // TODO: Could ask for password
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!pdf_doc->isOk()) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int error = pdf_doc->getErrorCode();
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/inkscape/files/poppler-22.04.0.patch b/graphics/inkscape/files/poppler-22.04.0.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 44cb6315109..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/inkscape/files/poppler-22.04.0.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,150 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 08b2f3d93c08bcf1e363f4284112fd14a7cbd09c Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Rafael Siejakowski <rs@rs-math.net>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Mon, 4 Apr 2022 22:09:39 -0300
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Compatibility with Poppler 22.04
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Replace vanilla pointers with std::shared_ptr for pointers to fonts;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-eliminate manual ref-counting.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Cherry-picked from 6a7b9ec0af088baa08b92fd76b33eca26537fb35.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Fixes https://gitlab.com/inkscape/inkscape/-/issues/3387
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/extension/internal/pdfinput/pdf-parser.cpp | 14 ++++++++------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- .../internal/pdfinput/poppler-transition-api.h | 6 ++++++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/extension/internal/pdfinput/svg-builder.cpp | 7 +------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/extension/internal/pdfinput/svg-builder.h | 1 -
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 4 files changed, 15 insertions(+), 13 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index feecefa043..d6e2ede4f3 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/extension/internal/pdfinput/pdf-parser.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/extension/internal/pdfinput/pdf-parser.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -30,6 +30,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "Gfx.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "pdf-parser.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "util/units.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "poppler-transition-api.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "glib/poppler-features.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "goo/gmem.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2158,7 +2159,7 @@ void PdfParser::opSetCharSpacing(Object args[], int /*numArgs*/)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // TODO not good that numArgs is ignored but args[] is used:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void PdfParser::opSetFont(Object args[], int /*numArgs*/)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- GfxFont *font = res->lookupFont(args[0].getName());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ auto font = res->lookupFont(args[0].getName());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!font) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // unsetting the font (drawing no text) is better than using the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2179,7 +2180,9 @@ void PdfParser::opSetFont(Object args[], int /*numArgs*/)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fflush(stdout);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if !POPPLER_CHECK_VERSION(22, 4, 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- font->incRefCnt();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- state->setFont(font, args[1].getNum());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fontChanged = gTrue;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2373,7 +2376,6 @@ void PdfParser::doShowText(const GooString *s) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void PdfParser::doShowText(GooString *s) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- GfxFont *font;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int wMode;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- double riseX, riseY;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CharCode code;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2392,7 +2394,7 @@ void PdfParser::doShowText(GooString *s) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int len, n, uLen;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- font = state->getFont();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ auto font = state->getFont();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- wMode = font->getWMode();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- builder->beginString(state);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2445,10 +2447,10 @@ void PdfParser::doShowText(GooString *s) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- //out->updateCTM(state, 1, 0, 0, 1, 0, 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (false){ /*!out->beginType3Char(state, curX + riseX, curY + riseY, tdx, tdy,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- code, u, uLen)) {*/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- _POPPLER_CALL_ARGS(charProc, ((Gfx8BitFont *)font)->getCharProc, code);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if ((resDict = ((Gfx8BitFont *)font)->getResources())) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _POPPLER_CALL_ARGS(charProc, _POPPLER_FONTPTR_TO_GFX8(font)->getCharProc, code);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (resDict = _POPPLER_FONTPTR_TO_GFX8(font)->getResources()) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pushResources(resDict);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (charProc.isStream()) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- //parse(&charProc, gFalse); // TODO: parse into SVG font
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/extension/internal/pdfinput/poppler-transition-api.h b/src/extension/internal/pdfinput/poppler-transition-api.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 50b617c25c..dc9e47e45b 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/extension/internal/pdfinput/poppler-transition-api.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/extension/internal/pdfinput/poppler-transition-api.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -14,6 +14,18 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <glib/poppler-features.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if POPPLER_CHECK_VERSION(22, 4, 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define _POPPLER_FONTPTR_TO_GFX8(font_ptr) ((Gfx8BitFont *)font_ptr.get())
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define _POPPLER_FONTPTR_TO_GFX8(font_ptr) ((Gfx8BitFont *)font_ptr)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if POPPLER_CHECK_VERSION(22, 3, 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define _POPPLER_MAKE_SHARED_PDFDOC(uri) std::make_shared<PDFDoc>(std::make_unique<GooString>(uri))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define _POPPLER_MAKE_SHARED_PDFDOC(uri) std::make_shared<PDFDoc>(new GooString(uri), nullptr, nullptr, nullptr)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if POPPLER_CHECK_VERSION(0, 83, 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define _POPPLER_CONST_83 const
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/extension/internal/pdfinput/svg-builder.cpp b/src/extension/internal/pdfinput/svg-builder.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 461a4fb788..8ad0331b97 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/extension/internal/pdfinput/svg-builder.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/extension/internal/pdfinput/svg-builder.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -108,7 +108,6 @@ SvgBuilder::~SvgBuilder() = default;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void SvgBuilder::_init() {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _font_style = nullptr;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- _current_font = nullptr;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _font_specification = nullptr;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _font_scaling = 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _need_font_update = true;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1021,11 +1020,8 @@ void SvgBuilder::updateFont(GfxState *state) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _need_font_update = false;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- updateTextMatrix(state); // Ensure that we have a text matrix built
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (_font_style) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- //sp_repr_css_attr_unref(_font_style);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _font_style = sp_repr_css_attr_new();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- GfxFont *font = state->getFont();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ auto font = state->getFont();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Store original name
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (font->getName()) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _font_specification = font->getName()->getCString();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1171,7 +1167,6 @@ void SvgBuilder::updateFont(GfxState *state) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sp_repr_css_set_property(_font_style, "writing-mode", "tb");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- _current_font = font;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _invalidated_style = true;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/extension/internal/pdfinput/svg-builder.h b/src/extension/internal/pdfinput/svg-builder.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 050465d4bf..9422a0e5ba 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/extension/internal/pdfinput/svg-builder.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/extension/internal/pdfinput/svg-builder.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -203,7 +203,6 @@ private:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- std::vector<SvgGraphicsState> _state_stack;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SPCSSAttr *_font_style; // Current font style
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- GfxFont *_current_font;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const char *_font_specification;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- double _font_scaling;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bool _need_font_update;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-GitLab
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>