commit: 890c7d1282a3374a0033b27888a4c027a0f415b0
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 7 09:10:41 2025 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jul 8 16:03:07 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=890c7d12
app-office/scribus: Fix build w/ >=app-text/poppler-25.07.0
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/scribus-1.7.0-poppler-25.07.0.patch | 38 ++++++++++++++++++++++
app-office/scribus/scribus-1.7.0-r2.ebuild | 2 +-
2 files changed, 39 insertions(+), 1 deletion(-)
diff --git a/app-office/scribus/files/scribus-1.7.0-poppler-25.07.0.patch
b/app-office/scribus/files/scribus-1.7.0-poppler-25.07.0.patch
new file mode 100644
index 000000000000..4f8c1be3fcec
--- /dev/null
+++ b/app-office/scribus/files/scribus-1.7.0-poppler-25.07.0.patch
@@ -0,0 +1,38 @@
+Index: Scribus/scribus/plugins/import/pdf/slaoutput.cpp
+===================================================================
+--- Scribus/scribus/plugins/import/pdf/slaoutput.cpp (revision 26939)
++++ Scribus/scribus/plugins/import/pdf/slaoutput.cpp (revision 26940)
+@@ -3091,10 +3091,15 @@
+ break;
+ case fontTrueType:
+ case fontTrueTypeOT:
+-#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0)
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 7, 0)
+ if (!fileName.empty())
+ ff = FoFiTrueType::load(fileName.c_str(),
fontLoc->fontNum);
+ else
++ ff = FoFiTrueType::make(fontsrc->buf,
fontLoc->fontNum);
++#elif POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0)
++ if (!fileName.empty())
++ ff = FoFiTrueType::load(fileName.c_str(),
fontLoc->fontNum);
++ else
+ ff = FoFiTrueType::make(fontsrc->buf.data(),
fontsrc->buf.size(), fontLoc->fontNum);
+ #else
+ if (!fileName.empty())
+@@ -3226,10 +3231,15 @@
+ #endif
+ else
+ {
+-#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0)
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 7, 0)
+ if (!fileName.empty())
+ ff =
FoFiTrueType::load(fileName.c_str(), fontLoc->fontNum);
+ else
++ ff = FoFiTrueType::make(fontsrc->buf,
fontLoc->fontNum);
++#elif POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0)
++ if (!fileName.empty())
++ ff =
FoFiTrueType::load(fileName.c_str(), fontLoc->fontNum);
++ else
+ ff =
FoFiTrueType::make(fontsrc->buf.data(), fontsrc->buf.size(), fontLoc->fontNum);
+ #else
+ if (!fileName.empty())
diff --git a/app-office/scribus/scribus-1.7.0-r2.ebuild
b/app-office/scribus/scribus-1.7.0-r2.ebuild
index 6bf12a218c95..c02b7e6e9ee4 100644
--- a/app-office/scribus/scribus-1.7.0-r2.ebuild
+++ b/app-office/scribus/scribus-1.7.0-r2.ebuild
@@ -80,7 +80,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.7.0-findhyphen.patch
"${FILESDIR}"/${PN}-1.7.0-dont-install-thirdparty-license.patch
"${FILESDIR}"/${PN}-1.7.0-fix-icon-version.patch
- "${FILESDIR}"/${P}-poppler-25.0{2,6}.0.patch # from trunk
+ "${FILESDIR}"/${P}-poppler-25.0{2,6,7}.0.patch # from trunk
"${FILESDIR}"/${PN}-1.7.0-fix-compiling-with-qt-6.9.0.patch # bug 957695
)
