commit: 1bb702d08d23a60f9fed6ba86648132078abe682 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Fri Mar 7 13:13:26 2025 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Fri Mar 7 13:16:08 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1bb702d0
app-office/scribus: drop 1.6.2 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> app-office/scribus/Manifest | 1 - .../files/scribus-1.6.2-poppler-24.10.0.patch | 178 ------------- .../files/scribus-1.6.2-poppler-24.11.0-1.patch | 277 --------------------- .../files/scribus-1.6.2-poppler-24.11.0-2.patch | 42 ---- app-office/scribus/scribus-1.6.2.ebuild | 159 ------------ 5 files changed, 657 deletions(-) diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest index 82c5a7176d92..3781d3b70a69 100644 --- a/app-office/scribus/Manifest +++ b/app-office/scribus/Manifest @@ -1,3 +1,2 @@ -DIST scribus-1.6.2.tar.xz 73129400 BLAKE2B 2da98dc322319db18a157f66aef024b7392dbbfaf22adba14f719b48c644d1cc1546cc4d0cccf6dfe479571cf84de6f5645e5d452154f96ddc886e390702d547 SHA512 2f691c1f6b7beada89be410a2936b23641913bf26bd2152974bbaa747aeafb05aa797356a85bd55c14f60f0031ce1addedc9a3ce3e92546ebbb45f96a5ff3e62 DIST scribus-1.6.3.tar.xz 74909384 BLAKE2B b208270fce3e013692e90ec354849f99440efc97bda0e15c0baea16a5fd039b7435498c4d2669bd5c3caaca9c7d1125f78ea6fde483bf81449a451f9f54bf26d SHA512 b408ed862285d06d0f79a646ac2b43b0eb0b241c23dc276544e94a72e4fc3a0bf4efd500c5893c295886b11490115cdbe5f34ce7de51da30d31099831ba25d87 DIST scribus-1.7.0.tar.xz 97163704 BLAKE2B 02c57ce21d0f48d2e6906d8056fa766ddbdae88d6ac4c758996ba59776243d308ffd34d6c1e5dc5b3f2e2042f6760f0188efa9ef3b16f2b38ff54dc4bc7e2bef SHA512 c3a392d69e109165a9c28c2396e0e2e18df2d232099a6836f6a472fc3f899f50316e2b9227be40c3226dffc9f84e9db94dc2f353052fa06b35c776cd4f664448 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 deleted file mode 100644 index 230af10ea007..000000000000 --- a/app-office/scribus/files/scribus-1.6.2-poppler-24.10.0.patch +++ /dev/null @@ -1,178 +0,0 @@ -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-1.patch b/app-office/scribus/files/scribus-1.6.2-poppler-24.11.0-1.patch deleted file mode 100644 index c6ad46df633a..000000000000 --- a/app-office/scribus/files/scribus-1.6.2-poppler-24.11.0-1.patch +++ /dev/null @@ -1,277 +0,0 @@ -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/files/scribus-1.6.2-poppler-24.11.0-2.patch b/app-office/scribus/files/scribus-1.6.2-poppler-24.11.0-2.patch deleted file mode 100644 index 1402ebd8d26e..000000000000 --- a/app-office/scribus/files/scribus-1.6.2-poppler-24.11.0-2.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 874e1c13995223b1433026bc26e13911a74f3880 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <[email protected]> -Date: Wed, 13 Nov 2024 23:19:51 +0100 -Subject: [PATCH] Drop unused headers to fix build w/ poppler-24.11 - -Fix still pending upstream: -https://bugs.scribus.net/view.php?id=17308 - -Signed-off-by: Andreas Sturmlechner <[email protected]> ---- - scribus/plugins/import/pdf/pdftextrecognition.h | 1 - - scribus/plugins/import/pdf/slaoutput.h | 2 -- - 2 files changed, 3 deletions(-) - -diff --git a/scribus/plugins/import/pdf/pdftextrecognition.h b/scribus/plugins/import/pdf/pdftextrecognition.h -index a04b45358..6edac9906 100644 ---- a/scribus/plugins/import/pdf/pdftextrecognition.h -+++ b/scribus/plugins/import/pdf/pdftextrecognition.h -@@ -16,7 +16,6 @@ for which a new license (GPL+exception) is in place. - #include "slaoutput.h" - - #include <poppler/GfxState.h> --#include <poppler/CharCodeToUnicode.h> - - /* PDF TextBox Framework */ - /* -diff --git a/scribus/plugins/import/pdf/slaoutput.h b/scribus/plugins/import/pdf/slaoutput.h -index 69bebbf5f..ae7630d29 100644 ---- a/scribus/plugins/import/pdf/slaoutput.h -+++ b/scribus/plugins/import/pdf/slaoutput.h -@@ -45,8 +45,6 @@ for which a new license (GPL+exception) is in place. - #include <poppler/Form.h> - #include <poppler/Page.h> - #include <poppler/Catalog.h> --#include <poppler/CharCodeToUnicode.h> --#include <poppler/FontEncodingTables.h> - #include <poppler/splash/SplashFontFileID.h> - #include <poppler/splash/SplashFontFile.h> - #include <poppler/splash/SplashFontEngine.h> --- -2.47.0 - diff --git a/app-office/scribus/scribus-1.6.2.ebuild b/app-office/scribus/scribus-1.6.2.ebuild deleted file mode 100644 index 71b32025e6fc..000000000000 --- a/app-office/scribus/scribus-1.6.2.ebuild +++ /dev/null @@ -1,159 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..13} ) -PYTHON_REQ_USE="tk?" -inherit cmake desktop flag-o-matic optfeature python-single-r1 xdg - -DESCRIPTION="Desktop publishing (DTP) and layout program" -HOMEPAGE="https://www.scribus.net/"; - -if [[ "${PV}" == *9999* ]] ; then - EGIT_REPO_URI="https://github.com/scribusproject/scribus"; - EGIT_BRANCH="Version16x" - inherit git-r3 -else - SRC_URI="https://downloads.sourceforge.net/project/${PN}/${PN}/${PV}/${P}.tar.xz"; - S="${WORKDIR}/${P}" - KEYWORDS="amd64 ppc ppc64 x86" -fi - -LICENSE="GPL-2" -SLOT="$(ver_cut 1-2)" -IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts +templates tk" - -REQUIRED_USE="${PYTHON_REQUIRED_USE} - tk? ( scripts )" - -# osg -# couple of third_party libs bundled -DEPEND="${PYTHON_DEPS} - app-text/libmspub - app-text/libqxp - app-text/poppler:= - dev-libs/hyphen - dev-libs/icu:0= - dev-libs/librevenge - dev-libs/libxml2 - dev-qt/qtcore:5 - dev-qt/qtgui:5[-gles2-only,X] - dev-qt/qtnetwork:5 - dev-qt/qtopengl:5 - dev-qt/qtprintsupport:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - media-libs/fontconfig - media-libs/freetype:2 - media-libs/harfbuzz:0=[icu] - media-libs/lcms:2 - media-libs/libcdr - media-libs/libfreehand - media-libs/libjpeg-turbo:= - media-libs/libpagemaker - media-libs/libpng:0= - media-libs/libvisio - media-libs/libzmf - media-libs/tiff:= - net-print/cups - sys-libs/zlib[minizip] - x11-libs/cairo[X,svg(+)] - boost? ( dev-libs/boost:= ) - graphicsmagick? ( media-gfx/graphicsmagick:= ) - hunspell? ( app-text/hunspell:= ) - osg? ( dev-games/openscenegraph:= ) - pdf? ( app-text/podofo:0= ) - scripts? ( - $(python_gen_cond_dep ' - dev-python/pillow[tk?,${PYTHON_USEDEP}] - ') - ) -" -RDEPEND="${DEPEND} - app-text/ghostscript-gpl -" -BDEPEND=" - dev-qt/linguist-tools:5 - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}"/${PN}-1.5.8-cmake.patch # bug 886251 - "${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.0.patch # bug 941932 - "${FILESDIR}"/${P}-poppler-24.11.0-{1,2}.patch -) - -src_prepare() { - cmake_src_prepare - cmake_run_in scribus cmake_comment_add_subdirectory ui/qml - - # for safety remove files that we patched out - rm -r scribus/third_party/hyphen || die -} - -src_configure() { - # bug #550818 - append-cppflags -DHAVE_MEMRCHR - - local mycmakeargs=( - -DTAG_VERSION="-${SLOT}" - -DHAVE_PYTHON=ON - -DWANT_DISTROBUILD=ON - -DWANT_CPP17=ON - -DDOCDIR="${EPREFIX}"/usr/share/doc/${PF}/ - -DPython3_EXECUTABLE="${PYTHON}" - -DWITH_BOOST=$(usex boost) - -DWANT_DEBUG=$(usex debug) - -DWANT_NOEXAMPLES=$(usex !examples) - -DWANT_GRAPHICSMAGICK=$(usex graphicsmagick) - -DWANT_HUNSPELL=$(usex hunspell) - -DWANT_HEADERINSTALL=$(usex !minimal) - -DWANT_NOOSG=$(usex !osg) - -DWITH_PODOFO=$(usex pdf) - -DWANT_NOTEMPLATES=$(usex !templates) - ) - cmake_src_configure -} - -src_install() { - cmake_src_install - - if ! use tk; then - rm "${ED}"/usr/share/scribus-${SLOT}/scripts/{FontSample,CalendarWizard}.py || die - fi - if use scripts; then - python_fix_shebang "${ED}"/usr/share/scribus-${SLOT}/scripts - python_optimize "${ED}"/usr/share/scribus-${SLOT}/scripts - else - rm "${ED}"/usr/share/scribus-${SLOT}/scripts/*.py || die - fi - - mv "${ED}"/usr/share/doc/${PF}/{en,html} || die - ln -sf html "${ED}"/usr/share/doc/${PF}/en || die - - # These files are parsed to populate the help/about window. - cat >> "${T}"/COPYING <<- EOF || die - ${PN} is licensed under the "${LICENSE}". - Please visit https://www.gnu.org/licenses/gpl-2.0.html for the complete license text. - EOF - dodoc "${T}"/COPYING - docompress -x /usr/share/doc/${PF}/en /usr/share/doc/${PF}/{AUTHORS,TRANSLATION,LINKS,COPYING} - - local size - for size in 16 32 128 256 512; do - newicon -s $size resources/iconsets/artwork/icon_${size}x${size}.png scribus-${SLOT}.png - done - newicon -s 64 resources/iconsets/artwork/[email protected] scribus-${SLOT}.png - newicon resources/iconsets/1_5_1/scribus.png scribus-${SLOT}.png - newmenu scribus.desktop scribus-${SLOT}.desktop -} - -pkg_postinst() { - xdg_pkg_postinst - - optfeature "MS Word .doc file import filter support" app-text/antiword -}
