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 C04A515807A for ; Sat, 07 Jun 2025 14:23:03 +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 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id AC13434301B for ; Sat, 07 Jun 2025 14:23:03 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id A2EF81102BE; Sat, 07 Jun 2025 14:23:02 +0000 (UTC) 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 bobolink.gentoo.org (Postfix) with ESMTPS id 97C5A1102BE for ; Sat, 07 Jun 2025 14:23:02 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4180D343017 for ; Sat, 07 Jun 2025 14:23:02 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D41D119FB for ; Sat, 07 Jun 2025 14:23:00 +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: <1749306174.a858be988d35179b6742cc570eadbc47ef101d3a.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.6.4-poppler-25.06.0.patch app-office/scribus/files/scribus-1.7.0-poppler-25.06.0.patch app-office/scribus/scribus-1.6.4.ebuild app-office/scribus/scribus-1.7.0.ebuild X-VCS-Directories: app-office/scribus/files/ app-office/scribus/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: a858be988d35179b6742cc570eadbc47ef101d3a X-VCS-Branch: master Date: Sat, 07 Jun 2025 14:23:00 +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: adeed486-d839-47d6-a87c-3b8896ef40a0 X-Archives-Hash: ad1a4ac97166450f5eb1d2a8ecc132d5 commit: a858be988d35179b6742cc570eadbc47ef101d3a Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Jun 7 14:12:46 2025 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Jun 7 14:22:54 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a858be98 app-office/scribus: Fix build w/ >=app-text/poppler-25.06.0 Closes: https://bugs.gentoo.org/957138 Signed-off-by: Andreas Sturmlechner gentoo.org> .../scribus/files/scribus-1.6.4-poppler-25.06.0.patch | 18 ++++++++++++++++++ .../scribus/files/scribus-1.7.0-poppler-25.06.0.patch | 17 +++++++++++++++++ app-office/scribus/scribus-1.6.4.ebuild | 1 + app-office/scribus/scribus-1.7.0.ebuild | 2 +- 4 files changed, 37 insertions(+), 1 deletion(-) diff --git a/app-office/scribus/files/scribus-1.6.4-poppler-25.06.0.patch b/app-office/scribus/files/scribus-1.6.4-poppler-25.06.0.patch new file mode 100644 index 000000000000..d87e8ca8a258 --- /dev/null +++ b/app-office/scribus/files/scribus-1.6.4-poppler-25.06.0.patch @@ -0,0 +1,18 @@ +Index: Scribus/scribus/plugins/import/pdf/slaoutput.cpp +=================================================================== +--- Scribus/scribus/plugins/import/pdf/slaoutput.cpp (revision 26916) ++++ Scribus/scribus/plugins/import/pdf/slaoutput.cpp (revision 26918) +@@ -606,7 +606,12 @@ + FormWidget *fm = m_formWidgets->getWidget(i); + if (!fm) + continue; +- AnnotWidget *ano = fm->getWidgetAnnotation(); ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 06, 0) ++ std::shared_ptr anoSharedPtr = fm->getWidgetAnnotation(); ++ AnnotWidget* ano = anoSharedPtr.get(); ++#else ++ AnnotWidget* ano = fm->getWidgetAnnotation(); ++#endif + if (!ano) + continue; + if (ano != (AnnotWidget*) annota) diff --git a/app-office/scribus/files/scribus-1.7.0-poppler-25.06.0.patch b/app-office/scribus/files/scribus-1.7.0-poppler-25.06.0.patch new file mode 100644 index 000000000000..c27b43ee17dc --- /dev/null +++ b/app-office/scribus/files/scribus-1.7.0-poppler-25.06.0.patch @@ -0,0 +1,17 @@ +Index: Scribus/scribus/plugins/import/pdf/slaoutput.cpp +=================================================================== +--- Scribus/scribus/plugins/import/pdf/slaoutput.cpp (revision 26917) ++++ Scribus/scribus/plugins/import/pdf/slaoutput.cpp (revision 26919) +@@ -580,7 +580,12 @@ + FormWidget *fm = m_formWidgets->getWidget(i); + if (!fm) + continue; ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 06, 0) ++ std::shared_ptr anoSharedPtr = fm->getWidgetAnnotation(); ++ AnnotWidget* ano = anoSharedPtr.get(); ++#else + AnnotWidget *ano = fm->getWidgetAnnotation(); ++#endif + if (!ano) + continue; + if (ano != (AnnotWidget*) annota) diff --git a/app-office/scribus/scribus-1.6.4.ebuild b/app-office/scribus/scribus-1.6.4.ebuild index 0f17502b6e9c..32d58591201a 100644 --- a/app-office/scribus/scribus-1.6.4.ebuild +++ b/app-office/scribus/scribus-1.6.4.ebuild @@ -83,6 +83,7 @@ PATCHES=( "${FILESDIR}"/${PN}-1.5.3-fpic.patch "${FILESDIR}"/${PN}-1.6.1-findhyphen.patch "${FILESDIR}"/${PN}-1.7.0-fix-icon-version.patch + "${FILESDIR}"/${P}-poppler-25.06.0.patch # 1.6 branch, in 1.6.5 ) src_prepare() { diff --git a/app-office/scribus/scribus-1.7.0.ebuild b/app-office/scribus/scribus-1.7.0.ebuild index 11ecb660fcc5..f0868e65df27 100644 --- a/app-office/scribus/scribus-1.7.0.ebuild +++ b/app-office/scribus/scribus-1.7.0.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.02.0.patch # from trunk + "${FILESDIR}"/${P}-poppler-25.0{2,6}.0.patch # from trunk ) src_prepare() {