Hi,
this fixes the build of print/scribus with an upcoming update of
print/poppler.
It would be really nice if anyone using scribus could test wether
this also works with the version of poppler we now have in the tree
(24.12.0), because it would allow to commit it before the poppler
update.
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 3 Jan 2025 23:24:56 -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 3 Jan 2025 23:24:56 -0000
@@ -1,6 +1,6 @@
-Fix build with poppler-24.10.0.
+Fix build with poppler-25.01.0.
-From upstream commits 26325, 26327, 26392 and 26394.
+From upstream commits 26325, 26327, 26392, 26394 and 26558.
Index: scribus/plugins/import/pdf/slaoutput.cpp
--- scribus/plugins/import/pdf/slaoutput.cpp.orig
@@ -36,21 +36,53 @@ Index: scribus/plugins/import/pdf/slaout
LinkImportData::LinkImportData(Object *actionObj)
{
if (!actionObj->isDict())
-@@ -167,13 +171,8 @@ void AnoOutputDev::drawString(GfxState *state, POPPLER
+@@ -120,21 +124,15 @@ LinkImportData::LinkImportData(Object *actionObj)
+ return;
+
+ Object obj3 = getFileSpecNameForPlatform(&obj1);
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 01, 0)
+ if (!obj3.isNull())
+ fileName = obj3.getString()->copy();
++#else
++ if (!obj3.isNull())
++ fileName.reset(obj3.getString()->copy());
++
No comments:
Post a Comment