Hi,
this fixes the build with poppler-25.01.0.
Unless there are objections, I'll commit this together with poppler and
(with an ok from rsadowski) kitinerary.
Ciao,
Kili
Index: Makefile
===================================================================
RCS file: /cvs/ports/print/scribus/Makefile,v
diff -u -p -r1.94 Makefile
--- Makefile 21 Dec 2024 11:38:39 -0000 1.94
+++ Makefile 6 Jan 2025 20:52:19 -0000
@@ -3,7 +3,7 @@ DPB_PROPERTIES= parallel
COMMENT= desktop publishing program
DISTNAME= scribus-1.6.2
CATEGORIES= print
-REVISION= 1
+REVISION= 2
HOMEPAGE= https://www.scribus.net/
Index: patches/patch-scribus_plugins_import_pdf_slaoutput_cpp
===================================================================
RCS file:
/cvs/ports/print/scribus/patches/patch-scribus_plugins_import_pdf_slaoutput_cpp,v
diff -u -p -r1.12 patch-scribus_plugins_import_pdf_slaoutput_cpp
--- patches/patch-scribus_plugins_import_pdf_slaoutput_cpp 6 Dec 2024
07:13:26 -0000 1.12
+++ patches/patch-scribus_plugins_import_pdf_slaoutput_cpp 6 Jan 2025
20:52:19 -0000
@@ -1,4 +1,4 @@
-Fix build with poppler-24.10.0.
+Fix build with poppler-24.10.0 and 25.01.0.
From upstream commits 26325, 26327, 26392 and 26394.
@@ -36,7 +36,16 @@ Index: scribus/plugins/import/pdf/slaout
LinkImportData::LinkImportData(Object *actionObj)
{
if (!actionObj->isDict())
-@@ -167,13 +171,8 @@ void AnoOutputDev::drawString(GfxState *state, POPPLER
+@@ -121,7 +125,7 @@ LinkImportData::LinkImportData(Object *actionObj)
+
+ Object obj3 = getFileSpecNameForPlatform(&obj1);
+ if (!obj3.isNull())
+- fileName = obj3.getString()->copy();
++ fileName = obj3.getString()->copy().get();
+ }
+
+ LinkImportData::~LinkImportData()
+@@ -167,14 +171,9 @@ void AnoOutputDev::drawString(GfxState *state, POPPLER
int shade = 100;
currColorText = getColor(state->getFillColorSpace(),
state->getFillColor(), &shade);
fontSize = state->getFontSize();
@@ -47,9 +56,11 @@ Index: scribus/plugins/import/pdf/slaout
- if (state->getFont())
- fontName = state->getFont()->getName()->copy();
-#endif
- itemText = s->copy();
+- itemText = s->copy();
++ itemText = s->copy().get();
}
+ QString AnoOutputDev::getColor(GfxColorSpace *color_space, POPPLER_CONST_070
GfxColor *color, int *shade)
@@ -359,30 +358,25 @@ LinkAction* SlaOutputDev::SC_getAdditionalAction(const
GBool SlaOutputDev::annotations_callback(Annot *annota, void *user_data)
{
