[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/, app-office/scribus/files/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     a858be988d35179b6742cc570eadbc47ef101d3a
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jun  7 14:12:46 2025 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> 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 <asturm <AT> 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<AnnotWidget> 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<AnnotWidget> 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() {