commit: ee6733d64b566645a2173155c7994f4c15092910 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sun Nov 3 20:28:08 2024 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sun Nov 3 20:35:50 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee6733d6
app-office/scribus: Fix build w/ >=app-text/poppler-24.10.0 (... still fails to build against >=24.11.0, unfortunately ...) Closes: https://bugs.gentoo.org/941932 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../files/scribus-1.6.2-poppler-24.10.0.patch | 178 +++++++++++++ .../files/scribus-1.6.2-poppler-24.11.0.patch | 277 +++++++++++++++++++++ app-office/scribus/scribus-1.6.2.ebuild | 1 + 3 files changed, 456 insertions(+) diff --git a/app-office/scribus/files/scribus-1.6.2-poppler-24.10.0.patch b/app-office/scribus/files/scribus-1.6.2-poppler-24.10.0.patch new file mode 100644 index 000000000000..230af10ea007 --- /dev/null +++ b/app-office/scribus/files/scribus-1.6.2-poppler-24.10.0.patch @@ -0,0 +1,178 @@ +From 09e6d8cd005fd36811998bbc8c9de3a019c7b8fb Mon Sep 17 00:00:00 2001 +From: Jean Ghali <[email protected]> +Date: Tue, 15 Oct 2024 21:09:31 +0000 +Subject: [PATCH 1/2] Fix build with poppler 24.10.0 + +git-svn-id: svn://scribus.net/branches/Version16x/Scribus@26324 11d20701-8431-0410-a711-e3c959e3b870 +--- + scribus/plugins/import/pdf/slaoutput.cpp | 34 ++++++++++++++++++++++++ + scribus/plugins/import/pdf/slaoutput.h | 6 ++++- + 2 files changed, 39 insertions(+), 1 deletion(-) + +diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp +index c002a886a..dfabf7039 100644 +--- a/scribus/plugins/import/pdf/slaoutput.cpp ++++ b/scribus/plugins/import/pdf/slaoutput.cpp +@@ -81,6 +81,8 @@ namespace + } + } + ++#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(24, 10, 0) ++ + LinkSubmitForm::LinkSubmitForm(Object *actionObj) + { + if (!actionObj->isDict()) +@@ -111,6 +113,8 @@ LinkSubmitForm::~LinkSubmitForm() + delete fileName; + } + ++#endif ++ + LinkImportData::LinkImportData(Object *actionObj) + { + if (!actionObj->isDict()) +@@ -1078,6 +1082,32 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotWidget *ano) + } + } + } ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 89, 0) ++ else if (Lact->getKind() == actionResetForm) ++ { ++ ite->annotation().setActionType(4); ++ } ++#endif ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 10, 0) ++ else if (Lact->getKind() == actionSubmitForm) ++ { ++ const auto* impo = (LinkSubmitForm*) Lact; ++ if (impo->isOk()) ++ { ++ ite->annotation().setActionType(3); ++ ite->annotation().setAction(UnicodeParsedString(impo->getUrl())); ++ int fl = impo->getFlags(); ++ if (fl == 0) ++ ite->annotation().setHTML(0); ++ else if (fl == 4) ++ ite->annotation().setHTML(1); ++ else if (fl == 64) ++ ite->annotation().setHTML(2); ++ else if (fl == 512) ++ ite->annotation().setHTML(3); ++ } ++ } ++#endif + else if (Lact->getKind() == actionUnknown) + { + auto *uno = (LinkUnknown*) Lact; +@@ -1106,7 +1136,11 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotWidget *ano) + if (impo->isOk()) + { + ite->annotation().setActionType(3); ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 10, 0) ++ ite->annotation().setAction(UnicodeParsedString(impo->getUrl())); ++#else + ite->annotation().setAction(UnicodeParsedString(impo->getFileName())); ++#endif + int fl = impo->getFlags(); + if (fl == 0) + ite->annotation().setHTML(0); +diff --git a/scribus/plugins/import/pdf/slaoutput.h b/scribus/plugins/import/pdf/slaoutput.h +index 35de565b0..90a745972 100644 +--- a/scribus/plugins/import/pdf/slaoutput.h ++++ b/scribus/plugins/import/pdf/slaoutput.h +@@ -56,9 +56,11 @@ for which a new license (GPL+exception) is in place. + #include <poppler/splash/SplashGlyphBitmap.h> + + //------------------------------------------------------------------------ +-// LinkSubmitData ++// LinkSubmitForm + //------------------------------------------------------------------------ + ++#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(24, 10, 0) ++ + class LinkSubmitForm: public LinkAction + { + public: +@@ -79,6 +81,8 @@ private: + int m_flags {0}; + }; + ++#endif ++ + //------------------------------------------------------------------------ + // LinkImportData + //------------------------------------------------------------------------ +-- +2.47.0 + + +From 6b80de8425a5b6b3e8c170b4a99cb4c5e0d85789 Mon Sep 17 00:00:00 2001 +From: Jean Ghali <[email protected]> +Date: Tue, 15 Oct 2024 21:15:36 +0000 +Subject: [PATCH 2/2] Simplify build fix for poppler 24.10.0 + +git-svn-id: svn://scribus.net/branches/Version16x/Scribus@26326 11d20701-8431-0410-a711-e3c959e3b870 +--- + scribus/plugins/import/pdf/slaoutput.cpp | 8 ++------ + scribus/plugins/import/pdf/slaoutput.h | 6 +++--- + 2 files changed, 5 insertions(+), 9 deletions(-) + +diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp +index dfabf7039..69022014b 100644 +--- a/scribus/plugins/import/pdf/slaoutput.cpp ++++ b/scribus/plugins/import/pdf/slaoutput.cpp +@@ -99,7 +99,7 @@ LinkSubmitForm::LinkSubmitForm(Object *actionObj) + { + Object obj2 = obj1.dictLookup("F"); + if (!obj2.isNull()) +- fileName = obj2.getString()->copy(); ++ m_url = obj2.getString()->copy(); + } + } + } +@@ -110,7 +110,7 @@ LinkSubmitForm::LinkSubmitForm(Object *actionObj) + + LinkSubmitForm::~LinkSubmitForm() + { +- delete fileName; ++ delete m_url; + } + + #endif +@@ -1136,11 +1136,7 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotWidget *ano) + if (impo->isOk()) + { + ite->annotation().setActionType(3); +-#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 10, 0) + ite->annotation().setAction(UnicodeParsedString(impo->getUrl())); +-#else +- ite->annotation().setAction(UnicodeParsedString(impo->getFileName())); +-#endif + int fl = impo->getFlags(); + if (fl == 0) + ite->annotation().setHTML(0); +diff --git a/scribus/plugins/import/pdf/slaoutput.h b/scribus/plugins/import/pdf/slaoutput.h +index 90a745972..0482a5855 100644 +--- a/scribus/plugins/import/pdf/slaoutput.h ++++ b/scribus/plugins/import/pdf/slaoutput.h +@@ -70,14 +70,14 @@ public: + virtual ~LinkSubmitForm(); + + // Was the LinkImportData created successfully? +- GBool isOk() POPPLER_CONST override { return fileName != nullptr; } ++ GBool isOk() POPPLER_CONST override { return m_url != nullptr; } + // Accessors. + LinkActionKind getKind() POPPLER_CONST override { return actionUnknown; } +- GooString *getFileName() { return fileName; } ++ GooString *getUrl() { return m_url; } + int getFlags() { return m_flags; } + + private: +- GooString *fileName {nullptr}; // file name ++ GooString *m_url {nullptr}; // URL + int m_flags {0}; + }; + +-- +2.47.0 + diff --git a/app-office/scribus/files/scribus-1.6.2-poppler-24.11.0.patch b/app-office/scribus/files/scribus-1.6.2-poppler-24.11.0.patch new file mode 100644 index 000000000000..c6ad46df633a --- /dev/null +++ b/app-office/scribus/files/scribus-1.6.2-poppler-24.11.0.patch @@ -0,0 +1,277 @@ +From 46f78fd4d22f17257ef18fb6c41267ad1185aaa6 Mon Sep 17 00:00:00 2001 +From: Jean Ghali <[email protected]> +Date: Sun, 3 Nov 2024 02:07:56 +0000 +Subject: [PATCH 1/3] Fix build with poppler 24.11.0 + +git-svn-id: svn://scribus.net/branches/Version16x/Scribus@26390 11d20701-8431-0410-a711-e3c959e3b870 +--- + scribus/plugins/import/pdf/slaoutput.cpp | 77 +++++++++++++++++++++++- + scribus/plugins/import/pdf/slaoutput.h | 7 +++ + 2 files changed, 82 insertions(+), 2 deletions(-) + +diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp +index 69022014b..a49ef2263 100644 +--- a/scribus/plugins/import/pdf/slaoutput.cpp ++++ b/scribus/plugins/import/pdf/slaoutput.cpp +@@ -3079,7 +3079,11 @@ void SlaOutputDev::updateFont(GfxState *state) + char* tmpBuf = nullptr; + #endif + GfxFontType fontType; ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0) ++ std::unique_ptr<SlaOutFontFileID> id; ++#else + SlaOutFontFileID *id; ++#endif + SplashFontFile *fontFile; + SplashFontSrc *fontsrc = nullptr; + Object refObj, strObj; +@@ -3109,9 +3113,15 @@ void SlaOutputDev::updateFont(GfxState *state) + goto err1; + + // check the font file cache ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0) ++ id.reset(new SlaOutFontFileID(gfxFont->getID())); ++ if ((fontFile = m_fontEngine->getFontFile(*id))) ++ id.reset(); ++#else + id = new SlaOutFontFileID(gfxFont->getID()); + if ((fontFile = m_fontEngine->getFontFile(id))) + delete id; ++#endif + else + { + fontLoc = gfxFont->locateFont(m_xref ? m_xref : m_pdfDoc->getXRef(), nullptr); +@@ -3165,29 +3175,58 @@ void SlaOutputDev::updateFont(GfxState *state) + // load the font file + switch (fontType) { + case fontType1: ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0) ++ if (!(fontFile = m_fontEngine->loadType1Font(std::move(id), fontsrc, (const char**) ((Gfx8BitFont*) gfxFont)->getEncoding(), fontLoc->fontNum))) ++ { ++ error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->c_str() : "(unnamed)"); ++ goto err2; ++ } ++#else + if (!(fontFile = m_fontEngine->loadType1Font(id, fontsrc, (const char **)((Gfx8BitFont *) gfxFont)->getEncoding()))) + { + error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)"); + goto err2; + } ++#endif + break; + case fontType1C: ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0) ++ if (!(fontFile = m_fontEngine->loadType1CFont(std::move(id), fontsrc, (const char**) ((Gfx8BitFont*) gfxFont)->getEncoding(), fontLoc->fontNum))) ++ { ++ error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->c_str() : "(unnamed)"); ++ goto err2; ++ } ++#else + if (!(fontFile = m_fontEngine->loadType1CFont(id, fontsrc, (const char **)((Gfx8BitFont *) gfxFont)->getEncoding()))) + { + error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)"); + goto err2; + } ++#endif + break; + case fontType1COT: ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0) ++ if (!(fontFile = m_fontEngine->loadOpenTypeT1CFont(std::move(id), fontsrc, (const char **)((Gfx8BitFont *) gfxFont)->getEncoding(), fontLoc->fontNum))) ++ { ++ error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->c_str() : "(unnamed)"); ++ goto err2; ++ } ++#else + if (!(fontFile = m_fontEngine->loadOpenTypeT1CFont(id, fontsrc, (const char **)((Gfx8BitFont *) gfxFont)->getEncoding()))) + { + error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)"); + goto err2; + } ++#endif + break; + case fontTrueType: + case fontTrueTypeOT: +-#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 4, 0) ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0) ++ if (!fileName.empty()) ++ ff = FoFiTrueType::load(fileName.c_str(), fontLoc->fontNum); ++ else ++ ff = FoFiTrueType::make(fontsrc->buf.data(), fontsrc->buf.size(), fontLoc->fontNum); ++#elif POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 4, 0) + if (!fileName.empty()) + ff = FoFiTrueType::load(fileName.c_str()); + else +@@ -3214,19 +3253,35 @@ void SlaOutputDev::updateFont(GfxState *state) + codeToGID = nullptr; + n = 0; + } ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0) ++ if (!(fontFile = m_fontEngine->loadTrueTypeFont(std::move(id), fontsrc, codeToGID, n, fontLoc->fontNum))) ++ { ++ error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->c_str() : "(unnamed)"); ++ goto err2; ++ } ++#else + if (!(fontFile = m_fontEngine->loadTrueTypeFont(id, fontsrc, codeToGID, n))) + { + error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)"); + goto err2; + } ++#endif + break; + case fontCIDType0: + case fontCIDType0C: ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0) ++ if (!(fontFile = m_fontEngine->loadCIDFont(std::move(id), fontsrc, fontLoc->fontNum))) ++ { ++ error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->c_str() : "(unnamed)"); ++ goto err2; ++ } ++#else + if (!(fontFile = m_fontEngine->loadCIDFont(id, fontsrc))) + { + error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)"); + goto err2; + } ++#endif + break; + case fontCIDType0COT: + if (((GfxCIDFont *) gfxFont)->getCIDToGID()) +@@ -3240,12 +3295,21 @@ void SlaOutputDev::updateFont(GfxState *state) + codeToGID = nullptr; + n = 0; + } ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0) ++ if (!(fontFile = m_fontEngine->loadOpenTypeCFFFont(std::move(id), fontsrc, codeToGID, n, fontLoc->fontNum))) ++ { ++ error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", ++ gfxFont->getName() ? gfxFont->getName()->c_str() : "(unnamed)"); ++ goto err2; ++ } ++#else + if (!(fontFile = m_fontEngine->loadOpenTypeCFFFont(id, fontsrc, codeToGID, n))) + { + error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", + gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)"); + goto err2; + } ++#endif + break; + case fontCIDType2: + case fontCIDType2OT: +@@ -3262,7 +3326,12 @@ void SlaOutputDev::updateFont(GfxState *state) + } + else + { +-#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 4, 0) ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0) ++ if (!fileName.empty()) ++ ff = FoFiTrueType::load(fileName.c_str(), fontLoc->fontNum); ++ else ++ ff = FoFiTrueType::make(fontsrc->buf.data(), fontsrc->buf.size(), fontLoc->fontNum); ++#elif POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 4, 0) + if (!fileName.empty()) + ff = FoFiTrueType::load(fileName.c_str()); + else +@@ -3322,7 +3391,11 @@ void SlaOutputDev::updateFont(GfxState *state) + return; + + err2: ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0) ++ id.reset(); ++#else + delete id; ++#endif + #if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(22, 2, 0) + delete fontLoc; + #endif +diff --git a/scribus/plugins/import/pdf/slaoutput.h b/scribus/plugins/import/pdf/slaoutput.h +index 0482a5855..69bebbf5f 100644 +--- a/scribus/plugins/import/pdf/slaoutput.h ++++ b/scribus/plugins/import/pdf/slaoutput.h +@@ -115,10 +115,17 @@ public: + SlaOutFontFileID(const Ref *rA) { r = *rA; } + ~SlaOutFontFileID() {} + ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0) ++ bool matches(const SplashFontFileID& id) const override ++ { ++ return ((const SlaOutFontFileID&) id).r.num == r.num && ((const SlaOutFontFileID&) id).r.gen == r.gen; ++ } ++#else + GBool matches(SplashFontFileID *id) override + { + return ((SlaOutFontFileID*) id)->r.num == r.num && ((SlaOutFontFileID *) id)->r.gen == r.gen; + } ++#endif + + private: + Ref r; +-- +2.47.0 + + +From 0a02f661959d62492695dee6b3538ab2bdf01c91 Mon Sep 17 00:00:00 2001 +From: Jean Ghali <[email protected]> +Date: Sun, 3 Nov 2024 02:12:49 +0000 +Subject: [PATCH 2/3] Fix build with poppler 24.11.0 (2) + +git-svn-id: svn://scribus.net/branches/Version16x/Scribus@26391 11d20701-8431-0410-a711-e3c959e3b870 +--- + scribus/plugins/import/pdf/slaoutput.cpp | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp +index a49ef2263..41eaba921 100644 +--- a/scribus/plugins/import/pdf/slaoutput.cpp ++++ b/scribus/plugins/import/pdf/slaoutput.cpp +@@ -3352,11 +3352,19 @@ void SlaOutputDev::updateFont(GfxState *state) + delete ff; + #endif + } ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0) ++ if (!(fontFile = m_fontEngine->loadTrueTypeFont(std::move(id), fontsrc, codeToGID, n, faceIndex))) ++ { ++ error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->c_str() : "(unnamed)"); ++ goto err2; ++ } ++#else + if (!(fontFile = m_fontEngine->loadTrueTypeFont(id, fontsrc, codeToGID, n, faceIndex))) + { + error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)"); + goto err2; + } ++#endif + break; + default: + // this shouldn't happen +-- +2.47.0 + + +From 93db266048e90ca31a9c50ee4696956a93b816ab Mon Sep 17 00:00:00 2001 +From: Jean Ghali <[email protected]> +Date: Sun, 3 Nov 2024 02:17:33 +0000 +Subject: [PATCH 3/3] Fix from poppler 24.11.0 SplashOutputDev + +git-svn-id: svn://scribus.net/branches/Version16x/Scribus@26393 11d20701-8431-0410-a711-e3c959e3b870 +--- + scribus/plugins/import/pdf/slaoutput.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp +index 41eaba921..9724ff72b 100644 +--- a/scribus/plugins/import/pdf/slaoutput.cpp ++++ b/scribus/plugins/import/pdf/slaoutput.cpp +@@ -3353,7 +3353,7 @@ void SlaOutputDev::updateFont(GfxState *state) + #endif + } + #if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0) +- if (!(fontFile = m_fontEngine->loadTrueTypeFont(std::move(id), fontsrc, codeToGID, n, faceIndex))) ++ if (!(fontFile = m_fontEngine->loadTrueTypeFont(std::move(id), fontsrc, codeToGID, n, fontLoc->fontNum))) + { + error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->c_str() : "(unnamed)"); + goto err2; +-- +2.47.0 + diff --git a/app-office/scribus/scribus-1.6.2.ebuild b/app-office/scribus/scribus-1.6.2.ebuild index 764455f39f70..753044e56f3c 100644 --- a/app-office/scribus/scribus-1.6.2.ebuild +++ b/app-office/scribus/scribus-1.6.2.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-24.{10,11}.0.patch # bug 941932 ) src_prepare() {
