From 374a6b23d662c3d4e4e357c24df0bc9df2aedcee2a845ed8970c365651111266 Mon Sep 17 00:00:00 2001 From: Christophe Marin Date: Wed, 19 Feb 2025 15:33:09 +0000 Subject: [PATCH 1/3] - Add 3f0f902d6e47adb45d280947f448bcca6c4e2556.patch: Fix build with poppler 25.02.0. OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/scribus?expand=0&rev=99 --- .gitattributes | 23 + .gitignore | 1 + 0001-Fix-build-with-poppler-24.10.0.patch | 105 ++ ...ation-displayed-on-the-about-window-.patch | 56 + ...902d6e47adb45d280947f448bcca6c4e2556.patch | 198 +++ _constraints | 7 + scribus-1.6.3.tar.xz | 3 + scribus-1.6.3.tar.xz.asc | 6 + scribus.changes | 1152 +++++++++++++++++ scribus.keyring | Bin 0 -> 1649 bytes scribus.spec | 191 +++ 11 files changed, 1742 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 0001-Fix-build-with-poppler-24.10.0.patch create mode 100644 0001-Make-sure-information-displayed-on-the-about-window-.patch create mode 100644 3f0f902d6e47adb45d280947f448bcca6c4e2556.patch create mode 100644 _constraints create mode 100644 scribus-1.6.3.tar.xz create mode 100644 scribus-1.6.3.tar.xz.asc create mode 100644 scribus.changes create mode 100644 scribus.keyring create mode 100644 scribus.spec diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..57affb6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.osc diff --git a/0001-Fix-build-with-poppler-24.10.0.patch b/0001-Fix-build-with-poppler-24.10.0.patch new file mode 100644 index 0000000..e30abe6 --- /dev/null +++ b/0001-Fix-build-with-poppler-24.10.0.patch @@ -0,0 +1,105 @@ +From 4e83dbc1fd484d93c8d1f737f7dd393bdefce443 Mon Sep 17 00:00:00 2001 +From: jghali +Date: Tue, 15 Oct 2024 21:10:37 +0000 +Subject: [PATCH] Fix build with poppler 24.10.0 + +git-svn-id: svn://scribus.net/trunk/Scribus@26325 11d20701-8431-0410-a711-e3c959e3b870 +--- + scribus/plugins/import/pdf/slaoutput.cpp | 32 ++++++++++++++++++++++++ + scribus/plugins/import/pdf/slaoutput.h | 6 ++++- + 2 files changed, 37 insertions(+), 1 deletion(-) + +diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp +index a0a2762..b96d097 100644 +--- a/scribus/plugins/import/pdf/slaoutput.cpp ++++ b/scribus/plugins/import/pdf/slaoutput.cpp +@@ -81,6 +81,8 @@ namespace + } + } + ++#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(24, 10, 0) ++ + LinkSubmitForm::LinkSubmitForm(Object *actionObj) + { + if (!actionObj->isDict()) +@@ -111,6 +113,8 @@ LinkSubmitForm::~LinkSubmitForm() + delete fileName; + } + ++#endif ++ + LinkImportData::LinkImportData(Object *actionObj) + { + if (!actionObj->isDict()) +@@ -1078,6 +1082,30 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotWidget *ano) + } + } + } ++ else if (Lact->getKind() == actionResetForm) ++ { ++ ite->annotation().setActionType(4); ++ } ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 10, 0) ++ else if (Lact->getKind() == actionSubmitForm) ++ { ++ const auto* impo = (LinkSubmitForm*) Lact; ++ if (impo->isOk()) ++ { ++ ite->annotation().setActionType(3); ++ ite->annotation().setAction(UnicodeParsedString(impo->getUrl())); ++ int fl = impo->getFlags(); ++ if (fl == 0) ++ ite->annotation().setHTML(0); ++ else if (fl == 4) ++ ite->annotation().setHTML(1); ++ else if (fl == 64) ++ ite->annotation().setHTML(2); ++ else if (fl == 512) ++ ite->annotation().setHTML(3); ++ } ++ } ++#endif + else if (Lact->getKind() == actionUnknown) + { + auto *uno = (LinkUnknown*) Lact; +@@ -1106,7 +1134,11 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotWidget *ano) + if (impo->isOk()) + { + ite->annotation().setActionType(3); ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 10, 0) ++ ite->annotation().setAction(UnicodeParsedString(impo->getUrl())); ++#else + ite->annotation().setAction(UnicodeParsedString(impo->getFileName())); ++#endif + int fl = impo->getFlags(); + if (fl == 0) + ite->annotation().setHTML(0); +diff --git a/scribus/plugins/import/pdf/slaoutput.h b/scribus/plugins/import/pdf/slaoutput.h +index 5942120..ad6e628 100644 +--- a/scribus/plugins/import/pdf/slaoutput.h ++++ b/scribus/plugins/import/pdf/slaoutput.h +@@ -56,9 +56,11 @@ for which a new license (GPL+exception) is in place. + #include + + //------------------------------------------------------------------------ +-// LinkSubmitData ++// LinkSubmitForm + //------------------------------------------------------------------------ + ++#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(24, 10, 0) ++ + class LinkSubmitForm: public LinkAction + { + public: +@@ -79,6 +81,8 @@ private: + int m_flags {0}; + }; + ++#endif ++ + //------------------------------------------------------------------------ + // LinkImportData + //------------------------------------------------------------------------ +-- +2.47.0 + diff --git a/0001-Make-sure-information-displayed-on-the-about-window-.patch b/0001-Make-sure-information-displayed-on-the-about-window-.patch new file mode 100644 index 0000000..6e42c85 --- /dev/null +++ b/0001-Make-sure-information-displayed-on-the-about-window-.patch @@ -0,0 +1,56 @@ +From a07bf4a6a200df8d8fed4a643af7d43a21ac1da6 Mon Sep 17 00:00:00 2001 +From: Christophe Giboudeaux +Date: Thu, 5 Sep 2019 12:16:58 +0200 +Subject: [PATCH] Make sure information displayed on the about window are + available + +The AUTHORS,COPYING,LINKS,TRANSLATION files are parsed to populate the +help/about window. + +We must ensure these files are always available (including on live CD). +--- + scribus/ui/about.cpp | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/scribus/ui/about.cpp b/scribus/ui/about.cpp +index 394f766..1c996ee 100644 +--- a/scribus/ui/about.cpp ++++ b/scribus/ui/about.cpp +@@ -146,7 +146,7 @@ About::About( QWidget* parent, AboutMode diaMode ) : QDialog( parent ) + tabLayout->setSpacing(6); + tabLayout->setContentsMargins(9, 9, 9, 9); + authorView = new QTextBrowser( tab_2 ); +- authorView->setHtml(About::parseAuthorFile(ScPaths::instance().docDir() + "AUTHORS")); ++ authorView->setHtml(About::parseAuthorFile(ScPaths::instance().shareDir() + "/aboutData/AUTHORS")); + tabLayout->addWidget( authorView ); + tabWidget2->addTab( tab_2, tr("A&uthors")); + +@@ -156,14 +156,14 @@ About::About( QWidget* parent, AboutMode diaMode ) : QDialog( parent ) + tabLayout_2->setSpacing(6); + tabLayout_2->setContentsMargins(9, 9, 9, 9); + transView = new QTextBrowser( tab_3); +- transView->setHtml(About::parseTranslationFile(ScPaths::instance().docDir() + "TRANSLATION")); ++ transView->setHtml(About::parseTranslationFile(ScPaths::instance().shareDir() + "/aboutData/TRANSLATION")); + tabLayout_2->addWidget( transView ); + tabWidget2->addTab( tab_3, tr("&Translations") ); + + /*! ONLINE tab (03/04/2004 petr vanek) */ + tab_4 = new QWidget( tabWidget2 ); + onlineView = new QTextBrowser( tab_4 ); +- onlineView->setHtml(About::parseLinksFile(ScPaths::instance().docDir() + "LINKS")); ++ onlineView->setHtml(About::parseLinksFile(ScPaths::instance().shareDir() + "/aboutData/LINKS")); + onlineView->setOpenExternalLinks(true); + tabLayout_4 = new QHBoxLayout( tab_4 ); + tabLayout_4->setSpacing(6); +@@ -192,7 +192,7 @@ About::About( QWidget* parent, AboutMode diaMode ) : QDialog( parent ) + textViewLicence = new QTextBrowser( tab_Licence); + licenceLayout->addWidget( textViewLicence ); + +- QFile licenceFile(ScPaths::instance().docDir() + "/COPYING"); ++ QFile licenceFile(ScPaths::instance().shareDir() + "/aboutData/COPYING"); + if (!licenceFile.open(QIODevice::ReadOnly | QIODevice::Text)) + textViewLicence->setPlainText(tr("Unable to open licence file. Please check your install directory or the Scribus website for licencing information.") ); + else +-- +2.44.0 + diff --git a/3f0f902d6e47adb45d280947f448bcca6c4e2556.patch b/3f0f902d6e47adb45d280947f448bcca6c4e2556.patch new file mode 100644 index 0000000..8a8b4ce --- /dev/null +++ b/3f0f902d6e47adb45d280947f448bcca6c4e2556.patch @@ -0,0 +1,198 @@ +From 3f0f902d6e47adb45d280947f448bcca6c4e2556 Mon Sep 17 00:00:00 2001 +From: Jean Ghali +Date: Tue, 4 Feb 2025 21:41:03 +0000 +Subject: [PATCH] #17405: Fix build error with poppler 25.02.0 + +git-svn-id: svn://scribus.net/branches/Version16x/Scribus@26668 11d20701-8431-0410-a711-e3c959e3b870 +--- + scribus/plugins/import/pdf/importpdf.cpp | 4 +- + scribus/plugins/import/pdf/importpdfconfig.h | 6 ++ + scribus/plugins/import/pdf/slaoutput.cpp | 67 ++++++++++++++++++-- + 3 files changed, 68 insertions(+), 9 deletions(-) + +diff --git a/scribus/plugins/import/pdf/importpdf.cpp b/scribus/plugins/import/pdf/importpdf.cpp +index c095320f48..a4ba4cfc28 100644 +--- a/scribus/plugins/import/pdf/importpdf.cpp ++++ b/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) +diff --git a/scribus/plugins/import/pdf/importpdfconfig.h b/scribus/plugins/import/pdf/importpdfconfig.h +index b922816253..57e26c9795 100644 +--- a/scribus/plugins/import/pdf/importpdfconfig.h ++++ b/scribus/plugins/import/pdf/importpdfconfig.h +@@ -27,4 +27,10 @@ for which a new license (GPL+exception) is in place. + #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 +diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp +index 2bf4a566fb..a18d2f59e5 100644 +--- a/scribus/plugins/import/pdf/slaoutput.cpp ++++ b/scribus/plugins/import/pdf/slaoutput.cpp +@@ -1685,7 +1685,7 @@ void SlaOutputDev::stroke(GfxState *state) + + auto& graphicState = m_graphicStack.top(); + graphicState.strokeColor = getColor(state->getStrokeColorSpace(), state->getStrokeColor(), &graphicState.strokeShade); +- ++ + QString output = convertPath(state->getPath()); + if ((m_Elements->count() != 0) && (output == m_coords)) // Path is the same as in last fill + { +@@ -2393,8 +2393,9 @@ bool SlaOutputDev::tilingPatternFill(GfxState *state, Gfx * /*gfx*/, Catalog *ca + #endif + m_graphicStack.top().clipPath = savedClip; + m_inPattern--; +- gElements = m_groupStack.pop(); + m_doc->m_Selection->clear(); ++ ++ gElements = m_groupStack.pop(); + if (gElements.Items.count() > 0) + { + for (int dre = 0; dre < gElements.Items.count(); ++dre) +@@ -2932,7 +2933,7 @@ void SlaOutputDev::beginMarkedContent(const char *name, Object *dictRef) + { + 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 +3085,11 @@ void SlaOutputDev::updateFont(GfxState *state) + #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 +3249,20 @@ void SlaOutputDev::updateFont(GfxState *state) + } + 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 +3293,18 @@ void SlaOutputDev::updateFont(GfxState *state) + #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 +3316,15 @@ void SlaOutputDev::updateFont(GfxState *state) + 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 +3342,15 @@ void SlaOutputDev::updateFont(GfxState *state) + 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 +3362,7 @@ void SlaOutputDev::updateFont(GfxState *state) + memcpy(codeToGID, ((GfxCIDFont *)gfxFont)->getCIDToGID(), n * sizeof(*codeToGID)); + } + } ++#endif + else + { + #if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0) +@@ -3338,7 +3383,9 @@ void SlaOutputDev::updateFont(GfxState *state) + #endif + 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()); ++#elif POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 2, 0) + codeToGID = ((GfxCIDFont*) gfxFont)->getCodeToGIDMap(ff.get(), &n); + ff.reset(); + #else +@@ -3346,7 +3393,13 @@ void SlaOutputDev::updateFont(GfxState *state) + 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/_constraints b/_constraints new file mode 100644 index 0000000..4496146 --- /dev/null +++ b/_constraints @@ -0,0 +1,7 @@ + + + + 5 + + + diff --git a/scribus-1.6.3.tar.xz b/scribus-1.6.3.tar.xz new file mode 100644 index 0000000..491b5e3 --- /dev/null +++ b/scribus-1.6.3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0ae58ced410101e82655e3b4c20a070cf1767145ada233dcef7c20b8ba6bd487 +size 74909384 diff --git a/scribus-1.6.3.tar.xz.asc b/scribus-1.6.3.tar.xz.asc new file mode 100644 index 0000000..5f74989 --- /dev/null +++ b/scribus-1.6.3.tar.xz.asc @@ -0,0 +1,6 @@ +-----BEGIN PGP SIGNATURE----- + +iF0EABECAB0WIQRlWL6E0nJzpDihURmL6kgRiuvuZAUCZ37jXwAKCRCL6kgRiuvu +ZNnVAKCrRLUuYGi15Hd/ZRjDdeJxrSHJWgCePzKCwgxgdY8khnmAVXSkZzjLZM8= +=T/s5 +-----END PGP SIGNATURE----- diff --git a/scribus.changes b/scribus.changes new file mode 100644 index 0000000..ac9e976 --- /dev/null +++ b/scribus.changes @@ -0,0 +1,1152 @@ +------------------------------------------------------------------- +Sun Feb 16 09:05:59 UTC 2025 - Bjørn Lie + +- Add 3f0f902d6e47adb45d280947f448bcca6c4e2556.patch: Fix build + with poppler 25.02.0. + +------------------------------------------------------------------- +Thu Jan 9 18:00:48 UTC 2025 - Christophe Marin + +- Update to 1.6.3. Check the ChangeLog file for the full list of + changes. +- Drop patch, merged upstream: + * fix_build_with_poppler_24.12.0.patch + +------------------------------------------------------------------- +Fri Dec 20 17:14:05 UTC 2024 - Bjørn Lie + +- Add poppler 24.10 compatibility patch: + * Add fix_build_with_poppler_24.12.0.patch + * Drop 0001-Fix-build-with-poppler-24.10.0.patch + +------------------------------------------------------------------- +Fri Oct 25 14:39:51 UTC 2024 - Christophe Marin + +- Add poppler 24.10 compatibility patch: + * 0001-Fix-build-with-poppler-24.10.0.patch + +------------------------------------------------------------------- +Tue Jul 2 14:52:57 UTC 2024 - Christophe Marin + +- Update to 1.6.2 + * https://www.scribus.net/scribus-1-6-2-released/ +- Drop patch, merged upstream: + * 0001-Fix-build-failure-with-poppler-24.03.0.patch + * 0001-Fix-incorrect-value-used-in-initial-build-fix-agains.patch + +------------------------------------------------------------------- +Fri Mar 8 09:33:29 UTC 2024 - Christophe Marin + +- Add patches to fix build with poppler 24.03: + * 0001-Fix-build-failure-with-poppler-24.03.0.patch + * 0001-Fix-incorrect-value-used-in-initial-build-fix-agains.patch + +------------------------------------------------------------------- +Wed Feb 7 17:39:59 UTC 2024 - Christophe Marin + +- Update to 1.6.1: + * [Scripter] Scripter: add functions to get the items in a group + * [Scripter] Scripter: add the return values for getObjectType + * [Story Editor / Text Frames] Wrapped text appears outside text + frame + * [Typography] Hyphenated text is rendering incorrectly in text + boxes + * [Usability] DublinCore DocInfo ComboBoxes + * [Usability] PDF/X accurate versions + * [OS-Win32] Windows installer causes reboot on some systems + part way through installation + * [User Interface] new document icon in 22x22 is garbage... + * [Language Tools] Can´t paste Spanish content + * [Story Editor / Text Frames] center alignment unprecise in + circles + * [Internal] [patch] remove a specific disabled broken code + or document what it should do + * [Usability] Y coordinate not updated in popup window + * [Build System] [PATCH] clean up the cmake files + * [User Interface] Create a command launcher + * [Story Editor / Text Frames] inline items produce a box at + the start of the frame + * [Story Editor / Text Frames] Incorrect layout of inline + items if vertical scale is different of 100% + * [User Interface] Snapping doesn't work when scaling frames + * [Canvas] Page margin rect inherits drop shadow properties of + line item + * [User Interface] ICC profile comboboxes too short + * [Translation] Wrong polish translation of orphan in edit->styles + * [Graphics / Image Frames] Adding a specific .psd file makes + itself and the other frames invisible + * [Scripter] PATCH: scripter: create setRotation(), deprecate + rotateObjectAbs() and add a way to use a specific basepoint + * [User Interface] arrange pages still has 3 and 4 pages layouts + * [Canvas] Changing the line blend mode has no effect on the canvas + * [User Interface] Add context menu to the "Arrange + Pages > Document Pages" Panel + * [User Interface] Spiral Edit Dialog doesn't allow angle greater + than 360° + * [General] When saving the document, arrows attached to spiral + shapes are not saved + * [Scripter] scribus_version and scribus_version_info should be + uppercase + * [Build System] [Proposal] Display versions of all libs used by + Scribus + * [General] Tooltips show no text + * [User Interface] Drag/Drop of ODT to text frame should trigger + the OpenDocument Importer menu + * [Scrapbook] White objects are invisible in scrapbook + * [Printing] Page prints incorrectly on Windows when using layer + blend modes + * [Styles] Sort the styles list in style deletion dialog + * [Typography] Hyphenation exceptions delete themselves + * [General] crash when starting the "insert > glyph" dialog + * [General] for loop defect + * [Scripter] [PATCH] scripter: accessing page > guides > columns/rows + * [Story Editor / Text Frames] Incorrect rendering of rotated + inline items + * [Story Editor / Text Frames] Copying a frame does not activate + paste when editing inside of a frame + * [Language Tools] File for Dutch hyphenation patterns gives bad + results. + * [General] Crash on startup if file recovery fails + * [Scripter] [PATCH] add setNormalMode() (and setEditMode()) to + the scripter + * [Graphics / Image Frames] Export to PDF ignores coloring effect + on grayscale PNG + * [User Interface] About box: Some names formatted improperly + in Authors tab + * [Build System] Build error caused by removed + 'std::unary_function' template in C++17 mode + * [Build System] Build error caused by conversion between void + pointer and function pointer + * [User Interface] About box: table tags not closed + * [User Interface] About box: Some text issues in + Translations tab + * [General] Search & Replace 'Replace All' hangs Scribus when + searching for text color + * [Build System] Build failure on newer macOS versions than + were available when Scribus was released + * [Translation] Translation problems in story editor when + changing language from settings + * [General] Scribus slow and unusable on Wayland + * [User Interface] Document Items Attributes in Document + Setup/Preferences + * [Internal] Rename ui/cpalette.* to ui/colorpalette.* + * [Integration] CI fails because of podofo + * [Story Editor / Text Frames] Bad inline object vertical + alignement in PDF export + * [Build System] CI on Gitlab is failing on podofo + * [General] Scribus does not build with podofo-0.10.0 + * [Internal] Internal page links not updated on page copy + * [Usability] Default button for preferences should be "Ok" + * [PDF] Build break with poppler 22.2.0 + * [Story Editor / Text Frames] Hyphenation stop being applied + after conditional hyphen + * [Master Pages] Crash when clicking on specific text frame + in master page + * [User Interface] Keyboard shortcuts always load "iCalamusTM" + and modifications cannot be saved. + * [Translation] Norwegian nynorsk invalid file + * [Master Pages] Arrange Pages> Document Pages> mini-pages + are almost unreadable on hi-res display + * [Translation] Spelling error in French translation + * [PDF] Build break with poppler 22.03.0 + * [PDF] Dashed lines imported from PDF have incorrect + segment lengths + * [General] Fix various typos + * [Graphics / Image Frames] "Show readable text" Option for + QR Code on "Insert Barcode" Window should be grey out + * [Graphics / Image Frames] QR code generated by "Insert + Barcode" could not show CJK characters correctly + * [Documentation] Fix various typos + * [Graphics / Image Frames] Issue when opening TIFF file + with incorrect embedded ICC profile + * [Scripter] importPage() argument usage documentation + * [Scripter] linkTextFrames() documentation vs GUI + * [User Interface] Scrapbook dialog dropdown menu has + unintuitive icon + * [Scripter] Scripter crashes with getAllObjects() on a + master page + * [Typography] A white space width become too small when + two Latin words are surrounded by CJK characters in a + justified paragraph + * [Scripter] Documentation of selectObject() lacks precision + * [Build System] No Document Icon is installed on Linux + * [Import / Export] Cannot export - save as image when active + layer is locked. + * [General] Import of Adobe Color Book palettes doesn't work + * [Usability] Unremovable or invisible tabulators on the ruler + * [User Interface] Cyrillic in Render Frame Editor English GUI + * [Typography] OpenType c2sc not practically usable + * [General] Scrbus fails to build since code cleanup in r25414 + * [Printing] Transparent image sitting above blue frame causes + color change on frame where they overlap + * [User Interface] Folder icons are missing in file dialogues + * [General] barcode doesn't show readable text + * [Import / Export] Some issues with PDF import + * [Shape Drawing] Scribus crash if you delete a symbol during + in "symbol edit mode". + * [PDF] Drop shadow of very large shapes shows up wrong in + exported PDF + * [User Interface] F12 shortcut does not affect Align and + Distribute palette + * [Canvas] Some objects from left masterpage are not rendered + * [Build System] Typo in Findpoppler.cmake? + * [Documentation] Readme file has dead link to Ghostscript + * [Usability] Scribus silently upgrades your file to the new format + * [PDF] Open path with stroke gradient SVG results in closed + path in PDF + * [PDF] PDFs with layers do not allow layer exclusion when printing + on Mac and Windows using Adobe Reader or FoxIt PDF Reader + * [General] Moving cursor with down arrow jump to end of next frame + * [Usability] If a right to left paragraph follows a left to right + paragraph, one of the paragraphs will not work properly + * [Story Editor / Text Frames] "Permanently replace missing font" + isnt permanent + * [Import / Export] CVG-import faulty + * [Build System] NetBSD: link against libexecinfo for + backtrace_symbols + * [User Interface] File selection dialog box always reverts to + small size + * [User Interface] Pixelated display in Enhanced Character Palette + * [User Interface] Section Default Numbering + * [User Interface] Scribus first start with tiny window + * [Scripter] Pdf export by python scripter embeds fonts which + should be subsetted + * [Import / Export] Inline image disappears when two sla containing + ones are merged + * [User Interface] Colors and Fills dialog too narrow + * [User Interface] PageItem Attribute dialog too small by default + * [Scripter] Provide the information about the page number being "shown" +- Drop patches, merged upstream: + * 0001-16734-Build-break-with-poppler-22.2.0.patch + * 0001-Small-update-vs-latest-code-in-poppler.patch + * 0001-16764-Build-break-with-poppler-22.03.0.patch + * 0001-Enforce-poppler-version-0.86.0.patch + * 0001-16764-Better-patch-avoid-a-memory-leak.patch + * 0001-Fix-build-with-poppler-22.04.0.patch + * scribus-1.5.8-poppler-22.09.0.patch + +------------------------------------------------------------------- +Mon Aug 7 12:17:33 UTC 2023 - Christophe Marin + +- Disable AI PDF import support until scribus supports Podofo >= 0.10 + (cf. https://bugs.scribus.net/view.php?id=16948) + +------------------------------------------------------------------- +Tue Sep 20 10:46:04 UTC 2022 - Christophe Giboudeaux + +- Add poppler 22.09 compatibility patch: + * scribus-1.5.8-poppler-22.09.0.patch + +------------------------------------------------------------------- +Fri Apr 22 08:33:17 UTC 2022 - Christophe Giboudeaux + +- Add patch to fix build with poppler 22.04: + * 0001-Fix-build-with-poppler-22.04.0.patch + +------------------------------------------------------------------- +Fri Mar 4 08:40:27 UTC 2022 - Christophe Giboudeaux + +- Add upstream changes: + * 0001-16734-Build-break-with-poppler-22.2.0.patch + * 0001-Small-update-vs-latest-code-in-poppler.patch + * 0001-16764-Build-break-with-poppler-22.03.0.patch + * 0001-Enforce-poppler-version-0.86.0.patch + * 0001-16764-Better-patch-avoid-a-memory-leak.patch + +------------------------------------------------------------------- +Mon Jan 24 12:49:07 UTC 2022 - Paolo Stivanin + +- Update to 1.5.8: + * UI Improvements for dark mode and some icon updates + and window interactivity + * Improvements to file import (IDML, PDF, PNG, TIFF, SVG) + * Improvements to PDF export + * Improvements with respect to tables (undo/redo, styles) + * Improvements to the Story Editor +- Remove 0001-Use-new-hb-subset-api-with-harfbuzz-2.9.0-in-order-t.patch +- Remove 0001-16697-Avoid-modifying-container-while-iterating-it.patch +- Remove 0002-16635-Replace-hb_subset-removed-in-harfbuzz-3.0-by-h.patch + +------------------------------------------------------------------- +Thu Jan 13 10:47:59 UTC 2022 - Christophe Giboudeaux + +- Add upstream patch to fix potential crash on startup: + * 0001-16697-Avoid-modifying-container-while-iterating-it.patch + +------------------------------------------------------------------- +Thu Jan 13 09:27:00 UTC 2022 - Bjørn Lie + +- Pass WANT_CPP17=ON to cmake, fix build with poppler 22.01.0 and + newer. + +------------------------------------------------------------------- +Fri Sep 24 09:13:39 UTC 2021 - Fabian Vogt + +- Add patches to fix build with harfbuzz 3.0.0: + * 0001-Use-new-hb-subset-api-with-harfbuzz-2.9.0-in-order-t.patch + * 0002-16635-Replace-hb_subset-removed-in-harfbuzz-3.0-by-h.patch +- Run dos2unix after applying patches + +------------------------------------------------------------------- +Mon Apr 26 09:23:12 UTC 2021 - Wolfgang Bauer + +- Update to 1.5.7 + * General: + + Improvements for undo and redo of grouped items + + Support for later versions of dependencies such as poppler + and podofo + + Fixed: Issue with Qt menu heuristics causing translations not + to work + + As of version 1.5.7, the minimum Qt version to compile + Scribus is 5.14 + * PDF import: + + As of version 1.5.7, Scribus can import text as editable text + from PDF files. It should be noted that this new feature is + still experimental. + * PDF export: + + Improved font embedding for OpenType fonts in PDF/X-4 + * User interface: + + Unification and standardization of the user interface + regarding margins, button and widget sizing, thanks to the + tireless work of Gyuris Gellért + * Render frames: + + Render frames are now pre-configured for the use of XeLaTeX +- Drop patches merged upstream: + * 0001-fix-build-of-pdf-import-plugin-with-poppler-21.03.0.patch + * 0002-fix-build-of-pdf-import-plugin-with-poppler-21.03.0.patch + * 0003-Page-getFormWidgets-returns-unique_ptr-in-poppler-21.04.0.patch +- Rebase 0001-Make-sure-information-displayed-on-the-about-window-.patch + +------------------------------------------------------------------- +Fri Apr 16 16:21:16 UTC 2021 - Christophe Giboudeaux + +- Stop owning directories provided by the filesystem package (boo#1184786) + +------------------------------------------------------------------- +Wed Apr 7 06:57:25 UTC 2021 - Antonio Larrosa + +- Add patch from upstream to build with poppler 21.04.0: + * 0003-Page-getFormWidgets-returns-unique_ptr-in-poppler-21.04.0.patch + +------------------------------------------------------------------- +Fri Mar 19 15:59:13 UTC 2021 - Antonio Larrosa + +- Add patches from upstream to fix build with popper 21.03.0: + * 0001-fix-build-of-pdf-import-plugin-with-poppler-21.03.0.patch + * 0002-fix-build-of-pdf-import-plugin-with-poppler-21.03.0.patch + +------------------------------------------------------------------- +Sun Nov 15 15:36:44 UTC 2020 - Wolfgang Bauer + +- Update to 1.5.6.1 + * Fix a spell checker crash + +------------------------------------------------------------------- +Wed Nov 11 14:00:23 UTC 2020 - Wolfgang Bauer + +- Update to 1.5.6 + * User Interface: + + One of the most important changes compared to earlier + versions is the introduction of a context-sensitive Content + Palette. If set to visible, it will adjust to the kind of + item (text frame, image frame, table, group) you have + selected. + + Ctrl/Cmd+Click enables selecting items below guides. + + A new PDF-based output preview is now available. + + Support for dark UI themes has been improved. + + Icon set can now be changed without needing to restart + application + + It's now possible to "cycle" through the items in a group by + pressing Alt+Ctrl/Cmd+Click + * Import/Export: + + Support for PDF 1.6 export, including embedded OpenType + fonts. + + A Markdown import filter has been added. + + Improvements to the IDML, PDF, XTG, SVG and KRA importers. + * Text and Typography: + + Launching Scribus via the Command Line on any OS will now + reveal more font-related problems; based on fontconfig 3.14. + * Colors: + + Default black and white colors can now alternatively be + defined in RGB and LAB. + * Printing: + + With the exception of the Windows platform, Scribus can now + use a PDF-based and newly written printing engine. PostScript + is still available, but will be removed over time. + * Scripter: + + On platforms other than macOS, Scribus now uses Python 3 by + default. As a consequence, existing scripts will likely need + to be modified so that they run in Scribus 1.5.6. + + Many new commands have been added to the Scripter; others + have been renamed to be more intuitive. For more information, + please have a look at the Scripter documentation, which has + also been updated to reflect the changes. +- Drop patches merged upstream: + * port-scripter-to-Python-3.patch + * Work-around-poppler-0.82-signature-changes.patch + * Use-same-mechanism-as-with-previous-poppler-versions.patch + * Fix-failure-to-build-against-poppler-0.83.0.patch + * Fix-failure-to-build-with-poppler-0.84.0.patch + * Fails-to-build-with-python-3.8.patch + * 0001-PDF-import-plugin-support-poppler-0.86.x.patch + * 0001-Fix-build-with-Qt-5.15.patch +- Add _constraints with a minimum disk size of 5GB, to avoid build + failures due to insufficient disk space +- Remove -DWANT_RELEASEWITHDEBUG=1 cmake option again, it causes + loading the plugins to fail due to unresolved symbols, and + possibly a crash on start + +------------------------------------------------------------------- +Thu Sep 17 17:36:18 UTC 2020 - Stefan Brüns + +- Depend on hicolor-icon-theme for directory structure +- Enable proper debuginfo/debugsource creation +- Spec file cleanup + * Remove unused libetonyek and GraphicsMagick++ build dependencies + * Do not install breeze SVG icon into pixmap directory, drop + breeze-icons dependency + * Remove conditionals for obsolete distro versions + +------------------------------------------------------------------- +Sat May 9 17:36:50 UTC 2020 - Wolfgang Bauer + +- Add 0001-Fix-build-with-Qt-5.15.patch to fix build with the + upcoming Qt 5.15 + +------------------------------------------------------------------- +Wed Apr 8 10:51:25 UTC 2020 - Christophe Giboudeaux + +- Add upstream patch: + *0001-PDF-import-plugin-support-poppler-0.86.x.patch +- Update: + * Fix-failure-to-build-against-poppler-0.83.0.patch + * Fix-failure-to-build-with-poppler-0.84.0.patch + * Use-same-mechanism-as-with-previous-poppler-versions.patch + * Work-around-poppler-0.82-signature-changes.patch + * port-scripter-to-Python-3.patch + +------------------------------------------------------------------- +Thu Jan 16 11:28:56 UTC 2020 - Wolfgang Bauer + +- Add port-scripter-to-Python-3.patch and build with python3 +- Add patches to fix build with newer poppler versions: + * Work-around-poppler-0.82-signature-changes.patch + * Use-same-mechanism-as-with-previous-poppler-versions.patch + * Fix-failure-to-build-against-poppler-0.83.0.patch + * Fix-failure-to-build-with-poppler-0.84.0.patch +- Add Fails-to-build-with-python-3.8.patch to fix build with python + 3.8 + +------------------------------------------------------------------- +Mon Sep 9 17:42:07 UTC 2019 - Jan Engelhardt + +- Drop faulty requires from documentation subpackage. + +------------------------------------------------------------------- +Fri Aug 9 20:36:41 UTC 2019 - Christophe Giboudeaux + +- Update to 1.5.5: + * Development version using Qt5. + * Large code refactoring + * Many bugs fixed +- Check https://wiki.scribus.net/canvas/1.5.5_Release for more information +- Drop hunspell.patch +- Add 0001-Make-sure-information-displayed-on-the-about-window-.patch + +------------------------------------------------------------------- +Sat Nov 24 16:26:56 UTC 2018 - Fabian Vogt + +- Rewrite hunspell-1.6.patch into hunspell.patch to cover all hunspell + versions + +------------------------------------------------------------------- +Sat Nov 24 10:55:44 UTC 2018 - wbauer@tmo.at + +- Update hunspell-1.6.patch to also accept hunspell 1.7 that's in + Factory now + +------------------------------------------------------------------- +Wed May 30 08:03:23 UTC 2018 - jengelh@inai.de + +- Trim marketing filler wording from description. +- Replace duplicate -fno-strict-aliasing. +- Run fdupes over more files. (Do it with hardlinks; + symlinks upset the documentation system.) + +------------------------------------------------------------------- +Tue May 1 21:29:52 UTC 2018 - wbauer@tmo.at + +- Add back hunspell-1.6.patch, it's still needed as the current + version still only supports hunspell up to 1.4 but Tumbleweed and + Leap 15.0 have 1.6 + +------------------------------------------------------------------- +Sun Apr 29 03:29:26 UTC 2018 - plinnell@opensuse.org + +- drop hunspell-1.6.patch fixed uptream +- lots of spec file cleanups +------------------------------------------------------------------- +Sat Apr 28 00:50:34 UTC 2018 - plinnell@opensuse.org + +- Update to 1.4.7 - likely last release from 1.4.x stable branch +- Stability and bugfix release +- Updated UI translations +- See: https://bugs.scribus.net/changelog_page.php?version_id=96 + for complete list. + +------------------------------------------------------------------- +Tue Mar 27 14:53:05 UTC 2018 - wbauer@tmo.at + +- Add hunspell-1.6.patch to fix spellchecking support in Tumbleweed + and Leap 15.0 + +------------------------------------------------------------------- +Thu Jan 4 17:18:39 UTC 2018 - wbauer@tmo.at + +- remove libQtWebKit-devel build requirement, it seems not to be + used/needed at all + +------------------------------------------------------------------- +Fri Aug 11 08:34:10 UTC 2017 - pgajdos@suse.com + +- remove dependency on aspell, scribus seem to use hunspell + [bsc#1052965] + +------------------------------------------------------------------- +Thu Feb 2 12:29:29 UTC 2017 - adam.majer@suse.de + +- use individual libboost-*-devel packages instead of boost-devel + +------------------------------------------------------------------- +Tue Nov 15 15:06:30 UTC 2016 - wbauer@tmo.at + +- Use shared-mime-info macros (boo#979301) +- Remove version check for > 11.3, earlier versions are not + supported any more + +------------------------------------------------------------------- +Wed Aug 10 07:03:48 UTC 2016 - badshah400@gmail.com + +- Fixup scribus.appdata.xml file + + Shorten name to just "scribus". + + Use images from github repository as appstream fails to load + images from https://wki.scribus.net. + + Improve a caption. + + Fix height of screenshot 2. + +------------------------------------------------------------------- +Thu Jul 28 16:16:26 UTC 2016 - badshah400@gmail.com + +- Add scribus.appdata.xml file and install it to the appdata dir; + this makes scribus appear in appstores like GNOME Software and + KDE Discover. + +------------------------------------------------------------------- +Fri Mar 18 10:38:55 UTC 2016 - alarrosa@suse.com + +- Added an fdupes call to symlink duplicate files installed + under /usr/share/. This reduces the installed size in around 20 Mb. + +------------------------------------------------------------------- +Mon Jan 11 17:26:06 UTC 2016 - plinnell@opensuse.org + +- Update to 1.4.6 + + See http://bugs.scribus.net/changelog_page.php?version_id=92 + +------------------------------------------------------------------- +Thu May 29 04:23:31 UTC 2014 - plinnell@opensuse.org + +- Update to 1.4.4 +- Drop python-version.diff it is upstream. + + PDF/X-1a export. + ++ The Barcode plug-in has been updated to reflect + the latest changes in the underlying Barcode Writer + in Pure PostScript (BWIPP). + ++ The Autoquote script has been rewritten and enhanced. + It now provides more options and adds thin spaces to French texts + where appropriate. + ++ A script to align images in frames has been added. + ++ Full support of the OpenICC Directory Proposal + (http://www.oyranos.org/wiki/index.php?title=OpenIccDirectoryProposal). + ++ The handling of transparencies in Photoshop-generated TIFF files + has been improved. + ++ Page borders can now act as guides (and thus be used for + snapping of items). + ++ The CMYK color palette created by the Newspaper Association + of America (NAA) for newspaper advertisements has been + integrated into Scribus. + ++ A new color palette for professional geographers has been added. + ++ Export to various bitmap formats has been re-enabled on Mac OS X. + ++ Several issues related to the user interface and canvas display + have been resolved. + ++ Adjustments for Windows 8.x. + ++ An issue with the spellchecker, resulting in a crash, + has been resolved. + ++ Documentation and translation updates and improvements. + + +For a complete list of changes see: + http://bugs.scribus.net/view_all_bug_page.php?filter=99610 + and http://lists.scribus.net/pipermail/scribus-commit. + +------------------------------------------------------------------- +Thu Apr 17 19:17:27 UTC 2014 - hrvoje.senjan@gmail.com + +- Added python_version.diff: fixes build with cmake 3.0 + +------------------------------------------------------------------- +Thu Aug 22 03:30:39 UTC 2013 - mrdocs@opensuse.org + +- Update to version 1.4.2 + + The Barcode Writer has been updated and supports many more + barcodes, including QR. + + The Galaxy Gauge™ color matching system and color tools have + been included. + + New color palettes from government agencies (Canada, + Germany, The Netherlands, United Kingdom) have been included. + + More Open Source color palettes have been included. + + Improvements to the build system. + + Improvements to the Preflight Verifier. + + The A4 page size limit of TeX-rendered graphics in Render + Frames has been removed. + + The Short Words plug-in now supports Danish. + + Many updates to the Online Manual. + +- Most important bugfixes: +- Disabled hyphenation on some Linux distributions is working again. +- Some unit conversion issues have been fixed. +- Display issues related to Ubuntu's Unity interface have been fixed. +- Some fixes to wrong or irritating UI behavior. +- Memory management in connection with the new Hyphenator has + been optimized. +- Issues with the Clang compiler have been fixed. +- Scribus now supports Pillow as an alternative to the Python Imaging Library. +- Many translation updates. + +------------------------------------------------------------------- +Mon Jan 14 04:22:20 UTC 2013 - mrdocs@opensuse.org + +- Update to version 1.4.2: + - New feature - hunspell based spell checker + - UI and Document Updates and translation updates + - Scribus will look for existing dictionaries on the system + it is installed already installed by hunspell packages or + LibreOffice. New dictionaries are downloadable directly from + within Scribus Preferences via freedesktop.org. + The spellchecker now also works within the Story Editor. + - Stability and other minor fixes + - Complete versioned changelog: + http://bugs.scribus.net/changelog_page.php?version_id=84 + +------------------------------------------------------------------- +Fri Jul 6 15:16:37 UTC 2012 - dmueller@suse.com + +- fix build for older distros + +------------------------------------------------------------------- +Mon Jun 25 00:03:47 UTC 2012 - badshah400@gmail.com + +- Install hi-res icons in the hicolor icon directory for better + appearance on desktop menu, specifically on the gnome-shell; add + BuildRequires: hicolor-icon-theme for this purpose. + +------------------------------------------------------------------- +Wed May 23 08:42:03 UTC 2012 - badshah400@gmail.com + +- Delete non-free colour swatches (givelife and dtp-studio) from + the package (bnc#763586) + +------------------------------------------------------------------- +Wed May 23 01:57:45 UTC 2012 - mrdocs@opensuse.org + +- drop fdupes in %datashare it breaks the help browser +- shorten the -devel description + +------------------------------------------------------------------- +Mon May 21 19:42:32 UTC 2012 - badshah400@gmail.com + +- Add back aspell and liblcms2-devel BuildRequires: these got + removed during the previous change by mistake. + +------------------------------------------------------------------- +Sat May 5 22:36:28 UTC 2012 - badshah400@gmail.com + +- Update to version 1.4.1: + + Many bugs fixed since 1.4.0 (see ChangeLog file installed in + /usr/share/doc/scribus/) + + Addition of the GiveLife Color System(R) swatch palettes + (www.givelifecolorsystem.com), license in the swatches + directory. + + Updates to resolve small canvas interaction issues + + Corrections to both bitmap and SVG image import issues + + Addition of undo steps for path operations and page moving + + Corrections to some master page behaviour + + Fixes for text editing issues + + Enhancements to scripter + + Translation updates + + The Italian version of the help documents has been updated + significantly + + Relocation of profiles and swatches to the share directory of + Unix-like systems (linux, OS X, etc) to fit in with the file + system recommendations +- Added build requirement on fdupes to link duplicate files +- Install desktop menu for application +- Changes from version 1.4.0: + + Many bugs fixed since 1.4.0rc6 (see ChangeLog file installed + in /usr/share/doc/scribus/). + +------------------------------------------------------------------- +Fri Jan 20 14:27:08 UTC 2012 - toddrme2178@gmail.com + +- Fixed aspell detection +- Added lcms2 buildrequires + +------------------------------------------------------------------- +Mon Jan 2 19:33:19 UTC 2012 - adrian@suse.de + +- update to final 1.4.0 release +- use xz compressed tar ball + +------------------------------------------------------------------- +Tue Dec 6 21:18:23 UTC 2011 - coolo@suse.com + +- scribus is GPL-2.0+ + +------------------------------------------------------------------- +Wed Oct 26 08:11:42 UTC 2011 - coolo@suse.com + +- merged KDF again + +------------------------------------------------------------------- +Wed Oct 19 04:57:23 UTC 2011 - mrdocs@opensuse.org + +-updated to 1.4.0.rc6 +-last RC before 1.4.0 final + +documentation updates, bug fixes and translation updates + +http://scribus.net/svn/Scribus/branches/Version135/Scribus/ChangeLog + for versioned changelog + +------------------------------------------------------------------- +Mon Aug 15 13:49:58 UTC 2011 - idonmez@novell.com + +- Fix build and use %{_smp_mflags} + +------------------------------------------------------------------- +Wed Aug 10 09:33:53 UTC 2011 - toddrme2178@gmail.com + + - Fixed language file identification + - Removed redundant buildrequires + - Cleaned up spec file formatting + +------------------------------------------------------------------- +Sat Jun 18 19:13:42 UTC 2011 - mrdocs@opensuse.org + +-update to 1.4.0.rc5 + + more bug fixes and translation updates + see http://bugs.scribus.net/changelog_page.php?version_id=68 + for versioned changelog + + +------------------------------------------------------------------- +Sun Apr 10 16:16:16 UTC 2011 - mrdocs@opensuse.org + +-update to 1.4.0.rc3 + + more bug fixes and translation updates + see http://bugs.scribus.net/changelog_page.php?version_id=68 + for versioned changelog + +------------------------------------------------------------------- +Tue Mar 8 01:49:59 UTC 2011 - mrdocs@opensuse.org + +-update to 1.4.0.rc2 + + more bug fixes and translation updates + see http://bugs.scribus.net/changelog_page.php?version_id=68 + for versioned changelog + +------------------------------------------------------------------- +Fri Feb 18 15:16:13 UTC 2011 - mrdocs@opensuse.org + +-remove some old versioning cruft from spec file + +------------------------------------------------------------------- +Fri Feb 18 14:30:37 UTC 2011 - mrdocs@opensuse.org + +- update to 1.4.0.rc1 1.4.0 is new stable branch + +40+ bugs fixed see: + http://bugs.scribus.net/changelog_page.php?version_id=68 for + versioned change log details +- Add Obsoletes/Provides for scribus-templates for those upgrading + from 1.3.3.14, former stable. 1.4.0 has new + and many additional templates included by default + + +------------------------------------------------------------------- +Fri Jan 16 00:00:00 CET 2011 - mrdocs@opensuse.org + +- disable parallel build by removing %jobs macro, it caused OOMs + during build. + +------------------------------------------------------------------- +Mon Dec 27 17:20:00 CET 2010 - dmueller@suse.de + +- fix build + +------------------------------------------------------------------- +Tue Dec 14 10:08:30 UTC 2010 - mrdocs@opensuse.org + +- spec file clean-ups from darix and remove all non-Suse related bits + +------------------------------------------------------------------- +Thu Dec 9 20:22:40 UTC 2010 - mrdocs@opensuse.org +- 1.3.9 release + + 60+ bug fixes + + addtional templates + +------------------------------------------------------------------- +Thu Mar 25 23:12:01 UTC 2010 - mrdocs@opensuse.org + +- update to 1.3.3.14 +- drop the implicit patch as its now upstream + +------------------------------------------------------------------- +Fri Jul 31 10:25:33 CEST 2009 - coolo@novell.com + +- fix build + +------------------------------------------------------------------- +Tue Apr 28 16:18 CET 2009 - mrdocs@opensuse.org + +- drop fdupes it breaks the help browser +- update to 1.3.3.13 +- make %jobs can break builds just use make + +------------------------------------------------------------------- +Mon Dec 8 11:36:05 CET 2008 - dmueller@suse.de + +- update to 1.3.3.12 (released tarball): + * Several fixes and improvements to text frames and the Story Editor. + * Some additional scripts have been added to enhance functionality. + * More translation and documentation updates. + * Several fixes to protect against possible crashes. + * Improvements to the Scripter to enable more features. + +------------------------------------------------------------------- +Thu Oct 9 11:28:54 CEST 2008 - meissner@suse.de + +- added stdlib.h, string.h +- run %fdupes + +------------------------------------------------------------------- +Tue Jun 3 00:54:07 CEST 2008 - crrodriguez@suse.de + +- needs fno-strict-aliasing + +------------------------------------------------------------------- +Wed Apr 16 15:18:04 CEST 2008 - dmueller@suse.de + +- update to 1.3.3.12svn: + * http://bugs.scribus.net/changelog_page.php +- add help files back (bnc#379906) + +------------------------------------------------------------------- +Mon Apr 14 20:02:25 CEST 2008 - dmueller@suse.de + +- fix build against cmake 2.6 +- sync buildrequires with the community package + +------------------------------------------------------------------- +Sun Jan 13 22:34:08 CET 2008 - dmueller@suse.de + +- update to 1.3.3.11: + * Special characters in plain text files aren't imported + correctly + * Change text string in PDF export dialog + +------------------------------------------------------------------- +Tue Jan 8 21:15:04 CET 2008 - stbinner@suse.de + +- update to 1.3.3.10, many bugfixes - for details see ChangeLog + +------------------------------------------------------------------- +Wed Jun 27 19:25:56 CEST 2007 - dmueller@suse.de + +- build against cmake to fix various issues + +------------------------------------------------------------------- +Wed Jun 13 15:26:52 CEST 2007 - ltinkl@suse.cz + +- update to 1.3.3.9 bugfix release + - many bugfixes + - more translation updates + - improvements to the SVG importer + - improvements to PDF forms +- update to 1.3.3.8 + - many bugfixes + - more translation updates + - improvements to the SVG importer + - improvements to the Open Document Draw importer + - improvements to PDF forms + +------------------------------------------------------------------- +Mon Apr 23 10:37:37 CEST 2007 - pgajdos@suse.cz + +- fixed doc paths in spec file + +------------------------------------------------------------------- +Mon Mar 12 09:54:04 CET 2007 - pgajdos@suse.cz + +- fixed gcc warnings in beta version: + * program uses possibly exploitable format strings + (format-not-literal.patch) + * program compares a char* pointer with string literal + (string-literal-comparsion.patch) + * added CFLAG -fno-strict-aliasing inside scribus.spec + +------------------------------------------------------------------- +Thu Mar 8 15:02:42 CET 2007 - pgajdos@suse.cz + +- fixed 'warning: comparsion with string literal' (#233016, #228963) +- string-literal-comparsion.patch + +------------------------------------------------------------------- +Sun Jan 28 18:52:37 CET 2007 - stbinner@suse.de + +- Updated to bugfix release 1.3.3.7 + +------------------------------------------------------------------- +Thu Nov 9 13:27:38 CET 2006 - sbrabec@suse.cz + +- Fixed python detection (#213668). + +------------------------------------------------------------------- +Sat Nov 4 18:59:50 CET 2006 - stbinner@suse.de + +- fix build for < 10.1 + +------------------------------------------------------------------- +Wed Oct 18 19:00:16 CEST 2006 - sbrabec@suse.cz + +- Updated to version 1.3.3.4: + * Purely a bug fix release. + * Translations updated. + +------------------------------------------------------------------- +Tue Aug 8 09:53:49 CEST 2006 - stbinner@suse.de + +- update to version 1.3.3.3 "stable usable development version" + * Fix borked color names and wrong Bitstream Vera rendering + * Many crash und other minor bug fixes + * Several translation updates + +------------------------------------------------------------------- +Thu Jul 13 11:45:16 CEST 2006 - stbinner@suse.de + +- fix build for <10.1 + +------------------------------------------------------------------- +Wed May 31 09:16:15 CEST 2006 - adrian@suse.de + +- update to version 1.3.3.2 "stable usable development version" + * more than 200 bugs and feature requests got implemented + * fix for pdf export using Adobe Reader 7.x + * new language translations + +------------------------------------------------------------------- +Mon May 29 15:52:24 CEST 2006 - schwab@suse.de + +- Don't strip binaries. + +------------------------------------------------------------------- +Mon Feb 20 17:39:00 CET 2006 - sbrabec@suse.cz + +- Export dynamic symbols from scribus binary (#148279). + +------------------------------------------------------------------- +Wed Jan 25 21:33:37 CET 2006 - mls@suse.de + +- converted neededforbuild to BuildRequires + +------------------------------------------------------------------- +Fri Jan 20 23:09:38 CET 2006 - schwab@suse.de + +- Don't strip binaries. + +------------------------------------------------------------------- +Tue Jan 10 18:53:21 CET 2006 - sbrabec@suse.cz + +- Re-enabled desktop file translation. + +------------------------------------------------------------------- +Fri Jan 6 12:37:01 CET 2006 - sbrabec@suse.cz + +- Updated to version 1.2.4.1. + +------------------------------------------------------------------- +Thu Jan 5 17:05:48 CET 2006 - sbrabec@suse.cz + +- Updated to version 1.2.4. + +------------------------------------------------------------------- +Tue Jan 3 16:01:11 CET 2006 - sbrabec@suse.cz + +- Suggest AdobeICCProfiles. + +------------------------------------------------------------------- +Wed Dec 7 16:16:54 CET 2005 - sbrabec@suse.cz + +- Search for ICC profiles in subdirectories. + http://bugs.scribus.net/view.php?id=2882 + +------------------------------------------------------------------- +Fri Nov 25 11:44:02 CET 2005 - sbrabec@suse.cz + +- Fixed devel splitting (#117811). +- Resource /usr/local/share/color/icc. + http://bugs.scribus.net/view.php?id=2864 +- Enabled parallel build. + +------------------------------------------------------------------- +Tue Oct 25 17:17:22 CEST 2005 - sbrabec@suse.cz + +- Updated to version 1.2.3. +- Install MIME info files. + +------------------------------------------------------------------- +Wed Jul 27 15:39:06 CEST 2005 - sbrabec@suse.cz + +- Provide and obsolete scribus-short-words. + +------------------------------------------------------------------- +Wed Jul 13 17:45:47 CEST 2005 - sbrabec@suse.cz + +- Updated to version 1.2.2.1. +- Removed unneeded static modules and .la files for modules. + +------------------------------------------------------------------- +Wed Jan 26 15:38:22 CET 2005 - sbrabec@suse.cz + +- Obsoleted old documentation packages. + +------------------------------------------------------------------- +Tue Jan 11 16:25:48 CET 2005 - sbrabec@suse.cz + +- Updated to version 1.2.1. + +------------------------------------------------------------------- +Thu Dec 16 15:25:22 CET 2004 - coolo@suse.de + +- fix unsermake install + +------------------------------------------------------------------- +Wed Sep 15 14:04:39 CEST 2004 - sbrabec@suse.cz + +- Worked-around bi-arch bugs by forcing /usr/lib (#44961). + http://bugs.scribus.net/bug_view_advanced_page.php?bug_id=0001057 + +------------------------------------------------------------------- +Sun Sep 5 09:40:49 CEST 2004 - coolo@suse.de + +- fixing build requires + +------------------------------------------------------------------- +Tue Aug 31 10:41:38 CEST 2004 - sbrabec@suse.cz + +- Updated to version 1.2. + +------------------------------------------------------------------- +Fri Aug 27 16:35:51 CEST 2004 - sbrabec@suse.cz + +- Updated to version 1.2RC1. + +------------------------------------------------------------------- +Thu Apr 1 01:05:56 CEST 2004 - ro@suse.de + +- run update_admin to get current libtool macros +- some more configure hackery to adapt to updated kde-macros + to finally find python on lib64 platforms + +------------------------------------------------------------------- +Wed Mar 31 17:48:32 CEST 2004 - sf@suse.de + +- add scribus-1.1.5-c++.diff (#37208) + +------------------------------------------------------------------- +Tue Mar 30 15:04:24 CEST 2004 - sbrabec@suse.cz + +- Updated to version 1.1.6. + +------------------------------------------------------------------- +Thu Mar 04 11:48:45 CET 2004 - sbrabec@suse.cz + +- Updated to version 1.1.5. + +------------------------------------------------------------------- +Mon Feb 23 15:41:52 CET 2004 - sbrabec@suse.cz + +- Fixed and turned on CUPS support. + +------------------------------------------------------------------- +Sat Jan 10 14:05:41 CET 2004 - adrian@suse.de + +- build as user + +------------------------------------------------------------------- +Fri Aug 22 13:21:54 CEST 2003 - sbrabec@suse.cz + +- Updated to version 1.0.1. + +------------------------------------------------------------------- +Fri Aug 15 20:39:39 CEST 2003 - adrian@suse.de + +- install desktop file + +------------------------------------------------------------------- +Thu Aug 14 01:04:56 CEST 2003 - ro@suse.de + +- run update_admin (autoreconf in kde-style) +- change prefix/lib to libdir in all Makefile.am + +------------------------------------------------------------------- +Tue Aug 12 16:35:40 CEST 2003 - sbrabec@suse.cz + +- Updated to version 1.0. + +------------------------------------------------------------------- +Thu Jun 12 01:29:09 CEST 2003 - ro@suse.de + +- add doc-dir to filelist + +------------------------------------------------------------------- +Mon Mar 31 02:14:03 CEST 2003 - ro@suse.de + +- fix build on lib64 + +------------------------------------------------------------------- +Mon Feb 10 19:15:30 CET 2003 - sbrabec@suse.cz + +- Fix Qt path for biarch. + +------------------------------------------------------------------- +Mon Feb 10 13:02:43 CET 2003 - sbrabec@suse.cz + +- Updated to version 0.9.7. + +------------------------------------------------------------------- +Wed Nov 20 16:29:48 CET 2002 - sbrabec@suse.cz + +- Added new package. +- FHS fixes. +- Aufoconf fixes. +- KDE autoconf fixes. diff --git a/scribus.keyring b/scribus.keyring new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..e6405216512aec20e98c9f10501f427f40af9bda0d04e55205dc495dd1704e50 GIT binary patch literal 1649 zcmbQqxQNC6>l__H7KZt8A&K_SIv*a2=}?M_^yd2hX`%n>%l`|m8^0{MseSvJ%WP(S zn>((L4Nsr5nV#>pzkTPdIOZz17rorKyEi}Fd`)||#Jcr0I?1p4JnO%d&(uA#y8Pjx z?@uh-3JzU0UHN|*SE1XZhP<+~2Tsn(o7Vm__mSSB7*DgTxf|a8`OwaEXf{7t63OYrmz@p%&(egWu-BP!{qv8#mA-J8Vk(!JLi>XJI>%e zb>L_C@zDPVWoOGR^4({_Z|(WN_1=2vLWVHCw?fYwyL>0HDb(osCIyP-uWj@(3gwt| zc-5TMLSHtsT}feDd4heG&$72wf@fkLbJX!vH{W@kcqL@P<<-ZIscoIgXI)Y0>&yJl zc!&AR+l!t(jJD0_e*2%x@!6ywhP8o(C5J95H2dFie!T0B=>A!CfsS&wOlLjX;l_T% zdf)5$|2`+K-CAU-|EA8JOSE6|+kL&6f=YFLtxKvGK2XjKSK7Sk+~dz$oZq`o9h0{` z);C9^@AmsuFWMNp-U;z0L{&y>GIcm@>RxLSJ>%6D4dMK3u&S1+;DuA`nsSdfXqo=KXSjhmB$otcS6l!=3xS&WI1Nsf_8yn#uQ zQB08~HDX`OrJ~{`77GIR&z0b|^_;DcxJ4P=g-C%34@W9Hv2;4a9KP!(xU#BSPgqWyx*dV%ZbIwMVU#Z#Z(B#lbGSyrOYrtC{6cL`rh;J z6BfJ8)Ml>M$S#`&jDP1gy~FKm?xt{gPFfP(^e+EozRJ}t_Nb232+qha%}G%xN-fAq zOion*rA<9ed})=EFg}6l{Kdx^7EG?aXz0lCQ*A@!T;{dT^&9>%Z#~U0&!~N0MdIVf z(ykZe^d9fN&B6P;)_5l)FR0+t6<}f5cr?GqRD5D(sBN{aPI2!IdoO8SkJqX%BmYFC(L=Y_r7|XSpM;PV&I+Zd};oz!cL)2H~;s1V*fF*`HAdl3%_8m+0{nc z^BI^~ng6N$T(S0W;RaWWb+Tz(e#uj{4-{{#ak?H;J%7)>A3_JV1S;>n)>`y<@==ow zhx#Y7&28FrK6!`lC7Zv}^YY50PTmTU72Wp4;sDQWcI)<@qipJ{ZI^~`dla?e$Q~)V z-}MCxCTIkEZBglZ8E8?+ezNGO&G)t3^P+ln&(5;TGT(dTTwX^Siv+ObP-Bwj!I%A> zfWv(|aslz$i(#Hl%$DF^TQ$`mt+!2FQFm>}f?jVchWS 1500 +%define pyver python3 +%else +%define pyver python311 +%endif + +Name: scribus +Version: 1.6.3 +Release: 0 +Summary: Page Layout and Desktop Publishing (DTP) +License: GPL-2.0-or-later +URL: https://www.scribus.net/ +# https://sourceforge.net/projects/scribus/files/scribus/1.6.3/ +Source0: %{name}-%{version}.tar.xz +%if %{with released} +Source1: %{name}-%{version}.tar.xz.asc +Source2: scribus.keyring +%endif +# PATCH-FIX-OPENSUSE +Patch0: 0001-Make-sure-information-displayed-on-the-about-window-.patch +# PATCH-FIX-UPSTREAM +Patch1: https://github.com/scribusproject/scribus/commit/3f0f902d6e47adb45d280947f448bcca6c4e2556.patch +BuildRequires: cmake >= 3.14.0 +BuildRequires: cups-devel +BuildRequires: dos2unix +BuildRequires: fdupes +BuildRequires: hicolor-icon-theme +BuildRequires: libboost_headers-devel +BuildRequires: libcdr-devel +BuildRequires: libfreehand-devel +BuildRequires: libmspub-devel +BuildRequires: libpagemaker-devel +%if %{with podofo} +BuildRequires: libpodofo-devel +%endif +BuildRequires: %{pyver}-devel +BuildRequires: libqxp-devel +BuildRequires: librevenge-devel +BuildRequires: libtiff-devel +BuildRequires: libvisio-devel +BuildRequires: libwpd-devel +BuildRequires: libwpg-devel +BuildRequires: libzmf-devel +BuildRequires: pkgconfig +BuildRequires: cmake(Qt5Core) >= 5.14.0 +BuildRequires: cmake(Qt5Gui) +BuildRequires: cmake(Qt5LinguistTools) +BuildRequires: cmake(Qt5Network) +BuildRequires: cmake(Qt5OpenGL) +BuildRequires: cmake(Qt5PrintSupport) +BuildRequires: cmake(Qt5Quick) +BuildRequires: cmake(Qt5Widgets) +BuildRequires: cmake(Qt5Xml) +BuildRequires: pkgconfig(GraphicsMagick) +BuildRequires: pkgconfig(cairo) +BuildRequires: pkgconfig(fontconfig) +BuildRequires: pkgconfig(freetype2) +BuildRequires: pkgconfig(harfbuzz) +BuildRequires: pkgconfig(hunspell) +BuildRequires: pkgconfig(icu-i18n) +BuildRequires: pkgconfig(icu-uc) +BuildRequires: pkgconfig(lcms2) +BuildRequires: pkgconfig(libjpeg) +BuildRequires: pkgconfig(libpng16) +BuildRequires: pkgconfig(libxml-2.0) +BuildRequires: pkgconfig(openssl) +BuildRequires: pkgconfig(poppler) > 21.03.0 +BuildRequires: pkgconfig(zlib) +Requires: hicolor-icon-theme +Recommends: %{pyver}-Pillow +Recommends: %{pyver}-tk +Recommends: scribus-doc +# Not packaged anymore +Provides: scribus-devel = %{version} +Obsoletes: scribus-devel < %{version} + +%description +Scribus is a page layout program which produces output in PDF and +Postscript. + +Scribus supports publishing features such as CMYK and spot colors, +PDF creation, Encapsulated Postscript import and export and creation +of color separations. + +%package doc +Summary: Documentation for Scribus + +%description doc +This package provides the documentation for Scribus. + +%prep +# Convert line endings before patching +%setup -q +# W: wrong-script-end-of-line-encoding +find . -type f \( -iname \*.py -o -iname \*.cpp -o -iname \*.h \) -exec dos2unix {} \; + +%autopatch -p1 + +# Unused test file still using QQC1 +rm scribus/ui/qml/qtq_test1.qml + +%if 0%{?suse_version} > 1500 +find . \( -name "*.py" -o -name "*.html" \) -exec sed -i 's#/usr/bin/env python.*#/usr/bin/python3#' {} \; +%else +find . \( -name "*.py" -o -name "*.html" \) -exec sed -i 's#/usr/bin/env python.*#/usr/bin/python3.11#' {} \; +%endif + +%build +# Don't use the %%cmake macro, it causes crashes when starting scribus +mkdir build +pushd build +cmake .. \ + -DCMAKE_INSTALL_PREFIX=%{_prefix} \ + -DWANT_DISTROBUILD=TRUE \ + -DWANT_HUNSPELL=TRUE \ + -DWANT_GRAPHICSMAGICK=TRUE \ + -DWANT_CPP17=TRUE \ +%if "%{_lib}" == "lib64" + -DWANT_LIB64=TRUE \ +%endif +%if %{without podofo} + -DWITH_PODOFO=FALSE +%endif + +%cmake_build +popd + +%install +%cmake_install + +# These files are required at runtime to populate the help/about window +mkdir -p %{buildroot}%{_datadir}/scribus/aboutData +mv %{buildroot}%{_datadir}/doc/scribus/{AUTHORS,COPYING,LINKS,TRANSLATION} %{buildroot}%{_datadir}/scribus/aboutData/ + +# Already in %%doc +rm %{buildroot}%{_datadir}/doc/scribus/{ChangeLog,README} + +%fdupes %{buildroot}%{_datadir}/doc/scribus +%fdupes %{buildroot}%{_datadir}/scribus + +%files doc +%license COPYING +%doc ChangeLog README +%dir %{_datadir}/doc/scribus/ +%lang(de) %{_datadir}/doc/scribus/de/ +%lang(it) %{_datadir}/doc/scribus/it/ +%lang(ru) %{_datadir}/doc/scribus/ru/ +%{_datadir}/doc/scribus/en/ + +%files +%license COPYING +%doc ChangeLog README +%dir %{_datadir}/doc/scribus/ +%dir %{_datadir}/icons/hicolor/1024x1024 +%dir %{_datadir}/icons/hicolor/1024x1024/apps +%lang(de) %{_mandir}/de/man1/scribus.1%{?ext_man} +%lang(pl) %{_mandir}/pl/man1/scribus.1%{?ext_man} +%{_bindir}/scribus +%{_datadir}/applications/scribus.desktop +%{_datadir}/icons/hicolor/*/apps/scribus.png +%{_datadir}/icons/hicolor/*/mimetypes/application-vnd.scribus.png +%{_datadir}/metainfo/scribus.appdata.xml +%{_datadir}/mime/packages/scribus.xml +%{_datadir}/scribus/ +%{_libdir}/scribus/ +%{_mandir}/man1/scribus.1%{?ext_man} + +%changelog From 7a1bbf9d63a39ddd2b2286922325f2a80eb6fd7e26f091ec7f7ad07982ae03bc Mon Sep 17 00:00:00 2001 From: Christophe Marin Date: Wed, 19 Feb 2025 16:11:38 +0000 Subject: [PATCH 2/3] Bah... Revert, that did not work as intended.... OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/scribus?expand=0&rev=100 --- ...902d6e47adb45d280947f448bcca6c4e2556.patch | 198 ------------------ scribus.changes | 6 - scribus.spec | 4 +- 3 files changed, 1 insertion(+), 207 deletions(-) delete mode 100644 3f0f902d6e47adb45d280947f448bcca6c4e2556.patch diff --git a/3f0f902d6e47adb45d280947f448bcca6c4e2556.patch b/3f0f902d6e47adb45d280947f448bcca6c4e2556.patch deleted file mode 100644 index 8a8b4ce..0000000 --- a/3f0f902d6e47adb45d280947f448bcca6c4e2556.patch +++ /dev/null @@ -1,198 +0,0 @@ -From 3f0f902d6e47adb45d280947f448bcca6c4e2556 Mon Sep 17 00:00:00 2001 -From: Jean Ghali -Date: Tue, 4 Feb 2025 21:41:03 +0000 -Subject: [PATCH] #17405: Fix build error with poppler 25.02.0 - -git-svn-id: svn://scribus.net/branches/Version16x/Scribus@26668 11d20701-8431-0410-a711-e3c959e3b870 ---- - scribus/plugins/import/pdf/importpdf.cpp | 4 +- - scribus/plugins/import/pdf/importpdfconfig.h | 6 ++ - scribus/plugins/import/pdf/slaoutput.cpp | 67 ++++++++++++++++++-- - 3 files changed, 68 insertions(+), 9 deletions(-) - -diff --git a/scribus/plugins/import/pdf/importpdf.cpp b/scribus/plugins/import/pdf/importpdf.cpp -index c095320f48..a4ba4cfc28 100644 ---- a/scribus/plugins/import/pdf/importpdf.cpp -+++ b/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) -diff --git a/scribus/plugins/import/pdf/importpdfconfig.h b/scribus/plugins/import/pdf/importpdfconfig.h -index b922816253..57e26c9795 100644 ---- a/scribus/plugins/import/pdf/importpdfconfig.h -+++ b/scribus/plugins/import/pdf/importpdfconfig.h -@@ -27,4 +27,10 @@ for which a new license (GPL+exception) is in place. - #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 -diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp -index 2bf4a566fb..a18d2f59e5 100644 ---- a/scribus/plugins/import/pdf/slaoutput.cpp -+++ b/scribus/plugins/import/pdf/slaoutput.cpp -@@ -1685,7 +1685,7 @@ void SlaOutputDev::stroke(GfxState *state) - - auto& graphicState = m_graphicStack.top(); - graphicState.strokeColor = getColor(state->getStrokeColorSpace(), state->getStrokeColor(), &graphicState.strokeShade); -- -+ - QString output = convertPath(state->getPath()); - if ((m_Elements->count() != 0) && (output == m_coords)) // Path is the same as in last fill - { -@@ -2393,8 +2393,9 @@ bool SlaOutputDev::tilingPatternFill(GfxState *state, Gfx * /*gfx*/, Catalog *ca - #endif - m_graphicStack.top().clipPath = savedClip; - m_inPattern--; -- gElements = m_groupStack.pop(); - m_doc->m_Selection->clear(); -+ -+ gElements = m_groupStack.pop(); - if (gElements.Items.count() > 0) - { - for (int dre = 0; dre < gElements.Items.count(); ++dre) -@@ -2932,7 +2933,7 @@ void SlaOutputDev::beginMarkedContent(const char *name, Object *dictRef) - { - 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 +3085,11 @@ void SlaOutputDev::updateFont(GfxState *state) - #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 +3249,20 @@ void SlaOutputDev::updateFont(GfxState *state) - } - 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 +3293,18 @@ void SlaOutputDev::updateFont(GfxState *state) - #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 +3316,15 @@ void SlaOutputDev::updateFont(GfxState *state) - 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 +3342,15 @@ void SlaOutputDev::updateFont(GfxState *state) - 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 +3362,7 @@ void SlaOutputDev::updateFont(GfxState *state) - memcpy(codeToGID, ((GfxCIDFont *)gfxFont)->getCIDToGID(), n * sizeof(*codeToGID)); - } - } -+#endif - else - { - #if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0) -@@ -3338,7 +3383,9 @@ void SlaOutputDev::updateFont(GfxState *state) - #endif - 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()); -+#elif POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 2, 0) - codeToGID = ((GfxCIDFont*) gfxFont)->getCodeToGIDMap(ff.get(), &n); - ff.reset(); - #else -@@ -3346,7 +3393,13 @@ void SlaOutputDev::updateFont(GfxState *state) - 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.changes b/scribus.changes index ac9e976..d63a90b 100644 --- a/scribus.changes +++ b/scribus.changes @@ -1,9 +1,3 @@ -------------------------------------------------------------------- -Sun Feb 16 09:05:59 UTC 2025 - Bjørn Lie - -- Add 3f0f902d6e47adb45d280947f448bcca6c4e2556.patch: Fix build - with poppler 25.02.0. - ------------------------------------------------------------------- Thu Jan 9 18:00:48 UTC 2025 - Christophe Marin diff --git a/scribus.spec b/scribus.spec index 977dcde..f4ec846 100644 --- a/scribus.spec +++ b/scribus.spec @@ -41,8 +41,6 @@ Source2: scribus.keyring %endif # PATCH-FIX-OPENSUSE Patch0: 0001-Make-sure-information-displayed-on-the-about-window-.patch -# PATCH-FIX-UPSTREAM -Patch1: https://github.com/scribusproject/scribus/commit/3f0f902d6e47adb45d280947f448bcca6c4e2556.patch BuildRequires: cmake >= 3.14.0 BuildRequires: cups-devel BuildRequires: dos2unix @@ -56,7 +54,6 @@ BuildRequires: libpagemaker-devel %if %{with podofo} BuildRequires: libpodofo-devel %endif -BuildRequires: %{pyver}-devel BuildRequires: libqxp-devel BuildRequires: librevenge-devel BuildRequires: libtiff-devel @@ -65,6 +62,7 @@ BuildRequires: libwpd-devel BuildRequires: libwpg-devel BuildRequires: libzmf-devel BuildRequires: pkgconfig +BuildRequires: %{pyver}-devel BuildRequires: cmake(Qt5Core) >= 5.14.0 BuildRequires: cmake(Qt5Gui) BuildRequires: cmake(Qt5LinguistTools) From 3e0b1258711ff43d4168a670069a2c1c0ab50f2668ccf68674b87e47ab3f17b1 Mon Sep 17 00:00:00 2001 From: Christophe Marin Date: Wed, 19 Feb 2025 16:19:01 +0000 Subject: [PATCH 3/3] reapply OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/scribus?expand=0&rev=101 --- ...Fix-build-error-with-poppler-25.02.0.patch | 201 ++++++++++++++++++ scribus.changes | 6 + scribus.spec | 2 + 3 files changed, 209 insertions(+) create mode 100644 0001-Fix-build-error-with-poppler-25.02.0.patch diff --git a/0001-Fix-build-error-with-poppler-25.02.0.patch b/0001-Fix-build-error-with-poppler-25.02.0.patch new file mode 100644 index 0000000..76b753f --- /dev/null +++ b/0001-Fix-build-error-with-poppler-25.02.0.patch @@ -0,0 +1,201 @@ +From 1a22e78bc589ea0bdabf5ff2c4dea4d7d6f31402 Mon Sep 17 00:00:00 2001 +From: Jean Ghali +Date: Tue, 4 Feb 2025 21:41:03 +0000 +Subject: [PATCH] #17405: Fix build error with poppler 25.02.0 + +git-svn-id: svn://scribus.net/branches/Version16x/Scribus@26668 11d20701-8431-0410-a711-e3c959e3b870 +--- + scribus/plugins/import/pdf/importpdf.cpp | 4 +- + scribus/plugins/import/pdf/importpdfconfig.h | 6 ++ + scribus/plugins/import/pdf/slaoutput.cpp | 67 ++++++++++++++++++-- + 3 files changed, 68 insertions(+), 9 deletions(-) + +diff --git a/scribus/plugins/import/pdf/importpdf.cpp b/scribus/plugins/import/pdf/importpdf.cpp +index f87275c..a0a5cdf 100644 +--- a/scribus/plugins/import/pdf/importpdf.cpp ++++ b/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) +diff --git a/scribus/plugins/import/pdf/importpdfconfig.h b/scribus/plugins/import/pdf/importpdfconfig.h +index fd57f25..46ecc58 100644 +--- a/scribus/plugins/import/pdf/importpdfconfig.h ++++ b/scribus/plugins/import/pdf/importpdfconfig.h +@@ -27,4 +27,10 @@ for which a new license (GPL+exception) is in place. + #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 +diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp +index 2b8cf94..6f6bf5f 100644 +--- a/scribus/plugins/import/pdf/slaoutput.cpp ++++ b/scribus/plugins/import/pdf/slaoutput.cpp +@@ -1685,7 +1685,7 @@ void SlaOutputDev::stroke(GfxState *state) + + auto& graphicState = m_graphicStack.top(); + graphicState.strokeColor = getColor(state->getStrokeColorSpace(), state->getStrokeColor(), &graphicState.strokeShade); +- ++ + QString output = convertPath(state->getPath()); + if ((m_Elements->count() != 0) && (output == m_coords)) // Path is the same as in last fill + { +@@ -2393,8 +2393,9 @@ bool SlaOutputDev::tilingPatternFill(GfxState *state, Gfx * /*gfx*/, Catalog *ca + #endif + m_graphicStack.top().clipPath = savedClip; + m_inPattern--; +- gElements = m_groupStack.pop(); + m_doc->m_Selection->clear(); ++ ++ gElements = m_groupStack.pop(); + if (gElements.Items.count() > 0) + { + for (int dre = 0; dre < gElements.Items.count(); ++dre) +@@ -2932,7 +2933,7 @@ void SlaOutputDev::beginMarkedContent(const char *name, Object *dictRef) + { + 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 +3085,11 @@ void SlaOutputDev::updateFont(GfxState *state) + #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 +3249,20 @@ void SlaOutputDev::updateFont(GfxState *state) + } + 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 +3293,18 @@ void SlaOutputDev::updateFont(GfxState *state) + #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 +3316,15 @@ void SlaOutputDev::updateFont(GfxState *state) + 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 +3342,15 @@ void SlaOutputDev::updateFont(GfxState *state) + 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 +3362,7 @@ void SlaOutputDev::updateFont(GfxState *state) + memcpy(codeToGID, ((GfxCIDFont *)gfxFont)->getCIDToGID(), n * sizeof(*codeToGID)); + } + } ++#endif + else + { + #if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0) +@@ -3338,7 +3383,9 @@ void SlaOutputDev::updateFont(GfxState *state) + #endif + 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()); ++#elif POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 2, 0) + codeToGID = ((GfxCIDFont*) gfxFont)->getCodeToGIDMap(ff.get(), &n); + ff.reset(); + #else +@@ -3346,7 +3393,13 @@ void SlaOutputDev::updateFont(GfxState *state) + 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)"); +-- +2.48.1 + diff --git a/scribus.changes b/scribus.changes index d63a90b..e66bca8 100644 --- a/scribus.changes +++ b/scribus.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Feb 16 09:05:59 UTC 2025 - Bjørn Lie + +- Add 0001-Fix-build-error-with-poppler-25.02.0.patch: Fix build + with poppler 25.02.0. + ------------------------------------------------------------------- Thu Jan 9 18:00:48 UTC 2025 - Christophe Marin diff --git a/scribus.spec b/scribus.spec index f4ec846..fc17307 100644 --- a/scribus.spec +++ b/scribus.spec @@ -41,6 +41,8 @@ Source2: scribus.keyring %endif # PATCH-FIX-OPENSUSE Patch0: 0001-Make-sure-information-displayed-on-the-about-window-.patch +# PATCH-FIX-UPSTREAM +Patch1: 0001-Fix-build-error-with-poppler-25.02.0.patch BuildRequires: cmake >= 3.14.0 BuildRequires: cups-devel BuildRequires: dos2unix