commit: 528c7c28696399c7f3688341b1d44dc454b9e4c2 Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> AuthorDate: Wed Jun 11 17:13:01 2025 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Wed Jun 11 17:13:01 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=528c7c28
app-office/scribus: fixed compilation of 1.7.0 with qt 6.9.0 + scrubbed patches Closes: https://bugs.gentoo.org/957695 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> .../files/scribus-1.6.3-poppler-25.02.0.patch | 18 +++++---------- .../files/scribus-1.6.4-poppler-25.06.0.patch | 6 ++--- ...scribus-1.7.0-fix-compiling-with-qt-6.9.0.patch | 27 ++++++++++++++++++++++ .../files/scribus-1.7.0-poppler-25.02.0.patch | 18 +++++---------- .../files/scribus-1.7.0-poppler-25.06.0.patch | 6 ++--- ...bus-1.7.0-r1.ebuild => scribus-1.7.0-r2.ebuild} | 1 + 6 files changed, 44 insertions(+), 32 deletions(-) diff --git a/app-office/scribus/files/scribus-1.6.3-poppler-25.02.0.patch b/app-office/scribus/files/scribus-1.6.3-poppler-25.02.0.patch index d933e5bbde0a..8b69d257ccee 100644 --- a/app-office/scribus/files/scribus-1.6.3-poppler-25.02.0.patch +++ b/app-office/scribus/files/scribus-1.6.3-poppler-25.02.0.patch @@ -1,7 +1,5 @@ -Index: Scribus/scribus/plugins/import/pdf/importpdf.cpp -=================================================================== ---- Scribus/scribus/plugins/import/pdf/importpdf.cpp (revision 26663) -+++ Scribus/scribus/plugins/import/pdf/importpdf.cpp (revision 26668) +--- Scribus/scribus/plugins/import/pdf/importpdf.cpp ++++ Scribus/scribus/plugins/import/pdf/importpdf.cpp @@ -462,11 +462,11 @@ if (dev->isOk()) @@ -16,10 +14,8 @@ Index: Scribus/scribus/plugins/import/pdf/importpdf.cpp if (order) { for (int i = 0; i < order->getLength (); ++i) -Index: Scribus/scribus/plugins/import/pdf/importpdfconfig.h -=================================================================== ---- Scribus/scribus/plugins/import/pdf/importpdfconfig.h (revision 26663) -+++ Scribus/scribus/plugins/import/pdf/importpdfconfig.h (revision 26668) +--- Scribus/scribus/plugins/import/pdf/importpdfconfig.h ++++ Scribus/scribus/plugins/import/pdf/importpdfconfig.h @@ -27,4 +27,10 @@ #define POPPLER_CONST_083 #endif @@ -31,10 +27,8 @@ Index: Scribus/scribus/plugins/import/pdf/importpdfconfig.h #endif + +#endif -Index: Scribus/scribus/plugins/import/pdf/slaoutput.cpp -=================================================================== ---- Scribus/scribus/plugins/import/pdf/slaoutput.cpp (revision 26663) -+++ Scribus/scribus/plugins/import/pdf/slaoutput.cpp (revision 26668) +--- Scribus/scribus/plugins/import/pdf/slaoutput.cpp ++++ Scribus/scribus/plugins/import/pdf/slaoutput.cpp @@ -1685,7 +1685,7 @@ auto& graphicState = m_graphicStack.top(); diff --git a/app-office/scribus/files/scribus-1.6.4-poppler-25.06.0.patch b/app-office/scribus/files/scribus-1.6.4-poppler-25.06.0.patch index d87e8ca8a258..7078faeec498 100644 --- a/app-office/scribus/files/scribus-1.6.4-poppler-25.06.0.patch +++ b/app-office/scribus/files/scribus-1.6.4-poppler-25.06.0.patch @@ -1,7 +1,5 @@ -Index: Scribus/scribus/plugins/import/pdf/slaoutput.cpp -=================================================================== ---- Scribus/scribus/plugins/import/pdf/slaoutput.cpp (revision 26916) -+++ Scribus/scribus/plugins/import/pdf/slaoutput.cpp (revision 26918) +--- Scribus/scribus/plugins/import/pdf/slaoutput.cpp ++++ Scribus/scribus/plugins/import/pdf/slaoutput.cpp @@ -606,7 +606,12 @@ FormWidget *fm = m_formWidgets->getWidget(i); if (!fm) diff --git a/app-office/scribus/files/scribus-1.7.0-fix-compiling-with-qt-6.9.0.patch b/app-office/scribus/files/scribus-1.7.0-fix-compiling-with-qt-6.9.0.patch new file mode 100644 index 000000000000..b9ce1482bcbb --- /dev/null +++ b/app-office/scribus/files/scribus-1.7.0-fix-compiling-with-qt-6.9.0.patch @@ -0,0 +1,27 @@ +From f553dce73905d11b301901dc039e973c18adf0a5 Mon Sep 17 00:00:00 2001 +From: Jean Ghali <[email protected]> +Date: Wed, 2 Apr 2025 22:26:39 +0000 +Subject: [PATCH] #17486: Compiler error when building with Qt 6.9.0 + +git-svn-id: svn://scribus.net/trunk/Scribus@26826 11d20701-8431-0410-a711-e3c959e3b870 +--- a/scribus/util_text.cpp ++++ b/scribus/util_text.cpp +@@ -100,10 +100,12 @@ QString stringToUnicode(const QString &text) + QString out; + + for (auto c : text) +- out += QString("U+%1,").arg(c.unicode(), 4, 16, QChar('0')).toUpper(); +- +- return out.mid(0, out.length() -1); ++ { ++ auto u = static_cast<uint>(c.unicode()); ++ out += QString("U+%1,").arg(u, 4, 16, QChar('0')).toUpper(); ++ } + ++ return out.mid(0, out.length() - 1); + } + + QString unicodeToString(const QString &text) +-- +2.49.0 + diff --git a/app-office/scribus/files/scribus-1.7.0-poppler-25.02.0.patch b/app-office/scribus/files/scribus-1.7.0-poppler-25.02.0.patch index 288f42ae3c53..ea17383d6806 100644 --- a/app-office/scribus/files/scribus-1.7.0-poppler-25.02.0.patch +++ b/app-office/scribus/files/scribus-1.7.0-poppler-25.02.0.patch @@ -1,7 +1,5 @@ -Index: Scribus/scribus/plugins/import/pdf/importpdf.cpp -=================================================================== ---- Scribus/scribus/plugins/import/pdf/importpdf.cpp (revision 26665) -+++ Scribus/scribus/plugins/import/pdf/importpdf.cpp (revision 26666) +--- Scribus/scribus/plugins/import/pdf/importpdf.cpp ++++ Scribus/scribus/plugins/import/pdf/importpdf.cpp @@ -416,11 +416,11 @@ if (dev->isOk()) @@ -16,10 +14,8 @@ Index: Scribus/scribus/plugins/import/pdf/importpdf.cpp if (order) { for (int i = 0; i < order->getLength (); ++i) -Index: Scribus/scribus/plugins/import/pdf/importpdfconfig.h -=================================================================== ---- Scribus/scribus/plugins/import/pdf/importpdfconfig.h (revision 26665) -+++ Scribus/scribus/plugins/import/pdf/importpdfconfig.h (revision 26666) +--- Scribus/scribus/plugins/import/pdf/importpdfconfig.h ++++ Scribus/scribus/plugins/import/pdf/importpdfconfig.h @@ -15,4 +15,10 @@ + ((micro) * 1)) #define POPPLER_ENCODED_VERSION POPPLER_VERSION_ENCODE(POPPLER_VERSION_MAJOR, POPPLER_VERSION_MINOR, POPPLER_VERSION_MICRO) @@ -31,10 +27,8 @@ Index: Scribus/scribus/plugins/import/pdf/importpdfconfig.h #endif + +#endif -Index: Scribus/scribus/plugins/import/pdf/slaoutput.cpp -=================================================================== ---- Scribus/scribus/plugins/import/pdf/slaoutput.cpp (revision 26665) -+++ Scribus/scribus/plugins/import/pdf/slaoutput.cpp (revision 26666) +--- Scribus/scribus/plugins/import/pdf/slaoutput.cpp ++++ Scribus/scribus/plugins/import/pdf/slaoutput.cpp @@ -2791,7 +2791,7 @@ { if (dictRef->isNull()) diff --git a/app-office/scribus/files/scribus-1.7.0-poppler-25.06.0.patch b/app-office/scribus/files/scribus-1.7.0-poppler-25.06.0.patch index c27b43ee17dc..d21097a063e3 100644 --- a/app-office/scribus/files/scribus-1.7.0-poppler-25.06.0.patch +++ b/app-office/scribus/files/scribus-1.7.0-poppler-25.06.0.patch @@ -1,7 +1,5 @@ -Index: Scribus/scribus/plugins/import/pdf/slaoutput.cpp -=================================================================== ---- Scribus/scribus/plugins/import/pdf/slaoutput.cpp (revision 26917) -+++ Scribus/scribus/plugins/import/pdf/slaoutput.cpp (revision 26919) +--- Scribus/scribus/plugins/import/pdf/slaoutput.cpp ++++ Scribus/scribus/plugins/import/pdf/slaoutput.cpp @@ -580,7 +580,12 @@ FormWidget *fm = m_formWidgets->getWidget(i); if (!fm) diff --git a/app-office/scribus/scribus-1.7.0-r1.ebuild b/app-office/scribus/scribus-1.7.0-r2.ebuild similarity index 98% rename from app-office/scribus/scribus-1.7.0-r1.ebuild rename to app-office/scribus/scribus-1.7.0-r2.ebuild index 106167d42133..6bf12a218c95 100644 --- a/app-office/scribus/scribus-1.7.0-r1.ebuild +++ b/app-office/scribus/scribus-1.7.0-r2.ebuild @@ -81,6 +81,7 @@ PATCHES=( "${FILESDIR}"/${PN}-1.7.0-dont-install-thirdparty-license.patch "${FILESDIR}"/${PN}-1.7.0-fix-icon-version.patch "${FILESDIR}"/${P}-poppler-25.0{2,6}.0.patch # from trunk + "${FILESDIR}"/${PN}-1.7.0-fix-compiling-with-qt-6.9.0.patch # bug 957695 ) src_prepare() {
