From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/files/, app-office/scribus/
Date: Tue, 08 Jul 2025 16:03:58 +0000 (UTC) [thread overview]
Message-ID: <1751990587.890c7d1282a3374a0033b27888a4c027a0f415b0.asturm@gentoo> (raw)
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
)
next reply other threads:[~2025-07-08 16:04 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-07-08 16:03 Andreas Sturmlechner [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-09-05 18:59 [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/files/, app-office/scribus/ Andreas Sturmlechner
2025-09-03 16:15 Andreas Sturmlechner
2025-03-07 13:16 Andreas Sturmlechner
2024-11-03 20:36 Andreas Sturmlechner
2024-06-03 17:36 Miroslav Šulc
2024-05-22 7:39 Miroslav Šulc
2024-05-14 17:25 Andreas Sturmlechner
2024-03-04 22:18 Andreas Sturmlechner
2024-01-14 10:24 Miroslav Šulc
2024-01-14 9:38 Miroslav Šulc
2024-01-01 9:30 Miroslav Šulc
2023-03-17 6:52 Miroslav Šulc
2023-02-06 10:36 Andreas Sturmlechner
2022-03-27 6:05 Miroslav Šulc
2022-02-10 19:38 Miroslav Šulc
2021-10-09 19:38 Sam James
2021-05-30 10:45 Miroslav Šulc
2021-03-07 1:30 Andreas Sturmlechner
2020-07-18 8:41 Andreas Sturmlechner
2020-05-30 9:31 Andreas Sturmlechner
2020-04-07 7:49 Andreas Sturmlechner
2019-12-29 11:54 Andreas Sturmlechner
2019-11-08 20:13 Andreas Sturmlechner
2019-10-01 23:43 Andreas Sturmlechner
2019-08-16 8:52 Miroslav Šulc
2019-06-23 16:44 Miroslav Šulc
2018-06-20 16:31 Andreas Sturmlechner
2018-05-10 15:55 Andreas Sturmlechner
2018-03-13 22:50 Andreas Sturmlechner
2018-01-09 13:46 Andreas Sturmlechner
2017-12-20 21:34 Justin Lecher
2016-11-06 8:25 Justin Lecher
2016-10-23 20:25 Justin Lecher
2016-09-27 18:50 Michael Weber
2015-10-19 12:06 Justin Lecher
2015-10-16 13:04 Justin Lecher
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1751990587.890c7d1282a3374a0033b27888a4c027a0f415b0.asturm@gentoo \
--to=asturm@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox