From 3fc16445f75ba68218902c69465e1ce690bd66df Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Wed, 18 Sep 2024 21:54:52 +0200 Subject: [PATCH] update to 4.0.1 [release 4.0.1-1mamba;Tue Sep 03 2024] --- calligra-3.1.0-libqt5-5.12.1.patch | 135 ------ ...ulaTool-Guard-against-crash-if-activ.patch | 45 -- ...38-Annotation-shape-crashes-on-paste.patch | 29 -- ...invalid-.local-share-autocorrect-cus.patch | 47 -- ...Fix-comparison-between-QString-and-0.patch | 71 --- ...large-JPEG-image-into-a-presentation.patch | 34 -- calligra-3.2.1-Fix-some-more-warnings.patch | 443 ------------------ ...ra-3.2.1-Make-show-hidden-row-s-work.patch | 31 -- ...f-Commit-62f51070-to-make-it-compile.patch | 86 ---- ...3.2.1-Repair-KFileWidget-integration.patch | 66 --- ...23474-Selections-not-retained-when-s.patch | 28 -- calligra-3.2.1-c++17.patch | 11 - calligra-3.2.1-gcc11.patch | 48 -- ...aware_xgettext.sh-fix-a-gawk-warning.patch | 30 -- calligra-3.2.1-poppler-22.08.0-1.patch | 65 --- calligra-3.2.1-poppler-22.08.0-2.patch | 86 ---- calligra.spec | 262 ++++------- 17 files changed, 82 insertions(+), 1435 deletions(-) delete mode 100644 calligra-3.1.0-libqt5-5.12.1.patch delete mode 100644 calligra-3.2.1-ChartTool-KoFormulaTool-Guard-against-crash-if-activ.patch delete mode 100644 calligra-3.2.1-Fix-Bug-423038-Annotation-shape-crashes-on-paste.patch delete mode 100644 calligra-3.2.1-Fix-assert-with-invalid-.local-share-autocorrect-cus.patch delete mode 100644 calligra-3.2.1-Fix-comparison-between-QString-and-0.patch delete mode 100644 calligra-3.2.1-Fix-inserting-a-large-JPEG-image-into-a-presentation.patch delete mode 100644 calligra-3.2.1-Fix-some-more-warnings.patch delete mode 100644 calligra-3.2.1-Make-show-hidden-row-s-work.patch delete mode 100644 calligra-3.2.1-Partial-update-of-Commit-62f51070-to-make-it-compile.patch delete mode 100644 calligra-3.2.1-Repair-KFileWidget-integration.patch delete mode 100644 calligra-3.2.1-Sheets-Fix-Bug-423474-Selections-not-retained-when-s.patch delete mode 100644 calligra-3.2.1-c++17.patch delete mode 100644 calligra-3.2.1-gcc11.patch delete mode 100644 calligra-3.2.1-kundo2_aware_xgettext.sh-fix-a-gawk-warning.patch delete mode 100644 calligra-3.2.1-poppler-22.08.0-1.patch delete mode 100644 calligra-3.2.1-poppler-22.08.0-2.patch diff --git a/calligra-3.1.0-libqt5-5.12.1.patch b/calligra-3.1.0-libqt5-5.12.1.patch deleted file mode 100644 index 0ddf0f2..0000000 --- a/calligra-3.1.0-libqt5-5.12.1.patch +++ /dev/null @@ -1,135 +0,0 @@ -From ee83e0f2c251072e47a2799619cdc79efe67e651 Mon Sep 17 00:00:00 2001 -From: David Faure -Date: Tue, 3 Apr 2018 00:31:19 +0200 -Subject: Fix compilation with Qt 5.11 (missing include) - ---- - stage/part/KPrPresentationTool.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/stage/part/KPrPresentationTool.cpp b/stage/part/KPrPresentationTool.cpp -index ae743da..3007f91 100644 ---- a/stage/part/KPrPresentationTool.cpp -+++ b/stage/part/KPrPresentationTool.cpp -@@ -32,6 +32,7 @@ - #include - #include - #include -+#include - - #include - #include ---- -From a7ebecb9fbee2190e649c44ed53f1299013baa30 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner -Date: Sun, 18 Mar 2018 11:56:57 +0100 -Subject: Fix build with Qt 5.11 (missing headers) - -Reviewers: #calligra:_3.0, anthonyfieroni, danders - -Reviewed By: #calligra:_3.0, anthonyfieroni, danders - -Subscribers: anthonyfieroni, danders - -Tags: #calligra:_3.0 - -Differential Revision: https://phabricator.kde.org/D11454 ---- - libs/widgets/KoCsvImportDialog.cpp | 1 + - libs/widgets/KoPageLayoutWidget.cpp | 2 ++ - plugins/chartshape/dialogs/TableEditorDialog.cpp | 1 + - plugins/formulashape/FormulaToolWidget.cpp | 1 + - sheets/dialogs/LayoutDialog.cpp | 1 + - words/part/dialogs/KWAnchoringProperties.cpp | 1 + - words/part/dialogs/KWRunAroundProperties.cpp | 2 ++ - 15 files changed, 18 insertions(+), 1 deletion(-) - -diff --git a/libs/widgets/KoCsvImportDialog.cpp b/libs/widgets/KoCsvImportDialog.cpp -index 0ffdcf6..cdca006 100644 ---- a/libs/widgets/KoCsvImportDialog.cpp -+++ b/libs/widgets/KoCsvImportDialog.cpp -@@ -21,6 +21,7 @@ - #include "KoCsvImportDialog.h" - - // Qt -+#include - #include - #include - -diff --git a/libs/widgets/KoPageLayoutWidget.cpp b/libs/widgets/KoPageLayoutWidget.cpp -index f91555c..a3816f9 100644 ---- a/libs/widgets/KoPageLayoutWidget.cpp -+++ b/libs/widgets/KoPageLayoutWidget.cpp -@@ -23,6 +23,8 @@ - - #include - -+#include -+ - class Q_DECL_HIDDEN KoPageLayoutWidget::Private - { - public: -diff --git a/plugins/chartshape/dialogs/TableEditorDialog.cpp b/plugins/chartshape/dialogs/TableEditorDialog.cpp -index c0d5136..d2a772e 100644 ---- a/plugins/chartshape/dialogs/TableEditorDialog.cpp -+++ b/plugins/chartshape/dialogs/TableEditorDialog.cpp -@@ -24,6 +24,7 @@ - - // Qt - #include -+#include - - // Calligra - #include -diff --git a/plugins/formulashape/FormulaToolWidget.cpp b/plugins/formulashape/FormulaToolWidget.cpp -index ed10919..8f52177 100644 ---- a/plugins/formulashape/FormulaToolWidget.cpp -+++ b/plugins/formulashape/FormulaToolWidget.cpp -@@ -30,6 +30,7 @@ - #include - #include - #include -+#include - #include - - FormulaToolWidget::FormulaToolWidget( KoFormulaTool* tool, QWidget* parent ) -diff --git a/sheets/dialogs/LayoutDialog.cpp b/sheets/dialogs/LayoutDialog.cpp -index a0a9832..7d7db53 100644 ---- a/sheets/dialogs/LayoutDialog.cpp -+++ b/sheets/dialogs/LayoutDialog.cpp -@@ -36,6 +36,7 @@ - #include - - #include -+#include - #include - #include - #include -diff --git a/words/part/dialogs/KWAnchoringProperties.cpp b/words/part/dialogs/KWAnchoringProperties.cpp -index d64208c..bfddb3a 100644 ---- a/words/part/dialogs/KWAnchoringProperties.cpp -+++ b/words/part/dialogs/KWAnchoringProperties.cpp -@@ -35,6 +35,7 @@ - - #include - -+#include - #include - - const int KWAnchoringProperties::vertRels[4][20] = { -diff --git a/words/part/dialogs/KWRunAroundProperties.cpp b/words/part/dialogs/KWRunAroundProperties.cpp -index e38599a..7e8b2d5 100644 ---- a/words/part/dialogs/KWRunAroundProperties.cpp -+++ b/words/part/dialogs/KWRunAroundProperties.cpp -@@ -28,6 +28,8 @@ - - #include - -+#include -+ - KWRunAroundProperties::KWRunAroundProperties(FrameConfigSharedState *state) - : m_state(state) - { --- -cgit v0.11.2 - diff --git a/calligra-3.2.1-ChartTool-KoFormulaTool-Guard-against-crash-if-activ.patch b/calligra-3.2.1-ChartTool-KoFormulaTool-Guard-against-crash-if-activ.patch deleted file mode 100644 index af857ac..0000000 --- a/calligra-3.2.1-ChartTool-KoFormulaTool-Guard-against-crash-if-activ.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 3bedba886436fb6cee2d92f446d4674ae431cab0 Mon Sep 17 00:00:00 2001 -From: Dag Andersen -Date: Tue, 30 Jun 2020 09:08:42 +0200 -Subject: [PATCH 10/54] ChartTool, KoFormulaTool: Guard against crash if - activated without shape - ---- - plugins/chartshape/ChartTool.cpp | 5 ++++- - plugins/formulashape/KoFormulaTool.cpp | 4 ++++ - 2 files changed, 8 insertions(+), 1 deletion(-) - -diff --git a/plugins/chartshape/ChartTool.cpp b/plugins/chartshape/ChartTool.cpp -index 33d9bb6d876..3fbf8c49f11 100644 ---- a/plugins/chartshape/ChartTool.cpp -+++ b/plugins/chartshape/ChartTool.cpp -@@ -267,7 +267,10 @@ void ChartTool::activate(ToolActivation, const QSet &shapes) - void ChartTool::deactivate() - { - debugChartTool<shape; -- -+ if (!d->shape) { -+ // activated without shape -+ return; -+ } - foreach (QWidget *w, optionWidgets()) { - ConfigWidgetBase *configWidget = dynamic_cast(w); - if (configWidget) -diff --git a/plugins/formulashape/KoFormulaTool.cpp b/plugins/formulashape/KoFormulaTool.cpp -index 6db24cad001..070633348ce 100644 ---- a/plugins/formulashape/KoFormulaTool.cpp -+++ b/plugins/formulashape/KoFormulaTool.cpp -@@ -128,6 +128,10 @@ void KoFormulaTool::deactivate() - for (const TemplateAction &templateAction : koAsConst(m_templateActions)) { - disconnect(templateAction.action, &QAction::triggered, this, nullptr); - } -+ if (!m_formulaShape) { -+ // activated without shape -+ return; -+ } - disconnect(m_formulaShape->formulaData(),0,this,0); - if (canvas()) { - m_cursorList.append(m_formulaEditor); --- -2.31.1 - diff --git a/calligra-3.2.1-Fix-Bug-423038-Annotation-shape-crashes-on-paste.patch b/calligra-3.2.1-Fix-Bug-423038-Annotation-shape-crashes-on-paste.patch deleted file mode 100644 index ed11c7a..0000000 --- a/calligra-3.2.1-Fix-Bug-423038-Annotation-shape-crashes-on-paste.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 2dea3f29791a2c157876824ce3e59291eeb0b200 Mon Sep 17 00:00:00 2001 -From: Dag Andersen -Date: Tue, 16 Jun 2020 10:06:01 +0200 -Subject: [PATCH 03/54] Fix Bug 423038 - Annotation shape crashes on paste - -BUG: 423038 - -Reviewers: -CCMAIL: cbo@boemann.dk ---- - plugins/textshape/AnnotationTextShapeFactory.cpp | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/plugins/textshape/AnnotationTextShapeFactory.cpp b/plugins/textshape/AnnotationTextShapeFactory.cpp -index 6467222ce32..c28ed1eeb23 100644 ---- a/plugins/textshape/AnnotationTextShapeFactory.cpp -+++ b/plugins/textshape/AnnotationTextShapeFactory.cpp -@@ -103,6 +103,8 @@ KoShape *AnnotationTextShapeFactory::createDefaultShape(KoDocumentResourceManage - document.setChangeTracker(changeTracker); - } - -+ document.setShapeController(documentResources->shapeController()); -+ - //update the resources of the document - annotation->updateDocumentData(); - annotation->setImageCollection(documentResources->imageCollection()); --- -2.31.1 - diff --git a/calligra-3.2.1-Fix-assert-with-invalid-.local-share-autocorrect-cus.patch b/calligra-3.2.1-Fix-assert-with-invalid-.local-share-autocorrect-cus.patch deleted file mode 100644 index 8b0432c..0000000 --- a/calligra-3.2.1-Fix-assert-with-invalid-.local-share-autocorrect-cus.patch +++ /dev/null @@ -1,47 +0,0 @@ -From dcea315173ffc1d5d42aa2734636fe97cd0180d9 Mon Sep 17 00:00:00 2001 -From: David Faure -Date: Sun, 9 Aug 2020 10:55:41 +0200 -Subject: [PATCH 18/54] Fix assert with invalid - ~/.local/share/autocorrect/custom-en-US.xml - ---- - .../textediting/autocorrection/Autocorrect.cpp | 16 ++++++++++++---- - 1 file changed, 12 insertions(+), 4 deletions(-) - -diff --git a/plugins/textediting/autocorrection/Autocorrect.cpp b/plugins/textediting/autocorrection/Autocorrect.cpp -index 4d17c0d79c2..61674276e9f 100644 ---- a/plugins/textediting/autocorrection/Autocorrect.cpp -+++ b/plugins/textediting/autocorrection/Autocorrect.cpp -@@ -845,8 +845,12 @@ void Autocorrect::readAutocorrectXmlEntry(const QString &fname, bool onlyCustomi - QDomNodeList nl = doubleQuote.childNodes(); - if(nl.count()==1) { - QDomElement element = nl.item(0).toElement(); -- m_typographicDoubleQuotes.begin = element.attribute(QLatin1String("begin")).at(0); -- m_typographicDoubleQuotes.end = element.attribute(QLatin1String("end")).at(0); -+ const QString beginStr = element.attribute(QLatin1String("begin")); -+ const QString endStr = element.attribute(QLatin1String("end")); -+ if (!beginStr.isEmpty() && !endStr.isEmpty()) { -+ m_typographicDoubleQuotes.begin = beginStr.at(0); -+ m_typographicDoubleQuotes.end = endStr.at(0); -+ } - } - } - -@@ -855,8 +859,12 @@ void Autocorrect::readAutocorrectXmlEntry(const QString &fname, bool onlyCustomi - QDomNodeList nl = singleQuote.childNodes(); - if(nl.count()==1) { - QDomElement element = nl.item(0).toElement(); -- m_typographicSingleQuotes.begin = element.attribute(QLatin1String("begin")).at(0); -- m_typographicSingleQuotes.end = element.attribute(QLatin1String("end")).at(0); -+ const QString beginStr = element.attribute(QLatin1String("begin")); -+ const QString endStr = element.attribute(QLatin1String("end")); -+ if (!beginStr.isEmpty() && !endStr.isEmpty()) { -+ m_typographicSingleQuotes.begin = beginStr.at(0); -+ m_typographicSingleQuotes.end = endStr.at(0); -+ } - } - } - --- -2.31.1 - diff --git a/calligra-3.2.1-Fix-comparison-between-QString-and-0.patch b/calligra-3.2.1-Fix-comparison-between-QString-and-0.patch deleted file mode 100644 index 0adf4dd..0000000 --- a/calligra-3.2.1-Fix-comparison-between-QString-and-0.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 622e3ae6cca729e11e83e56a91db87e3a4ecbf6f Mon Sep 17 00:00:00 2001 -From: David Faure -Date: Thu, 18 Jun 2020 22:55:10 +0200 -Subject: [PATCH 08/54] Fix comparison between QString and 0. - -Detected with local hack to qstring.h ---- - filters/stage/powerpoint/PptToOdp.cpp | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/filters/stage/powerpoint/PptToOdp.cpp b/filters/stage/powerpoint/PptToOdp.cpp -index f5646f7b089..245b314e7fe 100644 ---- a/filters/stage/powerpoint/PptToOdp.cpp -+++ b/filters/stage/powerpoint/PptToOdp.cpp -@@ -3485,7 +3485,7 @@ void PptToOdp::processDeclaration(KoXmlWriter* xmlWriter) - #if 0 - QString headerText = QString::fromLatin1(headerAtom->header, headerAtom->header.size()); - QString hdrName = findDeclaration(Header, headerText); -- if (hdrName == 0 ) { -+ if (hdrName.isEmpty() ) { - hdrName = QString("hdr%1").arg(declaration.values(Header).count() + 1); - insertDeclaration(Header, hdrName, headerText); - } -@@ -3495,7 +3495,7 @@ void PptToOdp::processDeclaration(KoXmlWriter* xmlWriter) - if (headerFooterAtom && headerFooterAtom->fHasFooter && footerAtom) { - QString footerText = QString::fromUtf16(footerAtom->footer.data(), footerAtom->footer.size()); - QString ftrName = findDeclaration(Footer, footerText); -- if ( ftrName == 0) { -+ if ( ftrName.isEmpty() ) { - ftrName = QString("ftr%1").arg((declaration.values(Footer).count() + 1)); - insertDeclaration(Footer, ftrName, footerText); - } -@@ -3505,7 +3505,7 @@ void PptToOdp::processDeclaration(KoXmlWriter* xmlWriter) - if(headerFooterAtom->fHasUserDate && userDateAtom) { - QString userDate = QString::fromUtf16(userDateAtom->userDate.data(), userDateAtom->userDate.size()); - QString dtdName = findDeclaration(DateTime, userDate); -- if ( dtdName == 0) { -+ if ( dtdName.isEmpty() ) { - dtdName = QString("dtd%1").arg((declaration.values(DateTime).count() + 1)); - insertDeclaration(DateTime, dtdName, userDate); - } -@@ -3513,7 +3513,7 @@ void PptToOdp::processDeclaration(KoXmlWriter* xmlWriter) - } - if(headerFooterAtom->fHasTodayDate) { - QString dtdName = findDeclaration(DateTime, ""); -- if ( dtdName == 0) { -+ if ( dtdName.isEmpty() ) { - dtdName = QString("dtd%1").arg((declaration.values(DateTime).count() + 1)); - insertDeclaration(DateTime, dtdName, ""); - } -@@ -3568,7 +3568,7 @@ QString PptToOdp::findDeclaration(DeclarationType type, const QString &text) con - return item.first; - } - } -- return 0; -+ return QString(); - } - - QString PptToOdp::findNotesDeclaration(DeclarationType type, const QString &text) const -@@ -3581,7 +3581,7 @@ QString PptToOdp::findNotesDeclaration(DeclarationType type, const QString &text - return item.first; - } - } -- return 0; -+ return QString(); - } - - void PptToOdp::insertDeclaration(DeclarationType type, const QString &name, const QString &text) --- -2.31.1 - diff --git a/calligra-3.2.1-Fix-inserting-a-large-JPEG-image-into-a-presentation.patch b/calligra-3.2.1-Fix-inserting-a-large-JPEG-image-into-a-presentation.patch deleted file mode 100644 index 00ccb28..0000000 --- a/calligra-3.2.1-Fix-inserting-a-large-JPEG-image-into-a-presentation.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 1b561c83b5076154f0e22ef57709fcb25c263931 Mon Sep 17 00:00:00 2001 -From: David Faure -Date: Sun, 9 Aug 2020 14:27:32 +0200 -Subject: [PATCH 20/54] Fix inserting a (large) JPEG image into a presentation - -The format was hardcoded to "png" but the JPEG data was written "as is" -into the temp file (because > 90kB), so loading as PNG failed. ---- - libs/flake/KoImageData.cpp | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/libs/flake/KoImageData.cpp b/libs/flake/KoImageData.cpp -index 5882360d8cd..c2238b4f42d 100644 ---- a/libs/flake/KoImageData.cpp -+++ b/libs/flake/KoImageData.cpp -@@ -148,6 +148,7 @@ QImage KoImageData::image() const - d->errorCode = OpenFailed; - } - else if (d->errorCode == Success && !d->image.load(d->temporaryFile->fileName(), d->suffix.toLatin1())) { -+ qWarning() << "Failed to open image" << d->temporaryFile->fileName() << "with format" << d->suffix; - d->errorCode = OpenFailed; - } - d->temporaryFile->close(); -@@ -316,6 +317,7 @@ void KoImageData::setImage(const QByteArray &imageData, KoImageCollection *colle - buffer.setData(imageData); - buffer.open(QIODevice::ReadOnly); - d->copyToTemporary(buffer); -+ d->suffix.clear(); // let QImage find out what the data contains - } - - QCryptographicHash md5(QCryptographicHash::Md5); --- -2.31.1 - diff --git a/calligra-3.2.1-Fix-some-more-warnings.patch b/calligra-3.2.1-Fix-some-more-warnings.patch deleted file mode 100644 index 648967c..0000000 --- a/calligra-3.2.1-Fix-some-more-warnings.patch +++ /dev/null @@ -1,443 +0,0 @@ -From 068cd9aec11052733e393976142516d2190e4564 Mon Sep 17 00:00:00 2001 -From: Pierre Ducroquet -Date: Sun, 28 Feb 2021 23:23:02 +0100 -Subject: [PATCH] Fix some more warnings - ---- - filters/libmsooxml/MsooXmlDiagramReader_p.cpp | 1 + - filters/sheets/csv/csvimport.cc | 2 +- - filters/sheets/excel/sidewinder/excel.cpp | 1 + - filters/sheets/excel/sidewinder/formulas.cpp | 2 +- - filters/sheets/gnumeric/gnumericexport.cc | 5 ++--- - filters/sheets/html/htmlexport.cc | 2 -- - filters/sheets/latex/export/latexexport.cc | 1 - - filters/sheets/latex/export/table.cc | 1 + - filters/sheets/xlsx/XlsxXmlWorksheetReader.cpp | 1 - - filters/stage/pptx/PptxXmlDocumentReader.cpp | 2 +- - filters/words/msword-odf/texthandler.cpp | 2 ++ - filters/words/msword-odf/wv2/src/parser9x.cpp | 4 +++- - filters/words/msword-odf/wv2/src/styles.cpp | 4 +--- - filters/words/msword-odf/wv2/src/styles.h | 11 ++++++++--- - gemini/lib/GeminiMainWindow.cpp | 2 ++ - libs/pageapp/KoPAOdfPageSaveHelper.cpp | 2 +- - plugins/spacenavigator/SpaceNavigatorDevice.h | 6 ++---- - plugins/spacenavigator/SpaceNavigatorEvent.h | 2 +- - plugins/spacenavigator/SpaceNavigatorPollingThread.h | 3 +-- - plugins/vectorshape/VectorShape.cpp | 1 + - sheets/functions/datetime.cpp | 1 + - sheets/part/Digest.cpp | 8 ++++---- - sheets/shape/TableToolFactory.h | 2 +- - sheets/tests/TestSort.cpp | 4 ++-- - 24 files changed, 38 insertions(+), 32 deletions(-) - -diff --git a/filters/libmsooxml/MsooXmlDiagramReader_p.cpp b/filters/libmsooxml/MsooXmlDiagramReader_p.cpp -index 14b08531262..14fc6ab9a71 100644 ---- a/filters/libmsooxml/MsooXmlDiagramReader_p.cpp -+++ b/filters/libmsooxml/MsooXmlDiagramReader_p.cpp -@@ -872,6 +872,7 @@ void LayoutNodeAtom::finishBuild(Context* context) { - case AlgorithmAtom::UnknownAlg: - warnMsooXml << "Layout with name=" << m_name << "defines an unknown algorithm."; - // fall through and use the composite-algorithm -+ // fall through - case AlgorithmAtom::CompositeAlg: m_algorithmImpl = new CompositeAlgorithm; break; - case AlgorithmAtom::ConnectorAlg: m_algorithmImpl = new ConnectorAlgorithm; break; - case AlgorithmAtom::CycleAlg: m_algorithmImpl = new CycleAlgorithm; break; -diff --git a/filters/sheets/csv/csvimport.cc b/filters/sheets/csv/csvimport.cc -index 89fb7162e00..1008d186f18 100644 ---- a/filters/sheets/csv/csvimport.cc -+++ b/filters/sheets/csv/csvimport.cc -@@ -97,8 +97,8 @@ KoFilter::ConversionStatus CSVFilter::convert(const QByteArray& from, const QByt - return KoFilter::FileNotFound; - } - -- QString csv_delimiter; - // ###### FIXME: disabled for now -+ //QString csv_delimiter; - //if (!config.isNull()) - // csv_delimiter = config[0]; - -diff --git a/filters/sheets/excel/sidewinder/excel.cpp b/filters/sheets/excel/sidewinder/excel.cpp -index ab592225ca6..7fa5633d433 100644 ---- a/filters/sheets/excel/sidewinder/excel.cpp -+++ b/filters/sheets/excel/sidewinder/excel.cpp -@@ -2449,6 +2449,7 @@ bool ExcelReader::load(Workbook* workbook, const char* filename) - } else { - bytes_read = combObjStream->read( buffer, markerOrLength ); - QString ansiString = readByteString(buffer, markerOrLength); -+ Q_UNUSED(ansiString); - //TODO... - //printf( "markerOrLength=%i ansiString=%s\n",markerOrLength,ansiString.ascii() ); - } -diff --git a/filters/sheets/excel/sidewinder/formulas.cpp b/filters/sheets/excel/sidewinder/formulas.cpp -index 62747469a49..0132d39e024 100644 ---- a/filters/sheets/excel/sidewinder/formulas.cpp -+++ b/filters/sheets/excel/sidewinder/formulas.cpp -@@ -1513,7 +1513,7 @@ static void mergeTokens(UStringStack* stack, unsigned count, const QString &merg - if (!stack) return; - if (stack->size() < count) return; - -- QString s1, s2; -+ QString s1; - - while (count) { - count--; -diff --git a/filters/sheets/gnumeric/gnumericexport.cc b/filters/sheets/gnumeric/gnumericexport.cc -index 1256c68bc74..2468548edb3 100644 ---- a/filters/sheets/gnumeric/gnumericexport.cc -+++ b/filters/sheets/gnumeric/gnumericexport.cc -@@ -1293,15 +1293,13 @@ KoFilter::ConversionStatus GNUMERICExport::convert(const QByteArray& from, const - i = 0; - } - -- QString line; - for (int currentcolumn = 1; currentcolumn <= iMaxColumn; currentcolumn++) { - QDomElement cell_contents; - Cell cell(table, currentcolumn, currentrow); - -- QString text, style; -+ QString text; - QDomDocument domLink; - QDomElement domRoot; -- QDomNode domNode; - QDomNodeList childNodes; - - if (!cell.isDefault() && !cell.isEmpty()) { -@@ -1342,6 +1340,7 @@ KoFilter::ConversionStatus GNUMERICExport::convert(const QByteArray& from, const - text = domNode.toElement().text(); - - while (!domNode.isNull()) { -+ QString style; - style = domNode.toElement().tagName(); - - if (style == "b") -diff --git a/filters/sheets/html/htmlexport.cc b/filters/sheets/html/htmlexport.cc -index 2d116e0608c..bf41a6f743e 100644 ---- a/filters/sheets/html/htmlexport.cc -+++ b/filters/sheets/html/htmlexport.cc -@@ -242,7 +242,6 @@ void HTMLExport::convertSheet(Sheet *sheet, QString &str, int iMaxUsedRow, int i - i = 0; - } - -- QString separators; - QString line; - unsigned int nonempty_cells = 0; - -@@ -435,7 +434,6 @@ void HTMLExport::detectFilledCells(Sheet *sheet, int &rows, int &columns) - int iUsedColumn = 0; - for (int currentcolumn = 1 ; currentcolumn <= iMaxColumn ; currentcolumn++) { - cell = Cell(sheet, currentcolumn, currentrow); -- QString text; - if (!cell.isDefault() && !cell.isEmpty()) { - iUsedColumn = currentcolumn; - } -diff --git a/filters/sheets/latex/export/latexexport.cc b/filters/sheets/latex/export/latexexport.cc -index 8d0698a3420..4f8caf235d9 100644 ---- a/filters/sheets/latex/export/latexexport.cc -+++ b/filters/sheets/latex/export/latexexport.cc -@@ -38,7 +38,6 @@ LATEXExport::LATEXExport(QObject* parent, const QVariantList&) : - - KoFilter::ConversionStatus LATEXExport::convert(const QByteArray& from, const QByteArray& to) - { -- QString config; - - if (to != "text/x-tex" || from != "application/x-kspread") - return KoFilter::NotImplemented; -diff --git a/filters/sheets/latex/export/table.cc b/filters/sheets/latex/export/table.cc -index 8d8b6701a39..e58827dfbc7 100644 ---- a/filters/sheets/latex/export/table.cc -+++ b/filters/sheets/latex/export/table.cc -@@ -118,6 +118,7 @@ void Table::analyzePaper(const QDomNode node) - - /* borders */ - QDomNode border = getChild(node, "borders"); -+ Q_UNUSED(border); - setBorderRight(getAttr(node, "right").toLong()); - setBorderLeft(getAttr(node, "left").toLong()); - setBorderBottom(getAttr(node, "bottom").toLong()); -diff --git a/filters/sheets/xlsx/XlsxXmlWorksheetReader.cpp b/filters/sheets/xlsx/XlsxXmlWorksheetReader.cpp -index 782a5914729..eda8ffc6b47 100644 ---- a/filters/sheets/xlsx/XlsxXmlWorksheetReader.cpp -+++ b/filters/sheets/xlsx/XlsxXmlWorksheetReader.cpp -@@ -872,7 +872,6 @@ KoFilter::ConversionStatus XlsxXmlWorksheetReader::read_conditionalFormatting() - while (index < m_conditionalIndices.size()) { - QString conditionalArea; - Condition examinedCondition = m_conditionalIndices.at(index); -- QString sqrefOriginal = sqref; - int areaIndex = 0; - Condition previousCond; - -diff --git a/filters/stage/pptx/PptxXmlDocumentReader.cpp b/filters/stage/pptx/PptxXmlDocumentReader.cpp -index 4cf86aea8c8..11b5ad266b9 100644 ---- a/filters/stage/pptx/PptxXmlDocumentReader.cpp -+++ b/filters/stage/pptx/PptxXmlDocumentReader.cpp -@@ -316,7 +316,7 @@ KoFilter::ConversionStatus PptxXmlDocumentReader::read_sldId() - - QString slideMasterPath, slideMasterFile; - MSOOXML::Utils::splitPathAndFile(m_context->relationships->targetForType(slidePath, slideFile, QLatin1String(MSOOXML::Schemas::officeDocument::relationships) + "/slideLayout"), &slideMasterPath, &slideMasterFile); -- const QString slideMasterPathAndFile = m_context->relationships->targetForType(slideMasterPath, slideMasterFile, QLatin1String(MSOOXML::Schemas::officeDocument::relationships) + "/slideMaster"); -+ // const QString slideMasterPathAndFile = m_context->relationships->targetForType(slideMasterPath, slideMasterFile, QLatin1String(MSOOXML::Schemas::officeDocument::relationships) + "/slideMaster"); - - // Delay the reading of a tableStyle until we find a table as we need the - // clrMap from the master slide -diff --git a/filters/words/msword-odf/texthandler.cpp b/filters/words/msword-odf/texthandler.cpp -index e167d86e028..89ef678961a 100644 ---- a/filters/words/msword-odf/texthandler.cpp -+++ b/filters/words/msword-odf/texthandler.cpp -@@ -408,6 +408,7 @@ void WordsTextHandler::footnoteFound(wvWare::FootnoteData data, - } - case msonfcUCLetter: - letter = 'A'; -+ // fall through - case msonfcLCLetter: - { - while (noteNumber / 25 > 0) { -@@ -1064,6 +1065,7 @@ void WordsTextHandler::fieldStart(const wvWare::FLD* fld, wvWare::SharedPtrm_type = UNSUPPORTED; -diff --git a/filters/words/msword-odf/wv2/src/parser9x.cpp b/filters/words/msword-odf/wv2/src/parser9x.cpp -index 9a6d1606ce9..e5d7d14691c 100644 ---- a/filters/words/msword-odf/wv2/src/parser9x.cpp -+++ b/filters/words/msword-odf/wv2/src/parser9x.cpp -@@ -581,7 +581,8 @@ void Parser9x::processPiece( String* string, U32 fc, U32 limit, const Position& - // same ASCII code as TTP_MARK (0x0007), NOTE: table depth == 1 - case CELL_MARK: - m_cellMarkFound = true; -- // Fall-through intended. A row/cell end is also a paragraph end. -+ // A row/cell end is also a paragraph end. -+ // fall through - case PARAGRAPH_MARK: - { - // No "index - start + 1" here, as we don't want to copy the -@@ -1064,6 +1065,7 @@ void Parser9x::emitSpecialCharacter( UChar character, U32 globalCP, SharedPtrtell(); // address where the STD starts -@@ -938,7 +936,7 @@ void Style::mergeUpechpx( const Style* parentStyle, WordVersion version ) - } - - --StyleSheet::StyleSheet( OLEStreamReader* tableStream, U32 fcStshf, U32 lcbStshf ) throw(InvalidFormatException) -+StyleSheet::StyleSheet( OLEStreamReader* tableStream, U32 fcStshf, U32 lcbStshf ) - : m_udsNum(0) - { - WordVersion version = Word8; -diff --git a/filters/words/msword-odf/wv2/src/styles.h b/filters/words/msword-odf/wv2/src/styles.h -index ba02def6845..41c8278dd21 100644 ---- a/filters/words/msword-odf/wv2/src/styles.h -+++ b/filters/words/msword-odf/wv2/src/styles.h -@@ -58,8 +58,9 @@ struct STD - STD(); - /** - * Simply calls read(...) -+ * @throw InvalidFormatException - */ -- STD( U16 stdfSize, U16 totalSize, OLEStreamReader* stream, bool preservePos = false ) throw(InvalidFormatException); -+ STD( U16 stdfSize, U16 totalSize, OLEStreamReader* stream, bool preservePos = false ); - /** - * Attention: This struct allocates memory on the heap - */ -@@ -74,8 +75,9 @@ struct STD - * false the state of stream will be changed! - * - * @return true - success, false - failed -+ * @throw InvalidFormatException - */ -- bool read( const U16 cbStd, const U16 stdfSize, OLEStreamReader* stream, bool preservePos = false ) throw(InvalidFormatException); -+ bool read( const U16 cbStd, const U16 stdfSize, OLEStreamReader* stream, bool preservePos = false ); - - /** - * Same as reading :) -@@ -365,7 +367,10 @@ private: - class WV2_EXPORT StyleSheet - { - public: -- StyleSheet( OLEStreamReader* tableStream, U32 fcStshf, U32 lcbStshf ) throw(InvalidFormatException); -+ /** -+ * @throw InvalidFormatException -+ */ -+ StyleSheet( OLEStreamReader* tableStream, U32 fcStshf, U32 lcbStshf ); - ~StyleSheet(); - - /** -diff --git a/gemini/lib/GeminiMainWindow.cpp b/gemini/lib/GeminiMainWindow.cpp -index 3d05f6461e0..eb5f120c0f7 100644 ---- a/gemini/lib/GeminiMainWindow.cpp -+++ b/gemini/lib/GeminiMainWindow.cpp -@@ -136,8 +136,10 @@ void GeminiMainWindow::setFullScreen(bool newState) - } - - -+ - void GeminiMainWindow::changeState(GeminiMainWindow::GeminiState newState, bool lockNewState) - { -+ Q_UNUSED(lockNewState); - d->syncObject = new GeminiModeSynchronisationObject; - - if(centralWidget()) { -diff --git a/libs/pageapp/KoPAOdfPageSaveHelper.cpp b/libs/pageapp/KoPAOdfPageSaveHelper.cpp -index 92c6dfd4cb4..068501c8af1 100644 ---- a/libs/pageapp/KoPAOdfPageSaveHelper.cpp -+++ b/libs/pageapp/KoPAOdfPageSaveHelper.cpp -@@ -49,7 +49,7 @@ KoPAOdfPageSaveHelper::KoPAOdfPageSaveHelper( KoPADocument * doc, QList( page ); - masterPages.insert( p->masterPage() ); - } -- m_masterPages = masterPages.toList(); -+ m_masterPages = masterPages.values(); - } - } - -diff --git a/plugins/spacenavigator/SpaceNavigatorDevice.h b/plugins/spacenavigator/SpaceNavigatorDevice.h -index b9056ac98c1..ecd696e415f 100644 ---- a/plugins/spacenavigator/SpaceNavigatorDevice.h -+++ b/plugins/spacenavigator/SpaceNavigatorDevice.h -@@ -31,10 +31,8 @@ public: - explicit SpaceNavigatorDevice(QObject *parent); - virtual ~SpaceNavigatorDevice(); - -- /// reimplemented from KoInputDeviceHandler -- virtual bool start(); -- /// reimplemented from KoInputDeviceHandler -- virtual bool stop(); -+ virtual bool start() override; -+ virtual bool stop() override; - private Q_SLOTS: - void slotMoveEvent( int x, int y, int z, int rx, int ry, int rz, Qt::MouseButtons ); - void slotButtonEvent( int x, int y, int z, int rx, int ry, int rz, Qt::MouseButtons, Qt::MouseButton, int type ); -diff --git a/plugins/spacenavigator/SpaceNavigatorEvent.h b/plugins/spacenavigator/SpaceNavigatorEvent.h -index 73751ec88ff..76ee8e2f880 100644 ---- a/plugins/spacenavigator/SpaceNavigatorEvent.h -+++ b/plugins/spacenavigator/SpaceNavigatorEvent.h -@@ -33,7 +33,7 @@ public: - void setPosition( int x, int y, int z ); - void setRotation( int rx, int ry, int rz ); - -- virtual KoPointerEvent * pointerEvent(); -+ virtual KoPointerEvent * pointerEvent() override; - - private: - int m_x, m_y, m_z; -diff --git a/plugins/spacenavigator/SpaceNavigatorPollingThread.h b/plugins/spacenavigator/SpaceNavigatorPollingThread.h -index 62c4de8ab73..67d59177021 100644 ---- a/plugins/spacenavigator/SpaceNavigatorPollingThread.h -+++ b/plugins/spacenavigator/SpaceNavigatorPollingThread.h -@@ -39,8 +39,7 @@ Q_SIGNALS: - - protected: - -- /// reimplemented from QThread -- virtual void run(); -+ virtual void run() override; - - private: - bool m_stopped; -diff --git a/plugins/vectorshape/VectorShape.cpp b/plugins/vectorshape/VectorShape.cpp -index a25ab3fc561..9acbd251c94 100644 ---- a/plugins/vectorshape/VectorShape.cpp -+++ b/plugins/vectorshape/VectorShape.cpp -@@ -294,6 +294,7 @@ void VectorShape::saveOdf(KoShapeSavingContext & context) const - break; - case VectorTypeSvg: - mimeType = "image/svg+xml"; -+ break; - default: - // FIXME: What here? - mimeType = "application/x-what"; -diff --git a/sheets/functions/datetime.cpp b/sheets/functions/datetime.cpp -index 9f59fe2cf75..6157b0996c1 100644 ---- a/sheets/functions/datetime.cpp -+++ b/sheets/functions/datetime.cpp -@@ -597,6 +597,7 @@ Value func_currentDate(valVector, ValueCalc * calc, FuncExtra *) - // Function: CURRENTTIME - Value func_currentTime(valVector, ValueCalc * calc, FuncExtra *) - { -+ Q_UNUSED(calc); - return Value(QTime::currentTime()); - } - -diff --git a/sheets/part/Digest.cpp b/sheets/part/Digest.cpp -index 8cd972db989..e9246ce6e7d 100644 ---- a/sheets/part/Digest.cpp -+++ b/sheets/part/Digest.cpp -@@ -596,10 +596,10 @@ static void __rtl_digest_endSHA(DigestContextSHA *ctx) - } - - switch (ctx->m_nDatLen & 0x03) { -- case 0: X[i] = ((sal_uInt32)(*(p++))) << 0L; -- case 1: X[i] |= ((sal_uInt32)(*(p++))) << 8L; -- case 2: X[i] |= ((sal_uInt32)(*(p++))) << 16L; -- case 3: X[i] |= ((sal_uInt32)(*(p++))) << 24L; -+ case 0: X[i] = ((sal_uInt32)(*(p++))) << 0L; /* fall through */ -+ case 1: X[i] |= ((sal_uInt32)(*(p++))) << 8L; /* fall through */ -+ case 2: X[i] |= ((sal_uInt32)(*(p++))) << 16L; /* fall through */ -+ case 3: X[i] |= ((sal_uInt32)(*(p++))) << 24L; /* fall through */ - } - - __rtl_digest_swapLong(X, i + 1); -diff --git a/sheets/shape/TableToolFactory.h b/sheets/shape/TableToolFactory.h -index 679bfe14b8e..9412d8ffdc5 100644 ---- a/sheets/shape/TableToolFactory.h -+++ b/sheets/shape/TableToolFactory.h -@@ -34,7 +34,7 @@ public: - TableToolFactory(); - ~TableToolFactory(); - -- KoToolBase* createTool(KoCanvasBase* canvas); -+ KoToolBase* createTool(KoCanvasBase* canvas) override; - }; - - } // namespace Sheets -diff --git a/sheets/tests/TestSort.cpp b/sheets/tests/TestSort.cpp -index b3f1e35169d..6354d79abc5 100644 ---- a/sheets/tests/TestSort.cpp -+++ b/sheets/tests/TestSort.cpp -@@ -68,7 +68,7 @@ void TestSort::AscendingOrder() - command->setSheet(sheet); - - // Parameters. -- command->setSortRows(Qt::Vertical); -+ command->setSortRows(true); - command->setSkipFirst(false); - command->setCopyFormat(false); - -@@ -121,7 +121,7 @@ void TestSort::DescendingOrder() - command->setSheet(sheet); - - // Parameters. -- command->setSortRows(Qt::Vertical); -+ command->setSortRows(true); - command->setSkipFirst(false); - command->setCopyFormat(false); - --- -2.34.1 - diff --git a/calligra-3.2.1-Make-show-hidden-row-s-work.patch b/calligra-3.2.1-Make-show-hidden-row-s-work.patch deleted file mode 100644 index 6895c3d..0000000 --- a/calligra-3.2.1-Make-show-hidden-row-s-work.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 28920c50e6300d643477f256aba91c8c51836682 Mon Sep 17 00:00:00 2001 -From: Dag Andersen -Date: Thu, 11 Jun 2020 10:43:38 +0200 -Subject: [PATCH 02/54] Make show hidden row(s) work - -Check for hidden rows was inverted to check for shown rows, -hence hidden rows would never be unhidden. - -BUG:338816 -BUG:354236 -FIXED-IN:3.2.2 ---- - sheets/commands/RowColumnManipulators.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/sheets/commands/RowColumnManipulators.cpp b/sheets/commands/RowColumnManipulators.cpp -index 95282d6e31b..25e8c454e27 100644 ---- a/sheets/commands/RowColumnManipulators.cpp -+++ b/sheets/commands/RowColumnManipulators.cpp -@@ -192,7 +192,7 @@ bool HideShowManipulator::preProcessing() - } - } - for (int row = range.top(); row <= range.bottom(); ++row) { -- if (!m_sheet->rowFormats()->isHidden(row)) { -+ if (m_sheet->rowFormats()->isHidden(row)) { - region.add(QRect(1, row, KS_colMax, 1)); - } - } --- -2.31.1 - diff --git a/calligra-3.2.1-Partial-update-of-Commit-62f51070-to-make-it-compile.patch b/calligra-3.2.1-Partial-update-of-Commit-62f51070-to-make-it-compile.patch deleted file mode 100644 index 46f6dd0..0000000 --- a/calligra-3.2.1-Partial-update-of-Commit-62f51070-to-make-it-compile.patch +++ /dev/null @@ -1,86 +0,0 @@ -From c7636fb343c848000300a9429410b74d17a4d54d Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?=C3=96mer=20Fad=C4=B1l=20Usta?= -Date: Tue, 8 Jun 2021 05:13:23 +0000 -Subject: [PATCH 53/54] Partial update of Commit 62f51070 to make it - compileable again - -Cmake to 3.16 -Fix Fontconfig's FOUND variable -Fix Fontconfig's include_dirs variable -Use Correct Target to link FontConfig and Freetype ---- - CMakeLists.txt | 14 +++++--------- - libs/text/CMakeLists.txt | 4 ++-- - 2 files changed, 7 insertions(+), 11 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1ce210ebe01..71272ffef2d 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,4 +1,4 @@ --cmake_minimum_required(VERSION 2.8.12) -+cmake_minimum_required(VERSION 3.16) - - project(calligra) - -@@ -168,6 +168,8 @@ calligra_set_productset(${PRODUCTSET}) - ## Look for ECM, Qt, KF5 ## - ########################### - ########################## -+set(REQUIRED_KF5_VERSION "5.7.0") -+set(REQUIRED_QT_VERSION "5.3.0") - - find_package(ECM 5.19 REQUIRED NO_MODULE) - set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) -@@ -199,9 +201,6 @@ include(MacroOptionalFindPackage) - include(MacroEnsureVersion) - include(MacroDesktopToJson) - -- --set(REQUIRED_KF5_VERSION "5.7.0") -- - find_package(KF5 ${REQUIRED_KF5_VERSION} REQUIRED - COMPONENTS - Archive -@@ -251,9 +250,6 @@ if(${KF5_VERSION} VERSION_LESS "5.16.0") - set(CALLIGRA_OLD_PLUGIN_METADATA TRUE) - endif() - -- --set(REQUIRED_QT_VERSION "5.3.0") -- - find_package(Qt5 ${REQUIRED_QT_VERSION} REQUIRED - COMPONENTS - Core -@@ -641,8 +637,8 @@ if(NOT WIN32 AND NOT APPLE) - ) - endif() - --if(NOT FONTCONFIG_FOUND OR NOT FREETYPE_FOUND) -- set(FONTCONFIG_INCLUDE_DIR "") -+if(NOT Fontconfig_FOUND OR NOT FREETYPE_FOUND) -+ set(Fontconfig_INCLUDE_DIRS "") - set(FREETYPE_INCLUDE_DIRS "") - else() - add_definitions( -DSHOULD_BUILD_FONT_CONVERSION ) -diff --git a/libs/text/CMakeLists.txt b/libs/text/CMakeLists.txt -index 16d7e066fa2..429afe79704 100644 ---- a/libs/text/CMakeLists.txt -+++ b/libs/text/CMakeLists.txt -@@ -152,11 +152,11 @@ if( SHOULD_BUILD_FEATURE_RDF ) - endif() - - if( FONTCONFIG_FOUND ) -- target_link_libraries(kotext PRIVATE ${FONTCONFIG_LIBRARIES}) -+ target_link_libraries(kotext PRIVATE Fontconfig::Fontconfig) - endif() - - if( FREETYPE_FOUND ) -- target_link_libraries(kotext PRIVATE ${FREETYPE_LIBRARIES}) -+ target_link_libraries(kotext PRIVATE Freetype::Freetype) - endif() - - --- -2.31.1 - diff --git a/calligra-3.2.1-Repair-KFileWidget-integration.patch b/calligra-3.2.1-Repair-KFileWidget-integration.patch deleted file mode 100644 index e40480e..0000000 --- a/calligra-3.2.1-Repair-KFileWidget-integration.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 4e9bc810ae78efb52dc2e7807032e32b6134a42e Mon Sep 17 00:00:00 2001 -From: David Faure -Date: Sun, 9 Aug 2020 13:04:00 +0200 -Subject: [PATCH 19/54] Repair KFileWidget integration - -We need to do like KDEPlatformFileDialog and call slotOk, to let it -process the selected files (or the location-lineedit text). ---- - plugins/pictureshape/PictureShapeConfigWidget.cpp | 14 ++++++++++++-- - plugins/pictureshape/PictureShapeConfigWidget.h | 3 +++ - 2 files changed, 15 insertions(+), 2 deletions(-) - -diff --git a/plugins/pictureshape/PictureShapeConfigWidget.cpp b/plugins/pictureshape/PictureShapeConfigWidget.cpp -index ac26c7ba8d6..9a7f289f838 100644 ---- a/plugins/pictureshape/PictureShapeConfigWidget.cpp -+++ b/plugins/pictureshape/PictureShapeConfigWidget.cpp -@@ -98,20 +98,30 @@ void PictureShapeConfigWidget::open(KoShape *shape) - m_fileWidget->setMimeFilter(imageFilters); - layout->addWidget(m_fileWidget); - setLayout(layout); -- connect(m_fileWidget, SIGNAL(accepted()), this, SIGNAL(accept())); -+ connect(m_fileWidget, &KFileWidget::accepted, this, &PictureShapeConfigWidget::slotAccept); - } - -+// The page dialog's own accept() is called by the OK button -+// This makes exec() return, then we get here. -+// For KFileWidget, nothing happened yet. It still needs to process things in slotOk. - void PictureShapeConfigWidget::save() - { - if (!m_shape) - return; -+ m_fileWidget->slotOk(); // emits accepted, possibly async -+} -+ -+// Called by slotOk, possibly async -+void PictureShapeConfigWidget::slotAccept() -+{ - m_fileWidget->accept(); -- QUrl url = m_fileWidget->selectedUrl(); -+ const QUrl url = m_fileWidget->selectedUrl(); - if (!url.isEmpty()) { - KIO::StoredTransferJob *job = KIO::storedGet(url, KIO::NoReload, 0); - PictureShapeLoadWaiter *waiter = new PictureShapeLoadWaiter(m_shape); - connect(job, SIGNAL(result(KJob*)), waiter, SLOT(setImageData(KJob*))); - } -+ Q_EMIT accept(); - } - - bool PictureShapeConfigWidget::showOnShapeCreate() -diff --git a/plugins/pictureshape/PictureShapeConfigWidget.h b/plugins/pictureshape/PictureShapeConfigWidget.h -index 83ca0d042b0..ed051915d9b 100644 ---- a/plugins/pictureshape/PictureShapeConfigWidget.h -+++ b/plugins/pictureshape/PictureShapeConfigWidget.h -@@ -43,6 +43,9 @@ public: - /// reimplemented from KoShapeConfigWidgetBase - bool showOnShapeSelect() override; - -+private: -+ void slotAccept(); -+ - private: - PictureShape *m_shape; - KFileWidget *m_fileWidget; --- -2.31.1 - diff --git a/calligra-3.2.1-Sheets-Fix-Bug-423474-Selections-not-retained-when-s.patch b/calligra-3.2.1-Sheets-Fix-Bug-423474-Selections-not-retained-when-s.patch deleted file mode 100644 index d44db70..0000000 --- a/calligra-3.2.1-Sheets-Fix-Bug-423474-Selections-not-retained-when-s.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 4788317516dd7d63235819b2f8ee5503221d0abf Mon Sep 17 00:00:00 2001 -From: Dag Andersen -Date: Thu, 25 Jun 2020 10:09:29 +0200 -Subject: [PATCH 09/54] Sheets: Fix Bug 423474 - Selections not retained when - switching between sheets - -BUG: 423474 ---- - sheets/part/View.cpp | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/sheets/part/View.cpp b/sheets/part/View.cpp -index 02e43b81b48..8c3d76af78a 100644 ---- a/sheets/part/View.cpp -+++ b/sheets/part/View.cpp -@@ -1266,7 +1266,8 @@ void View::setActiveSheet(Sheet* sheet, bool updateSheet) - d->selection->clear(); - d->selection->setActiveSheet(d->activeSheet); - d->selection->setOriginSheet(d->activeSheet); -- d->selection->initialize(QRect(newMarker, newAnchor)); -+ d->selection->initialize(newAnchor); -+ d->selection->update(newMarker); - - d->actions->showPageOutline->blockSignals(true); - d->actions->showPageOutline->setChecked(d->activeSheet->isShowPageOutline()); --- -2.31.1 - diff --git a/calligra-3.2.1-c++17.patch b/calligra-3.2.1-c++17.patch deleted file mode 100644 index 610958e..0000000 --- a/calligra-3.2.1-c++17.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- calligra-3.2.1/CMakeLists.txt -+++ calligra-3.2.1/CMakeLists.txt -@@ -108,7 +108,7 @@ message(STATUS "Release build: ${RELEASE - if (CMAKE_VERSION VERSION_LESS "3.1") - set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") - else () -- set (CMAKE_CXX_STANDARD 11) -+ set (CMAKE_CXX_STANDARD 17) - endif () - - ############ diff --git a/calligra-3.2.1-gcc11.patch b/calligra-3.2.1-gcc11.patch deleted file mode 100644 index c478958..0000000 --- a/calligra-3.2.1-gcc11.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff --git a/filters/sheets/excel/sidewinder/chartsubstreamhandler.cpp b/filters/sheets/excel/sidewinder/chartsubstreamhandler.cpp -index feac1c6..5739328 100644 ---- a/filters/sheets/excel/sidewinder/chartsubstreamhandler.cpp -+++ b/filters/sheets/excel/sidewinder/chartsubstreamhandler.cpp -@@ -19,6 +19,7 @@ - Boston, MA 02110-1301, USA - */ - -+#include - #include "chartsubstreamhandler.h" - #include "globalssubstreamhandler.h" - #include "worksheetsubstreamhandler.h" -diff --git a/filters/sheets/excel/sidewinder/objects.cpp b/filters/sheets/excel/sidewinder/objects.cpp -index 7531dd7..6cbca37 100644 ---- a/filters/sheets/excel/sidewinder/objects.cpp -+++ b/filters/sheets/excel/sidewinder/objects.cpp -@@ -17,6 +17,7 @@ - Boston, MA 02110-1301, USA - */ - -+#include - #include "objects.h" - - #include "generated/simpleParser.h" -diff --git a/filters/sheets/excel/sidewinder/utils.h b/filters/sheets/excel/sidewinder/utils.h -index 6e012b2..61d7624 100644 ---- a/filters/sheets/excel/sidewinder/utils.h -+++ b/filters/sheets/excel/sidewinder/utils.h -@@ -23,6 +23,7 @@ - - #include "value.h" - #include -+#include - - #include - #include -diff --git a/filters/sheets/excel/sidewinder/value.cpp b/filters/sheets/excel/sidewinder/value.cpp -index bfa3351..3007058 100644 ---- a/filters/sheets/excel/sidewinder/value.cpp -+++ b/filters/sheets/excel/sidewinder/value.cpp -@@ -17,6 +17,7 @@ - * Boston, MA 02110-1301, USA - */ - -+#include - #include "value.h" - #include "utils.h" - diff --git a/calligra-3.2.1-kundo2_aware_xgettext.sh-fix-a-gawk-warning.patch b/calligra-3.2.1-kundo2_aware_xgettext.sh-fix-a-gawk-warning.patch deleted file mode 100644 index c26a9d8..0000000 --- a/calligra-3.2.1-kundo2_aware_xgettext.sh-fix-a-gawk-warning.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 54ac021920c8975d3fa6fc6ad145627a85f87a9b Mon Sep 17 00:00:00 2001 -From: Luigi Toscano -Date: Sun, 21 Mar 2021 23:44:08 +0100 -Subject: [PATCH 37/54] kundo2_aware_xgettext.sh: fix a gawk warning - -The following warning is reported by gawk >= 5 but it really affects -also the previous versions: - -warning: regexp escape sequence `\"' is not a known regexp operator -(cherry picked from commit 15b70303e2b433e6fbb10e90924d7dbd801cf960) ---- - kundo2_aware_xgettext.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/kundo2_aware_xgettext.sh b/kundo2_aware_xgettext.sh -index b5921d93e2c..0249b68b03d 100644 ---- a/kundo2_aware_xgettext.sh -+++ b/kundo2_aware_xgettext.sh -@@ -38,7 +38,7 @@ function add_ctxt_qtundo() { - mv "${POT_PART_QUNDOFORMAT}" "${POT_PART_QUNDOFORMAT2}" - cat "${POT_PART_QUNDOFORMAT2}" | awk ' - /^msgid "/ { -- if (lastLine !~ /^\"/ && lastLine !~ /^msgctxt/ && lastLine != "#, fuzzy") { -+ if (lastLine !~ /^"/ && lastLine !~ /^msgctxt/ && lastLine != "#, fuzzy") { - print "msgctxt \"(qtundo-format)\"" - } - } --- -2.31.1 - diff --git a/calligra-3.2.1-poppler-22.08.0-1.patch b/calligra-3.2.1-poppler-22.08.0-1.patch deleted file mode 100644 index ff5539d..0000000 --- a/calligra-3.2.1-poppler-22.08.0-1.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 236bacbe13739414e919de868283b0caf2df5d8a Mon Sep 17 00:00:00 2001 -From: Albert Astals Cid -Date: Wed, 13 Apr 2022 01:25:44 +0200 -Subject: PdfImport: Fix compile with newer poppler - -Brings a dependency on poppler-qt5 to be able to include the version -header, honestly it's not strictly needed, one could do a -check_cxx_source_compiles, but I don't care about Calligra enough to -spend more time making it compile while it's using poppler the wrong -way. - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 51f1d65b8e6..06bbad5c24c 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -952,6 +952,7 @@ calligra_drop_product_on_bad_condition( FILTER_WPG_TO_ODG - calligra_drop_product_on_bad_condition( FILTER_PDF_TO_SVG - NOT_WIN "not supported on Windows" - PopplerXPDFHeaders_FOUND "poppler xpdf headers not found" -+ Poppler_FOUND "poppler qt5 headers not found" - ) - - calligra_drop_product_on_bad_condition( FILTER_HTML_TO_ODS -diff --git a/filters/karbon/pdf/CMakeLists.txt b/filters/karbon/pdf/CMakeLists.txt -index 8fddf1ad757..b71c92cbf04 100644 ---- a/filters/karbon/pdf/CMakeLists.txt -+++ b/filters/karbon/pdf/CMakeLists.txt -@@ -3,7 +3,7 @@ set(pdf2svg_PART_SRCS PdfImportDebug.cpp PdfImport.cpp SvgOutputDev.cpp ) - add_library(calligra_filter_pdf2svg MODULE ${pdf2svg_PART_SRCS}) - calligra_filter_desktop_to_json(calligra_filter_pdf2svg calligra_filter_pdf2svg.desktop) - --target_link_libraries(calligra_filter_pdf2svg komain Poppler::Core) -+target_link_libraries(calligra_filter_pdf2svg komain Poppler::Core Poppler::Qt5) - - install(TARGETS calligra_filter_pdf2svg DESTINATION ${PLUGIN_INSTALL_DIR}/calligra/formatfilters) - -diff --git a/filters/karbon/pdf/PdfImport.cpp b/filters/karbon/pdf/PdfImport.cpp -index abbe681b4e8..e97974fc133 100644 ---- a/filters/karbon/pdf/PdfImport.cpp -+++ b/filters/karbon/pdf/PdfImport.cpp -@@ -17,6 +17,10 @@ - - #include - -+#include -+ -+#define POPPLER_VERSION_MACRO ((POPPLER_VERSION_MAJOR << 16) | (POPPLER_VERSION_MINOR << 8) | (POPPLER_VERSION_MICRO)) -+ - // Don't show this warning: it's an issue in poppler - #ifdef __GNUC__ - #pragma GCC diagnostic ignored "-Wunused-parameter" -@@ -54,8 +58,13 @@ KoFilter::ConversionStatus PdfImport::convert(const QByteArray& from, const QByt - if (! globalParams) - return KoFilter::NotImplemented; - -+#if POPPLER_VERSION_MACRO < QT_VERSION_CHECK(22, 03, 0) - GooString * fname = new GooString(QFile::encodeName(m_chain->inputFile()).data()); - PDFDoc * pdfDoc = new PDFDoc(fname, 0, 0, 0); -+#else -+ std::unique_ptr fname = std::make_unique(QFile::encodeName(m_chain->inputFile()).data()); -+ PDFDoc * pdfDoc = new PDFDoc(std::move(fname)); -+#endif - if (! pdfDoc) { - #ifdef HAVE_POPPLER_PRE_0_83 - delete globalParams; diff --git a/calligra-3.2.1-poppler-22.08.0-2.patch b/calligra-3.2.1-poppler-22.08.0-2.patch deleted file mode 100644 index d6f5b20..0000000 --- a/calligra-3.2.1-poppler-22.08.0-2.patch +++ /dev/null @@ -1,86 +0,0 @@ -From 6b75bec784c9835c78993349845d8c2ef22ec3de Mon Sep 17 00:00:00 2001 -From: Dag Andersen -Date: Wed, 13 Apr 2022 14:45:33 +0200 -Subject: PdfImport: Fix compile with newer poppler - -Also fixes odg2pdf filter. - -Same solution as commit 236bacbe13739414e919de868283b0caf2df5d8a -by accid@kde.org. - -diff --git a/filters/karbon/pdf/CMakeLists.txt b/filters/karbon/pdf/CMakeLists.txt -index b71c92cbf04..4ce138ccdd6 100644 ---- a/filters/karbon/pdf/CMakeLists.txt -+++ b/filters/karbon/pdf/CMakeLists.txt -@@ -13,6 +13,6 @@ set(pdf2odg_PART_SRCS PdfImportDebug.cpp Pdf2OdgImport.cpp SvgOutputDev.cpp) - add_library(calligra_filter_pdf2odg MODULE ${pdf2odg_PART_SRCS}) - calligra_filter_desktop_to_json(calligra_filter_pdf2odg calligra_filter_pdf2odg.desktop) - --target_link_libraries(calligra_filter_pdf2odg kopageapp karbonui Poppler::Core) -+target_link_libraries(calligra_filter_pdf2odg kopageapp karbonui Poppler::Core Poppler::Qt5) - - install(TARGETS calligra_filter_pdf2odg DESTINATION ${PLUGIN_INSTALL_DIR}/calligra/formatfilters) -diff --git a/filters/karbon/pdf/Pdf2OdgImport.cpp b/filters/karbon/pdf/Pdf2OdgImport.cpp -index 934e31dd5aa..a21eac97a77 100644 ---- a/filters/karbon/pdf/Pdf2OdgImport.cpp -+++ b/filters/karbon/pdf/Pdf2OdgImport.cpp -@@ -27,6 +27,8 @@ - - #include - -+#include -+ - // Don't show this warning: it's an issue in poppler - #ifdef __GNUC__ - #pragma GCC diagnostic ignored "-Wunused-parameter" -@@ -36,6 +38,8 @@ - #include - #include - -+#define POPPLER_VERSION_MACRO ((POPPLER_VERSION_MAJOR << 16) | (POPPLER_VERSION_MINOR << 8) | (POPPLER_VERSION_MICRO)) -+ - K_PLUGIN_FACTORY_WITH_JSON(Pdf2OdgImportFactory, "calligra_filter_pdf2odg.json", - registerPlugin();) - -@@ -69,8 +73,13 @@ KoFilter::ConversionStatus Pdf2OdgImport::convert(const QByteArray& from, const - if (! globalParams) - return KoFilter::NotImplemented; - -+#if POPPLER_VERSION_MACRO < QT_VERSION_CHECK(22, 03, 0) - GooString * fname = new GooString(QFile::encodeName(m_chain->inputFile()).data()); - PDFDoc * pdfDoc = new PDFDoc(fname, 0, 0, 0); -+#else -+ std::unique_ptr fname = std::make_unique(QFile::encodeName(m_chain->inputFile()).data()); -+ PDFDoc * pdfDoc = new PDFDoc(std::move(fname)); -+#endif - if (! pdfDoc) { - #ifdef HAVE_POPPLER_PRE_0_83 - delete globalParams; -diff --git a/filters/karbon/pdf/SvgOutputDev.cpp b/filters/karbon/pdf/SvgOutputDev.cpp -index 0e6e5a934ca..7caec15175a 100644 ---- a/filters/karbon/pdf/SvgOutputDev.cpp -+++ b/filters/karbon/pdf/SvgOutputDev.cpp -@@ -22,6 +22,10 @@ - #include - #include - -+#include -+ -+#define POPPLER_VERSION_MACRO ((POPPLER_VERSION_MAJOR << 16) | (POPPLER_VERSION_MINOR << 8) | (POPPLER_VERSION_MICRO)) -+ - class SvgOutputDev::Private - { - public: -@@ -386,7 +390,12 @@ void SvgOutputDev::drawString(GfxState * state, const GooString * s) - if (s->getLength() == 0) - return; - -+#if POPPLER_VERSION_MACRO < QT_VERSION_CHECK(22, 03, 0) - GfxFont * font = state->getFont(); -+#else -+ std::shared_ptr font = state->getFont(); -+#endif -+ - - QString str; - diff --git a/calligra.spec b/calligra.spec index 4a14771..0343e9a 100644 --- a/calligra.spec +++ b/calligra.spec @@ -1,6 +1,6 @@ Name: calligra -Version: 3.2.1 -Release: 6mamba +Version: 4.0.1 +Release: 1mamba Epoch: 1 Summary: An integrated office suite built on the KDE platform (formerly known as koffice) Group: Graphical Desktop/Applications/Office @@ -8,103 +8,74 @@ Vendor: openmamba Distribution: openmamba Packager: Silvan Calarco URL: https://calligra.org/ -Source: http://ct.mirror.garr.it/mirrors/KDE/stable/calligra/%{version}/calligra-%{version}.tar.xz +Source: https://download.kde.org/stable/calligra/calligra-%{version}.tar.xz Source1: calligra-autoupdate #Source2: calligra-l10n-%{version}-langpacks.tar.xz -Patch0: calligra-3.1.0-libqt5-5.12.1.patch -Patch1: calligra-3.2.1-Fix-some-more-warnings.patch -Patch2: calligra-3.2.1-Make-show-hidden-row-s-work.patch -Patch3: calligra-3.2.1-Fix-Bug-423038-Annotation-shape-crashes-on-paste.patch -Patch4: calligra-3.2.1-Fix-comparison-between-QString-and-0.patch -Patch5: calligra-3.2.1-Sheets-Fix-Bug-423474-Selections-not-retained-when-s.patch -Patch6: calligra-3.2.1-ChartTool-KoFormulaTool-Guard-against-crash-if-activ.patch -Patch7: calligra-3.2.1-Fix-assert-with-invalid-.local-share-autocorrect-cus.patch -Patch8: calligra-3.2.1-Repair-KFileWidget-integration.patch -Patch9: calligra-3.2.1-Fix-inserting-a-large-JPEG-image-into-a-presentation.patch -Patch10: calligra-3.2.1-gcc11.patch -Patch11: calligra-3.2.1-Partial-update-of-Commit-62f51070-to-make-it-compile.patch -Patch12: calligra-3.2.1-kundo2_aware_xgettext.sh-fix-a-gawk-warning.patch -Patch13: calligra-3.2.1-poppler-22.08.0-1.patch -Patch14: calligra-3.2.1-poppler-22.08.0-2.patch -Patch15: calligra-3.2.1-c++17.patch License: GPL, LGPL ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel -BuildRequires: libICE-devel -BuildRequires: libQt5Svg-devel -BuildRequires: libQt5X11Extras-devel -BuildRequires: libSM-devel BuildRequires: libX11-devel -BuildRequires: libXext-devel BuildRequires: libetonyek-devel BuildRequires: libfontconfig-devel BuildRequires: libfreetype-devel BuildRequires: libgcc -BuildRequires: libgit2-devel +BuildRequires: libglvnd-devel BuildRequires: libgsl-devel -BuildRequires: libkactivities-devel -BuildRequires: libkarchive-devel -BuildRequires: libkauth-devel -BuildRequires: libkbookmarks-devel -BuildRequires: libkcmutils-devel -BuildRequires: libkcodecs-devel -BuildRequires: libkcompletion-devel -BuildRequires: libkconfig-devel -BuildRequires: libkconfigwidgets-devel -BuildRequires: libkcoreaddons-devel -BuildRequires: libkcrash-devel -BuildRequires: libkdbusaddons-devel -BuildRequires: libkdelibs4support-devel -BuildRequires: libkdiagram2-devel -BuildRequires: libkguiaddons-devel -BuildRequires: libkhtml-devel -BuildRequires: libki18n-devel -BuildRequires: libkiconthemes-devel -BuildRequires: libkio-devel -BuildRequires: libkitemviews-devel -BuildRequires: libkjobwidgets-devel -BuildRequires: libkjs-devel -BuildRequires: libknotifications-devel -BuildRequires: libknotifyconfig-devel -BuildRequires: libkparts-devel -BuildRequires: libkservice-devel -BuildRequires: libktextwidgets-devel -BuildRequires: libkunitconversion-devel -BuildRequires: libkwallet-devel -BuildRequires: libkwidgetsaddons-devel -BuildRequires: libkwindowsystem-devel -BuildRequires: libkxmlgui-devel -BuildRequires: liblcms2-devel +BuildRequires: libimath-devel +BuildRequires: libkdiagram-devel +BuildRequires: libkf6-karchive-devel +BuildRequires: libkf6-kbookmarks-devel +BuildRequires: libkf6-kcmutils-devel +BuildRequires: libkf6-kcolorscheme-devel +BuildRequires: libkf6-kcompletion-devel +BuildRequires: libkf6-kconfig-devel +BuildRequires: libkf6-kconfigwidgets-devel +BuildRequires: libkf6-kcoreaddons-devel +BuildRequires: libkf6-kcrash-devel +BuildRequires: libkf6-kdbusaddons-devel +BuildRequires: libkf6-kguiaddons-devel +BuildRequires: libkf6-ki18n-devel +BuildRequires: libkf6-kiconthemes-devel +BuildRequires: libkf6-kio-devel +BuildRequires: libkf6-kitemviews-devel +BuildRequires: libkf6-kjobwidgets-devel +BuildRequires: libkf6-knotifications-devel +BuildRequires: libkf6-knotifyconfig-devel +BuildRequires: libkf6-kservice-devel +BuildRequires: libkf6-ktextwidgets-devel +BuildRequires: libkf6-kwidgetsaddons-devel +BuildRequires: libkf6-kwindowsystem-devel +BuildRequires: libkf6-kxmlgui-devel +BuildRequires: libkf6-solid-devel +BuildRequires: libkf6-sonnet-devel BuildRequires: libodfgen-devel BuildRequires: libokular-devel -BuildRequires: libphonon-devel +BuildRequires: libopenssl-devel +BuildRequires: libphonon-qt6-devel BuildRequires: libpoppler-devel -BuildRequires: libpoppler-qt5-devel -BuildRequires: libqca-qt5-devel +BuildRequires: libpoppler-qt6-devel +BuildRequires: libqtkeychain-qt6-devel BuildRequires: librevenge-devel -BuildRequires: libsolid-devel -BuildRequires: libsonnet-devel -BuildRequires: libspnav-devel BuildRequires: libstdc++6-devel BuildRequires: libvisio-devel BuildRequires: libwpd-devel BuildRequires: libwpg-devel BuildRequires: libwps-devel BuildRequires: libz-devel -BuildRequires: qt5-qtbase-devel -BuildRequires: qt5-qtdeclarative-devel +BuildRequires: qt6-qtbase-devel +BuildRequires: qt6-qtdeclarative-devel +BuildRequires: qt6-qtpositioning-devel +BuildRequires: qt6-qtsvg-devel +BuildRequires: qt6-qtwebchannel-devel +BuildRequires: qt6-qtwebengine-devel ## AUTOBUILDREQ-END -BuildRequires: libpoppler-devel >= 24.02.0-1mamba -BuildRequires: libokular-devel >= 23.08.0-1mamba -BuildRequires: libgit2-devel >= 1.1.0-1mamba -BuildRequires: libwps-devel >= 0.4.0-1mamba -BuildRequires: libxbase-devel >= 2.1.1 BuildRequires: cmake -BuildRequires: pstoedit BuildRequires: libeigen2-devel -BuildRequires: llvm +BuildRequires: libgit2-devel >= 1.1.0-1mamba BuildRequires: libopenexr-devel >= 2.1.0 BuildRequires: libmarble-devel >= 4.14.0 +BuildRequires: llvm +BuildRequires: pstoedit BuildConflicts: libwpd08-devel Provides: calligra-active Obsoletes: calligra-active < 1:3.2.1-4mamba @@ -282,95 +253,48 @@ This package provides the run-time library used by most of the Calligra componen %setup -q #-D -T #:<< _EOF -#%patch0 -p1 -%patch 1 -p1 -b .Fix-some-more-warnings -%patch 2 -p1 -b .Make-show-hidden-row-s-work -%patch 3 -p1 -b .Fix-Bug-423038-Annotation-shape-crashes-on-paste -%patch 4 -p1 -b .Fix-comparison-between-QString-and-0 -%patch 5 -p1 -b .Sheets-Fix-Bug-423474-Selections-not-retained-when-s -%patch 6 -p1 -b .ChartTool-KoFormulaTool-Guard-against-crash-if-activ -%patch 7 -p1 -b .Fix-assert-with-invalid-.local-share-autocorrect-cus -%patch 8 -p1 -b .Repair-KFileWidget-integration -%patch 9 -p1 -b .Fix-inserting-a-large-JPEG-image-into-a-presentation -%patch 10 -p1 -b .gcc11 -%patch 11 -p1 -b .Partial-update-of-Commit-62f51070-to-make-it-compile -%patch 12 -p1 -b .kundo2_aware_xgettext.sh-fix-a-gawk-warning -%patch 13 -p1 -b .poppler-22.08.0-1 -%patch 14 -p1 -b .poppler-22.08.0-2 -%patch 15 -p1 -b .c++17 %build #:<< _EOF -%cmake_kde5 -d build \ +%cmake_kf6 \ -Wno-dev \ - -DEIGEN3_INCLUDE_DIR=%{_includedir}/eigen32 + -DPRODUCTSET=DESKTOP \ + -DBUILD_TESTING=OFF -%make +%cmake_build %install [ "%{buildroot}" != / ] && rm -rf %{buildroot} -%makeinstall -C build +%cmake_install -%find_lang %{name}5_qt --with-qt --with-man --with-html --all-name || touch %{name}5_qt.lang +%find_lang %{name} --with-qt --with-man --with-html --all-name || touch %{name}.lang %clean [ "%{buildroot}" != / ] && rm -rf %{buildroot} -%post -n libcalligra -p /sbin/ldconfig -%postun -n libcalligra -p /sbin/ldconfig - -%files -f %{name}5_qt.lang +%files -f %{name}.lang %defattr(-,root,root) -%{_sysconfdir}/xdg/calligra_stencils.knsrc %{_sysconfdir}/xdg/calligrasheetsrc %{_sysconfdir}/xdg/calligrastagerc %{_sysconfdir}/xdg/calligrawordsrc %{_sysconfdir}/xdg/karbonrc -%{_bindir}/calligra +%{_bindir}/braindump +%{_bindir}/calligralauncher %{_bindir}/calligraconverter %{_bindir}/calligrastage -%{_bindir}/cstester -%{_bindir}/cstrunner -%{_bindir}/calligragemini -%{_bindir}/calligrageminithumbnailhelper %{_bindir}/calligrasheets %{_bindir}/calligrawords %{_bindir}/karbon -%{_bindir}/visualimagecompare -%dir %{_libdir}/qt5/qml/Calligra/Gemini -%{_libdir}/qt5/qml/Calligra/Gemini/* -%dir %{_libdir}/qt5/qml/org/kde/calligra -%{_libdir}/qt5/qml/org/kde/calligra/* %{_datadir}/applications/okularApplication_*.desktop %{_datadir}/applications/calligra.desktop -%{_datadir}/applications/org.kde.calligragemini.desktop -%{_datadir}/applications/org.kde.calligrasheets.desktop -%{_datadir}/applications/org.kde.calligrastage.desktop -%{_datadir}/applications/org.kde.calligrawords.desktop +%{_datadir}/applications/org.kde.calligra*.desktop %{_datadir}/applications/org.kde.calligrawords_ascii.desktop -%{_datadir}/applications/org.kde.karbon.desktop -%{_datadir}/metainfo/org.kde.calligragemini.appdata.xml -%{_datadir}/metainfo/org.kde.calligrasheets.appdata.xml -%{_datadir}/metainfo/org.kde.calligrastage.appdata.xml -%{_datadir}/metainfo/org.kde.calligrawords.appdata.xml -%{_datadir}/metainfo/org.kde.karbon.appdata.xml +%{_metainfodir}/org.kde.calligra*.metainfo.xml %{_datadir}/config.kcfg/calligrasheets.kcfg -%{_datadir}/icons/hicolor/scalable/apps/calligra*.svg* -%{_datadir}/icons/hicolor/scalable/actions/office-chart-stock*.svg +%{_datadir}/kio/servicemenus/*_print.desktop +%{_datadir}/kxmlgui5/braindump/braindump*.rc %dir %{_datadir}/karbon %{_datadir}/karbon/* -%{_datadir}/kservices5/ServiceMenus/calligra/karbon_print.desktop -%{_datadir}/kservices5/ServiceMenus/calligra/sheets_print.desktop -%{_datadir}/kservices5/ServiceMenus/calligra/words_print.desktop -%{_datadir}/kservices5/ServiceMenus/calligra/stage_print.desktop -%{_datadir}/kservices5/calligra_odg_thumbnail.desktop -%{_datadir}/kservices5/calligradocinfopropspage.desktop -%{_datadir}/kservices5/flow_*.desktop -%{_datadir}/kservices5/karbon_*.desktop -%{_datadir}/kservices5/okular*.desktop -%{_datadir}/kservices5/sheets_*.desktop -%{_datadir}/kservices5/stage_*.desktop -%{_datadir}/kservices5/words_*.desktop %dir %{_datadir}/kxmlgui5/calligrasheets %{_datadir}/kxmlgui5/calligrasheets/* %dir %{_datadir}/kxmlgui5/calligrastage @@ -400,64 +324,42 @@ This package provides the run-time library used by most of the Calligra componen %{_datadir}/calligra/stencils/* %dir %{_datadir}/calligra/thesaurus %{_datadir}/calligra/thesaurus/* -%dir %{_datadir}/calligragemini -%{_datadir}/calligragemini/* +%dir %{_datadir}/calligra_shape_state +%{_datadir}/calligra_shape_state/* %dir %{_datadir}/calligrasheets %{_datadir}/calligrasheets/* %dir %{_datadir}/calligrastage %{_datadir}/calligrastage/* %dir %{_datadir}/calligrawords %{_datadir}/calligrawords/* -%dir %{_datadir}/color/icc/calligra -%{_datadir}/color/icc/calligra/* -%{_datadir}/icons/hicolor/*/apps/calligragemini.png -%{_datadir}/icons/hicolor/*/apps/calligrakarbon.png -%{_datadir}/icons/hicolor/*/apps/calligrasheets.png -%{_datadir}/icons/hicolor/*/apps/calligrastage.png -%{_datadir}/icons/hicolor/*/apps/calligrawords.png +%{_datadir}/icons/hicolor/*/apps/braindump.png +%{_datadir}/icons/hicolor/*/apps/calligra*.png +%{_datadir}/icons/hicolor/scalable/apps/calligra*.svg* +%{_datadir}/icons/hicolor/scalable/actions/office-chart-stock*.svg +%{_datadir}/icons/hicolor/scalable/apps/braindump.svgz +%{_datadir}/icons/hicolor/scalable/apps/org.kde.calligra.*.svg +%doc COPYING LICENSES %files -n libcalligra %defattr(-,root,root) -%{_libdir}/lib*.so.* -%dir %{_qt5_plugindir}/calligra -%dir %{_libdir}/qt5/plugins/calligra/colorspaces -%{_libdir}/qt5/plugins/calligra/colorspaces/* -#%dir %{_libdir}/qt5/plugins/calligra/deferred -#%{_libdir}/qt5/plugins/calligra/deferred/* -%dir %{_libdir}/qt5/plugins/calligra/devices -%{_libdir}/qt5/plugins/calligra/devices/* -%dir %{_libdir}/qt5/plugins/calligra/dockers -%{_libdir}/qt5/plugins/calligra/dockers/* -%dir %{_libdir}/qt5/plugins/calligra/formatfilters -%{_libdir}/qt5/plugins/calligra/formatfilters/* -%dir %{_libdir}/qt5/plugins/calligra/pageapptools -%{_libdir}/qt5/plugins/calligra/pageapptools/* -%dir %{_libdir}/qt5/plugins/calligra/parts -%{_libdir}/qt5/plugins/calligra/parts/* -%dir %{_libdir}/qt5/plugins/calligra/presentationeventactions -%{_libdir}/qt5/plugins/calligra/presentationeventactions/* -%dir %{_libdir}/qt5/plugins/calligra/shapefiltereffects -%{_libdir}/qt5/plugins/calligra/shapefiltereffects/* -%dir %{_libdir}/qt5/plugins/calligra/shapes -%{_libdir}/qt5/plugins/calligra/shapes/* -%dir %{_libdir}/qt5/plugins/calligra/textediting -%{_libdir}/qt5/plugins/calligra/textediting/* -%dir %{_libdir}/qt5/plugins/calligra/textinlineobjects -%{_libdir}/qt5/plugins/calligra/textinlineobjects/* -%dir %{_libdir}/qt5/plugins/calligra/tools -%{_libdir}/qt5/plugins/calligra/tools/* -%{_libdir}/qt5/plugins/*.so -%dir %{_libdir}/qt5/plugins/calligrasheets -%{_libdir}/qt5/plugins/calligrasheets/* -%dir %{_libdir}/qt5/plugins/calligrastage -%{_libdir}/qt5/plugins/calligrastage/* -%dir %{_libdir}/qt5/plugins/karbon -%{_libdir}/qt5/plugins/karbon/* -%dir %{_libdir}/qt5/plugins/okular -%{_libdir}/qt5/plugins/okular/* -%{_libdir}/lib*.so +%{_libdir}/lib*.so* +%dir %{_qt6_plugindir}/calligra +%{_qt6_plugindir}/calligra/* +%dir %{_qt6_plugindir}/calligrasheets +%{_qt6_plugindir}/calligrasheets/* +%dir %{_qt6_plugindir}/calligrastage +%{_qt6_plugindir}/calligrastage/* +%{_qt6_plugindir}/karbon/extensions/karbon_*.so +%{_kf6_plugindir}/propertiesdialog/calligradocinfopropspage.so +%{_kf6_plugindir}/thumbcreator/calligraimagethumbnail.so +%{_kf6_plugindir}/thumbcreator/calligrathumbnail.so +%{_qt6_plugindir}/okular_generators/okularGenerator_*_calligra.so +%doc COPYING.LIB %changelog +* Tue Sep 03 2024 Silvan Calarco 4.0.1-1mamba +- update to 4.0.1 + * Sun Feb 25 2024 Automatic Build System 3.2.1-6mamba - rebuilt by autoport with build requirements: libpoppler-devel>=24.02.0-1mamba