From 11a98a4b57d678ae7680f6f3f3ba03102a1c4711 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Mon, 7 Dec 2020 11:38:59 +0100 Subject: [PATCH 01/17] remove patches now in upstream --- scribus-1.5.6-poppler-0.84.0.patch | 157 ---------------------- scribus-1.5.6-poppler-0.90.0.patch | 201 ----------------------------- scribus.spec | 4 +- 3 files changed, 1 insertion(+), 361 deletions(-) delete mode 100644 scribus-1.5.6-poppler-0.84.0.patch delete mode 100644 scribus-1.5.6-poppler-0.90.0.patch diff --git a/scribus-1.5.6-poppler-0.84.0.patch b/scribus-1.5.6-poppler-0.84.0.patch deleted file mode 100644 index 3c44024..0000000 --- a/scribus-1.5.6-poppler-0.84.0.patch +++ /dev/null @@ -1,157 +0,0 @@ ---- a/scribus/plugins/import/pdf/importpdf.cpp -+++ b/scribus/plugins/import/pdf/importpdf.cpp -@@ -74,7 +74,11 @@ PdfPlug::PdfPlug(ScribusDoc* doc, int flags) - QImage PdfPlug::readThumbnail(const QString& fName) - { - QString pdfFile = QDir::toNativeSeparators(fName); -+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 83, 0) -+ globalParams.reset(new GlobalParams()); -+#else - globalParams = new GlobalParams(); -+#endif - if (globalParams) - { - #if defined(Q_OS_WIN32) && POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 62, 0) -@@ -89,7 +93,9 @@ QImage PdfPlug::readThumbnail(const QString& fName) - if (pdfDoc->getErrorCode() == errEncrypted) - { - delete pdfDoc; -+#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(0, 83, 0) - delete globalParams; -+#endif - return QImage(); - } - if (pdfDoc->isOk()) -@@ -133,11 +139,15 @@ QImage PdfPlug::readThumbnail(const QString& fName) - image.setText("YSize", QString("%1").arg(h)); - delete dev; - delete pdfDoc; -+#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(0, 83, 0) - delete globalParams; -+#endif - return image; - } - delete pdfDoc; -+#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(0, 83, 0) - delete globalParams; -+#endif - } - } - return QImage(); -@@ -343,7 +353,11 @@ bool PdfPlug::convert(const QString& fn) - qApp->processEvents(); - } - -+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 83, 0) -+ globalParams.reset(new GlobalParams()); -+#else - globalParams = new GlobalParams(); -+#endif - GooString *userPW = nullptr; - if (globalParams) - { -@@ -385,7 +399,9 @@ bool PdfPlug::convert(const QString& fn) - if (progressDialog) - progressDialog->close(); - delete pdfDoc; -+#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(0, 83, 0) - delete globalParams; -+#endif - return false; - } - if (progressDialog) -@@ -430,7 +446,9 @@ bool PdfPlug::convert(const QString& fn) - progressDialog->close(); - delete optImp; - delete pdfDoc; -+#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(0, 83, 0) - delete globalParams; -+#endif - return false; - } - pageString = optImp->getPagesString(); -@@ -843,8 +861,12 @@ bool PdfPlug::convert(const QString& fn) - } - delete pdfDoc; - } -+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 83, 0) -+ globalParams.release(); -+#else - delete globalParams; - globalParams = nullptr; -+#endif - - // qDebug() << "converting finished"; - // qDebug() << "Imported" << Elements.count() << "Elements"; -diff --git a/scribus/plugins/import/pdf/importpdfconfig.h b/scribus/plugins/import/pdf/importpdfconfig.h -index 9913ee382..5a7e0d216 100644 ---- a/scribus/plugins/import/pdf/importpdfconfig.h -+++ b/scribus/plugins/import/pdf/importpdfconfig.h -@@ -58,4 +58,10 @@ for which a new license (GPL+exception) is in place. - #define POPPLER_CONST_082 - #endif - -+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 83, 0) -+#define POPPLER_CONST_083 const -+#else -+#define POPPLER_CONST_083 -+#endif -+ - #endif -diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp -index 5e4d32a55..ffcfa8450 100644 ---- a/scribus/plugins/import/pdf/slaoutput.cpp -+++ b/scribus/plugins/import/pdf/slaoutput.cpp -@@ -3678,7 +3678,7 @@ QString SlaOutputDev::getAnnotationColor(const AnnotColor *color) - return fNam; - } - --QString SlaOutputDev::convertPath(GfxPath *path) -+QString SlaOutputDev::convertPath(POPPLER_CONST_083 GfxPath *path) - { - if (! path) - return QString(); -@@ -3688,7 +3688,7 @@ QString SlaOutputDev::convertPath(GfxPath *path) - - for (int i = 0; i < path->getNumSubpaths(); ++i) - { -- GfxSubpath * subpath = path->getSubpath(i); -+ POPPLER_CONST_083 GfxSubpath * subpath = path->getSubpath(i); - if (subpath->getNumPoints() > 0) - { - output += QString("M %1 %2").arg(subpath->getX(0)).arg(subpath->getY(0)); -diff --git a/scribus/plugins/import/pdf/slaoutput.h b/scribus/plugins/import/pdf/slaoutput.h -index 60fb90061..d928fada8 100644 ---- a/scribus/plugins/import/pdf/slaoutput.h -+++ b/scribus/plugins/import/pdf/slaoutput.h -@@ -282,7 +282,7 @@ private: - void getPenState(GfxState *state); - QString getColor(GfxColorSpace *color_space, POPPLER_CONST_070 GfxColor *color, int *shade); - QString getAnnotationColor(const AnnotColor *color); -- QString convertPath(GfxPath *path); -+ QString convertPath(POPPLER_CONST_083 GfxPath *path); - int getBlendMode(GfxState *state); - void applyMask(PageItem *ite); - void pushGroup(const QString& maskName = "", GBool forSoftMask = gFalse, GBool alpha = gFalse, bool inverted = false); ---- a/scribus/plugins/import/pdf/slaoutput.cpp -+++ b/scribus/plugins/import/pdf/slaoutput.cpp -@@ -1189,6 +1189,11 @@ void SlaOutputDev::startDoc(PDFDoc *doc, XRef *xrefA, Catalog *catA) - catalog = catA; - pdfDoc = doc; - updateGUICounter = 0; -+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 84, 0) -+ m_fontEngine = new SplashFontEngine(true, true, true, true); -+#elif POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 61, 0) -+ m_fontEngine = new SplashFontEngine(globalParams->getEnableFreeType(), true, true, true); -+#else - m_fontEngine = new SplashFontEngine( - #if HAVE_T1LIB_H - globalParams->getEnableT1lib(), -@@ -1199,6 +1204,7 @@ void SlaOutputDev::startDoc(PDFDoc *doc, XRef *xrefA, Catalog *catA) - true, - #endif - true); -+#endif - } - - void SlaOutputDev::startPage(int pageNum, GfxState *, XRef *) diff --git a/scribus-1.5.6-poppler-0.90.0.patch b/scribus-1.5.6-poppler-0.90.0.patch deleted file mode 100644 index 8200f64..0000000 --- a/scribus-1.5.6-poppler-0.90.0.patch +++ /dev/null @@ -1,201 +0,0 @@ ---- scribus-1.5.6/scribus/plugins/import/pdf/importpdf.cpp -+++ scribus-1.5.6/scribus/plugins/import/pdf/importpdf.cpp -@@ -792,14 +792,15 @@ bool PdfPlug::convert(const QString& fn) - names = catDict.dictLookup("OpenAction"); - if (names.isDict()) - { -- LinkAction *linkAction = nullptr; -+ std::unique_ptr<::LinkAction> linkAction; - linkAction = LinkAction::parseAction(&names, pdfDoc->getCatalog()->getBaseURI()); - if (linkAction) - { -- LinkJavaScript *jsa = (LinkJavaScript*)linkAction; -+ LinkJavaScript *jsa = static_cast(linkAction.get()); - if (jsa->isOk()) - { -- QString script = UnicodeParsedString(jsa->getScript()); -+ const GooString scriptGooString(jsa->getScript()); -+ QString script = UnicodeParsedString(&scriptGooString); - if (script.startsWith("this.")) - { - script.remove(0, 5); ---- scribus-1.5.6/scribus/plugins/import/pdf/slaoutput.cpp -+++ scribus-1.5.6/scribus/plugins/import/pdf/slaoutput.cpp -@@ -324,7 +324,7 @@ LinkAction* SlaOutputDev::SC_getAddition - { - Object actionObject = additionalActionsObject.dictLookup(key); - if (actionObject.isDict()) -- linkAction = LinkAction::parseAction(&actionObject, pdfDoc->getCatalog()->getBaseURI()); -+ linkAction = (LinkAction::parseAction(&actionObject, pdfDoc->getCatalog()->getBaseURI())).release(); - } - } - return linkAction; -@@ -455,7 +455,7 @@ bool SlaOutputDev::handleLinkAnnot(Annot - POPPLER_CONST GooString *ndst = gto->getNamedDest(); - if (ndst) - { -- LinkDest *dstn = pdfDoc->findDest(ndst); -+ std::unique_ptr dstn = pdfDoc->findDest(ndst); - if (dstn) - { - if (dstn->getKind() == destXYZ) -@@ -499,7 +499,7 @@ bool SlaOutputDev::handleLinkAnnot(Annot - POPPLER_CONST GooString *ndst = gto->getNamedDest(); - if (ndst) - { -- LinkDest *dstn = pdfDoc->findDest(ndst); -+ std::unique_ptr dstn = pdfDoc->findDest(ndst); - if (dstn) - { - if (dstn->getKind() == destXYZ) -@@ -516,8 +516,9 @@ bool SlaOutputDev::handleLinkAnnot(Annot - else if (act->getKind() == actionURI) - { - LinkURI *gto = (LinkURI*)act; -+ const GooString uriGooString(gto->getURI()); - validLink = true; -- fileName = UnicodeParsedString(gto->getURI()); -+ fileName = UnicodeParsedString(&uriGooString); - } - if (validLink) - { -@@ -929,8 +930,9 @@ void SlaOutputDev::handleActions(PageIte - LinkJavaScript *jsa = (LinkJavaScript*)Lact; - if (jsa->isOk()) - { -+ const GooString scriptGooString(jsa->getScript()); - ite->annotation().setActionType(1); -- ite->annotation().setAction(UnicodeParsedString(jsa->getScript())); -+ ite->annotation().setAction(UnicodeParsedString(&scriptGooString)); - } - } - else if (Lact->getKind() == actionGoTo) -@@ -967,7 +969,7 @@ void SlaOutputDev::handleActions(PageIte - POPPLER_CONST GooString *ndst = gto->getNamedDest(); - if (ndst) - { -- LinkDest *dstn = pdfDoc->findDest(ndst); -+ std::unique_ptr dstn = pdfDoc->findDest(ndst); - if (dstn) - { - if (dstn->getKind() == destXYZ) -@@ -1019,7 +1021,7 @@ void SlaOutputDev::handleActions(PageIte - POPPLER_CONST GooString *ndst = gto->getNamedDest(); - if (ndst) - { -- LinkDest *dstn = pdfDoc->findDest(ndst); -+ std::unique_ptr dstn = pdfDoc->findDest(ndst); - if (dstn) - { - if (dstn->getKind() == destXYZ) -@@ -1039,7 +1041,8 @@ void SlaOutputDev::handleActions(PageIte - else if (Lact->getKind() == actionUnknown) - { - LinkUnknown *uno = (LinkUnknown*)Lact; -- QString actString = UnicodeParsedString(uno->getAction()); -+ const GooString actionGooString(uno->getAction()); -+ QString actString = UnicodeParsedString(&actionGooString); - if (actString == "ResetForm") - { - ite->annotation().setActionType(4); -@@ -1082,8 +1085,9 @@ void SlaOutputDev::handleActions(PageIte - else if (Lact->getKind() == actionNamed) - { - LinkNamed *uno = (LinkNamed*)Lact; -+ const GooString nameGooString(uno->getName()); - ite->annotation().setActionType(10); -- ite->annotation().setAction(UnicodeParsedString(uno->getName())); -+ ite->annotation().setAction(UnicodeParsedString(&nameGooString)); - } - else - qDebug() << "Found unsupported Action of type" << Lact->getKind(); -@@ -1096,7 +1100,8 @@ void SlaOutputDev::handleActions(PageIte - LinkJavaScript *jsa = (LinkJavaScript*)Aact; - if (jsa->isOk()) - { -- ite->annotation().setD_act(UnicodeParsedString(jsa->getScript())); -+ const GooString scriptGooString(jsa->getScript()); -+ ite->annotation().setD_act(UnicodeParsedString(&scriptGooString)); - ite->annotation().setAAact(true); - } - } -@@ -1110,7 +1115,8 @@ void SlaOutputDev::handleActions(PageIte - LinkJavaScript *jsa = (LinkJavaScript*)Aact; - if (jsa->isOk()) - { -- ite->annotation().setE_act(UnicodeParsedString(jsa->getScript())); -+ const GooString scriptGooString(jsa->getScript()); -+ ite->annotation().setE_act(UnicodeParsedString(&scriptGooString)); - ite->annotation().setAAact(true); - } - } -@@ -1124,7 +1130,8 @@ void SlaOutputDev::handleActions(PageIte - LinkJavaScript *jsa = (LinkJavaScript*)Aact; - if (jsa->isOk()) - { -- ite->annotation().setX_act(UnicodeParsedString(jsa->getScript())); -+ const GooString scriptGooString(jsa->getScript()); -+ ite->annotation().setX_act(UnicodeParsedString(&scriptGooString)); - ite->annotation().setAAact(true); - } - } -@@ -1138,7 +1145,8 @@ void SlaOutputDev::handleActions(PageIte - LinkJavaScript *jsa = (LinkJavaScript*)Aact; - if (jsa->isOk()) - { -- ite->annotation().setFo_act(UnicodeParsedString(jsa->getScript())); -+ const GooString scriptGooString(jsa->getScript()); -+ ite->annotation().setFo_act(UnicodeParsedString(&scriptGooString)); - ite->annotation().setAAact(true); - } - } -@@ -1152,7 +1160,8 @@ void SlaOutputDev::handleActions(PageIte - LinkJavaScript *jsa = (LinkJavaScript*)Aact; - if (jsa->isOk()) - { -- ite->annotation().setBl_act(UnicodeParsedString(jsa->getScript())); -+ const GooString scriptGooString(jsa->getScript()); -+ ite->annotation().setBl_act(UnicodeParsedString(&scriptGooString)); - ite->annotation().setAAact(true); - } - } -@@ -1166,7 +1175,8 @@ void SlaOutputDev::handleActions(PageIte - LinkJavaScript *jsa = (LinkJavaScript*)Aact; - if (jsa->isOk()) - { -- ite->annotation().setC_act(UnicodeParsedString(jsa->getScript())); -+ const GooString scriptGooString(jsa->getScript()); -+ ite->annotation().setC_act(UnicodeParsedString(&scriptGooString)); - ite->annotation().setAAact(true); - } - } -@@ -1180,7 +1190,8 @@ void SlaOutputDev::handleActions(PageIte - LinkJavaScript *jsa = (LinkJavaScript*)Aact; - if (jsa->isOk()) - { -- ite->annotation().setF_act(UnicodeParsedString(jsa->getScript())); -+ const GooString scriptGooString(jsa->getScript()); -+ ite->annotation().setF_act(UnicodeParsedString(&scriptGooString)); - ite->annotation().setAAact(true); - ite->annotation().setFormat(5); - } -@@ -1195,7 +1206,8 @@ void SlaOutputDev::handleActions(PageIte - LinkJavaScript *jsa = (LinkJavaScript*)Aact; - if (jsa->isOk()) - { -- ite->annotation().setK_act(UnicodeParsedString(jsa->getScript())); -+ const GooString scriptGooString(jsa->getScript()); -+ ite->annotation().setK_act(UnicodeParsedString(&scriptGooString)); - ite->annotation().setAAact(true); - ite->annotation().setFormat(5); - } -@@ -1210,7 +1222,8 @@ void SlaOutputDev::handleActions(PageIte - LinkJavaScript *jsa = (LinkJavaScript*)Aact; - if (jsa->isOk()) - { -- ite->annotation().setV_act(UnicodeParsedString(jsa->getScript())); -+ const GooString scriptGooString(jsa->getScript()); -+ ite->annotation().setV_act(UnicodeParsedString(&scriptGooString)); - ite->annotation().setAAact(true); - } - } diff --git a/scribus.spec b/scribus.spec index 016f31c..32ec287 100644 --- a/scribus.spec +++ b/scribus.spec @@ -14,9 +14,7 @@ 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.6-poppler-0.84.0.patch -#Patch1: scribus-1.5.6-poppler-0.90.0.patch -#Patch2: scribus-ctorfix.patch +#Patch0: scribus-ctorfix.patch BuildRequires: boost-devel BuildRequires: cmake From dd0e6feacd3be2a79dee5eab5eee2fa069d39000 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Mon, 7 Dec 2020 11:39:21 +0100 Subject: [PATCH 02/17] update the LTO fix --- scribus-ctorfix.patch | 25 ++++++++++++------------- scribus.spec | 2 +- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/scribus-ctorfix.patch b/scribus-ctorfix.patch index 28ecaf5..7e98315 100644 --- a/scribus-ctorfix.patch +++ b/scribus-ctorfix.patch @@ -1,16 +1,3 @@ -diff --git a/scribus/ui/colorlistmodel.cpp b/scribus/ui/colorlistmodel.cpp -index a4905a5..8363e97 100644 ---- a/scribus/ui/colorlistmodel.cpp -+++ b/scribus/ui/colorlistmodel.cpp -@@ -10,8 +10,6 @@ for which a new license (GPL+exception) is in place. - #include "colorlistbox.h" - #include "commonstrings.h" - --ColorPixmapValue ColorListModel::m_NoneColor(ScColor(), nullptr, CommonStrings::None); -- - ColorListModel::ColorListModel(QObject *parent) - : QAbstractItemModel(parent) - { diff --git a/scribus/ui/colorlistmodel.h b/scribus/ui/colorlistmodel.h index 8f5bc65..892d0a7 100644 --- a/scribus/ui/colorlistmodel.h @@ -30,3 +17,15 @@ index 8f5bc65..892d0a7 100644 -#endif // COLORLISTMODEL_H \ No newline at end of file +#endif // COLORLISTMODEL_H +diff -up scribus-1.5.6.1/scribus/ui/colorlistmodel.cpp.orig scribus-1.5.6.1/scribus/ui/colorlistmodel.cpp +--- scribus-1.5.6.1/scribus/ui/colorlistmodel.cpp.orig 2020-12-07 10:58:06.108966263 +0100 ++++ scribus-1.5.6.1/scribus/ui/colorlistmodel.cpp 2020-12-07 10:58:11.058358432 +0100 +@@ -31,8 +31,6 @@ ColorPixmapValue::ColorPixmapValue( cons + m_name = colName; + } + +-ColorPixmapValue ColorListModel::m_NoneColor(ScColor(), nullptr, CommonStrings::None); +- + ColorListModel::ColorListModel(QObject *parent) + : QAbstractItemModel(parent) + { diff --git a/scribus.spec b/scribus.spec index 32ec287..ed42c2e 100644 --- a/scribus.spec +++ b/scribus.spec @@ -14,7 +14,7 @@ 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-ctorfix.patch +Patch0: scribus-ctorfix.patch BuildRequires: boost-devel BuildRequires: cmake From f825c2c532e23f08863154f947684fffc68bfebc Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sat, 9 Jan 2021 22:58:22 +0100 Subject: [PATCH 03/17] Rebuild (podofo) --- scribus.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scribus.spec b/scribus.spec index ed42c2e..4b62b18 100644 --- a/scribus.spec +++ b/scribus.spec @@ -1,6 +1,6 @@ Name: scribus Version: 1.5.6.1 -Release: 1%{?dist} +Release: 2%{?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 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 From ddfd0b67b534709c50572bf7b65a2b525c65cfec Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sun, 10 Jan 2021 16:36:01 +0100 Subject: [PATCH 04/17] Rebuild (podofo) --- scribus.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scribus.spec b/scribus.spec index 4b62b18..7c6c5c5 100644 --- a/scribus.spec +++ b/scribus.spec @@ -1,6 +1,6 @@ Name: scribus Version: 1.5.6.1 -Release: 2%{?dist} +Release: 3%{?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 +* 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) From 430ef5173b47c6d4764dcca8a8172344dec6863b Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sun, 10 Jan 2021 17:35:32 +0100 Subject: [PATCH 05/17] Add scribus_podofo.patch --- scribus.spec | 3 +++ scribus_podofo.patch | 11 +++++++++++ 2 files changed, 14 insertions(+) create mode 100644 scribus_podofo.patch diff --git a/scribus.spec b/scribus.spec index 7c6c5c5..c673bf6 100644 --- a/scribus.spec +++ b/scribus.spec @@ -15,6 +15,9 @@ Source0: %{name}-%{version}-free.tar.xz #Source1: http://downloads.sourceforge.net/%%{name}/%%{name}-%%{version}.tar.xz.asc Patch0: scribus-ctorfix.patch +# Fix build with podofo-0.9.7, which introduced PdfObject automatic ownership handling +# See https://sourceforge.net/p/podofo/code/2000/ +Patch1: scribus_podofo.patch BuildRequires: boost-devel BuildRequires: cmake diff --git a/scribus_podofo.patch b/scribus_podofo.patch new file mode 100644 index 0000000..581d615 --- /dev/null +++ b/scribus_podofo.patch @@ -0,0 +1,11 @@ +diff -rupN scribus-1.5.6.1/scribus/pdf_analyzer.cpp scribus-1.5.6.1-new/scribus/pdf_analyzer.cpp +--- scribus-1.5.6.1/scribus/pdf_analyzer.cpp 2020-11-14 23:37:18.000000000 +0100 ++++ scribus-1.5.6.1-new/scribus/pdf_analyzer.cpp 2021-01-10 17:11:46.352584802 +0100 +@@ -139,7 +139,6 @@ PDFColorSpace PDFAnalyzer::getCSType(Pdf + { + pBase = cs->GetOwner()->GetObject(base.GetReference()); + } +- pBase->SetOwner(cs->GetOwner()); + return getCSType(pBase); + } + if (csTypeName == "Separation") From 108f57eab4e72a3a73ded92875fd3d677efecec6 Mon Sep 17 00:00:00 2001 From: Marek Kasik Date: Tue, 19 Jan 2021 13:22:43 +0100 Subject: [PATCH 06/17] Rebuild for poppler-21.01.0 --- scribus.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scribus.spec b/scribus.spec index c673bf6..79e7766 100644 --- a/scribus.spec +++ b/scribus.spec @@ -1,6 +1,6 @@ Name: scribus Version: 1.5.6.1 -Release: 3%{?dist} +Release: 4%{?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+ @@ -144,6 +144,9 @@ appstream-util validate-relax --nonet \ %changelog +* 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) From 9c97623998002cd501d66eac6f1b80d1eb67dffa Mon Sep 17 00:00:00 2001 From: Marek Kasik Date: Tue, 19 Jan 2021 13:32:11 +0100 Subject: [PATCH 07/17] Rebuild for poppler-21.01.0 with correct target --- scribus.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scribus.spec b/scribus.spec index 79e7766..ac58230 100644 --- a/scribus.spec +++ b/scribus.spec @@ -1,6 +1,6 @@ Name: scribus Version: 1.5.6.1 -Release: 4%{?dist} +Release: 5%{?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+ @@ -144,6 +144,9 @@ appstream-util validate-relax --nonet \ %changelog +* 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 From 9e24aa5726b28fcb2614538f0c3ab0483d0a049f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 20:06:58 +0000 Subject: [PATCH 08/17] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_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 ac58230..889527c 100644 --- a/scribus.spec +++ b/scribus.spec @@ -1,6 +1,6 @@ Name: scribus Version: 1.5.6.1 -Release: 5%{?dist} +Release: 6%{?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+ @@ -144,6 +144,9 @@ appstream-util validate-relax --nonet \ %changelog +* 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 From 3af8bedcc3a7968582c6bf48cde5cc5c0215277f Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Sat, 15 May 2021 17:29:40 +0000 Subject: [PATCH 09/17] Update scribus.spec New release --- scribus.spec | 16 ++++++++-------- scribus_podofo.patch | 11 ----------- sources | 2 +- 3 files changed, 9 insertions(+), 20 deletions(-) delete mode 100644 scribus_podofo.patch diff --git a/scribus.spec b/scribus.spec index 889527c..49508c6 100644 --- a/scribus.spec +++ b/scribus.spec @@ -1,6 +1,6 @@ Name: scribus -Version: 1.5.6.1 -Release: 6%{?dist} +Version: 1.5.7 +Release: 1%{?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+ @@ -15,9 +15,6 @@ Source0: %{name}-%{version}-free.tar.xz #Source1: http://downloads.sourceforge.net/%%{name}/%%{name}-%%{version}.tar.xz.asc Patch0: scribus-ctorfix.patch -# Fix build with podofo-0.9.7, which introduced PdfObject automatic ownership handling -# See https://sourceforge.net/p/podofo/code/2000/ -Patch1: scribus_podofo.patch BuildRequires: boost-devel BuildRequires: cmake @@ -58,7 +55,7 @@ BuildRequires: pkgconfig(poppler) BuildRequires: pkgconfig(poppler-cpp) BuildRequires: pkgconfig(poppler-data) BuildRequires: pkgconfig(python3) -BuildRequires: pkgconfig(Qt5) +BuildRequires: pkgconfig(Qt5) > 5.14 BuildRequires: pkgconfig(Qt5Quick) BuildRequires: pkgconfig(Qt5UiTools) BuildRequires: pkgconfig(Qt5WebKit) @@ -92,8 +89,7 @@ import/export and creation of color separations. chmod a-x scribus/pageitem_latexframe.h # drop shebang lines from python scripts -pathfix.py -pni "%{__python3} %{py3_shbang_opts}" \ - %{name}/plugins/scriptplugin/{samples,scripts}/*.py +%py3_shebang_fix %{name}/plugins/scriptplugin/{samples,scripts}/*.py %build %cmake \ @@ -144,6 +140,10 @@ appstream-util validate-relax --nonet \ %changelog +* 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 diff --git a/scribus_podofo.patch b/scribus_podofo.patch deleted file mode 100644 index 581d615..0000000 --- a/scribus_podofo.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -rupN scribus-1.5.6.1/scribus/pdf_analyzer.cpp scribus-1.5.6.1-new/scribus/pdf_analyzer.cpp ---- scribus-1.5.6.1/scribus/pdf_analyzer.cpp 2020-11-14 23:37:18.000000000 +0100 -+++ scribus-1.5.6.1-new/scribus/pdf_analyzer.cpp 2021-01-10 17:11:46.352584802 +0100 -@@ -139,7 +139,6 @@ PDFColorSpace PDFAnalyzer::getCSType(Pdf - { - pBase = cs->GetOwner()->GetObject(base.GetReference()); - } -- pBase->SetOwner(cs->GetOwner()); - return getCSType(pBase); - } - if (csTypeName == "Separation") diff --git a/sources b/sources index 731e07c..36803ad 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (scribus-1.5.6.1-free.tar.xz) = f8888db74a20a6de24e7979bd99bbc13d9c45a44440c1706b075fdedc9ef624990b29e8f3168af0cffae610c1adf787cd047eb267d76e2cf37c16b8165f58b9d +SHA512 (scribus-1.5.7-free.tar.xz) = 10d13fb5444461e7eb26b519bef9ffc421f209bda10370307366d826258575b02fab0dc8769f01179c346b18211b668013ddfca7dc811cae07e686f2b2d4b287 From 45ec46837af9a90b4bbfc5dca3c87cd7baff7024 Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Thu, 20 May 2021 01:18:28 +0100 Subject: [PATCH 10/17] Rebuild for ICU 69 --- scribus.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scribus.spec b/scribus.spec index 49508c6..675c07f 100644 --- a/scribus.spec +++ b/scribus.spec @@ -1,6 +1,6 @@ Name: scribus Version: 1.5.7 -Release: 1%{?dist} +Release: 2%{?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 +* 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 From 0f9e021d72383d133d5c7591bf8febe24bd85043 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 4 Jun 2021 21:14:22 +0200 Subject: [PATCH 11/17] Rebuilt for Python 3.10 --- scribus.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scribus.spec b/scribus.spec index 675c07f..e938ac7 100644 --- a/scribus.spec +++ b/scribus.spec @@ -1,6 +1,6 @@ Name: scribus Version: 1.5.7 -Release: 2%{?dist} +Release: 3%{?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 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 From aa03a0e60c1af426120eab61fa358f9231840ff8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 17:14:25 +0000 Subject: [PATCH 12/17] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_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 e938ac7..3467685 100644 --- a/scribus.spec +++ b/scribus.spec @@ -1,6 +1,6 @@ Name: scribus Version: 1.5.7 -Release: 3%{?dist} +Release: 4%{?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 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 From 75dece1388fe16db1938581f8e378d652979e788 Mon Sep 17 00:00:00 2001 From: Marek Kasik Date: Thu, 5 Aug 2021 17:22:31 +0200 Subject: [PATCH 13/17] Rebuild for poppler-21.08.0 --- scribus.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scribus.spec b/scribus.spec index 3467685..db24041 100644 --- a/scribus.spec +++ b/scribus.spec @@ -1,6 +1,6 @@ Name: scribus Version: 1.5.7 -Release: 4%{?dist} +Release: 5%{?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 +* 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 From 8446996648566bfa082e4c1e79cb98712c5844dd Mon Sep 17 00:00:00 2001 From: Parag Nemade Date: Tue, 21 Sep 2021 15:32:09 +0530 Subject: [PATCH 14/17] Fix undefined symbol: hb_subset_input_set_name_legacy (rhbz#2006220) --- harfbuzz-3.0.0-symbol-lookup-fix.patch | 28 ++++++++++++++++++++++++++ scribus.spec | 7 ++++++- 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 harfbuzz-3.0.0-symbol-lookup-fix.patch diff --git a/harfbuzz-3.0.0-symbol-lookup-fix.patch b/harfbuzz-3.0.0-symbol-lookup-fix.patch new file mode 100644 index 0000000..1b6b154 --- /dev/null +++ b/harfbuzz-3.0.0-symbol-lookup-fix.patch @@ -0,0 +1,28 @@ +diff -urN scribus-1.5.7.old/scribus/fonts/sfnt.cpp scribus-1.5.7/scribus/fonts/sfnt.cpp +--- scribus-1.5.7.old/scribus/fonts/sfnt.cpp 2021-04-26 01:54:52.000000000 +0530 ++++ scribus-1.5.7/scribus/fonts/sfnt.cpp 2021-09-21 15:01:01.500775457 +0530 +@@ -1256,14 +1256,22 @@ + + for (int i = 0; i < cids.count(); ++i) + hb_set_add(glyphSet, cids.at(i)); +- ++ ++#if HB_VERSION_ATLEAST(2, 9, 0) ++ uint32_t subsetFlags = (uint32_t) hb_subset_input_get_flags(hbSubsetInput.get()); ++ subsetFlags |= HB_SUBSET_FLAGS_RETAIN_GIDS; ++ subsetFlags &= ~HB_SUBSET_FLAGS_NO_HINTING; ++ subsetFlags |= HB_SUBSET_FLAGS_NAME_LEGACY; ++ hb_subset_input_set_flags(hbSubsetInput.get(), subsetFlags); ++#else + hb_subset_input_set_retain_gids(hbSubsetInput.get(), true); + hb_subset_input_set_drop_hints(hbSubsetInput.get(), false); + #if HB_VERSION_ATLEAST(2, 6, 5) + hb_subset_input_set_name_legacy(hbSubsetInput.get(), true); + #endif ++#endif + +- QScopedPointer hbSubsetFace(hb_subset(hbFullFace.get(), hbSubsetInput.get())); ++ QScopedPointer hbSubsetFace(hb_subset_or_fail(hbFullFace.get(), hbSubsetInput.get())); + if (hbSubsetFace.isNull()) + return QByteArray(); + diff --git a/scribus.spec b/scribus.spec index db24041..5cdd67e 100644 --- a/scribus.spec +++ b/scribus.spec @@ -1,6 +1,6 @@ Name: scribus Version: 1.5.7 -Release: 5%{?dist} +Release: 6%{?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+ @@ -15,6 +15,8 @@ Source0: %{name}-%{version}-free.tar.xz #Source1: http://downloads.sourceforge.net/%%{name}/%%{name}-%%{version}.tar.xz.asc Patch0: scribus-ctorfix.patch +# https://github.com/archlinux/svntogit-community/commit/03e70e80801c540f7df7a525a911eafb9b685645 +Patch1: harfbuzz-3.0.0-symbol-lookup-fix.patch BuildRequires: boost-devel BuildRequires: cmake @@ -140,6 +142,9 @@ appstream-util validate-relax --nonet \ %changelog +* 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 From 8c21196f8e2952bb9fd2a6eab763e76c73b6eb53 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Mon, 15 Nov 2021 22:21:09 +0100 Subject: [PATCH 15/17] Rebuild (OpenSceneGraph) --- scribus.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scribus.spec b/scribus.spec index 5cdd67e..db245dc 100644 --- a/scribus.spec +++ b/scribus.spec @@ -1,6 +1,6 @@ Name: scribus Version: 1.5.7 -Release: 6%{?dist} +Release: 7%{?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+ @@ -142,6 +142,9 @@ appstream-util validate-relax --nonet \ %changelog +* 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) From 5331e5c467a308ccd6409ae7ef4ef8c412374a7a Mon Sep 17 00:00:00 2001 From: Marek Kasik Date: Tue, 18 Jan 2022 17:44:10 +0100 Subject: [PATCH 16/17] Rebuild for poppler-22.01.0 Switch to C++17 because it is needed by poppler now --- scribus-rename-byte.patch | 260 ++++++++++++++++++++++++++++++++++++++ scribus.spec | 9 +- 2 files changed, 268 insertions(+), 1 deletion(-) create mode 100644 scribus-rename-byte.patch diff --git a/scribus-rename-byte.patch b/scribus-rename-byte.patch new file mode 100644 index 0000000..cb5caaa --- /dev/null +++ b/scribus-rename-byte.patch @@ -0,0 +1,260 @@ +From 80405cec3d16e607eb97c048fa7686d3062671ff Mon Sep 17 00:00:00 2001 +From: Jean Ghali +Date: Mon, 10 Jan 2022 20:38:51 +0000 +Subject: [PATCH] Rename byte() to to_byte() in order to avoid potential + conflict with std::byte in c++17 mode + +git-svn-id: svn://scribus.net/trunk/Scribus@24801 11d20701-8431-0410-a711-e3c959e3b870 +--- + scribus/third_party/prc/oPRCFile.cc | 160 ++++++++++++++-------------- + 1 file changed, 80 insertions(+), 80 deletions(-) + +diff --git a/scribus/third_party/prc/oPRCFile.cc b/scribus/third_party/prc/oPRCFile.cc +index 10f943165..e92aedd6b 100644 +--- a/scribus/third_party/prc/oPRCFile.cc ++++ b/scribus/third_party/prc/oPRCFile.cc +@@ -74,7 +74,7 @@ using std::string; + using namespace std; + + // Map [0,1] to [0,255] +-inline uint8_t byte(double r) ++inline uint8_t to_byte(double r) + { + if(r < 0.0) r=0.0; + else if(r > 1.0) r=1.0; +@@ -449,9 +449,9 @@ void oPRCFile::doGroup(PRCgroup& group) + } + if(!same_color && i>0) + { +- tess->rgba_vertices.push_back(byte(lit->color.red)); +- tess->rgba_vertices.push_back(byte(lit->color.green)); +- tess->rgba_vertices.push_back(byte(lit->color.blue)); ++ tess->rgba_vertices.push_back(to_byte(lit->color.red)); ++ tess->rgba_vertices.push_back(to_byte(lit->color.green)); ++ tess->rgba_vertices.push_back(to_byte(lit->color.blue)); + } + } + } +@@ -593,23 +593,23 @@ void oPRCFile::doGroup(PRCgroup& group) + triangles++; + if(!same_colour) + { +- tessFace->rgba_vertices.push_back(byte(C[1].R)); +- tessFace->rgba_vertices.push_back(byte(C[1].G)); +- tessFace->rgba_vertices.push_back(byte(C[1].B)); ++ tessFace->rgba_vertices.push_back(to_byte(C[1].R)); ++ tessFace->rgba_vertices.push_back(to_byte(C[1].G)); ++ tessFace->rgba_vertices.push_back(to_byte(C[1].B)); + if(tessFace->is_rgba) +- tessFace->rgba_vertices.push_back(byte(C[1].A)); ++ tessFace->rgba_vertices.push_back(to_byte(C[1].A)); + +- tessFace->rgba_vertices.push_back(byte(C[2].R)); +- tessFace->rgba_vertices.push_back(byte(C[2].G)); +- tessFace->rgba_vertices.push_back(byte(C[2].B)); ++ tessFace->rgba_vertices.push_back(to_byte(C[2].R)); ++ tessFace->rgba_vertices.push_back(to_byte(C[2].G)); ++ tessFace->rgba_vertices.push_back(to_byte(C[2].B)); + if(tessFace->is_rgba) +- tessFace->rgba_vertices.push_back(byte(C[2].A)); ++ tessFace->rgba_vertices.push_back(to_byte(C[2].A)); + +- tessFace->rgba_vertices.push_back(byte(C[3].R)); +- tessFace->rgba_vertices.push_back(byte(C[3].G)); +- tessFace->rgba_vertices.push_back(byte(C[3].B)); ++ tessFace->rgba_vertices.push_back(to_byte(C[3].R)); ++ tessFace->rgba_vertices.push_back(to_byte(C[3].G)); ++ tessFace->rgba_vertices.push_back(to_byte(C[3].B)); + if(tessFace->is_rgba) +- tessFace->rgba_vertices.push_back(byte(C[3].A)); ++ tessFace->rgba_vertices.push_back(to_byte(C[3].A)); + } + } + else +@@ -620,23 +620,23 @@ void oPRCFile::doGroup(PRCgroup& group) + triangles++; + if(!same_colour) + { +- tessFace->rgba_vertices.push_back(byte(C[0].R)); +- tessFace->rgba_vertices.push_back(byte(C[0].G)); +- tessFace->rgba_vertices.push_back(byte(C[0].B)); ++ tessFace->rgba_vertices.push_back(to_byte(C[0].R)); ++ tessFace->rgba_vertices.push_back(to_byte(C[0].G)); ++ tessFace->rgba_vertices.push_back(to_byte(C[0].B)); + if(tessFace->is_rgba) +- tessFace->rgba_vertices.push_back(byte(C[0].A)); ++ tessFace->rgba_vertices.push_back(to_byte(C[0].A)); + +- tessFace->rgba_vertices.push_back(byte(C[2].R)); +- tessFace->rgba_vertices.push_back(byte(C[2].G)); +- tessFace->rgba_vertices.push_back(byte(C[2].B)); ++ tessFace->rgba_vertices.push_back(to_byte(C[2].R)); ++ tessFace->rgba_vertices.push_back(to_byte(C[2].G)); ++ tessFace->rgba_vertices.push_back(to_byte(C[2].B)); + if(tessFace->is_rgba) +- tessFace->rgba_vertices.push_back(byte(C[2].A)); ++ tessFace->rgba_vertices.push_back(to_byte(C[2].A)); + +- tessFace->rgba_vertices.push_back(byte(C[3].R)); +- tessFace->rgba_vertices.push_back(byte(C[3].G)); +- tessFace->rgba_vertices.push_back(byte(C[3].B)); ++ tessFace->rgba_vertices.push_back(to_byte(C[3].R)); ++ tessFace->rgba_vertices.push_back(to_byte(C[3].G)); ++ tessFace->rgba_vertices.push_back(to_byte(C[3].B)); + if(tessFace->is_rgba) +- tessFace->rgba_vertices.push_back(byte(C[3].A)); ++ tessFace->rgba_vertices.push_back(to_byte(C[3].A)); + } + tess->triangulated_index.push_back(vertex_indices[3]); + tess->triangulated_index.push_back(vertex_indices[1]); +@@ -644,23 +644,23 @@ void oPRCFile::doGroup(PRCgroup& group) + triangles++; + if(!same_colour) + { +- tessFace->rgba_vertices.push_back(byte(C[3].R)); +- tessFace->rgba_vertices.push_back(byte(C[3].G)); +- tessFace->rgba_vertices.push_back(byte(C[3].B)); ++ tessFace->rgba_vertices.push_back(to_byte(C[3].R)); ++ tessFace->rgba_vertices.push_back(to_byte(C[3].G)); ++ tessFace->rgba_vertices.push_back(to_byte(C[3].B)); + if(tessFace->is_rgba) +- tessFace->rgba_vertices.push_back(byte(C[3].A)); ++ tessFace->rgba_vertices.push_back(to_byte(C[3].A)); + +- tessFace->rgba_vertices.push_back(byte(C[1].R)); +- tessFace->rgba_vertices.push_back(byte(C[1].G)); +- tessFace->rgba_vertices.push_back(byte(C[1].B)); ++ tessFace->rgba_vertices.push_back(to_byte(C[1].R)); ++ tessFace->rgba_vertices.push_back(to_byte(C[1].G)); ++ tessFace->rgba_vertices.push_back(to_byte(C[1].B)); + if(tessFace->is_rgba) +- tessFace->rgba_vertices.push_back(byte(C[1].A)); ++ tessFace->rgba_vertices.push_back(to_byte(C[1].A)); + +- tessFace->rgba_vertices.push_back(byte(C[0].R)); +- tessFace->rgba_vertices.push_back(byte(C[0].G)); +- tessFace->rgba_vertices.push_back(byte(C[0].B)); ++ tessFace->rgba_vertices.push_back(to_byte(C[0].R)); ++ tessFace->rgba_vertices.push_back(to_byte(C[0].G)); ++ tessFace->rgba_vertices.push_back(to_byte(C[0].B)); + if(tessFace->is_rgba) +- tessFace->rgba_vertices.push_back(byte(C[0].A)); ++ tessFace->rgba_vertices.push_back(to_byte(C[0].A)); + } + } + } +@@ -1648,21 +1648,21 @@ uint32_t oPRCFile::createTriangleMesh(uint32_t nP, const double P[][3], uint32_t + tessFace->rgba_vertices.reserve((tessFace->is_rgba?4:3)*3*nI); + for(uint32_t i=0; irgba_vertices.push_back(byte(C[CI[i][0]].R)); +- tessFace->rgba_vertices.push_back(byte(C[CI[i][0]].G)); +- tessFace->rgba_vertices.push_back(byte(C[CI[i][0]].B)); ++ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][0]].R)); ++ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][0]].G)); ++ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][0]].B)); + if(tessFace->is_rgba) +- tessFace->rgba_vertices.push_back(byte(C[CI[i][0]].A)); +- tessFace->rgba_vertices.push_back(byte(C[CI[i][1]].R)); +- tessFace->rgba_vertices.push_back(byte(C[CI[i][1]].G)); +- tessFace->rgba_vertices.push_back(byte(C[CI[i][1]].B)); ++ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][0]].A)); ++ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][1]].R)); ++ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][1]].G)); ++ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][1]].B)); + if(tessFace->is_rgba) +- tessFace->rgba_vertices.push_back(byte(C[CI[i][1]].A)); +- tessFace->rgba_vertices.push_back(byte(C[CI[i][2]].R)); +- tessFace->rgba_vertices.push_back(byte(C[CI[i][2]].G)); +- tessFace->rgba_vertices.push_back(byte(C[CI[i][2]].B)); ++ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][1]].A)); ++ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][2]].R)); ++ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][2]].G)); ++ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][2]].B)); + if(tessFace->is_rgba) +- tessFace->rgba_vertices.push_back(byte(C[CI[i][2]].A)); ++ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][2]].A)); + } + } + tess->addTessFace(tessFace); +@@ -1792,37 +1792,37 @@ uint32_t oPRCFile::createQuadMesh(uint32_t nP, const double P[][3], uint32_t nI, + for(uint32_t i=0; irgba_vertices.push_back(byte(C[CI[i][0]].R)); +- tessFace->rgba_vertices.push_back(byte(C[CI[i][0]].G)); +- tessFace->rgba_vertices.push_back(byte(C[CI[i][0]].B)); ++ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][0]].R)); ++ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][0]].G)); ++ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][0]].B)); + if(tessFace->is_rgba) +- tessFace->rgba_vertices.push_back(byte(C[CI[i][0]].A)); +- tessFace->rgba_vertices.push_back(byte(C[CI[i][1]].R)); +- tessFace->rgba_vertices.push_back(byte(C[CI[i][1]].G)); +- tessFace->rgba_vertices.push_back(byte(C[CI[i][1]].B)); ++ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][0]].A)); ++ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][1]].R)); ++ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][1]].G)); ++ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][1]].B)); + if(tessFace->is_rgba) +- tessFace->rgba_vertices.push_back(byte(C[CI[i][1]].A)); +- tessFace->rgba_vertices.push_back(byte(C[CI[i][3]].R)); +- tessFace->rgba_vertices.push_back(byte(C[CI[i][3]].G)); +- tessFace->rgba_vertices.push_back(byte(C[CI[i][3]].B)); ++ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][1]].A)); ++ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][3]].R)); ++ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][3]].G)); ++ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][3]].B)); + if(tessFace->is_rgba) +- tessFace->rgba_vertices.push_back(byte(C[CI[i][3]].A)); ++ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][3]].A)); + // second triangle +- tessFace->rgba_vertices.push_back(byte(C[CI[i][1]].R)); +- tessFace->rgba_vertices.push_back(byte(C[CI[i][1]].G)); +- tessFace->rgba_vertices.push_back(byte(C[CI[i][1]].B)); ++ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][1]].R)); ++ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][1]].G)); ++ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][1]].B)); + if(tessFace->is_rgba) +- tessFace->rgba_vertices.push_back(byte(C[CI[i][1]].A)); +- tessFace->rgba_vertices.push_back(byte(C[CI[i][2]].R)); +- tessFace->rgba_vertices.push_back(byte(C[CI[i][2]].G)); +- tessFace->rgba_vertices.push_back(byte(C[CI[i][2]].B)); ++ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][1]].A)); ++ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][2]].R)); ++ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][2]].G)); ++ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][2]].B)); + if(tessFace->is_rgba) +- tessFace->rgba_vertices.push_back(byte(C[CI[i][2]].A)); +- tessFace->rgba_vertices.push_back(byte(C[CI[i][3]].R)); +- tessFace->rgba_vertices.push_back(byte(C[CI[i][3]].G)); +- tessFace->rgba_vertices.push_back(byte(C[CI[i][3]].B)); ++ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][2]].A)); ++ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][3]].R)); ++ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][3]].G)); ++ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][3]].B)); + if(tessFace->is_rgba) +- tessFace->rgba_vertices.push_back(byte(C[CI[i][3]].A)); ++ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][3]].A)); + } + } + tess->addTessFace(tessFace); +@@ -1910,11 +1910,11 @@ uint32_t oPRCFile::createLines(uint32_t nP, const double P[][3], uint32_t nI, co + tess->rgba_vertices.reserve((tess->is_rgba?4:3)*nCI); + for(uint32_t i=0; irgba_vertices.push_back(byte(C[CI[i]].R)); +- tess->rgba_vertices.push_back(byte(C[CI[i]].G)); +- tess->rgba_vertices.push_back(byte(C[CI[i]].B)); ++ tess->rgba_vertices.push_back(to_byte(C[CI[i]].R)); ++ tess->rgba_vertices.push_back(to_byte(C[CI[i]].G)); ++ tess->rgba_vertices.push_back(to_byte(C[CI[i]].B)); + if(tess->is_rgba) +- tess->rgba_vertices.push_back(byte(C[CI[i]].A)); ++ tess->rgba_vertices.push_back(to_byte(C[CI[i]].A)); + } + } + const uint32_t tess_index = add3DWireTess(tess); +-- +2.34.1 + diff --git a/scribus.spec b/scribus.spec index db245dc..8da3c22 100644 --- a/scribus.spec +++ b/scribus.spec @@ -1,6 +1,6 @@ Name: scribus Version: 1.5.7 -Release: 7%{?dist} +Release: 8%{?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+ @@ -18,6 +18,8 @@ Patch0: scribus-ctorfix.patch # https://github.com/archlinux/svntogit-community/commit/03e70e80801c540f7df7a525a911eafb9b685645 Patch1: harfbuzz-3.0.0-symbol-lookup-fix.patch +Patch2: scribus-rename-byte.patch + BuildRequires: boost-devel BuildRequires: cmake BuildRequires: cups-devel @@ -96,6 +98,7 @@ chmod a-x scribus/pageitem_latexframe.h %build %cmake \ -DCMAKE_CXX_STANDARD=17 \ + -DWANT_CPP17=ON \ -DWANT_CCACHE=YES \ -DWANT_DISTROBUILD=YES \ -DWANT_GRAPHICSMAGICK=1 \ @@ -142,6 +145,10 @@ appstream-util validate-relax --nonet \ %changelog +* 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) From 583d4a8b0e6dec9bd0fbc5d5395beefe6e37a9c9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 00:32:47 +0000 Subject: [PATCH 17/17] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_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 8da3c22..9510ef6 100644 --- a/scribus.spec +++ b/scribus.spec @@ -1,6 +1,6 @@ Name: scribus Version: 1.5.7 -Release: 8%{?dist} +Release: 9%{?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+ @@ -145,6 +145,9 @@ appstream-util validate-relax --nonet \ %changelog +* 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