diff options
| author | root <root@alpha.trunkmasters.com> | 2026-09-19 19:27:39 -0500 |
|---|---|---|
| committer | root <root@alpha.trunkmasters.com> | 2026-09-19 19:27:39 -0500 |
| commit | 47516b9667518dacb1efd6d257f7b3e6a481ec93 (patch) | |
| tree | 15968af203a3ff5970f912ab816b33e3a8648196 /app-office | |
| parent | 1e827c97be50f4e8e4da3697da898689b2bde9d5 (diff) | |
| download | baldeagleos-repo-47516b9667518dacb1efd6d257f7b3e6a481ec93.tar.gz baldeagleos-repo-47516b9667518dacb1efd6d257f7b3e6a481ec93.tar.xz baldeagleos-repo-47516b9667518dacb1efd6d257f7b3e6a481ec93.zip | |
Adding metadata
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/scribus/Manifest | 1 | ||||
| -rw-r--r-- | app-office/scribus/files/scribus-1.7.2-poppler-26.02.patch | 407 | ||||
| -rw-r--r-- | app-office/scribus/files/scribus-1.7.2-poppler-26.03.patch | 14 | ||||
| -rw-r--r-- | app-office/scribus/scribus-1.7.2.ebuild | 156 |
4 files changed, 0 insertions, 578 deletions
diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest index f0534a1c2fd7..0511a092ec53 100644 --- a/app-office/scribus/Manifest +++ b/app-office/scribus/Manifest @@ -1,2 +1 @@ -DIST scribus-1.7.2.tar.xz 97976736 BLAKE2B 06a4360a05f1ce8deec6178f0ac53859663b7a65aa6c6367e82732e5c3f8f577990830ddd17bb530385961f5fae54e009dc051003fdd07355d1c53aacc0c607e SHA512 9ced669fe3f337b6136840027a8c10d8fa699d014519960917a1f38c4de1752299c65a35c3c3f1feec990f930f5778e5f02e7549148a0320c209713bdddb896a DIST scribus-1.7.3.tar.xz 98101324 BLAKE2B 4af3b3531c3eaa381c26ab5dc5d5637eb99d8886d27259042b86a9fe7ec37cd919de817a4e71f1561e9f96b953058ddd751f75bb09e306f2b9ad8a9e6b311057 SHA512 50f568b76829deb89d2fafcaa4d9f6655876dfef1bcefd3f547ede15b704a54c9c95d7de379312a6351c698893ac00f7fd56784436f0bf00631640e42e2b155e diff --git a/app-office/scribus/files/scribus-1.7.2-poppler-26.02.patch b/app-office/scribus/files/scribus-1.7.2-poppler-26.02.patch deleted file mode 100644 index e3f3252c2d16..000000000000 --- a/app-office/scribus/files/scribus-1.7.2-poppler-26.02.patch +++ /dev/null @@ -1,407 +0,0 @@ ---- Scribus/scribus/plugins/import/pdf/importpdf.cpp -+++ Scribus/scribus/plugins/import/pdf/importpdf.cpp -@@ -79,7 +79,11 @@ - bgColor[0] = 255;
- bgColor[1] = 255;
- bgColor[2] = 255;
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(26, 2, 0)
-+ SplashOutputDev dev(splashModeXBGR8, 4, bgColor, true);
-+#else
- SplashOutputDev dev(splashModeXBGR8, 4, false, bgColor, true);
-+#endif
- dev.setVectorAntialias(true);
- dev.setFreeTypeHinting(true, false);
- dev.startDoc(&pdfDoc);
-@@ -154,20 +158,17 @@ - }
- double docWidth = PrefsManager::instance().appPrefs.docSetupPrefs.pageWidth;
- double docHeight = PrefsManager::instance().appPrefs.docSetupPrefs.pageHeight;
-- if (!m_interactive || (flags & LoadSavePlugin::lfInsertPage))
-+ if (m_Doc && (!m_interactive || (flags & LoadSavePlugin::lfInsertPage)))
- {
- m_Doc->setPage(docWidth, docHeight, 0, 0, 0, 0, 0, 0, false, false);
- m_Doc->addPage(0);
- m_Doc->view()->addPage(0, true);
- }
-- else
-+ else if (!m_Doc || (flags & LoadSavePlugin::lfCreateDoc))
- {
-- if (!m_Doc || (flags & LoadSavePlugin::lfCreateDoc))
-- {
-- m_Doc = ScCore->primaryMainWindow()->doFileNew(docWidth, docHeight, 0, 0, 0, 0, 0, 0, false, 0, 0, 0, 0, 1, "Custom", true);
-- ScCore->primaryMainWindow()->HaveNewDoc();
-- ret = true;
-- }
-+ m_Doc = ScCore->primaryMainWindow()->doFileNew(docWidth, docHeight, 0, 0, 0, 0, 0, 0, false, 0, 0, 0, 0, 1, "Custom", true);
-+ ScCore->primaryMainWindow()->HaveNewDoc();
-+ ret = true;
- }
-
- if (ret || !m_interactive)
-@@ -801,11 +802,15 @@ - bgColor[0] = 255;
- bgColor[1] = 255;
- bgColor[2] = 255;
-- SplashOutputDev *dev = new SplashOutputDev(splashModeXBGR8, 4, false, bgColor, true);
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(26, 2, 0)
-+ auto dev = std::make_unique<SplashOutputDev>(splashModeXBGR8, 4, bgColor, true);
-+#else
-+ auto dev = std::make_unique<SplashOutputDev>(splashModeXBGR8, 4, false, bgColor, true);
-+#endif
- dev->setVectorAntialias(true);
- dev->setFreeTypeHinting(true, false);
- dev->startDoc(m_pdfDoc);
-- m_pdfDoc->displayPage(dev, pgNum, hDPI, vDPI, 0, true, false, false);
-+ m_pdfDoc->displayPage(dev.get(), pgNum, hDPI, vDPI, 0, true, false, false);
- SplashBitmap *bitmap = dev->getBitmap();
- int bw = bitmap->getWidth();
- int bh = bitmap->getHeight();
-@@ -843,7 +848,6 @@ - pp.drawRect(cRect);
- pp.end();
- }
-- delete dev;
- return image;
- }
-
---- Scribus/scribus/plugins/import/pdf/pdftextrecognition.cpp -+++ Scribus/scribus/plugins/import/pdf/pdftextrecognition.cpp -@@ -81,7 +81,7 @@ - */
- PdfGlyph PdfTextRecognition::AddCharCommon(GfxState* state, double x, double y, double dx, double dy, Unicode const* u, int uLen)
- {
-- const double * ctm = state->getCTM();
-+ const auto ctm = state->getCTM();
- QTransform trans(ctm[0], ctm[1], ctm[2], ctm[3], ctm[4], ctm[5]);
- QPointF charDelta1 = trans.map(QPointF(0.0, 0.0));
- QPointF charDelta2 = trans.map(QPointF(dx, dy));
-@@ -121,7 +121,7 @@ - setCharMode(AddCharMode::ADDBASICCHAR);
-
- //only need to be called for the very first point
-- const double * ctm = state->getCTM();
-+ const auto ctm = state->getCTM();
- QTransform trans(ctm[0], ctm[1], ctm[2], ctm[3], ctm[4], ctm[5]);
- QPointF glyphPos = trans.map(QPointF(x, y));
-
-@@ -136,7 +136,7 @@ - */
- PdfGlyph PdfTextRecognition::AddBasicChar(GfxState* state, double x, double y, double dx, double dy, double originX, double originY, CharCode code, int nBytes, Unicode const* u, int uLen)
- {
-- const double * ctm = state->getCTM();
-+ const auto ctm = state->getCTM();
- QTransform trans(ctm[0], ctm[1], ctm[2], ctm[3], ctm[4], ctm[5]);
-
- PdfGlyph newGlyph = AddCharCommon(state, x, y, dx, dy, u, uLen);
-@@ -461,7 +461,7 @@ - */
- void PdfTextOutputDev::updateTextPos(GfxState* state)
- {
-- const double * ctm = state->getCTM();
-+ const auto ctm = state->getCTM();
- QTransform trans(ctm[0], ctm[1], ctm[2], ctm[3], ctm[4], ctm[5]);
-
- QPointF newPosition = trans.map(QPointF(state->getCurX(), state->getCurY()));
---- Scribus/scribus/plugins/import/pdf/slaoutput.cpp -+++ Scribus/scribus/plugins/import/pdf/slaoutput.cpp -@@ -1535,7 +1535,7 @@ -
- void SlaOutputDev::adjustClip(GfxState *state, Qt::FillRule fillRule)
- {
-- const double *ctm = state->getCTM();
-+ const auto ctm = state->getCTM();
- m_ctm = QTransform(ctm[0], ctm[1], ctm[2], ctm[3], ctm[4], ctm[5]);
- QString output = convertPath(state->getPath());
- if (output.isEmpty())
-@@ -1563,7 +1563,7 @@ - void SlaOutputDev::stroke(GfxState *state)
- {
- // qDebug() << "Stroke";
-- const double *ctm = state->getCTM();
-+ const auto ctm = state->getCTM();
- m_ctm = QTransform(ctm[0], ctm[1], ctm[2], ctm[3], ctm[4], ctm[5]);
- double xCoor = m_doc->currentPage()->xOffset();
- double yCoor = m_doc->currentPage()->yOffset();
-@@ -1671,8 +1671,7 @@ -
- void SlaOutputDev::createFillItem(GfxState *state, Qt::FillRule fillRule)
- {
-- const double *ctm;
-- ctm = state->getCTM();
-+ const auto ctm = state->getCTM();
- m_ctm = QTransform(ctm[0], ctm[1], ctm[2], ctm[3], ctm[4], ctm[5]);
- double xCoor = m_doc->currentPage()->xOffset();
- double yCoor = m_doc->currentPage()->yOffset();
-@@ -1799,7 +1798,7 @@ - out = intersection(m_graphicStack.top().clipPath, out);
- crect = out.boundingRect();
- }
-- const double *ctm = state->getCTM();
-+ const auto ctm = state->getCTM();
- m_ctm = QTransform(ctm[0], ctm[1], ctm[2], ctm[3], ctm[4], ctm[5]);
- FPointArray gr;
- gr.addPoint(GrStartX, GrStartY);
-@@ -1938,7 +1937,7 @@ - double GrFocalY = y1;
- GrEndX = GrFocalX + r1;
- GrEndY = GrFocalY;
-- const double *ctm = state->getCTM();
-+ const auto ctm = state->getCTM();
- m_ctm = QTransform(ctm[0], ctm[1], ctm[2], ctm[3], ctm[4], ctm[5]);
- FPointArray gr;
- gr.addPoint(GrStartX, GrStartY);
-@@ -2023,7 +2022,7 @@ - output += QString("Z");
- m_pathIsClosed = true;
- m_coords = output;
-- const double *ctm = state->getCTM();
-+ const auto ctm = state->getCTM();
- m_ctm = QTransform(ctm[0], ctm[1], ctm[2], ctm[3], ctm[4], ctm[5]);
- const auto& graphicState = m_graphicStack.top();
- int z = m_doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, xCoor + crect.x(), yCoor + crect.y(), crect.width(), crect.height(), 0, graphicState.fillColor, CommonStrings::None);
-@@ -2104,7 +2103,7 @@ - output += QString("Z");
- m_pathIsClosed = true;
- m_coords = output;
-- const double *ctm = state->getCTM();
-+ const auto ctm = state->getCTM();
- m_ctm = QTransform(ctm[0], ctm[1], ctm[2], ctm[3], ctm[4], ctm[5]);
- const auto& graphicState = m_graphicStack.top();
- int z = m_doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, xCoor + crect.x(), yCoor + crect.y(), crect.width(), crect.height(), 0, graphicState.fillColor, CommonStrings::None);
-@@ -2265,7 +2264,7 @@ - box.x2 = bbox[2];
- box.y2 = bbox[3];
-
-- const double *ctm = state->getCTM();
-+ const auto ctm = state->getCTM();
- m_ctm = QTransform(ctm[0], ctm[1], ctm[2], ctm[3], ctm[4], ctm[5]);
- QTransform mm(mat[0], mat[1], mat[2], mat[3], mat[4], mat[5]);
- QTransform mmx = mm * m_ctm;
-@@ -2712,7 +2711,7 @@ - void SlaOutputDev::createImageFrame(QImage& image, GfxState *state, int numColorComponents)
- {
- // qDebug() << "SlaOutputDev::createImageFrame";
-- const double *ctm = state->getCTM();
-+ const auto ctm = state->getCTM();
- double xCoor = m_doc->currentPage()->xOffset();
- double yCoor = m_doc->currentPage()->yOffset();
-
-@@ -3002,8 +3001,16 @@ - #else
- SlaOutFontFileID *id;
- #endif
-- SplashFontFile *fontFile;
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(26, 2, 0)
-+ std::shared_ptr<SplashFontFile> fontFile;
-+#else
-+ SplashFontFile *fontFile = nullptr;
-+#endif
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(26, 2, 0)
-+ std::unique_ptr<SplashFontSrc> fontsrc;
-+#else
- SplashFontSrc *fontsrc = nullptr;
-+#endif
- Object refObj, strObj;
- #if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 2, 0)
- std::vector<int> codeToGID;
-@@ -3010,7 +3017,11 @@ - #else
- int *codeToGID = nullptr;
- #endif
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(26, 2, 0)
-+ std::array<double, 6> textMat;
-+#else
- const double *textMat = nullptr;
-+#endif
- double m11, m12, m21, m22, fontSize;
- #if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(26, 1, 0)
- std::array<SplashCoord, 4> mat = { 1.0, 0.0, 0.0, 1.0 };
-@@ -3070,16 +3081,29 @@ - fontType = fontLoc->fontType;
- }
-
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(26, 2, 0)
-+ if (!fileName.empty())
-+ fontsrc = std::make_unique<SplashFontSrc>(fileName);
-+ else
-+ fontsrc = std::make_unique<SplashFontSrc>(std::move(tmpBuf.value()));
-+#else
- fontsrc = new SplashFontSrc;
- if (!fileName.empty())
- fontsrc->setFile(fileName);
- else
- fontsrc->setBuf(std::move(tmpBuf.value()));
-+#endif
-
- // load the font file
- switch (fontType) {
- case fontType1:
--#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0)
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(26, 2, 0)
-+ if (!(fontFile = m_fontEngine->loadType1Font(std::move(id), std::move(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;
-+ }
-+#elif 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)");
-@@ -3094,7 +3118,13 @@ - #endif
- break;
- case fontType1C:
--#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0)
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(26, 2, 0)
-+ if (!(fontFile = m_fontEngine->loadType1CFont(std::move(id), std::move(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;
-+ }
-+#elif 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)");
-@@ -3109,7 +3139,13 @@ - #endif
- break;
- case fontType1COT:
--#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0)
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(26, 2, 0)
-+ if (!(fontFile = m_fontEngine->loadOpenTypeT1CFont(std::move(id), std::move(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;
-+ }
-+#elif 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)");
-@@ -3125,10 +3161,15 @@ - break;
- case fontTrueType:
- case fontTrueTypeOT:
--#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 7, 0)
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(26, 2, 0)
- if (!fileName.empty())
- ff = FoFiTrueType::load(fileName.c_str(), fontLoc->fontNum);
- else
-+ ff = FoFiTrueType::make(fontsrc->buf(), fontLoc->fontNum);
-+#elif POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 7, 0)
-+ if (!fileName.empty())
-+ ff = FoFiTrueType::load(fileName.c_str(), fontLoc->fontNum);
-+ else
- ff = FoFiTrueType::make(fontsrc->buf, fontLoc->fontNum);
- #elif POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0)
- if (!fileName.empty())
-@@ -3156,7 +3197,13 @@ - #endif
- n = 0;
- }
--#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 2, 0)
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(26, 2, 0)
-+ if (!(fontFile = m_fontEngine->loadTrueTypeFont(std::move(id), std::move(fontsrc), std::move(codeToGID), fontLoc->fontNum)))
-+ {
-+ error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->c_str() : "(unnamed)");
-+ goto err2;
-+ }
-+#elif POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 2, 0)
- if (!(fontFile = m_fontEngine->loadTrueTypeFont(std::move(id), fontsrc, std::move(codeToGID), fontLoc->fontNum)))
- {
- error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->c_str() : "(unnamed)");
-@@ -3178,7 +3225,13 @@ - break;
- case fontCIDType0:
- case fontCIDType0C:
--#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0)
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(26, 2, 0)
-+ if (!(fontFile = m_fontEngine->loadCIDFont(std::move(id), std::move(fontsrc), fontLoc->fontNum)))
-+ {
-+ error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->c_str() : "(unnamed)");
-+ goto err2;
-+ }
-+#elif 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)");
-@@ -3217,7 +3270,14 @@ - n = 0;
- }
- #endif
--#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 2, 0)
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(26, 2, 0)
-+ if (!(fontFile = m_fontEngine->loadOpenTypeCFFFont(std::move(id), std::move(fontsrc), std::move(codeToGID), fontLoc->fontNum)))
-+ {
-+ error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'",
-+ gfxFont->getName() ? gfxFont->getName()->c_str() : "(unnamed)");
-+ goto err2;
-+ }
-+#elif POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 2, 0)
- if (!(fontFile = m_fontEngine->loadOpenTypeCFFFont(std::move(id), fontsrc, std::move(codeToGID), fontLoc->fontNum)))
- {
- error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'",
-@@ -3265,10 +3325,15 @@ - #endif
- else
- {
--#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 7, 0)
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(26, 2, 0)
- if (!fileName.empty())
- ff = FoFiTrueType::load(fileName.c_str(), fontLoc->fontNum);
- else
-+ ff = FoFiTrueType::make(fontsrc->buf(), fontLoc->fontNum);
-+#elif POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 7, 0)
-+ if (!fileName.empty())
-+ ff = FoFiTrueType::load(fileName.c_str(), fontLoc->fontNum);
-+ else
- ff = FoFiTrueType::make(fontsrc->buf, fontLoc->fontNum);
- #elif POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0)
- if (!fileName.empty())
-@@ -3290,7 +3355,13 @@ - #endif
- ff.reset();
- }
--#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 2, 0)
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(26, 2, 0)
-+ if (!(fontFile = m_fontEngine->loadTrueTypeFont(std::move(id), std::move(fontsrc), std::move(codeToGID), fontLoc->fontNum)))
-+ {
-+ error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->c_str() : "(unnamed)");
-+ goto err2;
-+ }
-+#elif POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 2, 0)
- if (!(fontFile = m_fontEngine->loadTrueTypeFont(std::move(id), fontsrc, std::move(codeToGID), fontLoc->fontNum)))
- {
- error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->c_str() : "(unnamed)");
-@@ -3335,8 +3406,10 @@ - mat[3] = -m22;
- m_font = m_fontEngine->getFont(fontFile, mat, matrix);
-
-+#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(26, 2, 0)
- if (fontsrc && !fontsrc->isFile)
- fontsrc->unref();
-+#endif
- return;
-
- err2:
-@@ -3347,8 +3420,12 @@ - #endif
-
- err1:
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(26, 2, 0)
-+ fontsrc.reset();
-+#else
- if (fontsrc && !fontsrc->isFile)
- fontsrc->unref();
-+#endif
- }
-
- void SlaOutputDev::drawChar(GfxState* state, double x, double y, double dx, double dy, double originX, double originY, CharCode code, int nBytes, const Unicode* u, int uLen)
-@@ -3402,7 +3479,7 @@ - if (f & splashPathLast)
- qPath.closeSubpath();
- }
-- const double * ctm = state->getCTM();
-+ const auto ctm = state->getCTM();
- m_ctm = QTransform(ctm[0], ctm[1], ctm[2], ctm[3], ctm[4], ctm[5]);
- double xCoor = m_doc->currentPage()->xOffset();
- double yCoor = m_doc->currentPage()->yOffset();
diff --git a/app-office/scribus/files/scribus-1.7.2-poppler-26.03.patch b/app-office/scribus/files/scribus-1.7.2-poppler-26.03.patch deleted file mode 100644 index dbec17a60e47..000000000000 --- a/app-office/scribus/files/scribus-1.7.2-poppler-26.03.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- Scribus/scribus/plugins/import/pdf/slaoutput.cpp -+++ Scribus/scribus/plugins/import/pdf/slaoutput.cpp -@@ -884,7 +884,11 @@ - const Ref ref = childRef.getRef();
- radList.append(ref.num);
- }
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(26, 3, 0)
-+ QString tmTxt = UnicodeParsedString(annota->getUniqueName());
-+#else
- QString tmTxt = UnicodeParsedString(annota->getName());
-+#endif
- m_radioMap.insert(tmTxt, radList);
- }
- }
diff --git a/app-office/scribus/scribus-1.7.2.ebuild b/app-office/scribus/scribus-1.7.2.ebuild deleted file mode 100644 index 644e69232376..000000000000 --- a/app-office/scribus/scribus-1.7.2.ebuild +++ /dev/null @@ -1,156 +0,0 @@ -# Copyright 1999-2026 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{13..14} ) -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" - inherit git-r3 -else - SRC_URI=" - https://downloads.sourceforge.net/project/${PN}/${PN}/${PV}/${P}.tar.xz - https://downloads.sourceforge.net/project/${PN}/${PN}-devel/${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 +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/hunspell:= - app-text/libmspub - app-text/libqxp - app-text/poppler:= - dev-libs/hyphen - dev-libs/icu:0= - dev-libs/librevenge - dev-libs/libxml2:= - dev-qt/qt5compat:6 - dev-qt/qtbase:6[gui,network,opengl,X,xml,widgets] - dev-qt/qtsvg:6 - 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 - virtual/minizip:= - x11-libs/cairo[X,svg(+)] - x11-libs/libxcb - boost? ( dev-libs/boost:= ) - graphicsmagick? ( media-gfx/graphicsmagick:= ) - 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/qttools:6[linguist] - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}"/${PN}-1.5.8-cmake.patch # bug 886251 - "${FILESDIR}"/${PN}-1.5.3-fpic.patch - "${FILESDIR}"/${PN}-1.7.0-findhyphen.patch - "${FILESDIR}"/${PN}-1.7.0-dont-install-qtadvanceddocking.patch # bugs 961290, 960017 - "${FILESDIR}"/${PN}-1.7.0-fix-icon-version.patch - "${FILESDIR}"/${P}-poppler-26.0{2,3}.patch # upstream trunk -) - -src_prepare() { - cmake_src_prepare - - # 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_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/icon_32x32@2x.png scribus-${SLOT}.png - newicon resources/iconsets/1_7_0/scribus-icon.svg 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 -} |
