gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

app-office/scribus: Fix build w/ >=app-text/poppler-25.06.0

Browse Source 
Closes: https://bugs.gentoo.org/957138
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
This commit is contained in:
Andreas Sturmlechner
2025-06-07 16:12:46 +02:00
parent bd1c6e20f4
commit a858be988d
4 changed files with 37 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app-office/scribus/files/scribus-1.6.4-poppler-25.06.0.patch Normal file
View File

@@ -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)

17
app-office/scribus/files/scribus-1.7.0-poppler-25.06.0.patch Normal file
View File

@@ -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)

1
app-office/scribus/scribus-1.6.4.ebuild
View File

@@ -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() {

2
app-office/scribus/scribus-1.7.0.ebuild
View File

@@ -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() {