Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package inkscape for openSUSE:Factory checked in at 2025-12-15 11:35:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/inkscape (Old) and /work/SRC/openSUSE:Factory/.inkscape.new.1939 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "inkscape" Mon Dec 15 11:35:18 2025 rev:150 rq:1322639 version:1.4.2+git48.4b73df015e Changes: -------- --- /work/SRC/openSUSE:Factory/inkscape/inkscape.changes 2025-11-25 15:50:52.725503896 +0100 +++ /work/SRC/openSUSE:Factory/.inkscape.new.1939/inkscape.changes 2025-12-15 11:35:41.606185015 +0100 @@ -1,0 +2,15 @@ +Thu Dec 11 09:37:23 UTC 2025 - Petr Gajdos <[email protected]> + +- ace884e13e413b0cc49ece80936584ef92c986f5.patch had to be backported, + so remove patch url +- also remove source urls from other patches as it causes issues + (https://build.opensuse.org/requests/1322235) + +------------------------------------------------------------------- +Tue Dec 9 12:42:56 UTC 2025 - Petr Gajdos <[email protected]> + +- fix building with Poppler 25.10.0 +- added patches + * ace884e13e413b0cc49ece80936584ef92c986f5.patch + +------------------------------------------------------------------- New: ---- ace884e13e413b0cc49ece80936584ef92c986f5.patch ----------(New B)---------- New: - ace884e13e413b0cc49ece80936584ef92c986f5.patch had to be backported, so remove patch url ----------(New E)---------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ inkscape.spec ++++++ --- /var/tmp/diff_new_pack.Vgfi3d/_old 2025-12-15 11:35:43.418261458 +0100 +++ /var/tmp/diff_new_pack.Vgfi3d/_new 2025-12-15 11:35:43.422261626 +0100 @@ -28,9 +28,11 @@ Source1: openSUSE.gpl Source2: inkscape-split-extensions-extra.py # PATCH-FIX-UPSTREAM ce52c5f96106ae5747171663a46831f21aa52d95.patch -- Fix building with Poppler 25.07.0 -Patch: https://gitlab.com/inkscape/inkscape/-/commit/ce52c5f96106ae5747171663a46831f21aa52d95.patch +Patch: ce52c5f96106ae5747171663a46831f21aa52d95.patch # PATCH-FIX-UPSTREAM b60d81745016b5f20d4c6aec6d073b8a6f3e499c.patch -- Fix building with Poppler 25.09.0 -Patch1: https://gitlab.com/inkscape/inkscape/-/commit/b60d81745016b5f20d4c6aec6d073b8a6f3e499c.patch +Patch1: b60d81745016b5f20d4c6aec6d073b8a6f3e499c.patch +# PATCH-FIX-UPSTREAM ace884e13e413b0cc49ece80936584ef92c986f5.patch -- Fix building with Poppler 25.10.0 +Patch2: ace884e13e413b0cc49ece80936584ef92c986f5.patch BuildRequires: cmake BuildRequires: double-conversion-devel ++++++ ace884e13e413b0cc49ece80936584ef92c986f5.patch ++++++ >From ace884e13e413b0cc49ece80936584ef92c986f5 Mon Sep 17 00:00:00 2001 From: mike kowalski <[email protected]> Date: Sun, 12 Oct 2025 10:04:22 -0700 Subject: [PATCH] Replace getLength() with size() on a GooString (Poppler) GooString in poppler no longer defines getLength() method. Call size() from base string directly. --- src/extension/internal/pdfinput/pdf-parser.cpp | 4 ++-- src/extension/internal/pdfinput/poppler-utils.cpp | 6 +++--- src/extension/internal/pdfinput/poppler-utils.h | 9 +++++++++ 3 files changed, 14 insertions(+), 5 deletions(-) diff -upr inkscape-1.4.2+git48.4b73df015e.orig/src/extension/internal/pdfinput/pdf-parser.cpp inkscape-1.4.2+git48.4b73df015e/src/extension/internal/pdfinput/pdf-parser.cpp --- inkscape-1.4.2+git48.4b73df015e.orig/src/extension/internal/pdfinput/pdf-parser.cpp 2025-12-09 12:20:06.724954122 +0000 +++ inkscape-1.4.2+git48.4b73df015e/src/extension/internal/pdfinput/pdf-parser.cpp 2025-12-09 12:20:35.467596811 +0000 @@ -2256,7 +2256,7 @@ void PdfParser::doShowText(GooString *s) auto font = state->getFont(); int wMode = font->getWMode(); // Vertical/Horizontal/Invalid - builder->beginString(state, s->getLength()); + builder->beginString(state, get_goostring_length(*s)); // handle a Type 3 char if (font->getType() == fontType3) { @@ -2267,7 +2267,7 @@ void PdfParser::doShowText(GooString *s) state->textTransformDelta(0, state->getRise(), &riseX, &riseY); auto p = s->getCString(); // char* or const char* - int len = s->getLength(); + int len = get_goostring_length(*s); while (len > 0) { diff -upr inkscape-1.4.2+git48.4b73df015e.orig/src/extension/internal/pdfinput/poppler-utils.cpp inkscape-1.4.2+git48.4b73df015e/src/extension/internal/pdfinput/poppler-utils.cpp --- inkscape-1.4.2+git48.4b73df015e.orig/src/extension/internal/pdfinput/poppler-utils.cpp 2025-12-09 12:20:06.725282024 +0000 +++ inkscape-1.4.2+git48.4b73df015e/src/extension/internal/pdfinput/poppler-utils.cpp 2025-12-09 12:21:39.906047557 +0000 @@ -168,7 +168,7 @@ void InkFontDict::hashFontObject1(const case objString: h->hash('s'); s = obj->getString(); - h->hash(s->c_str(), s->getLength()); + h->hash(s->c_str(), get_goostring_length(*s)); break; case objName: h->hash('n'); @@ -586,10 +586,10 @@ std::string getDictString(Dict *dict, co std::string getString(const GooString *value) { if (_POPPLER_HAS_UNICODE_BOM(value)) { - return g_convert(value->getCString () + 2, value->getLength () - 2, + return g_convert(value->getCString () + 2, get_goostring_length(*value) - 2, "UTF-8", "UTF-16BE", NULL, NULL, NULL); } else if (_POPPLER_HAS_UNICODE_BOMLE(value)) { - return g_convert(value->getCString () + 2, value->getLength () - 2, + return g_convert(value->getCString () + 2, get_goostring_length(*value) - 2, "UTF-8", "UTF-16LE", NULL, NULL, NULL); } return value->toStr(); diff -upr inkscape-1.4.2+git48.4b73df015e.orig/src/extension/internal/pdfinput/poppler-utils.h inkscape-1.4.2+git48.4b73df015e/src/extension/internal/pdfinput/poppler-utils.h --- inkscape-1.4.2+git48.4b73df015e.orig/src/extension/internal/pdfinput/poppler-utils.h 2025-12-09 12:20:06.725311104 +0000 +++ inkscape-1.4.2+git48.4b73df015e/src/extension/internal/pdfinput/poppler-utils.h 2025-12-09 12:20:35.468483796 +0000 @@ -19,6 +19,7 @@ #include <string> #include <unordered_set> #include <vector> +#include <goo/GooString.h> #include "poppler-transition-api.h" @@ -104,4 +105,12 @@ private: void hashFontObject1(const Object *obj, FNVHash *h); }; +inline size_t get_goostring_length(const GooString& str) { +#if POPPLER_CHECK_VERSION(25, 10, 0) + return str.size(); +#else + return str.getLength(); +#endif +} + #endif /* POPPLER_UTILS_H */
