Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package inkscape for openSUSE:Factory checked in at 2022-04-28 23:07:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/inkscape (Old) and /work/SRC/openSUSE:Factory/.inkscape.new.1538 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "inkscape" Thu Apr 28 23:07:19 2022 rev:120 rq:972200 version:1.1.2 Changes: -------- --- /work/SRC/openSUSE:Factory/inkscape/inkscape.changes 2022-03-07 17:45:46.483140053 +0100 +++ /work/SRC/openSUSE:Factory/.inkscape.new.1538/inkscape.changes 2022-04-28 23:07:22.700648933 +0200 @@ -1,0 +2,7 @@ +Fri Apr 22 09:08:10 UTC 2022 - Christophe Giboudeaux <[email protected]> + +- Add poppler 22.04.0 compability fix: + * Fix_build_poppler_22040.patch +- Update Fix_build_poppler_22030.patch + +------------------------------------------------------------------- New: ---- Fix_build_poppler_22040.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ inkscape.spec ++++++ --- /var/tmp/diff_new_pack.RmjkNS/_old 2022-04-28 23:07:23.492649796 +0200 +++ /var/tmp/diff_new_pack.RmjkNS/_new 2022-04-28 23:07:23.496649800 +0200 @@ -33,7 +33,8 @@ Source99: https://inkscape.org/~MarcJeanmougin/gpg#/%name.keyring # PATCH-FIX-UPSTREAM Fix_build_poppler_22030.patch -- Fix build with poppler 22.03.0 Patch0: Fix_build_poppler_22030.patch - +# PATCH-FIX-UPSTREAM +Patch1: Fix_build_poppler_22040.patch BuildRequires: cmake BuildRequires: double-conversion-devel BuildRequires: fdupes ++++++ Fix_build_poppler_22030.patch ++++++ --- /var/tmp/diff_new_pack.RmjkNS/_old 2022-04-28 23:07:23.516649822 +0200 +++ /var/tmp/diff_new_pack.RmjkNS/_new 2022-04-28 23:07:23.520649826 +0200 @@ -1,36 +1,52 @@ -From 15ab83e02b07018c3ffd4952a2623393187659e0 Mon Sep 17 00:00:00 2001 +From f7857a4fc2b916e64d9689ccc89914ad19f3ef0a Mon Sep 17 00:00:00 2001 From: Evangelos Foutras <[email protected]> -Date: Wed, 2 Mar 2022 19:50:02 +0200 -Subject: [PATCH] Fix build with poppler 22.03.0 +Date: Sun, 20 Mar 2022 22:41:51 -0300 +Subject: [PATCH] Ensure compatibility with Poppler 22.03 and later -PDFDoc's constructor now takes an std::unique_ptr as the filename and -the rest of the parameters are std::optional and can be left out. +This change ensures that Inkscape will build against Poppler 22.03 after +the changes that were made to the constructor of `PDFDoc`. -Also, remove an obsolete comment regarding special handling on win32; -the "ifndef _WIN32" it was referring to has been removed by commit -ad8effaa6ec3 ("Fix PDF import with non-ASCII filename on Windows"). +See: https://gitlab.freedesktop.org/poppler/poppler/-/commit/4f2abd3ef + +Co-authored-by: Rafael Siejakowski <[email protected]> +(cherry picked from commit a18c57ffff313fd08bc8a44f6b6bf0b01d7e9b75) --- - src/extension/internal/pdfinput/pdf-input.cpp | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) + src/extension/internal/pdfinput/pdf-input.cpp | 3 +-- + src/extension/internal/pdfinput/poppler-transition-api.h | 6 ++++++ + 2 files changed, 7 insertions(+), 2 deletions(-) -Index: inkscape-1.1.2_2022-02-04_0a00cf5339/src/extension/internal/pdfinput/pdf-input.cpp -=================================================================== ---- inkscape-1.1.2_2022-02-04_0a00cf5339.orig/src/extension/internal/pdfinput/pdf-input.cpp -+++ inkscape-1.1.2_2022-02-04_0a00cf5339/src/extension/internal/pdfinput/pdf-input.cpp -@@ -666,10 +666,12 @@ PdfInput::open(::Inkscape::Extension::In - // PDFDoc is from poppler. PDFDoc is used for preview and for native import. - std::shared_ptr<PDFDoc> pdf_doc; - -- // poppler does not use glib g_open. So on win32 we must use unicode call. code was copied from -- // glib gstdio.c -+#if POPPLER_CHECK_VERSION(22, 3, 0) -+ pdf_doc = std::make_shared<PDFDoc>(std::make_unique<GooString>(uri)); // TODO: Could ask for password -+#else - GooString *filename_goo = new GooString(uri); +diff --git a/src/extension/internal/pdfinput/pdf-input.cpp b/src/extension/internal/pdfinput/pdf-input.cpp +index e6204f650c..82b0d97765 100644 +--- a/src/extension/internal/pdfinput/pdf-input.cpp ++++ b/src/extension/internal/pdfinput/pdf-input.cpp +@@ -668,8 +668,7 @@ PdfInput::open(::Inkscape::Extension::Input * /*mod*/, const gchar * uri) { + + // poppler does not use glib g_open. So on win32 we must use unicode call. code was copied from + // glib gstdio.c +- GooString *filename_goo = new GooString(uri); - pdf_doc = std::make_shared<PDFDoc>(filename_goo, nullptr, nullptr, nullptr); // TODO: Could ask for password -+ pdf_doc = std::make_shared<PDFDoc>(filename_goo, nullptr, nullptr, nullptr); // TODO: Could ask for password -+#endif - ++ pdf_doc = _POPPLER_MAKE_SHARED_PDFDOC(uri); // TODO: Could ask for password + if (!pdf_doc->isOk()) { int error = pdf_doc->getErrorCode(); +diff --git a/src/extension/internal/pdfinput/poppler-transition-api.h b/src/extension/internal/pdfinput/poppler-transition-api.h +index 87a19d4c42..50b617c25c 100644 +--- a/src/extension/internal/pdfinput/poppler-transition-api.h ++++ b/src/extension/internal/pdfinput/poppler-transition-api.h +@@ -14,6 +14,12 @@ + + #include <glib/poppler-features.h> + ++#if POPPLER_CHECK_VERSION(22, 3, 0) ++#define _POPPLER_MAKE_SHARED_PDFDOC(uri) std::make_shared<PDFDoc>(std::make_unique<GooString>(uri)) ++#else ++#define _POPPLER_MAKE_SHARED_PDFDOC(uri) std::make_shared<PDFDoc>(new GooString(uri), nullptr, nullptr, nullptr) ++#endif ++ + #if POPPLER_CHECK_VERSION(0, 83, 0) + #define _POPPLER_CONST_83 const + #else +-- +GitLab + ++++++ Fix_build_poppler_22040.patch ++++++ >From 08b2f3d93c08bcf1e363f4284112fd14a7cbd09c Mon Sep 17 00:00:00 2001 From: Rafael Siejakowski <[email protected]> Date: Mon, 4 Apr 2022 22:09:39 -0300 Subject: [PATCH] Compatibility with Poppler 22.04 Replace vanilla pointers with std::shared_ptr for pointers to fonts; eliminate manual ref-counting. Cherry-picked from 6a7b9ec0af088baa08b92fd76b33eca26537fb35. Fixes https://gitlab.com/inkscape/inkscape/-/issues/3387 --- src/extension/internal/pdfinput/pdf-parser.cpp | 14 ++++++++------ .../internal/pdfinput/poppler-transition-api.h | 6 ++++++ src/extension/internal/pdfinput/svg-builder.cpp | 7 +------ src/extension/internal/pdfinput/svg-builder.h | 1 - 4 files changed, 15 insertions(+), 13 deletions(-) diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp index feecefa043..d6e2ede4f3 100644 --- a/src/extension/internal/pdfinput/pdf-parser.cpp +++ b/src/extension/internal/pdfinput/pdf-parser.cpp @@ -30,6 +30,7 @@ #include "Gfx.h" #include "pdf-parser.h" #include "util/units.h" +#include "poppler-transition-api.h" #include "glib/poppler-features.h" #include "goo/gmem.h" @@ -2158,7 +2159,7 @@ void PdfParser::opSetCharSpacing(Object args[], int /*numArgs*/) // TODO not good that numArgs is ignored but args[] is used: void PdfParser::opSetFont(Object args[], int /*numArgs*/) { - GfxFont *font = res->lookupFont(args[0].getName()); + auto font = res->lookupFont(args[0].getName()); if (!font) { // unsetting the font (drawing no text) is better than using the @@ -2179,7 +2180,9 @@ void PdfParser::opSetFont(Object args[], int /*numArgs*/) fflush(stdout); } +#if !POPPLER_CHECK_VERSION(22, 4, 0) font->incRefCnt(); +#endif state->setFont(font, args[1].getNum()); fontChanged = gTrue; } @@ -2373,7 +2376,6 @@ void PdfParser::doShowText(const GooString *s) { #else void PdfParser::doShowText(GooString *s) { #endif - GfxFont *font; int wMode; double riseX, riseY; CharCode code; @@ -2392,7 +2394,7 @@ void PdfParser::doShowText(GooString *s) { #endif int len, n, uLen; - font = state->getFont(); + auto font = state->getFont(); wMode = font->getWMode(); builder->beginString(state); @@ -2445,10 +2447,10 @@ void PdfParser::doShowText(GooString *s) { //out->updateCTM(state, 1, 0, 0, 1, 0, 0); if (false){ /*!out->beginType3Char(state, curX + riseX, curY + riseY, tdx, tdy, code, u, uLen)) {*/ - _POPPLER_CALL_ARGS(charProc, ((Gfx8BitFont *)font)->getCharProc, code); - if ((resDict = ((Gfx8BitFont *)font)->getResources())) { + _POPPLER_CALL_ARGS(charProc, _POPPLER_FONTPTR_TO_GFX8(font)->getCharProc, code); + if (resDict = _POPPLER_FONTPTR_TO_GFX8(font)->getResources()) { pushResources(resDict); - } + } if (charProc.isStream()) { //parse(&charProc, gFalse); // TODO: parse into SVG font } else { diff --git a/src/extension/internal/pdfinput/poppler-transition-api.h b/src/extension/internal/pdfinput/poppler-transition-api.h index 50b617c25c..dc9e47e45b 100644 --- a/src/extension/internal/pdfinput/poppler-transition-api.h +++ b/src/extension/internal/pdfinput/poppler-transition-api.h @@ -14,6 +14,12 @@ #include <glib/poppler-features.h> +#if POPPLER_CHECK_VERSION(22, 4, 0) +#define _POPPLER_FONTPTR_TO_GFX8(font_ptr) ((Gfx8BitFont *)font_ptr.get()) +#else +#define _POPPLER_FONTPTR_TO_GFX8(font_ptr) ((Gfx8BitFont *)font_ptr) +#endif + #if POPPLER_CHECK_VERSION(22, 3, 0) #define _POPPLER_MAKE_SHARED_PDFDOC(uri) std::make_shared<PDFDoc>(std::make_unique<GooString>(uri)) #else diff --git a/src/extension/internal/pdfinput/svg-builder.cpp b/src/extension/internal/pdfinput/svg-builder.cpp index 461a4fb788..8ad0331b97 100644 --- a/src/extension/internal/pdfinput/svg-builder.cpp +++ b/src/extension/internal/pdfinput/svg-builder.cpp @@ -108,7 +108,6 @@ SvgBuilder::~SvgBuilder() = default; void SvgBuilder::_init() { _font_style = nullptr; - _current_font = nullptr; _font_specification = nullptr; _font_scaling = 1; _need_font_update = true; @@ -1021,11 +1020,8 @@ void SvgBuilder::updateFont(GfxState *state) { _need_font_update = false; updateTextMatrix(state); // Ensure that we have a text matrix built - if (_font_style) { - //sp_repr_css_attr_unref(_font_style); - } _font_style = sp_repr_css_attr_new(); - GfxFont *font = state->getFont(); + auto font = state->getFont(); // Store original name if (font->getName()) { _font_specification = font->getName()->getCString(); @@ -1171,7 +1167,6 @@ void SvgBuilder::updateFont(GfxState *state) { sp_repr_css_set_property(_font_style, "writing-mode", "tb"); } - _current_font = font; _invalidated_style = true; } diff --git a/src/extension/internal/pdfinput/svg-builder.h b/src/extension/internal/pdfinput/svg-builder.h index 050465d4bf..9422a0e5ba 100644 --- a/src/extension/internal/pdfinput/svg-builder.h +++ b/src/extension/internal/pdfinput/svg-builder.h @@ -203,7 +203,6 @@ private: std::vector<SvgGraphicsState> _state_stack; SPCSSAttr *_font_style; // Current font style - GfxFont *_current_font; const char *_font_specification; double _font_scaling; bool _need_font_update; -- GitLab
