From 4e7c42625d742016f62fbd06c480719dc80cd444 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Wed, 18 Mar 2026 22:03:06 +0100 Subject: [PATCH] app-office/scribus: Fix build w/ poppler-26.03 Signed-off-by: Andreas Sturmlechner --- .../files/scribus-1.7.2-poppler-26.03.patch | 16 ++++++++++++++++ app-office/scribus/scribus-1.7.2.ebuild | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 app-office/scribus/files/scribus-1.7.2-poppler-26.03.patch diff --git a/app-office/scribus/files/scribus-1.7.2-poppler-26.03.patch b/app-office/scribus/files/scribus-1.7.2-poppler-26.03.patch new file mode 100644 index 0000000000000..d8efa740c26dc --- /dev/null +++ b/app-office/scribus/files/scribus-1.7.2-poppler-26.03.patch @@ -0,0 +1,16 @@ +Index: Scribus/scribus/plugins/import/pdf/slaoutput.cpp +=================================================================== +--- Scribus/scribus/plugins/import/pdf/slaoutput.cpp (revision 27452) ++++ Scribus/scribus/plugins/import/pdf/slaoutput.cpp (revision 27454) +@@ -884,7 +884,11 @@ + const Ref ref = childRef.getRef(); + radList.append(ref.num); + } ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(26, 3, 0) ++ QString tmTxt = UnicodeParsedString(annota->getUniqueName()); ++#else + QString tmTxt = UnicodeParsedString(annota->getName()); ++#endif + m_radioMap.insert(tmTxt, radList); + } + } diff --git a/app-office/scribus/scribus-1.7.2.ebuild b/app-office/scribus/scribus-1.7.2.ebuild index ef46281cd6e8e..03965d3abf18b 100644 --- a/app-office/scribus/scribus-1.7.2.ebuild +++ b/app-office/scribus/scribus-1.7.2.ebuild @@ -83,7 +83,7 @@ PATCHES=( "${FILESDIR}"/${PN}-1.7.0-findhyphen.patch "${FILESDIR}"/${PN}-1.7.0-dont-install-qtadvanceddocking.patch # bugs 961290, 960017 "${FILESDIR}"/${PN}-1.7.0-fix-icon-version.patch - "${FILESDIR}"/${P}-poppler-26.02.patch # upstream trunk + "${FILESDIR}"/${P}-poppler-26.0{2,3}.patch # upstream trunk ) src_prepare() {