From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 79065158176 for ; Mon, 06 Oct 2025 18:36:44 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 6186A340D7F for ; Mon, 06 Oct 2025 18:36:44 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 51D4E1102C9; Mon, 06 Oct 2025 18:36:43 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 47E7C1102C9 for ; Mon, 06 Oct 2025 18:36:43 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 00EFC340D7F for ; Mon, 06 Oct 2025 18:36:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1F88F3AC8 for ; Mon, 06 Oct 2025 18:36:41 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1759775793.42408740bdee4a748d99d26f13e5d0b9ca717e33.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/, app-office/scribus/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-office/scribus/files/scribus-1.7.1_pre20250929-poppler-25.10.0.patch app-office/scribus/scribus-1.7.1_pre20250929.ebuild X-VCS-Directories: app-office/scribus/ app-office/scribus/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 42408740bdee4a748d99d26f13e5d0b9ca717e33 X-VCS-Branch: master Date: Mon, 06 Oct 2025 18:36:41 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: dea353b0-793c-464c-a6ef-81565f44c628 X-Archives-Hash: 5ffddeca07cd7e8fe30c336b44419ccf commit: 42408740bdee4a748d99d26f13e5d0b9ca717e33 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Oct 6 18:32:09 2025 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Oct 6 18:36:33 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42408740 app-office/scribus: Fix build w/ IUSE doc Signed-off-by: Andreas Sturmlechner gentoo.org> ...scribus-1.7.1_pre20250929-poppler-25.10.0.patch | 111 +++++++++++++++++++++ .../scribus/scribus-1.7.1_pre20250929.ebuild | 1 + 2 files changed, 112 insertions(+) diff --git a/app-office/scribus/files/scribus-1.7.1_pre20250929-poppler-25.10.0.patch b/app-office/scribus/files/scribus-1.7.1_pre20250929-poppler-25.10.0.patch new file mode 100644 index 000000000000..8abe7b029ede --- /dev/null +++ b/app-office/scribus/files/scribus-1.7.1_pre20250929-poppler-25.10.0.patch @@ -0,0 +1,111 @@ +Index: Scribus/scribus/plugins/import/pdf/importpdf.cpp +=================================================================== +--- Scribus/scribus/plugins/import/pdf/importpdf.cpp (revision 27039) ++++ Scribus/scribus/plugins/import/pdf/importpdf.cpp (revision 27042) +@@ -874,6 +874,44 @@ + + QString PdfPlug::UnicodeParsedString(const GooString *s1) + { ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 10, 0) ++ if (!s1 || s1->size() == 0) ++ return QString(); ++ bool isUnicode; ++ int i; ++ Unicode u; ++ QString result; ++ if ((s1->getChar(0) & 0xff) == 0xfe && (s1->size() > 1 && (s1->getChar(1) & 0xff) == 0xff)) ++ { ++ isUnicode = true; ++ i = 2; ++ result.reserve((s1->size() - 2) / 2); ++ } ++ else ++ { ++ isUnicode = false; ++ i = 0; ++ result.reserve(s1->size()); ++ } ++ while (i < s1->size()) ++ { ++ if (isUnicode) ++ { ++ u = ((s1->getChar(i) & 0xff) << 8) | (s1->getChar(i + 1) & 0xff); ++ i += 2; ++ } ++ else ++ { ++ u = s1->getChar(i) & 0xff; ++ ++i; ++ } ++ // #15616: imagemagick may write unicode strings incorrectly in PDF ++ if (u == 0) ++ continue; ++ result += QChar(u); ++ } ++ return result; ++#else + if (!s1 || s1->getLength() == 0) + return QString(); + bool isUnicode; +@@ -910,6 +948,7 @@ + result += QChar( u ); + } + return result; ++#endif + } + + QString PdfPlug::UnicodeParsedString(const std::string& s1) +Index: Scribus/scribus/plugins/import/pdf/slaoutput.cpp +=================================================================== +--- Scribus/scribus/plugins/import/pdf/slaoutput.cpp (revision 27039) ++++ Scribus/scribus/plugins/import/pdf/slaoutput.cpp (revision 27042) +@@ -3883,6 +3883,41 @@ + + QString SlaOutputDev::UnicodeParsedString(const GooString *s1) const + { ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 10, 0) ++ if (!s1 || s1->size() == 0) ++ return QString(); ++ bool isUnicode; ++ int i; ++ Unicode u; ++ QString result; ++ if ((s1->getChar(0) & 0xff) == 0xfe && (s1->size() > 1 && (s1->getChar(1) & 0xff) == 0xff)) ++ { ++ isUnicode = true; ++ i = 2; ++ result.reserve((s1->size() - 2) / 2); ++ } ++ else ++ { ++ isUnicode = false; ++ i = 0; ++ result.reserve(s1->size()); ++ } ++ while (i < s1->size()) ++ { ++ if (isUnicode) ++ { ++ u = ((s1->getChar(i) & 0xff) << 8) | (s1->getChar(i + 1) & 0xff); ++ i += 2; ++ } ++ else ++ { ++ u = s1->getChar(i) & 0xff; ++ ++i; ++ } ++ result += QChar(u); ++ } ++ return result; ++#else + if (!s1 || s1->getLength() == 0) + return QString(); + bool isUnicode; +@@ -3916,6 +3951,7 @@ + result += QChar( u ); + } + return result; ++#endif + } + + QString SlaOutputDev::UnicodeParsedString(const std::string& s1) const diff --git a/app-office/scribus/scribus-1.7.1_pre20250929.ebuild b/app-office/scribus/scribus-1.7.1_pre20250929.ebuild index ab505d3c8bbf..3b0c7ddf4325 100644 --- a/app-office/scribus/scribus-1.7.1_pre20250929.ebuild +++ b/app-office/scribus/scribus-1.7.1_pre20250929.ebuild @@ -85,6 +85,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-25.10.0.patch # from trunk ) src_prepare() {