From 1113824a7a9ae6d292f0bada1e757a7dc67f0c55 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 16 Jun 2023 18:00:26 +0200 Subject: [PATCH 01/27] Rebuilt for Python 3.12 --- scribus.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scribus.spec b/scribus.spec index cd71d5d..20c823a 100644 --- a/scribus.spec +++ b/scribus.spec @@ -1,6 +1,6 @@ Name: scribus Version: 1.5.8 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Desktop Publishing application written in Qt # swatches bring in the fun licenses License: GPLv2+ and OGL and CC0 and CC-BY and CC-BY-SA and Public Domain and ASL 2.0 and LGPLv2+ @@ -140,6 +140,9 @@ appstream-util validate-relax --nonet \ %changelog +* Fri Jun 16 2023 Python Maint - 1.5.8-10 +- Rebuilt for Python 3.12 + * Mon Feb 06 2023 Marek Kasik - 1.5.8-9 - Rebuild for poppler-23.02.0 - Backported handling of new API of getLineDash() From cd5200a1c79c5583373627510fde928b2c557a9c Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Sun, 18 Jun 2023 00:44:14 +0200 Subject: [PATCH 02/27] Backported upstream patch to fix PyUnicode_AS_UNICODE (#2155514) --- scribus-1.5.8-python-3.12.patch | 32 ++++++++++++++++++++++++++++++++ scribus.spec | 6 +++++- 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 scribus-1.5.8-python-3.12.patch diff --git a/scribus-1.5.8-python-3.12.patch b/scribus-1.5.8-python-3.12.patch new file mode 100644 index 0000000..ba30cb3 --- /dev/null +++ b/scribus-1.5.8-python-3.12.patch @@ -0,0 +1,32 @@ +Backport of https://github.com/scribusproject/scribus/commit/065459990d1fe097d4339653c7ba600cc3547523 to fix +https://bugzilla.redhat.com/show_bug.cgi?id=2155514: Fails to build with Python 3.12: error: 'PyUnicode_AS_UNICODE' +was not declared in this scope. + +--- scribus-1.5.8/scribus/plugins/scriptplugin/cmdgetsetprop.cpp 2022-01-23 17:16:04.000000000 +0100 ++++ scribus-1.5.8/scribus/plugins/scriptplugin/cmdgetsetprop.cpp.python-3.12 2023-06-17 23:59:35.497937156 +0200 +@@ -409,10 +409,8 @@ + success = obj->setProperty(propertyName, QString::fromUtf8(PyBytes_AsString(objValue))); + else if (PyUnicode_Check(objValue)) + { +- // Get a pointer to the internal buffer of the Py_Unicode object, which is UCS2 formatted +- const unsigned short * ucs2Data = (const unsigned short *) PyUnicode_AS_UNICODE(objValue); +- // and make a new QString from it (the string is copied) +- success = obj->setProperty(propertyName, QString::fromUtf16(ucs2Data)); ++ QString qStrValue = PyUnicode_asQString(objValue); ++ success = obj->setProperty(propertyName, qStrValue); + } + else + matched = false; +@@ -429,10 +427,8 @@ + } + else if (PyUnicode_Check(objValue)) + { +- // Get a pointer to the internal buffer of the Py_Unicode object, which is UCS2 formatted +- const unsigned short * utf16Data = (const unsigned short *)PyUnicode_AS_UNICODE(objValue); +- // and make a new QString from it (the string is copied) +- success = obj->setProperty(propertyName, QString::fromUtf16(utf16Data).toLatin1()); ++ QString qStrValue = PyUnicode_asQString(objValue); ++ success = obj->setProperty(propertyName, qStrValue.toLatin1()); + } + else + matched = false; diff --git a/scribus.spec b/scribus.spec index 20c823a..276c0a9 100644 --- a/scribus.spec +++ b/scribus.spec @@ -1,6 +1,6 @@ Name: scribus Version: 1.5.8 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Desktop Publishing application written in Qt # swatches bring in the fun licenses License: GPLv2+ and OGL and CC0 and CC-BY and CC-BY-SA and Public Domain and ASL 2.0 and LGPLv2+ @@ -16,6 +16,7 @@ Source0: %{name}-%{version}-free.tar.xz Patch0: scribus-1.5.8-poppler-22.08.0.patch Patch1: scribus-1.5.8-poppler-22.09.0.patch +Patch2: scribus-1.5.8-python-3.12.patch BuildRequires: boost-devel BuildRequires: cmake @@ -140,6 +141,9 @@ appstream-util validate-relax --nonet \ %changelog +* Sun Jun 18 2023 Robert Scheck - 1.5.8-11 +- Backported upstream patch to fix PyUnicode_AS_UNICODE (#2155514) + * Fri Jun 16 2023 Python Maint - 1.5.8-10 - Rebuilt for Python 3.12 From effa3afbd5a25b3e6e6001c9f49ef1170b8e59a9 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 26 Jun 2023 13:59:27 +0200 Subject: [PATCH 03/27] Rebuilt for Python 3.12 --- scribus.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scribus.spec b/scribus.spec index 276c0a9..61bf551 100644 --- a/scribus.spec +++ b/scribus.spec @@ -1,6 +1,6 @@ Name: scribus Version: 1.5.8 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Desktop Publishing application written in Qt # swatches bring in the fun licenses License: GPLv2+ and OGL and CC0 and CC-BY and CC-BY-SA and Public Domain and ASL 2.0 and LGPLv2+ @@ -141,6 +141,9 @@ appstream-util validate-relax --nonet \ %changelog +* Mon Jun 26 2023 Python Maint - 1.5.8-12 +- Rebuilt for Python 3.12 + * Sun Jun 18 2023 Robert Scheck - 1.5.8-11 - Backported upstream patch to fix PyUnicode_AS_UNICODE (#2155514) From 9c81a57ddb84ed9187a9ba4b0115b9be1b729c09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= Date: Tue, 11 Jul 2023 22:21:56 +0200 Subject: [PATCH 04/27] Rebuilt for ICU 73.2 --- scribus.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scribus.spec b/scribus.spec index 61bf551..04d1138 100644 --- a/scribus.spec +++ b/scribus.spec @@ -1,6 +1,6 @@ Name: scribus Version: 1.5.8 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Desktop Publishing application written in Qt # swatches bring in the fun licenses License: GPLv2+ and OGL and CC0 and CC-BY and CC-BY-SA and Public Domain and ASL 2.0 and LGPLv2+ @@ -141,6 +141,9 @@ appstream-util validate-relax --nonet \ %changelog +* Tue Jul 11 2023 František Zatloukal - 1.5.8-13 +- Rebuilt for ICU 73.2 + * Mon Jun 26 2023 Python Maint - 1.5.8-12 - Rebuilt for Python 3.12 From 0aeec6a0640ce76c06944fb5e8b7e0bf817394fb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 01:15:05 +0000 Subject: [PATCH 05/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- scribus.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scribus.spec b/scribus.spec index 04d1138..f7fd84b 100644 --- a/scribus.spec +++ b/scribus.spec @@ -1,6 +1,6 @@ Name: scribus Version: 1.5.8 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Desktop Publishing application written in Qt # swatches bring in the fun licenses License: GPLv2+ and OGL and CC0 and CC-BY and CC-BY-SA and Public Domain and ASL 2.0 and LGPLv2+ @@ -141,6 +141,9 @@ appstream-util validate-relax --nonet \ %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 1.5.8-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Tue Jul 11 2023 František Zatloukal - 1.5.8-13 - Rebuilt for ICU 73.2 From 3d91da3e8ec8dae9326929527a75395c42066214 Mon Sep 17 00:00:00 2001 From: Marek Kasik Date: Mon, 7 Aug 2023 16:43:03 +0200 Subject: [PATCH 06/27] Rebuild for poppler 23.08.0 --- scribus.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scribus.spec b/scribus.spec index f7fd84b..9de999f 100644 --- a/scribus.spec +++ b/scribus.spec @@ -1,6 +1,6 @@ Name: scribus Version: 1.5.8 -Release: 14%{?dist} +Release: 15%{?dist} Summary: Desktop Publishing application written in Qt # swatches bring in the fun licenses License: GPLv2+ and OGL and CC0 and CC-BY and CC-BY-SA and Public Domain and ASL 2.0 and LGPLv2+ @@ -141,6 +141,9 @@ appstream-util validate-relax --nonet \ %changelog +* Mon Aug 07 2023 Marek Kasik - 1.5.8-15 +- Rebuild for poppler 23.08.0 + * Sat Jul 22 2023 Fedora Release Engineering - 1.5.8-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 94d040f8ec18ea036da71c08dbba0913d026aafc Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Wed, 16 Aug 2023 19:01:28 +0200 Subject: [PATCH 07/27] Switch to BR podofo0.9-devel --- scribus.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/scribus.spec b/scribus.spec index 9de999f..23da777 100644 --- a/scribus.spec +++ b/scribus.spec @@ -1,6 +1,6 @@ Name: scribus Version: 1.5.8 -Release: 15%{?dist} +Release: 16%{?dist} Summary: Desktop Publishing application written in Qt # swatches bring in the fun licenses License: GPLv2+ and OGL and CC0 and CC-BY and CC-BY-SA and Public Domain and ASL 2.0 and LGPLv2+ @@ -42,7 +42,7 @@ BuildRequires: pkgconfig(libjpeg) BuildRequires: pkgconfig(libmspub-0.1) BuildRequires: pkgconfig(libpagemaker-0.0) BuildRequires: pkgconfig(libpng) -BuildRequires: pkgconfig(libpodofo) +BuildRequires: podofo0.9-devel BuildRequires: pkgconfig(libqxp-0.0) BuildRequires: pkgconfig(librevenge-0.0) BuildRequires: pkgconfig(libtiff-4) @@ -141,6 +141,9 @@ appstream-util validate-relax --nonet \ %changelog +* Wed Aug 16 2023 Sandro Mani - 1.5.8-16 +- Switch to BR podofo0.9-devel + * Mon Aug 07 2023 Marek Kasik - 1.5.8-15 - Rebuild for poppler 23.08.0 From 9e413607b7b9a9562b65ef5420e5fc4d9188d7b1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 02:18:56 +0000 Subject: [PATCH 08/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- scribus.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scribus.spec b/scribus.spec index 23da777..3e71a5c 100644 --- a/scribus.spec +++ b/scribus.spec @@ -1,6 +1,6 @@ Name: scribus Version: 1.5.8 -Release: 16%{?dist} +Release: 17%{?dist} Summary: Desktop Publishing application written in Qt # swatches bring in the fun licenses License: GPLv2+ and OGL and CC0 and CC-BY and CC-BY-SA and Public Domain and ASL 2.0 and LGPLv2+ @@ -141,6 +141,9 @@ appstream-util validate-relax --nonet \ %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 1.5.8-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Aug 16 2023 Sandro Mani - 1.5.8-16 - Switch to BR podofo0.9-devel From 9d9becddc4ead01e572f8733f81913b91c394ac5 Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Mon, 1 Jan 2024 13:12:49 -0800 Subject: [PATCH 09/27] Update to 1.6.0 ... (rhbz#2256351) - Convert licenses to SPDX format - Switch to rpmautospec format --- .gitignore | 1 + scribus-1.5.8-poppler-22.08.0.patch | 312 ------------ scribus-1.5.8-poppler-22.09.0.patch | 27 -- scribus-1.5.8-python-3.12.patch | 32 -- scribus.spec | 708 +--------------------------- sources | 2 +- 6 files changed, 16 insertions(+), 1066 deletions(-) delete mode 100644 scribus-1.5.8-poppler-22.08.0.patch delete mode 100644 scribus-1.5.8-poppler-22.09.0.patch delete mode 100644 scribus-1.5.8-python-3.12.patch diff --git a/.gitignore b/.gitignore index 130495f..cf1c2f6 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ scribus-1.3.8.tar.bz2 /scribus-1.5.6-free.tar.xz /scribus-1.5.6.1-free.tar.xz /scribus-1.5.8-free.tar.xz +/scribus-1.6.0-free.tar.xz diff --git a/scribus-1.5.8-poppler-22.08.0.patch b/scribus-1.5.8-poppler-22.08.0.patch deleted file mode 100644 index 65a40ce..0000000 --- a/scribus-1.5.8-poppler-22.08.0.patch +++ /dev/null @@ -1,312 +0,0 @@ ---- scribus-1.5.8/scribus/plugins/import/pdf/importpdf.cpp -+++ scribus-1.5.8/scribus/plugins/import/pdf/importpdf.cpp -@@ -82,15 +82,21 @@ QImage PdfPlug::readThumbnail(const QStr - std::unique_ptr globalParamsPtr(new GlobalParams()); - globalParams = globalParamsPtr.get(); - #endif -+ globalParams->setErrQuiet(gTrue); - --#if defined(Q_OS_WIN32) && POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 62, 0) -- auto fname = new GooString(pdfFile.toUtf8().data()); -+#if defined(Q_OS_WIN32) -+ QByteArray encodedFileName = pdfFile.toUtf8(); - #else -- auto fname = new GooString(QFile::encodeName(pdfFile).data()); -+ QByteArray encodedFileName = QFile::encodeName(pdfFile); - #endif -- globalParams->setErrQuiet(gTrue); -- -+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 3, 0) -+ auto fname = std::make_unique(encodedFileName.data()); -+ PDFDoc pdfDoc{ std::move(fname) }; -+#else -+ auto fname = new GooString(encodedFileName.data()); - PDFDoc pdfDoc{fname, nullptr, nullptr, nullptr}; -+#endif -+ - if (!pdfDoc.isOk() || pdfDoc.getErrorCode() == errEncrypted) - return QImage(); - -@@ -335,15 +341,23 @@ bool PdfPlug::convert(const QString& fn) - std::unique_ptr globalParamsPtr(new GlobalParams()); - globalParams = globalParamsPtr.get(); - #endif --#if defined(Q_OS_WIN32) && POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 62, 0) -- auto fname = new GooString(fn.toUtf8().data()); --#else -- auto fname = new GooString(QFile::encodeName(fn).data()); --#endif -+ - globalParams->setErrQuiet(gTrue); - // globalParams->setPrintCommands(gTrue); - QList ocgGroups; -- auto pdfDoc = std::unique_ptr(new PDFDoc(fname, nullptr, nullptr, nullptr)); -+ -+#if defined(Q_OS_WIN32) -+ QByteArray encodedFileName = fn.toUtf8(); -+#else -+ QByteArray encodedFileName = QFile::encodeName(fn); -+#endif -+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 3, 0) -+ auto fname = std::make_unique(encodedFileName.data()); -+ auto pdfDoc = std::make_unique(std::move(fname)); -+#else -+ auto fname = new GooString(encodedFileName.data()); -+ auto pdfDoc = std::make_unique(fname, nullptr, nullptr, nullptr); -+#endif - if (pdfDoc) - { - if (pdfDoc->getErrorCode() == errEncrypted) -@@ -357,13 +371,15 @@ bool PdfPlug::convert(const QString& fn) - QString text = QInputDialog::getText(mw, tr("Open PDF-File"), tr("Password"), QLineEdit::Normal, "", &ok); - if (ok && !text.isEmpty()) - { --#if defined(Q_OS_WIN32) && POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 62, 0) -- auto fname = new GooString(fn.toUtf8().data()); -+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 3, 0) -+ auto fname = std::make_unique(encodedFileName.data()); -+ std::optional userPW(std::in_place, text.toLocal8Bit().data()); -+ pdfDoc.reset(new PDFDoc(std::move(fname), userPW, userPW, nullptr)); - #else -- auto fname = new GooString(QFile::encodeName(fn).data()); --#endif -+ auto fname = new GooString(encodedFileName.data()); - auto userPW = new GooString(text.toLocal8Bit().data()); - pdfDoc.reset(new PDFDoc(fname, userPW, userPW, nullptr)); -+#endif - qApp->changeOverrideCursor(QCursor(Qt::WaitCursor)); - } - if ((!pdfDoc) || (pdfDoc->getErrorCode() != errNone)) ---- scribus-1.5.8/scribus/plugins/import/pdf/slaoutput.cpp -+++ scribus-1.5.8/scribus/plugins/import/pdf/slaoutput.cpp -@@ -169,8 +169,13 @@ void AnoOutputDev::drawString(GfxState * - int shade = 100; - currColorText = getColor(state->getFillColorSpace(), state->getFillColor(), &shade); - fontSize = state->getFontSize(); -+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 4, 0) -+ if (state->getFont() && state->getFont()->getName()) -+ fontName = new GooString(state->getFont()->getName().value()); -+#else - if (state->getFont()) - fontName = state->getFont()->getName()->copy(); -+#endif - itemText = s->copy(); - } - -@@ -358,7 +363,12 @@ LinkAction* SlaOutputDev::SC_getAddition - GBool SlaOutputDev::annotations_callback(Annot *annota, void *user_data) - { - SlaOutputDev *dev = (SlaOutputDev*)user_data; -+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 4, 0) -+ const PDFRectangle& annotRect = annota->getRect();; -+ const PDFRectangle* box = &annotRect; -+#else - PDFRectangle *box = annota->getRect(); -+#endif - double xCoor = dev->m_doc->currentPage()->xOffset() + box->x1 - dev->cropOffsetX; - double yCoor = dev->m_doc->currentPage()->yOffset() + dev->m_doc->currentPage()->height() - box->y2 + dev->cropOffsetY; - double width = box->x2 - box->x1; -@@ -701,7 +711,12 @@ bool SlaOutputDev::handleWidgetAnnot(Ann - if (apa || !achar) - { - AnoOutputDev *annotOutDev = new AnoOutputDev(m_doc, m_importedColors); -+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 4, 0) -+ const PDFRectangle& annotaRect = annota->getRect(); -+ Gfx* gfx = new Gfx(pdfDoc, annotOutDev, pdfDoc->getPage(m_actPage)->getResourceDict(), &annotaRect, nullptr); -+#else - Gfx *gfx = new Gfx(pdfDoc, annotOutDev, pdfDoc->getPage(m_actPage)->getResourceDict(), annota->getRect(), nullptr); -+#endif - ano->draw(gfx, false); - if (!bgFound) - m_currColorFill = annotOutDev->currColorFill; -@@ -3026,16 +3041,27 @@ void SlaOutputDev::markPoint(POPPLER_CON - - void SlaOutputDev::updateFont(GfxState *state) - { -- GfxFont *gfxFont; -- GfxFontLoc *fontLoc; -+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 4, 0) -+ std::optional fontLoc; -+ std::string fileName; -+ std::unique_ptr ff; -+ std::optional> tmpBuf; -+#elif POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 2, 0) -+ std::optional fontLoc; -+ const GooString * fileName = nullptr; -+ std::unique_ptr ff; -+ char* tmpBuf = nullptr; -+#else -+ GfxFontLoc * fontLoc = nullptr; -+ GooString * fileName = nullptr; -+ FoFiTrueType * ff = nullptr; -+ char* tmpBuf = nullptr; -+#endif - GfxFontType fontType; - SlaOutFontFileID *id; - SplashFontFile *fontFile; - SplashFontSrc *fontsrc = nullptr; -- FoFiTrueType *ff; - Object refObj, strObj; -- GooString *fileName; -- char *tmpBuf; - int tmpBufLen = 0; - int *codeToGID; - const double *textMat; -@@ -3046,11 +3072,12 @@ void SlaOutputDev::updateFont(GfxState * - SplashCoord matrix[6]; - - m_font = nullptr; -- fileName = nullptr; -- tmpBuf = nullptr; -- fontLoc = nullptr; - -- gfxFont = state->getFont(); -+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 4, 0) -+ GfxFont* gfxFont = state->getFont().get(); -+#else -+ GfxFont* gfxFont = state->getFont(); -+#endif - if (!gfxFont) - goto err1; - -@@ -3075,23 +3102,42 @@ void SlaOutputDev::updateFont(GfxState * - if (fontLoc->locType == gfxFontLocEmbedded) - { - // if there is an embedded font, read it to memory -- tmpBuf = gfxFont->readEmbFontFile(xref, &tmpBufLen); -+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 4, 0) -+ tmpBuf = gfxFont->readEmbFontFile((xref) ? xref : pdfDoc->getXRef()); - if (! tmpBuf) - goto err2; -+#else -+ tmpBuf = gfxFont->readEmbFontFile(xref, &tmpBufLen); -+ if (!tmpBuf) -+ goto err2; -+#endif - - // external font - } - else - { // gfxFontLocExternal -+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 4, 0) - fileName = fontLoc->path; -+#elif POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 2, 0) -+ fileName = fontLoc->pathAsGooString(); -+#else -+ fileName = fontLoc->path; -+#endif - fontType = fontLoc->fontType; - } - - fontsrc = new SplashFontSrc; -+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 4, 0) -+ if (!fileName.empty()) -+ fontsrc->setFile(fileName); -+ else -+ fontsrc->setBuf(std::move(tmpBuf.value())); -+#else - if (fileName) -- fontsrc->setFile(fileName, gFalse); -+ fontsrc->setFile(fileName, false); - else -- fontsrc->setBuf(tmpBuf, tmpBufLen, gTrue); -+ fontsrc->setBuf(tmpBuf, tmpBufLen, true); -+#endif - - // load the font file - switch (fontType) { -@@ -3130,15 +3176,27 @@ void SlaOutputDev::updateFont(GfxState * - break; - case fontTrueType: - case fontTrueTypeOT: -+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 4, 0) -+ if (!fileName.empty()) -+ ff = FoFiTrueType::load(fileName.c_str()); -+ else -+ ff = FoFiTrueType::make(fontsrc->buf.data(), fontsrc->buf.size()); -+#else - if (fileName) -- ff = FoFiTrueType::load(fileName->getCString()); -+ ff = FoFiTrueType::load(fileName->c_str()); - else - ff = FoFiTrueType::make(tmpBuf, tmpBufLen); -+#endif - if (ff) - { -+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 2, 0) -+ codeToGID = ((Gfx8BitFont*) gfxFont)->getCodeToGIDMap(ff.get()); -+ ff.reset(); -+#else - codeToGID = ((Gfx8BitFont *)gfxFont)->getCodeToGIDMap(ff); -- n = 256; - delete ff; -+#endif -+ n = 256; - } - else - { -@@ -3203,14 +3261,26 @@ void SlaOutputDev::updateFont(GfxState * - } - else - { -+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 4, 0) -+ if (!fileName.empty()) -+ ff = FoFiTrueType::load(fileName.c_str()); -+ else -+ ff = FoFiTrueType::make(fontsrc->buf.data(), fontsrc->buf.size()); -+#else - if (fileName) -- ff = FoFiTrueType::load(fileName->getCString()); -+ ff = FoFiTrueType::load(fileName->c_str()); - else - ff = FoFiTrueType::make(tmpBuf, tmpBufLen); -+#endif - if (! ff) - goto err2; -+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 2, 0) -+ codeToGID = ((GfxCIDFont*) gfxFont)->getCodeToGIDMap(ff.get(), &n); -+ ff.reset(); -+#else - codeToGID = ((GfxCIDFont *)gfxFont)->getCodeToGIDMap(ff, &n); - delete ff; -+#endif - } - if (!(fontFile = m_fontEngine->loadTrueTypeFont( - id, -@@ -3247,14 +3317,19 @@ void SlaOutputDev::updateFont(GfxState * - mat[3] = -m22; - m_font = m_fontEngine->getFont(fontFile, mat, matrix); - -+#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(22, 2, 0) - delete fontLoc; -+#endif - if (fontsrc && !fontsrc->isFile) - fontsrc->unref(); - return; - - err2: - delete id; -+#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(22, 2, 0) - delete fontLoc; -+#endif -+ - err1: - if (fontsrc && !fontsrc->isFile) - fontsrc->unref(); -@@ -3357,9 +3432,15 @@ void SlaOutputDev::drawChar(GfxState* st - GBool SlaOutputDev::beginType3Char(GfxState *state, double x, double y, double dx, double dy, CharCode code, POPPLER_CONST_082 Unicode *u, int uLen) - { - // qDebug() << "beginType3Char"; -+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 4, 0) - GfxFont *gfxFont; -+ if (!(gfxFont = state->getFont().get())) -+ return true; -+#else -+ GfxFont* gfxFont; - if (!(gfxFont = state->getFont())) -- return gTrue; -+ return true; -+#endif - if (gfxFont->getType() != fontType3) - return gTrue; - F3Entry f3e; diff --git a/scribus-1.5.8-poppler-22.09.0.patch b/scribus-1.5.8-poppler-22.09.0.patch deleted file mode 100644 index b11cef0..0000000 --- a/scribus-1.5.8-poppler-22.09.0.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- scribus-1.5.8/scribus/plugins/import/pdf/slaoutput.cpp -+++ scribus-1.5.8/scribus/plugins/import/pdf/slaoutput.cpp -@@ -3762,15 +3762,21 @@ void SlaOutputDev::getPenState(GfxState - break; - } - double lw = state->getLineWidth(); -- double *dashPattern; -+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 9, 0) -+ const auto& dashPattern = state->getLineDash(&DashOffset); -+ QVector pattern(dashPattern.size()); -+ for (size_t i = 0; i < dashPattern.size(); ++i) -+ pattern[i] = dashPattern[i] / lw; -+ DashValues = pattern; -+#else -+ double* dashPattern; - int dashLength; - state->getLineDash(&dashPattern, &dashLength, &DashOffset); - QVector pattern(dashLength); - for (int i = 0; i < dashLength; ++i) -- { - pattern[i] = dashPattern[i] / lw; -- } - DashValues = pattern; -+#endif - } - - int SlaOutputDev::getBlendMode(GfxState *state) diff --git a/scribus-1.5.8-python-3.12.patch b/scribus-1.5.8-python-3.12.patch deleted file mode 100644 index ba30cb3..0000000 --- a/scribus-1.5.8-python-3.12.patch +++ /dev/null @@ -1,32 +0,0 @@ -Backport of https://github.com/scribusproject/scribus/commit/065459990d1fe097d4339653c7ba600cc3547523 to fix -https://bugzilla.redhat.com/show_bug.cgi?id=2155514: Fails to build with Python 3.12: error: 'PyUnicode_AS_UNICODE' -was not declared in this scope. - ---- scribus-1.5.8/scribus/plugins/scriptplugin/cmdgetsetprop.cpp 2022-01-23 17:16:04.000000000 +0100 -+++ scribus-1.5.8/scribus/plugins/scriptplugin/cmdgetsetprop.cpp.python-3.12 2023-06-17 23:59:35.497937156 +0200 -@@ -409,10 +409,8 @@ - success = obj->setProperty(propertyName, QString::fromUtf8(PyBytes_AsString(objValue))); - else if (PyUnicode_Check(objValue)) - { -- // Get a pointer to the internal buffer of the Py_Unicode object, which is UCS2 formatted -- const unsigned short * ucs2Data = (const unsigned short *) PyUnicode_AS_UNICODE(objValue); -- // and make a new QString from it (the string is copied) -- success = obj->setProperty(propertyName, QString::fromUtf16(ucs2Data)); -+ QString qStrValue = PyUnicode_asQString(objValue); -+ success = obj->setProperty(propertyName, qStrValue); - } - else - matched = false; -@@ -429,10 +427,8 @@ - } - else if (PyUnicode_Check(objValue)) - { -- // Get a pointer to the internal buffer of the Py_Unicode object, which is UCS2 formatted -- const unsigned short * utf16Data = (const unsigned short *)PyUnicode_AS_UNICODE(objValue); -- // and make a new QString from it (the string is copied) -- success = obj->setProperty(propertyName, QString::fromUtf16(utf16Data).toLatin1()); -+ QString qStrValue = PyUnicode_asQString(objValue); -+ success = obj->setProperty(propertyName, qStrValue.toLatin1()); - } - else - matched = false; diff --git a/scribus.spec b/scribus.spec index 3e71a5c..a9cb3ce 100644 --- a/scribus.spec +++ b/scribus.spec @@ -1,9 +1,9 @@ Name: scribus -Version: 1.5.8 -Release: 17%{?dist} +Version: 1.6.0 +Release: %autorelease Summary: Desktop Publishing application written in Qt # swatches bring in the fun licenses -License: GPLv2+ and OGL and CC0 and CC-BY and CC-BY-SA and Public Domain and ASL 2.0 and LGPLv2+ +License: GPL-2.0-or-later and OGL-UK-3.0 and CC0-1.0 and CC-BY-4.0 and CC-BY-SA-4.0 and LicenseRef-Fedora-Public-Domain and Apache-2.0 and LGPL-2.0-or-later URL: http://www.scribus.net/ # svn export svn://scribus.net/trunk/Scribus scribus-%%{version} @@ -14,11 +14,8 @@ Source0: %{name}-%{version}-free.tar.xz #Source0: http://downloads.sourceforge.net/%%{name}/%%{name}-%%{version}.tar.xz #Source1: http://downloads.sourceforge.net/%%{name}/%%{name}-%%{version}.tar.xz.asc -Patch0: scribus-1.5.8-poppler-22.08.0.patch -Patch1: scribus-1.5.8-poppler-22.09.0.patch -Patch2: scribus-1.5.8-python-3.12.patch -BuildRequires: boost-devel +BuildRequires: boost-devel >= 1.76 BuildRequires: cmake BuildRequires: cups-devel BuildRequires: desktop-file-utils @@ -26,14 +23,14 @@ BuildRequires: gcc-c++ BuildRequires: ghostscript BuildRequires: hyphen-devel BuildRequires: libappstream-glib -BuildRequires: pkgconfig(cairo) +BuildRequires: pkgconfig(cairo) >= 1.17.6 BuildRequires: pkgconfig(fontconfig) -BuildRequires: pkgconfig(freetype2) +BuildRequires: pkgconfig(freetype2) >= 2.13.2 BuildRequires: pkgconfig(gnutls) BuildRequires: pkgconfig(GraphicsMagick) BuildRequires: pkgconfig(GraphicsMagick++) BuildRequires: pkgconfig(harfbuzz) -BuildRequires: pkgconfig(hunspell) +BuildRequires: pkgconfig(hunspell) >= 1.7.2 BuildRequires: pkgconfig(icu-uc) BuildRequires: pkgconfig(lcms2) BuildRequires: pkgconfig(libcdr-0.1) @@ -104,6 +101,7 @@ chmod a-x scribus/pageitem_latexframe.h %if "%{_lib}" == "lib64" -DWANT_LIB64=YES \ %endif + -WANT_NOHEADERINSTALL=1 \ -DWANT_NORPATH=1 \ -DWITH_BOOST=1 \ -DWITH_PODOFO=1 @@ -134,6 +132,11 @@ appstream-util validate-relax --nonet \ %{_datadir}/icons/hicolor/256x256/apps/%{name}.png %{_datadir}/icons/hicolor/512x512/apps/%{name}.png %{_datadir}/icons/hicolor/1024x1024/apps/%{name}.png +%{_datadir}/icons/hicolor/16x16/mimetypes/application-vnd.%{name}.png +%{_datadir}/icons/hicolor/32x32/mimetypes/application-vnd.%{name}.png +%{_datadir}/icons/hicolor/64x64/mimetypes/application-vnd.%{name}.png +%{_datadir}/icons/hicolor/128x128/mimetypes/application-vnd.%{name}.png +%{_datadir}/icons/hicolor/256x256/mimetypes/application-vnd.%{name}.png %{_datadir}/%{name}/ %{_mandir}/man1/* %{_mandir}/pl/man1/* @@ -141,687 +144,4 @@ appstream-util validate-relax --nonet \ %changelog -* Sat Jan 27 2024 Fedora Release Engineering - 1.5.8-17 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Wed Aug 16 2023 Sandro Mani - 1.5.8-16 -- Switch to BR podofo0.9-devel - -* Mon Aug 07 2023 Marek Kasik - 1.5.8-15 -- Rebuild for poppler 23.08.0 - -* Sat Jul 22 2023 Fedora Release Engineering - 1.5.8-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Tue Jul 11 2023 František Zatloukal - 1.5.8-13 -- Rebuilt for ICU 73.2 - -* Mon Jun 26 2023 Python Maint - 1.5.8-12 -- Rebuilt for Python 3.12 - -* Sun Jun 18 2023 Robert Scheck - 1.5.8-11 -- Backported upstream patch to fix PyUnicode_AS_UNICODE (#2155514) - -* Fri Jun 16 2023 Python Maint - 1.5.8-10 -- Rebuilt for Python 3.12 - -* Mon Feb 06 2023 Marek Kasik - 1.5.8-9 -- Rebuild for poppler-23.02.0 -- Backported handling of new API of getLineDash() - -* Sat Jan 21 2023 Fedora Release Engineering - 1.5.8-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Sat Dec 31 2022 Pete Walter - 1.5.8-7 -- Rebuild for ICU 72 - -* Mon Aug 08 2022 Marek Kasik - 1.5.8-6 -- Rebuild for poppler-22.08.0 -- Backport necessary changes from upstream - -* Mon Aug 01 2022 Frantisek Zatloukal - 1.5.8-5 -- Rebuilt for ICU 71.1 - -* Sat Jul 23 2022 Fedora Release Engineering - 1.5.8-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Mon Jun 13 2022 Python Maint - 1.5.8-3 -- Rebuilt for Python 3.11 - -* Tue May 03 2022 Sandro Mani - 1.5.8-2 -- Rebuild (podofo) - -* Sat Jan 22 2022 Fedora Release Engineering - 1.5.8-1 -- Update to 1.5.8 - -* Sat Jan 22 2022 Fedora Release Engineering - 1.5.7-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Tue Jan 18 2022 Marek Kasik - 1.5.7-8 -- Rebuild for poppler-22.01.0 -- Switch to C++17 because it is needed by poppler now - -* Mon Nov 15 2021 Sandro Mani - 1.5.7-7 -- Rebuild (OpenSceneGraph) - -* Tue Sep 21 2021 Parag Nemade - 1.5.7-6 -- Fix undefined symbol: hb_subset_input_set_name_legacy (rhbz#2006220) - -* Thu Aug 05 2021 Marek Kasik - 1.5.7-5 -- Rebuild for poppler-21.08.0 - -* Fri Jul 23 2021 Fedora Release Engineering - 1.5.7-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Fri Jun 04 2021 Python Maint - 1.5.7-3 -- Rebuilt for Python 3.10 - -* Thu May 20 2021 Pete Walter - 1.5.7-2 -- Rebuild for ICU 69 - -* Wed May 12 2021 Luya Tshimbalanga - 1.5.7-1 -- Update to 1.5.7 -- Drop patch for podofo 0.9.7 fixed upstream - -* Wed Jan 27 2021 Fedora Release Engineering - 1.5.6.1-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Tue Jan 19 2021 Marek Kasik - 1.5.6.1-5 -- Rebuild for poppler-21.01.0 with correct target - -* Tue Jan 19 2021 Marek Kasik - 1.5.6.1-4 -- Rebuild for poppler-21.01.0 - -* Sun Jan 10 16:35:55 CET 2021 Sandro Mani - 1.5.6.1-3 -- Rebuild (podofo) - -* Sat Jan 9 22:58:15 CET 2021 Sandro Mani - 1.5.6.1-2 -- Rebuild (podofo) - -* Tue Dec 01 2020 Luya Tshimbalanga - 1.5.6.1-1 -- Update to 1.5.6.1 -- Use c++17 - -* Tue Nov 03 2020 Luya Tshimbalanga - 1.5.6-0.14 -- Further implement pkgconfig for build requirement -- Use python3dist macro for some build requirement - -* Mon Oct 05 2020 Than Ngo - 1.5.6-0.13 -- add BR on python3-setuptools explicitly - -* Fri Aug 21 2020 Jeff law - 1.5.6-0.12 -- Fix static ctor initialization issue by removing the unused static - data member - Re-enable LTO - -* Fri Aug 21 2020 Dan Horák - 1.5.6-0.11 -- build with LTO disabled (#1866207) - -* Wed Jul 29 2020 Fedora Release Engineering - 1.5.6-0.10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Wed Jul 22 2020 Dan Horák - 1.5.6-0.9 -- Update for https://fedoraproject.org/wiki/Changes/CMake_to_do_out-of-source_builds -- Rebuild for poppler-0.90.0 - -* Wed Jun 03 2020 Charalampos Stratakis - 1.5.6-0.8 -- Remove dependency on the retired qt5-devel metapackage (#1840633) - -* Tue May 26 2020 Miro Hrončok - 1.5.6-0.7 -- Rebuilt for Python 3.9 - -* Thu Apr 02 2020 Björn Esser - 1.5.6-0.6 -- Fix string quoting for rpm >= 4.16 - -* Thu Jan 30 2020 Fedora Release Engineering - 1.5.6-0.5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Fri Jan 17 2020 Marek Kasik - 1.5.6-0.4 -- Rebuild for poppler-0.84.0 - -* Tue Nov 05 2019 Luya Tshimbalanga - 1.5.6-0.3 -- Update to 1.5.6 pre-release (svn 23333) - -* Fri Nov 01 2019 Luya Tshimbalanga - 1.5.6-0.2 -- Update to 1.5.6 pre-release (svn r23311) -- Improve make-free-archives script -- Revamp spec file for adherence to Fedora Packaging Guideline -- Drop source high quality icon -- Drop obsolete patches - -* Wed Oct 30 2019 François Cami - 1.5.6-0.1 -- Ship 1.5.6 pre-release (svn r23306) to switch to Python3 - -* Fri Jul 26 2019 Fedora Release Engineering - 1.4.6-17 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sat Feb 02 2019 Fedora Release Engineering - 1.4.6-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Tue Nov 13 2018 Caolán McNamara - 1.4.6-15 -- rebuild for hunspell-1.7.0 - -* Mon Sep 17 2018 Michael J Gruber - 1.4.6-14 -- fix EPS import (bz #1628943) - -* Sat Jul 14 2018 Fedora Release Engineering - 1.4.6-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Wed Jul 11 2018 Sandro Mani - 1.4.6-12 -- Rebuild (podofo) - -* Mon Feb 12 2018 Iryna Shcherbina - 1.4.6-11 -- Update Python 2 dependency declarations to new packaging standards - (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) - -* Fri Feb 09 2018 Fedora Release Engineering - 1.4.6-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Aug 03 2017 Fedora Release Engineering - 1.4.6-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 1.4.6-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Jul 07 2017 Igor Gnatenko - 1.4.6-7 -- Rebuild due to bug in RPM (RHBZ #1468476) - -* Fri Apr 07 2017 Yaakov Selkowitz - 1.4.6-6 -- Fix detection of latest hunspell for spell-checking support (#1425305) - -* Mon Feb 06 2017 Kalev Lember - 1.4.6-5 -- Rebuilt for Boost 1.63 - -* Thu Feb 02 2017 Sandro Mani - 1.4.6-4 -- Rebuild (podofo) - -* Fri Jan 27 2017 Jonathan Wakely - 1.4.6-3 -- Rebuilt for Boost 1.63 - -* Fri Sep 23 2016 Jon Ciesla - 1.4.6-2 -- podofo rebuild. - -* Tue May 24 2016 Jon Ciesla - 1.4.6-1 -- 1.4.6 - -* Thu Feb 04 2016 Fedora Release Engineering - 1.4.5-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Fri Jan 15 2016 Jonathan Wakely - 1.4.5-8 -- Rebuilt for Boost 1.60 - -* Tue Jan 12 2016 Tom Callaway - 1.4.5-7 -- fix license tag, remove found non-free swatches (bz 1297262) - -* Fri Sep 18 2015 Richard Hughes - 1.4.5-6 -- Use a bigger resolution application icon - -* Thu Aug 27 2015 Jonathan Wakely - 1.4.5-5 -- Rebuilt for Boost 1.59 - -* Wed Jul 29 2015 Fedora Release Engineering - 1.4.5-4 -- Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159 - -* Wed Jul 22 2015 David Tardon - 1.4.5-3 -- rebuild for Boost 1.58 - -* Fri Jun 19 2015 Fedora Release Engineering - 1.4.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Thu May 7 2015 Tom Callaway 1.4.5-1 -- update to 1.4.5 -- drop non-free and questionable hyphen dic files (bz 1219415) -- fix necessary LPPL attributions - -* Thu Mar 26 2015 Richard Hughes - 1.4.4-7 -- Add an AppData file for the software center - -* Tue Jan 27 2015 Petr Machata - 1.4.4-6 -- Rebuild for boost 1.57.0 - -* Thu Aug 28 2014 Dan Horák - 1.4.4-5 -- switch to Debian patch for the qreal vs double conflict on ARM (fixes #1076885) - -* Wed Aug 20 2014 Kevin Fenzi - 1.4.4-4 -- Rebuild for rpm bug 1131892 - -* Mon Aug 18 2014 Fedora Release Engineering - 1.4.4-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sat Aug 09 2014 Rex Dieter 1.4.4-2 -- optimize/update scriptlets - -* Fri Jun 6 2014 Tom Callaway - 1.4.4-1 -- update to 1.4.4, drop non-free dot files - -* Fri May 23 2014 Petr Machata - 1.4.3-3 -- Rebuild for boost 1.55.0 - -* Thu Sep 19 2013 Dan Horák - 1.4.3-2 -- fix the double patch (#1009979) - -* Mon Aug 19 2013 Dan Horák - 1.4.3-1 -- update to 1.4.3 (#990030) -- update for unversioned docdir - -* Sun Aug 04 2013 Fedora Release Engineering - 1.4.2-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Tue Jul 30 2013 Petr Machata - 1.4.2-6 -- Rebuild for boost 1.54.0 - -* Mon Feb 25 2013 Toshio Kuratomi - 1.4.2-5 -- Remove --vendor from desktop-file-install for F19+ https://fedorahosted.org/fesco/ticket/1077 - -* Wed Jan 30 2013 Dan Horák - 1.4.2-4 -- update for Pillow (#896301) - -* Mon Jan 21 2013 Adam Tkac - 1.4.2-3 -- rebuild due to "jpeg8-ABI" feature drop - -* Fri Jan 18 2013 Dan Horák - 1.4.2-2 -- use hunspell to be consistent with the rest of the system - -* Tue Jan 15 2013 Dan Horák - 1.4.2-1 -- update to 1.4.2 -- remove non-free content from source archive (#887221) -- drop doc and devel sub-packages -- switch to lcms2 - -* Fri Dec 21 2012 Adam Tkac - 1.4.1-4 -- rebuild against new libjpeg - -* Thu Aug 9 2012 Peter Robinson - 1.4.1-3 -- Add patch to fix FTBFS on ARM - -* Sat Jul 21 2012 Fedora Release Engineering - 1.4.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Sun May 06 2012 Dan Horák - 1.4.1-1 -- update to 1.4.1 - -* Wed Mar 07 2012 Dan Horák - 1.4.0-5 -- fix crash at export as image (rhbz#800765) - -* Tue Feb 28 2012 Fedora Release Engineering - 1.4.0-4 -- Rebuilt for c++ ABI breakage - -* Sat Jan 14 2012 Fedora Release Engineering - 1.4.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Tue Jan 03 2012 Dan Horák - 1.4.0-2 -- the swatches/profiles patches were submitted to upstream bugtracker - -* Mon Jan 02 2012 Dan Horák - 1.4.0-1.1 -- install profiles and swatches to datadir -- use versioned docdir - -* Mon Jan 02 2012 Dan Horák - 1.4.0-1 -- update to 1.4.0 - -* Fri Jun 24 2011 Dan Horák - 1.3.9-6 -- fix build with cups 1.5 (#716107) - -* Wed May 04 2011 Dan Horák - 1.3.9-5 -- rebuilt against podofo 0.9.1 - -* Thu Apr 14 2011 Dan Horák - 1.3.9-4 -- rebuilt against podofo 0.9.0 - -* Wed Feb 09 2011 Fedora Release Engineering - 1.3.9-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Mon Dec 20 2010 Dan Horák - 1.3.9-2 -- run update-desktop-database in scriptlets too (#664318) - -* Tue Nov 30 2010 Dan Horák - 1.3.9-1 -- update to 1.3.9 -- filter unwanted Provides - -* Wed Nov 03 2010 Dan Horák - 1.3.8-3 -- rebuilt against podofo 0.8.4 - -* Fri Oct 22 2010 Dan Horák - 1.3.8-2 -- rebuilt against podofo 0.8.3 - -* Mon Aug 16 2010 Dan Horák - 1.3.8-1 -- update to 1.3.8 - -* Tue Jul 27 2010 David Malcolm - 1.3.7-5 -- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild - -* Tue Jun 15 2010 Dan Horák - 1.3.7-4 -- fix crash when selecting frame (#604124) - -* Tue Jun 15 2010 Dan Horák - 1.3.7-3 -- show icons in shapes menu (#603921) - -* Tue Jun 08 2010 Dan Horák - 1.3.7-2 -- rebuilt with podofo 0.8.1 - -* Tue Jun 1 2010 Dan Horák - 1.3.7-1 -- update to final 1.3.7 - -* Thu Apr 29 2010 Dan Horák - 1.3.6-4 -- fix build with podofo 0.8.0 - -* Thu Apr 29 2010 Dan Horák - 1.3.6-3 -- rebuilt for podofo 0.8.0 - -* Wed Mar 31 2010 Dan Horák - 1.3.6-2 -- added 2 patches for rawhide - -* Mon Mar 29 2010 Dan Horák - 1.3.6-1 -- update to final 1.3.6 - -* Wed Nov 25 2009 Dan Horák - 1.3.5.1-5 -- fixed a crash when closing a hyphenator object (#537677) - -* Thu Aug 27 2009 Tomas Mraz - 1.3.5.1-4 -- rebuilt with new openssl - -* Tue Aug 25 2009 Dan Horák - 1.3.5.1-3 -- drop shebang line from python scripts -- don't package precompiled python scripts - -* Thu Aug 20 2009 Dan Horák - 1.3.5.1-1 -- update to final 1.3.5.1 -- drop the upstreamed "install-headers" patch -- always install doc subpackage (#446148) -- full changelog: http://www.scribus.net/?q=node/193 - -* Wed Jul 29 2009 Dan Horák - 1.3.5-0.17.rc3 -- don't use parallel build on s390x - -* Sun Jul 26 2009 Fedora Release Engineering - 1.3.5-0.16.rc3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Tue Jul 21 2009 Dan Horák - 1.3.5-0.15.rc3 -- update to 1.3.5-rc3 -- use system hyphen library (#506074) -- fix update path for the doc subpackage (#512498) -- preserve directories when installing headers (#511800) - -* Thu Jun 4 2009 Dan Horák - 1.3.5-0.14.rc2 -- update to 1.3.5-rc2 - -* Mon May 18 2009 Dan Horák - 1.3.5-0.13.beta -- rebuilt with podofo enabled - -* Wed Apr 22 2009 Dan Horák - 1.3.5-0.12.beta -- update to 1.3.5.beta -- make docs subpackage noarch -- drop outdated Obsoletes/Provides - -* Sun Mar 29 2009 Dan Horák - 1.3.5-0.11.20090329svn13359 -- update to revision 13359 -- add aspell-devel and boost-devel as BR -- update release tag to conform to the pre-release versioning guideline - -* Wed Feb 25 2009 Fedora Release Engineering - 1.3.5-0.10.12516svn -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Sat Jan 17 2009 Tomas Mraz - 1.3.4-0.9.12516svn -- rebuild with new openssl - -* Thu Dec 04 2008 Ignacio Vazquez-Abrams - 1.3.5-0.8.12516svn -- Rebuild for Python 2.6 - -* Tue Dec 2 2008 Dan Horák - 1.3.5-0.7.12516svn -- fix directory ownership in doc subpackage (#474041) - -* Sun Nov 30 2008 Ignacio Vazquez-Abrams - 1.3.5-0.6.12516svn -- Rebuild for Python 2.6 - -* Mon Oct 13 2008 Dan Horák 1.3.5-0.5.12516svn -- install global desktop file instead of KDE-only one (#461124) -- little cleanup - -* Fri Sep 05 2008 Andreas Bierfert -- 1.3.5-0.4.12516svn -- new svn snapshot - -* Sun Jul 27 2008 Andreas Bierfert -- 1.3.5-0.3.12419svn -- new svn snapshot - -* Mon Jul 21 2008 Andreas Bierfert -- 1.3.5-0.2.12404svn -- svn snapshot - -* Mon Feb 18 2008 Fedora Release Engineering - 1.3.4-5 -- Autorebuild for GCC 4.3 - -* Mon Feb 11 2008 Andreas Bierfert - 1.3.4-4 -- Rebuilt for gcc43 - -* Fri Dec 28 2007 Andreas Bierfert -- 1.3.4-3 -- fix inclusion of python scripts as proposed by Todd Zullinger (#312091) -- fix desktop file - -* Thu Aug 23 2007 Andreas Bierfert -- 1.3.4-2 -- rebuild for buildid -- new license tag - -* Sat Jun 02 2007 Andreas Bierfert -1.3.4 -- version upgrade - -* Mon Dec 04 2006 Andreas Bierfert -1.3.3.6-1 -- version upgrade - -* Sat Nov 11 2006 Andreas Bierfert -1.3.3.5-1 -- version upgrade - -* Wed Oct 04 2006 Andreas Bierfert -1.3.3.4-1 -- version upgrade - -* Fri Sep 15 2006 Andreas Bierfert -1.3.3.3-1 -- version upgrade (#205962) - -* Sun Jun 18 2006 Andreas Bierfert -1.3.3.2-2 -- bump - -* Tue May 30 2006 Andreas Bierfert -1.3.3.2-1 -- version upgrade - -* Sat Apr 22 2006 Andreas Bierfert -1.3.3.1-1 -- version upgrade - -* Tue Mar 28 2006 Andreas Bierfert -1.3.3-1 -- version upgrade -- add BR gnutls-devel - -* Sat Mar 18 2006 Andreas Bierfert -1.3.2-1 -- upgrade to beta version - -* Thu Feb 16 2006 Andreas Bierfert -1.2.4.1-4 -- Rebuild for Fedora Extras 5 - -* Wed Feb 08 2006 Andreas Bierfert -1.2.4.1-3 -- add missing requires python-imaging - -* Sat Jan 21 2006 Andreas Bierfert -1.2.4.1-2 -- rebuild (#178494) - -* Wed Jan 18 2006 Andreas Bierfert -1.2.4.1-1 -- version upgrade - -* Thu Jul 7 2005 Tom "spot" Callaway 1.2.2.1-2 -- use dist tag for sanity between branches - -* Tue Jul 5 2005 P Linnell - 1.2.2.1-1 -- 1.2.2.1 released to fix crash on open with certain 1.2.1 docs - -* Sun Jul 3 2005 P Linnell - 1.2.2-0.fc4 -- 1.2.2 final - -* Tue Jun 28 2005 P Linnell - 1.2.2cvs-0 -- test build for 1.2.2cvs -- Add freetype2 explicit build requirement -- Add obsoletes. See PACKAGING in the source tarball -- Change the description per PACKAGING -- Bump required python. 2.2 is no longer supported. - - -* Sun May 22 2005 Jeremy Katz - 1.2.1-5 -- rebuild on all arches - -* Fri Apr 7 2005 Michael Schwendt -- rebuilt - -* Sun Feb 06 2005 Phillip Compton - 1.2.1-3 -- Bumped BR on qt-devel to 3.3. - -* Thu Feb 3 2005 Michael Schwendt - 1.2.1-2 -- Fix x86_64 build and summary. - -* Sun Jan 09 2005 Phillip Compton - 1.2.1-1 -- 1.2.1. - -* Sat Dec 04 2004 Phillip Compton - 1.2.1-0.1.cvs20041118 -- cvs snapshot. - -* Wed Nov 11 2004 Phillip Compton - 1.2-0.fdr.3 -- Redirect output in post/postun, to avoid failure. - -* Wed Nov 10 2004 Phillip Compton - 1.2-0.fdr.2 -- Mime-type corrections for FC3. -- Dropped redundent BR XFree86-devel. - -* Thu Aug 26 2004 Phillip Compton - 0:1.2-0.fdr.1 -- 1.2. -- Dropping old obsoletes/provides (don't know of anyone using them). - -* Thu Aug 19 2004 Phillip Compton - 0:1.2-0.fdr.0.RC1 -- 1.2RC1. - -* Sat Aug 07 2004 Phillip Compton - 0:1.1.7-0.fdr.4 -- mime info/icon for .sla files. - -* Fri Jul 10 2004 Phillip Compton - 0:1.1.7-0.fdr.3 -- BuildReq openssl-devel (#1727). - -* Thu Jun 10 2004 Phillip Compton - 0:1.1.7-0.fdr.2 -- Source0 allows direct download (#1727). -- Req tkinter (#1727). - -* Sun Jun 06 2004 Phillip Compton - 0:1.1.7-0.fdr.1 -- Updated to 1.1.7. -- Re-added _smp_mflags. - -* Mon May 24 2004 Phillip Compton - 0:1.1.6-0.fdr.3 -- Add Application Category to desktop entry. - -* Sun Apr 11 2004 Phillip Compton - 0:1.1.6-0.fdr.2 -- Bump ghostscript Req to 7.07. -- URL scribus.net. - -* Tue Apr 06 2004 Phillip Compton - 0:1.1.6-0.fdr.1 -- Updated to 1.1.6. -- Using upstream desktop entry. - -* Sat Feb 14 2004 Phillip Compton - 0:1.1.5-0.fdr.1 -- Updated to 1.1.5. - -* Sun Dec 21 2003 Phillip Compton - 0:1.1.4-0.fdr.1 -- Updated to 1.1.4. - -* Thu Dec 04 2003 Phillip Compton - 0:1.1.3-0.fdr.2 -- Dropped LDFLAGS="-lm" -- Added --with-pythondir=%%{_prefix} -- Req ghostscript. - -* Sun Nov 30 2003 Phillip Compton - 0:1.1.3-0.fdr.1 -- Updated to 1.1.3. -- Removed _smp_mflags. - -* Tue Nov 18 2003 Phillip Compton - 0:1.1.2-0.fdr.2 -- Req python. -- Provides scribus-scripting. - -* Sun Nov 09 2003 Phillip Compton - 0:1.1.2-0.fdr.1 -- Updated to 1.1.2. -- Obsoletes scribus-scripting. - -* Sat Oct 11 2003 Phillip Compton - 0:1.1.1-0.fdr.2 -- BuildReq littlecms-devel -> lcms-devel. - -* Thu Oct 09 2003 Phillip Compton - 0:1.1.1-0.fdr.1 -- Updated to 1.1.1. -- BuildReq littlecms-devel. -- BuildReq libart_lgpl-devel. - -* Wed Sep 10 2003 Phillip Compton - 0:1.0.1-0.fdr.1 -- Updated to 1.0.1. -- Split off devel package for headers. -- No longer Obsoletes scribus-i18n-en - -* Thu Jul 24 2003 Phillip Compton - 0:1.0-0.fdr.3 -- desktop entry terminal=0 -> false. - -* Tue Jul 15 2003 Phillip Compton - 0:1.0-0.fdr.2 -- Added Obsoletes scribus-i18n-en. - -* Tue Jul 15 2003 Phillip Compton - 0:1.0-0.fdr.1 -- Updated to 1.0. - -* Tue Jul 01 2003 Phillip Compton - 0:1.0-0.fdr.0.1.rc1 -- Updated to 1.0RC1. - -* Fri Jun 20 2003 Phillip Compton - 0:0.9.11.1-0.fdr.1 -- Updated to 0.9.11.1. -- Added obsoletes scribus-svg. - -* Sun May 25 2003 Phillip Compton - 0:0.9.10-0.fdr.3 -- Using make DESTDIR= workaround for plugin issue. -- Removed post/postun ldconfig. -- Removed devel subpackage. - -* Mon May 19 2003 Phillip Compton - 0:0.9.10-0.fdr.2 -- Explicitly set file permission on icon. -- Created devel package. -- Removed .la files. -- Added ChangeLog to Documentation. - -* Sun May 18 2003 Phillip Compton - 0:0.9.10-0.fdr.1 -- Updated to 0.9.10. -- buildroot -> RPM_BUILD_ROOT. - -* Sat Apr 26 2003 Phillip Compton - 0:0.9.9-0.fdr.3 -- Added BuildRequires for cups-devel. - -* Thu Apr 24 2003 Phillip Compton - 0:0.9.9-0.fdr.2 -- Added BuildRequires for libtiff-devel. -- Added line to help package find tiff. - -* Sun Apr 20 2003 Phillip Compton - 0:0.9.9-0.fdr.1 -- Updated to 0.9.9. -- Added line for QT. - -* Thu Apr 10 2003 Phillip Compton - 0:0.9.8-0.fdr.3.rh90 -- Added missing BuildRequires. -- Corrected Group. - -* Tue Apr 01 2003 Phillip Compton - 0:0.9.8-0.fdr.2 -- Added desktop-file-utils to BuildRequires. -- Changed category to X-Fedora-Extra. -- Added Epoch:0. - -* Thu Mar 27 2003 Phillip Compton - 0.9.8-0.fdr.1 -- Initial RPM release. +%autochangelog diff --git a/sources b/sources index a6de699..2767531 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (scribus-1.5.8-free.tar.xz) = 28ef07d7ee0be9c8db53b990fa260b05a61ebd47a3ace88b6b56193dda261e6c6b4d79c57d7514387cc0778d00f5e4a57de7242b57414d01c7f6c78e8f0d6878 +SHA512 (scribus-1.6.0-free.tar.xz) = 56363ba557cd8b21a8cde6015d4fa031ab5c28e15f85d99d5f775d9b441b96cd0f1ffe9ef3ddc5f0df4410843b9a22ef22b40f550cf67e7bada5594be2abb7d2 From ea2e4279e56891f7cb7db64979eb92bd0f82281c Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Mon, 1 Jan 2024 13:43:58 -0800 Subject: [PATCH 10/27] Convert operators to upper-case for SPDX license expressions ... - Fix cmake parameter `-WANT_NOHEADERINSTALL=1` to `-DWANT_NOHEADERINSTALL=1` --- scribus.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scribus.spec b/scribus.spec index a9cb3ce..607fd95 100644 --- a/scribus.spec +++ b/scribus.spec @@ -3,7 +3,7 @@ Version: 1.6.0 Release: %autorelease Summary: Desktop Publishing application written in Qt # swatches bring in the fun licenses -License: GPL-2.0-or-later and OGL-UK-3.0 and CC0-1.0 and CC-BY-4.0 and CC-BY-SA-4.0 and LicenseRef-Fedora-Public-Domain and Apache-2.0 and LGPL-2.0-or-later +License: GPL-2.0-or-later AND OGL-UK-3.0 AND CC0-1.0 AND CC-BY-4.0 AND CC-BY-SA-4.0 AND LicenseRef-Fedora-Public-Domain AND Apache-2.0 AND LGPL-2.0-or-later URL: http://www.scribus.net/ # svn export svn://scribus.net/trunk/Scribus scribus-%%{version} @@ -101,7 +101,7 @@ chmod a-x scribus/pageitem_latexframe.h %if "%{_lib}" == "lib64" -DWANT_LIB64=YES \ %endif - -WANT_NOHEADERINSTALL=1 \ + -DWANT_NOHEADERINSTALL=1 \ -DWANT_NORPATH=1 \ -DWITH_BOOST=1 \ -DWITH_PODOFO=1 From 4207de9764cf88f43ed24b3ae479f63af24a7862 Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Sun, 7 Jan 2024 14:54:38 -0800 Subject: [PATCH 11/27] Update to 1.6.1 ...(#2256351) - Use pkgconfig for podofo-0.9 build requirment - Drop unused noheadinstall cmake parameter --- .gitignore | 1 + scribus.spec | 12 +++++------- sources | 2 +- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index cf1c2f6..affbe31 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ scribus-1.3.8.tar.bz2 /scribus-1.5.6.1-free.tar.xz /scribus-1.5.8-free.tar.xz /scribus-1.6.0-free.tar.xz +/scribus-1.6.1-free.tar.xz diff --git a/scribus.spec b/scribus.spec index 607fd95..fef5b62 100644 --- a/scribus.spec +++ b/scribus.spec @@ -1,5 +1,5 @@ Name: scribus -Version: 1.6.0 +Version: 1.6.1 Release: %autorelease Summary: Desktop Publishing application written in Qt # swatches bring in the fun licenses @@ -39,7 +39,7 @@ BuildRequires: pkgconfig(libjpeg) BuildRequires: pkgconfig(libmspub-0.1) BuildRequires: pkgconfig(libpagemaker-0.0) BuildRequires: pkgconfig(libpng) -BuildRequires: podofo0.9-devel +BuildRequires: pkgconfig(libpodofo) < 0.9.9 BuildRequires: pkgconfig(libqxp-0.0) BuildRequires: pkgconfig(librevenge-0.0) BuildRequires: pkgconfig(libtiff-4) @@ -92,16 +92,14 @@ chmod a-x scribus/pageitem_latexframe.h %build %cmake \ - -DCMAKE_CXX_STANDARD=17 \ - -DWANT_CPP17=ON \ -DWANT_CCACHE=YES \ + -DWANT_CPP17=ON \ -DWANT_DISTROBUILD=YES \ -DWANT_GRAPHICSMAGICK=1 \ -DWANT_HUNSPELL=1 \ %if "%{_lib}" == "lib64" -DWANT_LIB64=YES \ %endif - -DWANT_NOHEADERINSTALL=1 \ -DWANT_NORPATH=1 \ -DWITH_BOOST=1 \ -DWITH_PODOFO=1 @@ -139,8 +137,8 @@ appstream-util validate-relax --nonet \ %{_datadir}/icons/hicolor/256x256/mimetypes/application-vnd.%{name}.png %{_datadir}/%{name}/ %{_mandir}/man1/* -%{_mandir}/pl/man1/* -%{_mandir}/de/man1/* +%exclude %{_mandir}/pl/man1/* +%exclude %{_mandir}/de/man1/* %changelog diff --git a/sources b/sources index 2767531..6c6a50f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (scribus-1.6.0-free.tar.xz) = 56363ba557cd8b21a8cde6015d4fa031ab5c28e15f85d99d5f775d9b441b96cd0f1ffe9ef3ddc5f0df4410843b9a22ef22b40f550cf67e7bada5594be2abb7d2 +SHA512 (scribus-1.6.1-free.tar.xz) = 690798ce9a94a9cf4cc8ad5eca03c287afe0986df213660152032e7a0d6a2e0e30cd1a9edd403eb9a162c5493c6dc8efde4fd3a4a38a021678fb3ee8e56d2267 From 387daf98b015048e8b9189baaeceab6de6bba646 Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Tue, 9 Jan 2024 19:00:14 -0800 Subject: [PATCH 12/27] Revert increasing mininal build requirement --- scribus.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scribus.spec b/scribus.spec index fef5b62..0824b95 100644 --- a/scribus.spec +++ b/scribus.spec @@ -15,7 +15,7 @@ Source0: %{name}-%{version}-free.tar.xz #Source1: http://downloads.sourceforge.net/%%{name}/%%{name}-%%{version}.tar.xz.asc -BuildRequires: boost-devel >= 1.76 +BuildRequires: boost-devel BuildRequires: cmake BuildRequires: cups-devel BuildRequires: desktop-file-utils @@ -23,14 +23,14 @@ BuildRequires: gcc-c++ BuildRequires: ghostscript BuildRequires: hyphen-devel BuildRequires: libappstream-glib -BuildRequires: pkgconfig(cairo) >= 1.17.6 +BuildRequires: pkgconfig(cairo) BuildRequires: pkgconfig(fontconfig) BuildRequires: pkgconfig(freetype2) >= 2.13.2 BuildRequires: pkgconfig(gnutls) BuildRequires: pkgconfig(GraphicsMagick) BuildRequires: pkgconfig(GraphicsMagick++) BuildRequires: pkgconfig(harfbuzz) -BuildRequires: pkgconfig(hunspell) >= 1.7.2 +BuildRequires: pkgconfig(hunspell) BuildRequires: pkgconfig(icu-uc) BuildRequires: pkgconfig(lcms2) BuildRequires: pkgconfig(libcdr-0.1) From 0c3e637175cf603397c96796f8040f3b69565d39 Mon Sep 17 00:00:00 2001 From: Marek Kasik Date: Thu, 8 Feb 2024 13:32:34 +0100 Subject: [PATCH 13/27] Rebuild for poppler 24.02.0 From 292edcd0425b474f54b321679c44e1fc482a80e6 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Sat, 8 Jun 2024 22:34:27 +0200 Subject: [PATCH 14/27] Rebuilt for Python 3.13 From d4287af29bdefa58b63b6b568fb7602e9325993b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 05:02:12 +0000 Subject: [PATCH 15/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 1f13657293ac505c7b0166177d8e04f95a6b4b7a Mon Sep 17 00:00:00 2001 From: Marek Kasik Date: Thu, 22 Aug 2024 16:13:43 +0200 Subject: [PATCH 16/27] Rebuild for poppler 24.08.0 Backport of changes necessary to do the rebuild. --- scribus-1.6.1-c++20-warnings.patch | 30 +++++++++++++ scribus-1.6.1-c++20.patch | 27 +++++++++++ scribus-1.6.1-point-operator.patch | 42 ++++++++++++++++++ scribus-1.6.1-poppler-24.03.0-fix.patch | 32 ++++++++++++++ scribus-1.6.1-poppler-24.03.0.patch | 59 +++++++++++++++++++++++++ scribus.spec | 6 +++ 6 files changed, 196 insertions(+) create mode 100644 scribus-1.6.1-c++20-warnings.patch create mode 100644 scribus-1.6.1-c++20.patch create mode 100644 scribus-1.6.1-point-operator.patch create mode 100644 scribus-1.6.1-poppler-24.03.0-fix.patch create mode 100644 scribus-1.6.1-poppler-24.03.0.patch diff --git a/scribus-1.6.1-c++20-warnings.patch b/scribus-1.6.1-c++20-warnings.patch new file mode 100644 index 0000000..944055a --- /dev/null +++ b/scribus-1.6.1-c++20-warnings.patch @@ -0,0 +1,30 @@ +From 3116328e804c7366ec64c4224cbf20b0f14e52c8 Mon Sep 17 00:00:00 2001 +From: Jean Ghali +Date: Sun, 31 Mar 2024 21:40:42 +0000 +Subject: Fix C++20 related warning "template-id is not allowed for constructor + in C++20" + +git-svn-id: svn://scribus.net/trunk/Scribus@26079 11d20701-8431-0410-a711-e3c959e3b870 + +diff --git a/scribus/third_party/lib2geom/rect.h b/scribus/third_party/lib2geom/rect.h +index c740d847f..ae1934782 100644 +--- a/scribus/third_party/lib2geom/rect.h ++++ b/scribus/third_party/lib2geom/rect.h +@@ -56,14 +56,14 @@ class D2 { + private: + Interval f[2]; + public: +- D2() { f[X] = f[Y] = Interval(0, 0); } ++ D2() { f[X] = f[Y] = Interval(0, 0); } + +- D2(Interval const &a, Interval const &b) { ++ D2(Interval const &a, Interval const &b) { + f[X] = a; + f[Y] = b; + } + +- D2(Point const & a, Point const & b) { ++ D2(Point const & a, Point const & b) { + f[X] = Interval(a[X], b[X]); + f[Y] = Interval(a[Y], b[Y]); + } diff --git a/scribus-1.6.1-c++20.patch b/scribus-1.6.1-c++20.patch new file mode 100644 index 0000000..5544598 --- /dev/null +++ b/scribus-1.6.1-c++20.patch @@ -0,0 +1,27 @@ +From 985b7944e50b23f4558ba4ca539659f37b4b7ba4 Mon Sep 17 00:00:00 2001 +From: Jean Ghali +Date: Thu, 2 May 2024 22:26:03 +0000 +Subject: Enforce C++20 when building with poppler >= 24.05.0 + +git-svn-id: svn://scribus.net/trunk/Scribus@26125 11d20701-8431-0410-a711-e3c959e3b870 + +diff --git a/CMakeLists_Dependencies.cmake b/CMakeLists_Dependencies.cmake +index a19acfc23..33f827298 100644 +--- a/CMakeLists_Dependencies.cmake ++++ b/CMakeLists_Dependencies.cmake +@@ -28,7 +28,14 @@ if (poppler_FOUND) + message(STATUS "Found poppler") + message(STATUS "Found poppler libs: ${poppler_LIBRARY}") + message(STATUS "Found poppler includes: ${poppler_INCLUDE_DIR}") +- if (poppler_VERSION VERSION_GREATER_EQUAL 22.01.0) ++ if (poppler_VERSION VERSION_GREATER_EQUAL 24.05.0) ++ message(STATUS "Poppler Version:" ${poppler_VERSION}) ++ if (CMAKE_CXX_STANDARD LESS 20) ++ message(STATUS "C++20 is the minimum C++ standard since poppler 24.05.0") ++ message(STATUS "Enabling C++20 compiler features") ++ set(CMAKE_CXX_STANDARD 20) ++ endif() ++ elseif (poppler_VERSION VERSION_GREATER_EQUAL 22.01.0) + message(STATUS "Poppler Version:" ${poppler_VERSION}) + if (CMAKE_CXX_STANDARD LESS 17) + message(STATUS "C++17 is the minimum C++ standard since poppler 22.01.0") diff --git a/scribus-1.6.1-point-operator.patch b/scribus-1.6.1-point-operator.patch new file mode 100644 index 0000000..030fc6d --- /dev/null +++ b/scribus-1.6.1-point-operator.patch @@ -0,0 +1,42 @@ +From 8beacae24242c683d60cd280fec14ba5db6d8090 Mon Sep 17 00:00:00 2001 +From: Jean Ghali +Date: Sat, 1 Jun 2024 22:03:54 +0000 +Subject: #17229: scribus fails to compile with boost 1.85.0 + +git-svn-id: svn://scribus.net/trunk/Scribus@26169 11d20701-8431-0410-a711-e3c959e3b870 + +diff --git a/scribus/third_party/lib2geom/point.h b/scribus/third_party/lib2geom/point.h +index 9aa62461a..4e86740e1 100644 +--- a/scribus/third_party/lib2geom/point.h ++++ b/scribus/third_party/lib2geom/point.h +@@ -121,10 +121,14 @@ class Point { + + Point &operator*=(Matrix const &m); + +- inline int operator == (const Point &in_pnt) { ++ inline bool operator==(const Point &in_pnt) const { + return ((_pt[X] == in_pnt[X]) && (_pt[Y] == in_pnt[Y])); + } + ++ inline bool operator!=(const Point &in_pnt) const { ++ return ((_pt[X] != in_pnt[X]) || (_pt[Y] != in_pnt[Y])); ++ } ++ + friend inline std::ostream &operator<< (std::ostream &out_file, const Geom::Point &in_pnt); + }; + +@@ -144,14 +148,6 @@ inline Point operator^(Point const &a, Point const &b) { + return ret; + } + +-//IMPL: boost::EqualityComparableConcept +-inline bool operator==(Point const &a, Point const &b) { +- return (a[X] == b[X]) && (a[Y] == b[Y]); +-} +-inline bool operator!=(Point const &a, Point const &b) { +- return (a[X] != b[X]) || (a[Y] != b[Y]); +-} +- + /** This is a lexicographical ordering for points. It is remarkably useful for sweepline algorithms*/ + inline bool operator<=(Point const &a, Point const &b) { + return ( ( a[Y] < b[Y] ) || diff --git a/scribus-1.6.1-poppler-24.03.0-fix.patch b/scribus-1.6.1-poppler-24.03.0-fix.patch new file mode 100644 index 0000000..7c8968a --- /dev/null +++ b/scribus-1.6.1-poppler-24.03.0-fix.patch @@ -0,0 +1,32 @@ +From 53e715d2f65ffaf6b78833d9dd012a93dbaaca93 Mon Sep 17 00:00:00 2001 +From: Jean Ghali +Date: Tue, 5 Mar 2024 16:42:40 +0000 +Subject: Fix incorrect value used in initial build fix against poppler 24.03. + See + https://gitlab.freedesktop.org/poppler/poppler/-/commit/6e3824d45d42cb806a28a2df84e4ab6bb3587083 + for details. + +git-svn-id: svn://scribus.net/trunk/Scribus@26047 11d20701-8431-0410-a711-e3c959e3b870 + +diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp +index f5297bba7..e69c4177c 100644 +--- a/scribus/plugins/import/pdf/slaoutput.cpp ++++ b/scribus/plugins/import/pdf/slaoutput.cpp +@@ -1758,7 +1758,7 @@ bool SlaOutputDev::axialShadedFill(GfxState *state, GfxAxialShading *shading, do + } + } + #if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 3, 0) +- else if ((func->getType() == Function::Type::Exponential) || (func->getType() == Function::Type::Identity)) ++ else if ((func->getType() == Function::Type::Exponential) || (func->getType() == Function::Type::Sampled)) + #else + else if ((func->getType() == 2) || (func->getType() == 0)) + #endif +@@ -1900,7 +1900,7 @@ bool SlaOutputDev::radialShadedFill(GfxState *state, GfxRadialShading *shading, + } + } + #if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 3, 0) +- else if ((func->getType() == Function::Type::Exponential) || (func->getType() == Function::Type::Identity)) ++ else if ((func->getType() == Function::Type::Exponential) || (func->getType() == Function::Type::Sampled)) + #else + else if ((func->getType() == 2) || (func->getType() == 0)) + #endif diff --git a/scribus-1.6.1-poppler-24.03.0.patch b/scribus-1.6.1-poppler-24.03.0.patch new file mode 100644 index 0000000..a188164 --- /dev/null +++ b/scribus-1.6.1-poppler-24.03.0.patch @@ -0,0 +1,59 @@ +From c57362c4f7bdef67904bf2f3d8126073792bdcf9 Mon Sep 17 00:00:00 2001 +From: Jean Ghali +Date: Mon, 4 Mar 2024 20:39:54 +0000 +Subject: Fix build failure with poppler 24.03.0 + +git-svn-id: svn://scribus.net/trunk/Scribus@26042 11d20701-8431-0410-a711-e3c959e3b870 + +diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp +index 4e31e4b6c..58f030503 100644 +--- a/scribus/plugins/import/pdf/slaoutput.cpp ++++ b/scribus/plugins/import/pdf/slaoutput.cpp +@@ -1731,7 +1731,11 @@ bool SlaOutputDev::axialShadedFill(GfxState *state, GfxAxialShading *shading, do + VGradient FillGradient = VGradient(VGradient::linear); + FillGradient.clearStops(); + GfxColorSpace *color_space = shading->getColorSpace(); ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 3, 0) ++ if (func->getType() == Function::Type::Stitching) ++#else + if (func->getType() == 3) ++#endif + { + StitchingFunction *stitchingFunc = (StitchingFunction*)func; + const double *bounds = stitchingFunc->getBounds(); +@@ -1753,7 +1757,11 @@ bool SlaOutputDev::axialShadedFill(GfxState *state, GfxAxialShading *shading, do + FillGradient.addStop( ScColorEngine::getShadeColor(m_doc->PageColors[stopColor], m_doc, shade), stopPoint, 0.5, 1.0, stopColor, shade ); + } + } ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 3, 0) ++ else if ((func->getType() == Function::Type::Exponential) || (func->getType() == Function::Type::Identity)) ++#else + else if ((func->getType() == 2) || (func->getType() == 0)) ++#endif + { + GfxColor stop1; + shading->getColor(0.0, &stop1); +@@ -1865,7 +1873,11 @@ bool SlaOutputDev::radialShadedFill(GfxState *state, GfxRadialShading *shading, + VGradient FillGradient = VGradient(VGradient::linear); + FillGradient.clearStops(); + GfxColorSpace *color_space = shading->getColorSpace(); ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 3, 0) ++ if (func->getType() == Function::Type::Stitching) ++#else + if (func->getType() == 3) ++#endif + { + StitchingFunction *stitchingFunc = (StitchingFunction*)func; + const double *bounds = stitchingFunc->getBounds(); +@@ -1887,7 +1899,11 @@ bool SlaOutputDev::radialShadedFill(GfxState *state, GfxRadialShading *shading, + FillGradient.addStop( ScColorEngine::getShadeColor(m_doc->PageColors[stopColor], m_doc, shade), stopPoint, 0.5, 1.0, stopColor, shade ); + } + } ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 3, 0) ++ else if ((func->getType() == Function::Type::Exponential) || (func->getType() == Function::Type::Identity)) ++#else + else if ((func->getType() == 2) || (func->getType() == 0)) ++#endif + { + GfxColor stop1; + shading->getColor(0.0, &stop1); diff --git a/scribus.spec b/scribus.spec index 0824b95..8739f5c 100644 --- a/scribus.spec +++ b/scribus.spec @@ -14,6 +14,12 @@ Source0: %{name}-%{version}-free.tar.xz #Source0: http://downloads.sourceforge.net/%%{name}/%%{name}-%%{version}.tar.xz #Source1: http://downloads.sourceforge.net/%%{name}/%%{name}-%%{version}.tar.xz.asc +# Enforce C++20 due to poppler +Patch0: scribus-1.6.1-c++20.patch +Patch1: scribus-1.6.1-c++20-warnings.patch +Patch2: scribus-1.6.1-point-operator.patch +Patch3: scribus-1.6.1-poppler-24.03.0.patch +Patch4: scribus-1.6.1-poppler-24.03.0-fix.patch BuildRequires: boost-devel BuildRequires: cmake From b8fd860cfe159227a1c9f73252967857ca503071 Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Sun, 8 Dec 2024 22:45:00 +0000 Subject: [PATCH 17/27] Rebuild for ICU 76 From 1053ea0db310889c0f04c46028e0dd1dcedf475d Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Tue, 14 Jan 2025 22:14:41 +0000 Subject: [PATCH 18/27] Update to 1.6.3 (rhbz#2292539) --- .gitignore | 1 + scribus-1.6.1-c++20-warnings.patch | 30 ------------- scribus-1.6.1-c++20.patch | 27 ----------- scribus-1.6.1-point-operator.patch | 42 ------------------ scribus-1.6.1-poppler-24.03.0-fix.patch | 32 -------------- scribus-1.6.1-poppler-24.03.0.patch | 59 ------------------------- scribus.spec | 9 +--- sources | 2 +- 8 files changed, 3 insertions(+), 199 deletions(-) delete mode 100644 scribus-1.6.1-c++20-warnings.patch delete mode 100644 scribus-1.6.1-c++20.patch delete mode 100644 scribus-1.6.1-point-operator.patch delete mode 100644 scribus-1.6.1-poppler-24.03.0-fix.patch delete mode 100644 scribus-1.6.1-poppler-24.03.0.patch diff --git a/.gitignore b/.gitignore index affbe31..a0b1525 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ scribus-1.3.8.tar.bz2 /scribus-1.5.8-free.tar.xz /scribus-1.6.0-free.tar.xz /scribus-1.6.1-free.tar.xz +/scribus-1.6.3-free.tar.xz diff --git a/scribus-1.6.1-c++20-warnings.patch b/scribus-1.6.1-c++20-warnings.patch deleted file mode 100644 index 944055a..0000000 --- a/scribus-1.6.1-c++20-warnings.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 3116328e804c7366ec64c4224cbf20b0f14e52c8 Mon Sep 17 00:00:00 2001 -From: Jean Ghali -Date: Sun, 31 Mar 2024 21:40:42 +0000 -Subject: Fix C++20 related warning "template-id is not allowed for constructor - in C++20" - -git-svn-id: svn://scribus.net/trunk/Scribus@26079 11d20701-8431-0410-a711-e3c959e3b870 - -diff --git a/scribus/third_party/lib2geom/rect.h b/scribus/third_party/lib2geom/rect.h -index c740d847f..ae1934782 100644 ---- a/scribus/third_party/lib2geom/rect.h -+++ b/scribus/third_party/lib2geom/rect.h -@@ -56,14 +56,14 @@ class D2 { - private: - Interval f[2]; - public: -- D2() { f[X] = f[Y] = Interval(0, 0); } -+ D2() { f[X] = f[Y] = Interval(0, 0); } - -- D2(Interval const &a, Interval const &b) { -+ D2(Interval const &a, Interval const &b) { - f[X] = a; - f[Y] = b; - } - -- D2(Point const & a, Point const & b) { -+ D2(Point const & a, Point const & b) { - f[X] = Interval(a[X], b[X]); - f[Y] = Interval(a[Y], b[Y]); - } diff --git a/scribus-1.6.1-c++20.patch b/scribus-1.6.1-c++20.patch deleted file mode 100644 index 5544598..0000000 --- a/scribus-1.6.1-c++20.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 985b7944e50b23f4558ba4ca539659f37b4b7ba4 Mon Sep 17 00:00:00 2001 -From: Jean Ghali -Date: Thu, 2 May 2024 22:26:03 +0000 -Subject: Enforce C++20 when building with poppler >= 24.05.0 - -git-svn-id: svn://scribus.net/trunk/Scribus@26125 11d20701-8431-0410-a711-e3c959e3b870 - -diff --git a/CMakeLists_Dependencies.cmake b/CMakeLists_Dependencies.cmake -index a19acfc23..33f827298 100644 ---- a/CMakeLists_Dependencies.cmake -+++ b/CMakeLists_Dependencies.cmake -@@ -28,7 +28,14 @@ if (poppler_FOUND) - message(STATUS "Found poppler") - message(STATUS "Found poppler libs: ${poppler_LIBRARY}") - message(STATUS "Found poppler includes: ${poppler_INCLUDE_DIR}") -- if (poppler_VERSION VERSION_GREATER_EQUAL 22.01.0) -+ if (poppler_VERSION VERSION_GREATER_EQUAL 24.05.0) -+ message(STATUS "Poppler Version:" ${poppler_VERSION}) -+ if (CMAKE_CXX_STANDARD LESS 20) -+ message(STATUS "C++20 is the minimum C++ standard since poppler 24.05.0") -+ message(STATUS "Enabling C++20 compiler features") -+ set(CMAKE_CXX_STANDARD 20) -+ endif() -+ elseif (poppler_VERSION VERSION_GREATER_EQUAL 22.01.0) - message(STATUS "Poppler Version:" ${poppler_VERSION}) - if (CMAKE_CXX_STANDARD LESS 17) - message(STATUS "C++17 is the minimum C++ standard since poppler 22.01.0") diff --git a/scribus-1.6.1-point-operator.patch b/scribus-1.6.1-point-operator.patch deleted file mode 100644 index 030fc6d..0000000 --- a/scribus-1.6.1-point-operator.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 8beacae24242c683d60cd280fec14ba5db6d8090 Mon Sep 17 00:00:00 2001 -From: Jean Ghali -Date: Sat, 1 Jun 2024 22:03:54 +0000 -Subject: #17229: scribus fails to compile with boost 1.85.0 - -git-svn-id: svn://scribus.net/trunk/Scribus@26169 11d20701-8431-0410-a711-e3c959e3b870 - -diff --git a/scribus/third_party/lib2geom/point.h b/scribus/third_party/lib2geom/point.h -index 9aa62461a..4e86740e1 100644 ---- a/scribus/third_party/lib2geom/point.h -+++ b/scribus/third_party/lib2geom/point.h -@@ -121,10 +121,14 @@ class Point { - - Point &operator*=(Matrix const &m); - -- inline int operator == (const Point &in_pnt) { -+ inline bool operator==(const Point &in_pnt) const { - return ((_pt[X] == in_pnt[X]) && (_pt[Y] == in_pnt[Y])); - } - -+ inline bool operator!=(const Point &in_pnt) const { -+ return ((_pt[X] != in_pnt[X]) || (_pt[Y] != in_pnt[Y])); -+ } -+ - friend inline std::ostream &operator<< (std::ostream &out_file, const Geom::Point &in_pnt); - }; - -@@ -144,14 +148,6 @@ inline Point operator^(Point const &a, Point const &b) { - return ret; - } - --//IMPL: boost::EqualityComparableConcept --inline bool operator==(Point const &a, Point const &b) { -- return (a[X] == b[X]) && (a[Y] == b[Y]); --} --inline bool operator!=(Point const &a, Point const &b) { -- return (a[X] != b[X]) || (a[Y] != b[Y]); --} -- - /** This is a lexicographical ordering for points. It is remarkably useful for sweepline algorithms*/ - inline bool operator<=(Point const &a, Point const &b) { - return ( ( a[Y] < b[Y] ) || diff --git a/scribus-1.6.1-poppler-24.03.0-fix.patch b/scribus-1.6.1-poppler-24.03.0-fix.patch deleted file mode 100644 index 7c8968a..0000000 --- a/scribus-1.6.1-poppler-24.03.0-fix.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 53e715d2f65ffaf6b78833d9dd012a93dbaaca93 Mon Sep 17 00:00:00 2001 -From: Jean Ghali -Date: Tue, 5 Mar 2024 16:42:40 +0000 -Subject: Fix incorrect value used in initial build fix against poppler 24.03. - See - https://gitlab.freedesktop.org/poppler/poppler/-/commit/6e3824d45d42cb806a28a2df84e4ab6bb3587083 - for details. - -git-svn-id: svn://scribus.net/trunk/Scribus@26047 11d20701-8431-0410-a711-e3c959e3b870 - -diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp -index f5297bba7..e69c4177c 100644 ---- a/scribus/plugins/import/pdf/slaoutput.cpp -+++ b/scribus/plugins/import/pdf/slaoutput.cpp -@@ -1758,7 +1758,7 @@ bool SlaOutputDev::axialShadedFill(GfxState *state, GfxAxialShading *shading, do - } - } - #if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 3, 0) -- else if ((func->getType() == Function::Type::Exponential) || (func->getType() == Function::Type::Identity)) -+ else if ((func->getType() == Function::Type::Exponential) || (func->getType() == Function::Type::Sampled)) - #else - else if ((func->getType() == 2) || (func->getType() == 0)) - #endif -@@ -1900,7 +1900,7 @@ bool SlaOutputDev::radialShadedFill(GfxState *state, GfxRadialShading *shading, - } - } - #if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 3, 0) -- else if ((func->getType() == Function::Type::Exponential) || (func->getType() == Function::Type::Identity)) -+ else if ((func->getType() == Function::Type::Exponential) || (func->getType() == Function::Type::Sampled)) - #else - else if ((func->getType() == 2) || (func->getType() == 0)) - #endif diff --git a/scribus-1.6.1-poppler-24.03.0.patch b/scribus-1.6.1-poppler-24.03.0.patch deleted file mode 100644 index a188164..0000000 --- a/scribus-1.6.1-poppler-24.03.0.patch +++ /dev/null @@ -1,59 +0,0 @@ -From c57362c4f7bdef67904bf2f3d8126073792bdcf9 Mon Sep 17 00:00:00 2001 -From: Jean Ghali -Date: Mon, 4 Mar 2024 20:39:54 +0000 -Subject: Fix build failure with poppler 24.03.0 - -git-svn-id: svn://scribus.net/trunk/Scribus@26042 11d20701-8431-0410-a711-e3c959e3b870 - -diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp -index 4e31e4b6c..58f030503 100644 ---- a/scribus/plugins/import/pdf/slaoutput.cpp -+++ b/scribus/plugins/import/pdf/slaoutput.cpp -@@ -1731,7 +1731,11 @@ bool SlaOutputDev::axialShadedFill(GfxState *state, GfxAxialShading *shading, do - VGradient FillGradient = VGradient(VGradient::linear); - FillGradient.clearStops(); - GfxColorSpace *color_space = shading->getColorSpace(); -+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 3, 0) -+ if (func->getType() == Function::Type::Stitching) -+#else - if (func->getType() == 3) -+#endif - { - StitchingFunction *stitchingFunc = (StitchingFunction*)func; - const double *bounds = stitchingFunc->getBounds(); -@@ -1753,7 +1757,11 @@ bool SlaOutputDev::axialShadedFill(GfxState *state, GfxAxialShading *shading, do - FillGradient.addStop( ScColorEngine::getShadeColor(m_doc->PageColors[stopColor], m_doc, shade), stopPoint, 0.5, 1.0, stopColor, shade ); - } - } -+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 3, 0) -+ else if ((func->getType() == Function::Type::Exponential) || (func->getType() == Function::Type::Identity)) -+#else - else if ((func->getType() == 2) || (func->getType() == 0)) -+#endif - { - GfxColor stop1; - shading->getColor(0.0, &stop1); -@@ -1865,7 +1873,11 @@ bool SlaOutputDev::radialShadedFill(GfxState *state, GfxRadialShading *shading, - VGradient FillGradient = VGradient(VGradient::linear); - FillGradient.clearStops(); - GfxColorSpace *color_space = shading->getColorSpace(); -+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 3, 0) -+ if (func->getType() == Function::Type::Stitching) -+#else - if (func->getType() == 3) -+#endif - { - StitchingFunction *stitchingFunc = (StitchingFunction*)func; - const double *bounds = stitchingFunc->getBounds(); -@@ -1887,7 +1899,11 @@ bool SlaOutputDev::radialShadedFill(GfxState *state, GfxRadialShading *shading, - FillGradient.addStop( ScColorEngine::getShadeColor(m_doc->PageColors[stopColor], m_doc, shade), stopPoint, 0.5, 1.0, stopColor, shade ); - } - } -+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 3, 0) -+ else if ((func->getType() == Function::Type::Exponential) || (func->getType() == Function::Type::Identity)) -+#else - else if ((func->getType() == 2) || (func->getType() == 0)) -+#endif - { - GfxColor stop1; - shading->getColor(0.0, &stop1); diff --git a/scribus.spec b/scribus.spec index 8739f5c..32661f2 100644 --- a/scribus.spec +++ b/scribus.spec @@ -1,5 +1,5 @@ Name: scribus -Version: 1.6.1 +Version: 1.6.3 Release: %autorelease Summary: Desktop Publishing application written in Qt # swatches bring in the fun licenses @@ -14,13 +14,6 @@ Source0: %{name}-%{version}-free.tar.xz #Source0: http://downloads.sourceforge.net/%%{name}/%%{name}-%%{version}.tar.xz #Source1: http://downloads.sourceforge.net/%%{name}/%%{name}-%%{version}.tar.xz.asc -# Enforce C++20 due to poppler -Patch0: scribus-1.6.1-c++20.patch -Patch1: scribus-1.6.1-c++20-warnings.patch -Patch2: scribus-1.6.1-point-operator.patch -Patch3: scribus-1.6.1-poppler-24.03.0.patch -Patch4: scribus-1.6.1-poppler-24.03.0-fix.patch - BuildRequires: boost-devel BuildRequires: cmake BuildRequires: cups-devel diff --git a/sources b/sources index 6c6a50f..d97e813 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (scribus-1.6.1-free.tar.xz) = 690798ce9a94a9cf4cc8ad5eca03c287afe0986df213660152032e7a0d6a2e0e30cd1a9edd403eb9a162c5493c6dc8efde4fd3a4a38a021678fb3ee8e56d2267 +SHA512 (scribus-1.6.3-free.tar.xz) = 6bdd4509542481fb2ac720fe8116e044380b94450bf945e2d1fc1ee79bcb5752d8653c90280191fb2aa1dab11b063b2af286369874ce2578f5169d686ef220bb From 5b737e54a6d4392846db1fb0dd8e269bd0cda467 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 10:13:39 +0000 Subject: [PATCH 19/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 1d9e1e846d108a70929d522abed0d892c377bf06 Mon Sep 17 00:00:00 2001 From: Marek Kasik Date: Tue, 18 Feb 2025 13:49:24 +0100 Subject: [PATCH 20/27] Rebuild for poppler 25.02.0 Modify patch from Jean Ghali so it apply. --- scribus-1.6.3-poppler-25.02.0.patch | 167 ++++++++++++++++++++++++++++ scribus.spec | 2 + 2 files changed, 169 insertions(+) create mode 100644 scribus-1.6.3-poppler-25.02.0.patch diff --git a/scribus-1.6.3-poppler-25.02.0.patch b/scribus-1.6.3-poppler-25.02.0.patch new file mode 100644 index 0000000..64af51e --- /dev/null +++ b/scribus-1.6.3-poppler-25.02.0.patch @@ -0,0 +1,167 @@ +From 188d030acd0cb71e89dbb57695fe52158b6a0959 Mon Sep 17 00:00:00 2001 +From: Jean Ghali +Date: Tue, 4 Feb 2025 19:29:16 +0000 +Subject: #17405: Fix build error with poppler 25.02.0 + +git-svn-id: svn://scribus.net/trunk/Scribus@26666 11d20701-8431-0410-a711-e3c959e3b870 + +--- scribus-1.6.3/scribus/plugins/import/pdf/importpdfconfig.h ++++ scribus-1.6.3/scribus/plugins/import/pdf/importpdfconfig.h +@@ -27,4 +27,10 @@ for which a new license (GPL+exception) + #define POPPLER_CONST_083 + #endif + ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 2, 0) ++#define POPPLER_CONST_25_02 const ++#else ++#define POPPLER_CONST_25_02 ++#endif ++ + #endif +--- scribus-1.6.3/scribus/plugins/import/pdf/importpdf.cpp ++++ scribus-1.6.3/scribus/plugins/import/pdf/importpdf.cpp +@@ -462,11 +462,11 @@ bool PdfPlug::convert(const QString& fn) + + if (dev->isOk()) + { +- OCGs* ocg = pdfDoc->getOptContentConfig(); ++ POPPLER_CONST_25_02 OCGs* ocg = pdfDoc->getOptContentConfig(); + if (ocg && ocg->hasOCGs()) + { + QStringList ocgNames; +- Array *order = ocg->getOrderArray(); ++ POPPLER_CONST_25_02 Array *order = ocg->getOrderArray(); + if (order) + { + for (int i = 0; i < order->getLength (); ++i) +--- scribus-1.6.3/scribus/plugins/import/pdf/slaoutput.cpp ++++ scribus-1.6.3/scribus/plugins/import/pdf/slaoutput.cpp +@@ -2932,7 +2932,7 @@ void SlaOutputDev::beginMarkedContent(co + { + if (dictRef->isNull()) + return; +- OCGs *contentConfig = m_catalog->getOptContentConfig(); ++ POPPLER_CONST_25_02 OCGs *contentConfig = m_catalog->getOptContentConfig(); + OptionalContentGroup *oc; + if (dictRef->isRef()) + { +@@ -3084,7 +3084,11 @@ void SlaOutputDev::updateFont(GfxState * + #if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(22, 4, 0) + int tmpBufLen = 0; + #endif ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 2, 0) ++ std::vector codeToGID; ++#else + int *codeToGID = nullptr; ++#endif + const double *textMat = nullptr; + double m11, m12, m21, m22, fontSize; + SplashCoord mat[4] = { 1.0, 0.0, 0.0, 1.0 }; +@@ -3244,10 +3248,20 @@ void SlaOutputDev::updateFont(GfxState * + } + else + { ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 2, 0) ++ codeToGID.clear(); ++#else + codeToGID = nullptr; ++#endif + n = 0; + } +-#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0) ++#if 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)"); ++ goto err2; ++ } ++#elif 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)"); +@@ -3278,6 +3292,18 @@ void SlaOutputDev::updateFont(GfxState * + #endif + break; + case fontCIDType0COT: ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 2, 0) ++ if (((GfxCIDFont*) gfxFont)->getCIDToGIDLen() > 0) ++ { ++ codeToGID = ((GfxCIDFont*) gfxFont)->getCIDToGID(); ++ n = codeToGID.size(); ++ } ++ else ++ { ++ codeToGID.clear(); ++ n = 0; ++ } ++#else + if (((GfxCIDFont *) gfxFont)->getCIDToGID()) + { + n = ((GfxCIDFont *) gfxFont)->getCIDToGIDLen(); +@@ -3289,7 +3315,15 @@ void SlaOutputDev::updateFont(GfxState * + codeToGID = nullptr; + n = 0; + } +-#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0) ++#endif ++#if 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}'", ++ gfxFont->getName() ? gfxFont->getName()->c_str() : "(unnamed)"); ++ goto err2; ++ } ++#elif 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}'", +@@ -3307,6 +3341,15 @@ void SlaOutputDev::updateFont(GfxState * + break; + case fontCIDType2: + case fontCIDType2OT: ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 2, 0) ++ codeToGID.clear(); ++ n = 0; ++ if (((GfxCIDFont*) gfxFont)->getCIDToGIDLen() > 0) ++ { ++ codeToGID = ((GfxCIDFont*) gfxFont)->getCIDToGID(); ++ n = codeToGID.size(); ++ } ++#else + codeToGID = nullptr; + n = 0; + if (((GfxCIDFont *) gfxFont)->getCIDToGID()) +@@ -3318,6 +3361,7 @@ void SlaOutputDev::updateFont(GfxState * + memcpy(codeToGID, ((GfxCIDFont *)gfxFont)->getCIDToGID(), n * sizeof(*codeToGID)); + } + } ++#endif + else + { + #if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0) +@@ -3339,14 +3383,24 @@ void SlaOutputDev::updateFont(GfxState * + if (! ff) + goto err2; + #if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 2, 0) ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 2, 0) ++ codeToGID = ((GfxCIDFont*) gfxFont)->getCodeToGIDMap(ff.get()); ++#else + codeToGID = ((GfxCIDFont*) gfxFont)->getCodeToGIDMap(ff.get(), &n); ++#endif + ff.reset(); + #else + codeToGID = ((GfxCIDFont *)gfxFont)->getCodeToGIDMap(ff, &n); + delete ff; + #endif + } +-#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0) ++#if 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)"); ++ goto err2; ++ } ++#elif 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)"); diff --git a/scribus.spec b/scribus.spec index 32661f2..759ea5c 100644 --- a/scribus.spec +++ b/scribus.spec @@ -14,6 +14,8 @@ Source0: %{name}-%{version}-free.tar.xz #Source0: http://downloads.sourceforge.net/%%{name}/%%{name}-%%{version}.tar.xz #Source1: http://downloads.sourceforge.net/%%{name}/%%{name}-%%{version}.tar.xz.asc +Patch0: scribus-1.6.3-poppler-25.02.0.patch + BuildRequires: boost-devel BuildRequires: cmake BuildRequires: cups-devel From 4098c8f1b70dda67615df8d2635431e958abef61 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Tue, 3 Jun 2025 16:25:37 +0200 Subject: [PATCH 21/27] Rebuilt for Python 3.14 From bc14e4109e27a6812c5325bff2149a3f46646e25 Mon Sep 17 00:00:00 2001 From: Marek Kasik Date: Tue, 22 Jul 2025 17:41:21 +0200 Subject: [PATCH 22/27] Rebuild for poppler 25.07.0 --- scribus-1.6.3-poppler-25.06.0.patch | 24 ++++++++++++++++++ scribus-1.6.3-poppler-25.07.0.patch | 39 +++++++++++++++++++++++++++++ scribus.spec | 2 ++ 3 files changed, 65 insertions(+) create mode 100644 scribus-1.6.3-poppler-25.06.0.patch create mode 100644 scribus-1.6.3-poppler-25.07.0.patch diff --git a/scribus-1.6.3-poppler-25.06.0.patch b/scribus-1.6.3-poppler-25.06.0.patch new file mode 100644 index 0000000..6427f66 --- /dev/null +++ b/scribus-1.6.3-poppler-25.06.0.patch @@ -0,0 +1,24 @@ +From 8dcf8d777bd85a0741c455961f2de382e3ed47ec Mon Sep 17 00:00:00 2001 +From: Jean Ghali +Date: Tue, 3 Jun 2025 22:50:26 +0000 +Subject: Fix build with poppler 25.06.0 + +git-svn-id: svn://scribus.net/trunk/Scribus@26919 11d20701-8431-0410-a711-e3c959e3b870 + +diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp +index 0b878b6e2..63f28fa4f 100644 +--- a/scribus/plugins/import/pdf/slaoutput.cpp ++++ b/scribus/plugins/import/pdf/slaoutput.cpp +@@ -580,7 +580,12 @@ bool SlaOutputDev::handleWidgetAnnot(Annot* annota, double xCoor, double yCoor, + FormWidget *fm = m_formWidgets->getWidget(i); + if (!fm) + continue; ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 06, 0) ++ std::shared_ptr anoSharedPtr = fm->getWidgetAnnotation(); ++ AnnotWidget* ano = anoSharedPtr.get(); ++#else + AnnotWidget *ano = fm->getWidgetAnnotation(); ++#endif + if (!ano) + continue; + if (ano != (AnnotWidget*) annota) diff --git a/scribus-1.6.3-poppler-25.07.0.patch b/scribus-1.6.3-poppler-25.07.0.patch new file mode 100644 index 0000000..2f784b0 --- /dev/null +++ b/scribus-1.6.3-poppler-25.07.0.patch @@ -0,0 +1,39 @@ +From ff6c6abfa8683028e548a269dee6a859b6f63335 Mon Sep 17 00:00:00 2001 +From: Jean Ghali +Date: Fri, 4 Jul 2025 19:27:20 +0000 +Subject: Fix build with poppler 25.07.0 + +git-svn-id: svn://scribus.net/trunk/Scribus@26940 11d20701-8431-0410-a711-e3c959e3b870 + +diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp +index 63f28fa4f..a575c91bb 100644 +--- a/scribus/plugins/import/pdf/slaoutput.cpp ++++ b/scribus/plugins/import/pdf/slaoutput.cpp +@@ -3091,7 +3091,12 @@ void SlaOutputDev::updateFont(GfxState *state) + break; + case fontTrueType: + case fontTrueTypeOT: +-#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0) ++#if 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()) + ff = FoFiTrueType::load(fileName.c_str(), fontLoc->fontNum); + else +@@ -3226,7 +3231,12 @@ void SlaOutputDev::updateFont(GfxState *state) + #endif + else + { +-#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0) ++#if 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()) + ff = FoFiTrueType::load(fileName.c_str(), fontLoc->fontNum); + else diff --git a/scribus.spec b/scribus.spec index 759ea5c..f5d3e2d 100644 --- a/scribus.spec +++ b/scribus.spec @@ -15,6 +15,8 @@ Source0: %{name}-%{version}-free.tar.xz #Source1: http://downloads.sourceforge.net/%%{name}/%%{name}-%%{version}.tar.xz.asc Patch0: scribus-1.6.3-poppler-25.02.0.patch +Patch1: scribus-1.6.3-poppler-25.06.0.patch +Patch2: scribus-1.6.3-poppler-25.07.0.patch BuildRequires: boost-devel BuildRequires: cmake From 0c13094e7d45220b29500ce4adcbc199e51d7f5d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 18:03:12 +0000 Subject: [PATCH 23/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 00084463c02562950b6ec8f8316a0835c71e1cb6 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Mon, 4 Aug 2025 22:00:43 +0200 Subject: [PATCH 24/27] Rebuild against podofo0.10 --- scribus.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scribus.spec b/scribus.spec index f5d3e2d..9e3f450 100644 --- a/scribus.spec +++ b/scribus.spec @@ -42,7 +42,7 @@ BuildRequires: pkgconfig(libjpeg) BuildRequires: pkgconfig(libmspub-0.1) BuildRequires: pkgconfig(libpagemaker-0.0) BuildRequires: pkgconfig(libpng) -BuildRequires: pkgconfig(libpodofo) < 0.9.9 +BuildRequires: pkgconfig(libpodofo) < 1.0 BuildRequires: pkgconfig(libqxp-0.0) BuildRequires: pkgconfig(librevenge-0.0) BuildRequires: pkgconfig(libtiff-4) From a4481d588de4774f2ec090fa91e25de2354c6561 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= Date: Wed, 6 Aug 2025 09:57:50 +0200 Subject: [PATCH 25/27] Rebuilt for icu 77.1 From 703ed9d00c16bd5ba158b31a91ec5c60e369b9b9 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Wed, 13 Aug 2025 15:15:35 -0500 Subject: [PATCH 26/27] 1.6.4 --- .gitignore | 1 + scribus-1.6.3-poppler-25.02.0.patch | 167 ---------------------------- scribus.spec | 7 +- sources | 2 +- 4 files changed, 5 insertions(+), 172 deletions(-) delete mode 100644 scribus-1.6.3-poppler-25.02.0.patch diff --git a/.gitignore b/.gitignore index a0b1525..d85d151 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ scribus-1.3.8.tar.bz2 /scribus-1.6.0-free.tar.xz /scribus-1.6.1-free.tar.xz /scribus-1.6.3-free.tar.xz +/scribus-1.6.4-free.tar.xz diff --git a/scribus-1.6.3-poppler-25.02.0.patch b/scribus-1.6.3-poppler-25.02.0.patch deleted file mode 100644 index 64af51e..0000000 --- a/scribus-1.6.3-poppler-25.02.0.patch +++ /dev/null @@ -1,167 +0,0 @@ -From 188d030acd0cb71e89dbb57695fe52158b6a0959 Mon Sep 17 00:00:00 2001 -From: Jean Ghali -Date: Tue, 4 Feb 2025 19:29:16 +0000 -Subject: #17405: Fix build error with poppler 25.02.0 - -git-svn-id: svn://scribus.net/trunk/Scribus@26666 11d20701-8431-0410-a711-e3c959e3b870 - ---- scribus-1.6.3/scribus/plugins/import/pdf/importpdfconfig.h -+++ scribus-1.6.3/scribus/plugins/import/pdf/importpdfconfig.h -@@ -27,4 +27,10 @@ for which a new license (GPL+exception) - #define POPPLER_CONST_083 - #endif - -+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 2, 0) -+#define POPPLER_CONST_25_02 const -+#else -+#define POPPLER_CONST_25_02 -+#endif -+ - #endif ---- scribus-1.6.3/scribus/plugins/import/pdf/importpdf.cpp -+++ scribus-1.6.3/scribus/plugins/import/pdf/importpdf.cpp -@@ -462,11 +462,11 @@ bool PdfPlug::convert(const QString& fn) - - if (dev->isOk()) - { -- OCGs* ocg = pdfDoc->getOptContentConfig(); -+ POPPLER_CONST_25_02 OCGs* ocg = pdfDoc->getOptContentConfig(); - if (ocg && ocg->hasOCGs()) - { - QStringList ocgNames; -- Array *order = ocg->getOrderArray(); -+ POPPLER_CONST_25_02 Array *order = ocg->getOrderArray(); - if (order) - { - for (int i = 0; i < order->getLength (); ++i) ---- scribus-1.6.3/scribus/plugins/import/pdf/slaoutput.cpp -+++ scribus-1.6.3/scribus/plugins/import/pdf/slaoutput.cpp -@@ -2932,7 +2932,7 @@ void SlaOutputDev::beginMarkedContent(co - { - if (dictRef->isNull()) - return; -- OCGs *contentConfig = m_catalog->getOptContentConfig(); -+ POPPLER_CONST_25_02 OCGs *contentConfig = m_catalog->getOptContentConfig(); - OptionalContentGroup *oc; - if (dictRef->isRef()) - { -@@ -3084,7 +3084,11 @@ void SlaOutputDev::updateFont(GfxState * - #if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(22, 4, 0) - int tmpBufLen = 0; - #endif -+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 2, 0) -+ std::vector codeToGID; -+#else - int *codeToGID = nullptr; -+#endif - const double *textMat = nullptr; - double m11, m12, m21, m22, fontSize; - SplashCoord mat[4] = { 1.0, 0.0, 0.0, 1.0 }; -@@ -3244,10 +3248,20 @@ void SlaOutputDev::updateFont(GfxState * - } - else - { -+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 2, 0) -+ codeToGID.clear(); -+#else - codeToGID = nullptr; -+#endif - n = 0; - } --#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0) -+#if 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)"); -+ goto err2; -+ } -+#elif 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)"); -@@ -3278,6 +3292,18 @@ void SlaOutputDev::updateFont(GfxState * - #endif - break; - case fontCIDType0COT: -+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 2, 0) -+ if (((GfxCIDFont*) gfxFont)->getCIDToGIDLen() > 0) -+ { -+ codeToGID = ((GfxCIDFont*) gfxFont)->getCIDToGID(); -+ n = codeToGID.size(); -+ } -+ else -+ { -+ codeToGID.clear(); -+ n = 0; -+ } -+#else - if (((GfxCIDFont *) gfxFont)->getCIDToGID()) - { - n = ((GfxCIDFont *) gfxFont)->getCIDToGIDLen(); -@@ -3289,7 +3315,15 @@ void SlaOutputDev::updateFont(GfxState * - codeToGID = nullptr; - n = 0; - } --#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0) -+#endif -+#if 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}'", -+ gfxFont->getName() ? gfxFont->getName()->c_str() : "(unnamed)"); -+ goto err2; -+ } -+#elif 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}'", -@@ -3307,6 +3341,15 @@ void SlaOutputDev::updateFont(GfxState * - break; - case fontCIDType2: - case fontCIDType2OT: -+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 2, 0) -+ codeToGID.clear(); -+ n = 0; -+ if (((GfxCIDFont*) gfxFont)->getCIDToGIDLen() > 0) -+ { -+ codeToGID = ((GfxCIDFont*) gfxFont)->getCIDToGID(); -+ n = codeToGID.size(); -+ } -+#else - codeToGID = nullptr; - n = 0; - if (((GfxCIDFont *) gfxFont)->getCIDToGID()) -@@ -3318,6 +3361,7 @@ void SlaOutputDev::updateFont(GfxState * - memcpy(codeToGID, ((GfxCIDFont *)gfxFont)->getCIDToGID(), n * sizeof(*codeToGID)); - } - } -+#endif - else - { - #if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0) -@@ -3339,14 +3383,24 @@ void SlaOutputDev::updateFont(GfxState * - if (! ff) - goto err2; - #if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 2, 0) -+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 2, 0) -+ codeToGID = ((GfxCIDFont*) gfxFont)->getCodeToGIDMap(ff.get()); -+#else - codeToGID = ((GfxCIDFont*) gfxFont)->getCodeToGIDMap(ff.get(), &n); -+#endif - ff.reset(); - #else - codeToGID = ((GfxCIDFont *)gfxFont)->getCodeToGIDMap(ff, &n); - delete ff; - #endif - } --#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0) -+#if 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)"); -+ goto err2; -+ } -+#elif 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)"); diff --git a/scribus.spec b/scribus.spec index 9e3f450..5605d15 100644 --- a/scribus.spec +++ b/scribus.spec @@ -1,5 +1,5 @@ Name: scribus -Version: 1.6.3 +Version: 1.6.4 Release: %autorelease Summary: Desktop Publishing application written in Qt # swatches bring in the fun licenses @@ -14,9 +14,8 @@ Source0: %{name}-%{version}-free.tar.xz #Source0: http://downloads.sourceforge.net/%%{name}/%%{name}-%%{version}.tar.xz #Source1: http://downloads.sourceforge.net/%%{name}/%%{name}-%%{version}.tar.xz.asc -Patch0: scribus-1.6.3-poppler-25.02.0.patch -Patch1: scribus-1.6.3-poppler-25.06.0.patch -Patch2: scribus-1.6.3-poppler-25.07.0.patch +Patch0: scribus-1.6.3-poppler-25.06.0.patch +Patch1: scribus-1.6.3-poppler-25.07.0.patch BuildRequires: boost-devel BuildRequires: cmake diff --git a/sources b/sources index d97e813..623b22e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (scribus-1.6.3-free.tar.xz) = 6bdd4509542481fb2ac720fe8116e044380b94450bf945e2d1fc1ee79bcb5752d8653c90280191fb2aa1dab11b063b2af286369874ce2578f5169d686ef220bb +SHA512 (scribus-1.6.4-free.tar.xz) = 5186b9244b27d2b3a5aaa2a1f21beacc9a2aa90add0d3111f8b83b1fa376544049e9b57caf9f6a4749a463398cc2f4aeb69fca6f2d153d4571cea02dce97b9d1 From bd8adf5a426f3554ed41203d05e4f091bdf63151 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 5 Jan 2026 09:23:11 -0600 Subject: [PATCH 27/27] 1.6.5 --- .gitignore | 1 + scribus-1.6.3-poppler-25.06.0.patch | 24 ------------------ scribus-1.6.3-poppler-25.07.0.patch | 39 ----------------------------- scribus.spec | 4 +-- sources | 2 +- 5 files changed, 3 insertions(+), 67 deletions(-) delete mode 100644 scribus-1.6.3-poppler-25.06.0.patch delete mode 100644 scribus-1.6.3-poppler-25.07.0.patch diff --git a/.gitignore b/.gitignore index d85d151..84085b0 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ scribus-1.3.8.tar.bz2 /scribus-1.6.1-free.tar.xz /scribus-1.6.3-free.tar.xz /scribus-1.6.4-free.tar.xz +/scribus-1.6.5-free.tar.xz diff --git a/scribus-1.6.3-poppler-25.06.0.patch b/scribus-1.6.3-poppler-25.06.0.patch deleted file mode 100644 index 6427f66..0000000 --- a/scribus-1.6.3-poppler-25.06.0.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 8dcf8d777bd85a0741c455961f2de382e3ed47ec Mon Sep 17 00:00:00 2001 -From: Jean Ghali -Date: Tue, 3 Jun 2025 22:50:26 +0000 -Subject: Fix build with poppler 25.06.0 - -git-svn-id: svn://scribus.net/trunk/Scribus@26919 11d20701-8431-0410-a711-e3c959e3b870 - -diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp -index 0b878b6e2..63f28fa4f 100644 ---- a/scribus/plugins/import/pdf/slaoutput.cpp -+++ b/scribus/plugins/import/pdf/slaoutput.cpp -@@ -580,7 +580,12 @@ bool SlaOutputDev::handleWidgetAnnot(Annot* annota, double xCoor, double yCoor, - FormWidget *fm = m_formWidgets->getWidget(i); - if (!fm) - continue; -+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 06, 0) -+ std::shared_ptr anoSharedPtr = fm->getWidgetAnnotation(); -+ AnnotWidget* ano = anoSharedPtr.get(); -+#else - AnnotWidget *ano = fm->getWidgetAnnotation(); -+#endif - if (!ano) - continue; - if (ano != (AnnotWidget*) annota) diff --git a/scribus-1.6.3-poppler-25.07.0.patch b/scribus-1.6.3-poppler-25.07.0.patch deleted file mode 100644 index 2f784b0..0000000 --- a/scribus-1.6.3-poppler-25.07.0.patch +++ /dev/null @@ -1,39 +0,0 @@ -From ff6c6abfa8683028e548a269dee6a859b6f63335 Mon Sep 17 00:00:00 2001 -From: Jean Ghali -Date: Fri, 4 Jul 2025 19:27:20 +0000 -Subject: Fix build with poppler 25.07.0 - -git-svn-id: svn://scribus.net/trunk/Scribus@26940 11d20701-8431-0410-a711-e3c959e3b870 - -diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp -index 63f28fa4f..a575c91bb 100644 ---- a/scribus/plugins/import/pdf/slaoutput.cpp -+++ b/scribus/plugins/import/pdf/slaoutput.cpp -@@ -3091,7 +3091,12 @@ void SlaOutputDev::updateFont(GfxState *state) - break; - case fontTrueType: - case fontTrueTypeOT: --#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0) -+#if 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()) - ff = FoFiTrueType::load(fileName.c_str(), fontLoc->fontNum); - else -@@ -3226,7 +3231,12 @@ void SlaOutputDev::updateFont(GfxState *state) - #endif - else - { --#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0) -+#if 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()) - ff = FoFiTrueType::load(fileName.c_str(), fontLoc->fontNum); - else diff --git a/scribus.spec b/scribus.spec index 5605d15..3e913a6 100644 --- a/scribus.spec +++ b/scribus.spec @@ -1,5 +1,5 @@ Name: scribus -Version: 1.6.4 +Version: 1.6.5 Release: %autorelease Summary: Desktop Publishing application written in Qt # swatches bring in the fun licenses @@ -14,8 +14,6 @@ Source0: %{name}-%{version}-free.tar.xz #Source0: http://downloads.sourceforge.net/%%{name}/%%{name}-%%{version}.tar.xz #Source1: http://downloads.sourceforge.net/%%{name}/%%{name}-%%{version}.tar.xz.asc -Patch0: scribus-1.6.3-poppler-25.06.0.patch -Patch1: scribus-1.6.3-poppler-25.07.0.patch BuildRequires: boost-devel BuildRequires: cmake diff --git a/sources b/sources index 623b22e..9563bfe 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (scribus-1.6.4-free.tar.xz) = 5186b9244b27d2b3a5aaa2a1f21beacc9a2aa90add0d3111f8b83b1fa376544049e9b57caf9f6a4749a463398cc2f4aeb69fca6f2d153d4571cea02dce97b9d1 +SHA512 (scribus-1.6.5-free.tar.xz) = f023b42e7c59447c52bc41adcb2b4800568d1cf8c88a5b3d6b155f78403a5c92b518ed95e74a20d671e043c206757b0a0e4724b1562ec814901422364f326dfe