From d887d95d31ec0141a83144ef07f78983e84cefb7 Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Mon, 2 May 2022 20:02:49 +0000 Subject: Mon May 2 20:02:49 UTC 2022 a/hwdata-0.359-noarch-1.txz: Upgraded. a/kernel-firmware-20220502_c3624eb-noarch-1.txz: Upgraded. ap/htop-3.2.0-x86_64-1.txz: Upgraded. d/gdb-12.1-x86_64-1.txz: Upgraded. kde/calligra-3.2.1-x86_64-17.txz: Rebuilt. Recompiled against poppler-22.04.0. kde/cantor-22.04.0-x86_64-2.txz: Rebuilt. Recompiled against poppler-22.04.0. kde/kfilemetadata-5.93.0-x86_64-2.txz: Rebuilt. Recompiled against poppler-22.04.0. kde/kile-2.9.93-x86_64-16.txz: Rebuilt. Recompiled against poppler-22.04.0. kde/kitinerary-22.04.0-x86_64-2.txz: Rebuilt. Recompiled against poppler-22.04.0. kde/krita-5.0.6-x86_64-3.txz: Rebuilt. Recompiled against poppler-22.04.0. kde/okular-22.04.0-x86_64-2.txz: Rebuilt. Recompiled against poppler-22.04.0. l/fuse3-3.11.0-x86_64-1.txz: Upgraded. l/libxml2-2.9.14-x86_64-1.txz: Upgraded. This update fixes bugs and the following security issues: Fix integer overflow in xmlBuf and xmlBuffer. Fix potential double-free in xmlXPtrStringRangeFunction. Fix memory leak in xmlFindCharEncodingHandler. Normalize XPath strings in-place. Prevent integer-overflow in htmlSkipBlankChars() and xmlSkipBlankChars(). Fix leak of xmlElementContent. For more information, see: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-29824 (* Security fix *) l/poppler-22.04.0-x86_64-1.txz: Upgraded. Shared library .so-version bump. n/samba-4.16.1-x86_64-1.txz: Upgraded. This is a bugfix release. For more information, see: https://www.samba.org/samba/history/samba-4.16.1.html xap/mozilla-firefox-100.0-x86_64-1.txz: Upgraded. This is a bugfix release. For more information, see: https://www.mozilla.org/en-US/firefox/100.0/releasenotes/ --- source/kde/kde/build/calligra | 2 +- source/kde/kde/build/cantor | 2 +- source/kde/kde/build/kfilemetadata | 2 +- source/kde/kde/build/kile | 2 +- source/kde/kde/build/kitinerary | 2 +- source/kde/kde/build/krita | 2 +- source/kde/kde/build/okular | 2 +- source/kde/kde/cmake/calligra | 8 +- source/kde/kde/patch/calligra.patch | 13 +- ...ate-of-Commit-62f51070-to-make-it-compile.patch | 86 ---- source/kde/kde/patch/calligra/calligra-gcc11.patch | 48 --- .../patch/calligra/calligra.poppler.GfxFont.patch | 11 + .../kde/kde/patch/calligra/poppler-22.03.0.patch | 46 +++ ...ix-compile-with-newer-versions-of-poppler.patch | 22 + .../calligra/upstream_Fix-some-more-warnings.patch | 443 +++++++++++++++++++++ ...ate-of-Commit-62f51070-to-make-it-compile.patch | 86 ++++ ...stream_Remove-old-std-c-11-setting-for-Vc.patch | 32 ++ .../upstream_Small-CMake-modernization.patch | 128 ++++++ ...e-and-deps-Fix-Freetype-and-FontConfig-Li.patch | 38 ++ source/n/samba/samba.SlackBuild | 2 +- source/n/samba/samba.url | 4 +- 21 files changed, 829 insertions(+), 152 deletions(-) delete mode 100644 source/kde/kde/patch/calligra/0053-Partial-update-of-Commit-62f51070-to-make-it-compile.patch delete mode 100644 source/kde/kde/patch/calligra/calligra-gcc11.patch create mode 100644 source/kde/kde/patch/calligra/calligra.poppler.GfxFont.patch create mode 100644 source/kde/kde/patch/calligra/poppler-22.03.0.patch create mode 100644 source/kde/kde/patch/calligra/upstream_Fix-compile-with-newer-versions-of-poppler.patch create mode 100644 source/kde/kde/patch/calligra/upstream_Fix-some-more-warnings.patch create mode 100644 source/kde/kde/patch/calligra/upstream_Partial-update-of-Commit-62f51070-to-make-it-compile.patch create mode 100644 source/kde/kde/patch/calligra/upstream_Remove-old-std-c-11-setting-for-Vc.patch create mode 100644 source/kde/kde/patch/calligra/upstream_Small-CMake-modernization.patch create mode 100644 source/kde/kde/patch/calligra/upstream_Update-Cmake-and-deps-Fix-Freetype-and-FontConfig-Li.patch (limited to 'source') diff --git a/source/kde/kde/build/calligra b/source/kde/kde/build/calligra index b6a7d89c6..98d9bcb75 100644 --- a/source/kde/kde/build/calligra +++ b/source/kde/kde/build/calligra @@ -1 +1 @@ -16 +17 diff --git a/source/kde/kde/build/cantor b/source/kde/kde/build/cantor index d00491fd7..0cfbf0888 100644 --- a/source/kde/kde/build/cantor +++ b/source/kde/kde/build/cantor @@ -1 +1 @@ -1 +2 diff --git a/source/kde/kde/build/kfilemetadata b/source/kde/kde/build/kfilemetadata index d00491fd7..0cfbf0888 100644 --- a/source/kde/kde/build/kfilemetadata +++ b/source/kde/kde/build/kfilemetadata @@ -1 +1 @@ -1 +2 diff --git a/source/kde/kde/build/kile b/source/kde/kde/build/kile index 60d3b2f4a..b6a7d89c6 100644 --- a/source/kde/kde/build/kile +++ b/source/kde/kde/build/kile @@ -1 +1 @@ -15 +16 diff --git a/source/kde/kde/build/kitinerary b/source/kde/kde/build/kitinerary index d00491fd7..0cfbf0888 100644 --- a/source/kde/kde/build/kitinerary +++ b/source/kde/kde/build/kitinerary @@ -1 +1 @@ -1 +2 diff --git a/source/kde/kde/build/krita b/source/kde/kde/build/krita index 0cfbf0888..00750edc0 100644 --- a/source/kde/kde/build/krita +++ b/source/kde/kde/build/krita @@ -1 +1 @@ -2 +3 diff --git a/source/kde/kde/build/okular b/source/kde/kde/build/okular index d00491fd7..0cfbf0888 100644 --- a/source/kde/kde/build/okular +++ b/source/kde/kde/build/okular @@ -1 +1 @@ -1 +2 diff --git a/source/kde/kde/cmake/calligra b/source/kde/kde/cmake/calligra index 87a381ca3..64b6f9ddd 100644 --- a/source/kde/kde/cmake/calligra +++ b/source/kde/kde/cmake/calligra @@ -3,10 +3,10 @@ cd cmake-build cmake \ $KDE_OPT_ARGS \ -DKDE_PLATFORM_FEATURE_DISABLE_DEPRECATED=TRUE \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS -Wno-deprecated -Wno-deprecated-declarations" \ + -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS -Wno-deprecated -Wno-deprecated-declarations" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -Wno-deprecated -Wno-deprecated-declarations" \ + -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS -Wno-deprecated -Wno-deprecated-declarations" \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ -DMAN_INSTALL_DIR=/usr/man \ diff --git a/source/kde/kde/patch/calligra.patch b/source/kde/kde/patch/calligra.patch index fb91a8179..a5a9d2047 100644 --- a/source/kde/kde/patch/calligra.patch +++ b/source/kde/kde/patch/calligra.patch @@ -1,5 +1,10 @@ -# Fix blank page in calligragemini cat $CWD/patch/calligra/calligragemini_fix_blank_page_without_libgit2.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } -cat $CWD/patch/calligra/0053-Partial-update-of-Commit-62f51070-to-make-it-compile.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } -cat $CWD/patch/calligra/calligra-gcc11.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } -cat $CWD/patch/calligra-openexr3.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } +cat $CWD/patch/calligra/calligra-openexr3.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } +cat $CWD/patch/calligra/poppler-22.03.0.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } +cat $CWD/patch/calligra/calligra.poppler.GfxFont.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } +cat $CWD/patch/calligra/upstream_Partial-update-of-Commit-62f51070-to-make-it-compile.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } +cat $CWD/patch/calligra/upstream_Fix-some-more-warnings.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } +cat $CWD/patch/calligra/upstream_Small-CMake-modernization.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } +cat $CWD/patch/calligra/upstream_Update-Cmake-and-deps-Fix-Freetype-and-FontConfig-Li.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } +cat $CWD/patch/calligra/upstream_Remove-old-std-c-11-setting-for-Vc.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } +cat $CWD/patch/calligra/upstream_Fix-compile-with-newer-versions-of-poppler.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } diff --git a/source/kde/kde/patch/calligra/0053-Partial-update-of-Commit-62f51070-to-make-it-compile.patch b/source/kde/kde/patch/calligra/0053-Partial-update-of-Commit-62f51070-to-make-it-compile.patch deleted file mode 100644 index 46f6dd044..000000000 --- a/source/kde/kde/patch/calligra/0053-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/source/kde/kde/patch/calligra/calligra-gcc11.patch b/source/kde/kde/patch/calligra/calligra-gcc11.patch deleted file mode 100644 index c47895822..000000000 --- a/source/kde/kde/patch/calligra/calligra-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/source/kde/kde/patch/calligra/calligra.poppler.GfxFont.patch b/source/kde/kde/patch/calligra/calligra.poppler.GfxFont.patch new file mode 100644 index 000000000..071f6f6c8 --- /dev/null +++ b/source/kde/kde/patch/calligra/calligra.poppler.GfxFont.patch @@ -0,0 +1,11 @@ +--- ./filters/karbon/pdf/SvgOutputDev.cpp.orig 2020-05-14 01:51:30.000000000 -0500 ++++ ./filters/karbon/pdf/SvgOutputDev.cpp 2022-05-02 01:24:57.902177123 -0500 +@@ -410,7 +410,7 @@ + if (s->getLength() == 0) + return; + +- GfxFont * font = state->getFont(); ++ std::shared_ptr font = state->getFont(); + + QString str; + diff --git a/source/kde/kde/patch/calligra/poppler-22.03.0.patch b/source/kde/kde/patch/calligra/poppler-22.03.0.patch new file mode 100644 index 000000000..a20747df5 --- /dev/null +++ b/source/kde/kde/patch/calligra/poppler-22.03.0.patch @@ -0,0 +1,46 @@ +diff -uprw calligra-3.2.1.orig/filters/karbon/pdf/CMakeLists.txt calligra-3.2.1/filters/karbon/pdf/CMakeLists.txt +--- calligra-3.2.1.orig/filters/karbon/pdf/CMakeLists.txt 2020-05-14 09:51:30.000000000 +0300 ++++ calligra-3.2.1/filters/karbon/pdf/CMakeLists.txt 2022-03-02 12:19:08.039939530 +0200 +@@ -14,6 +14,10 @@ if(Poppler_VERSION VERSION_LESS "0.83.0" + add_definitions("-DHAVE_POPPLER_PRE_0_83") + endif() + ++if(Poppler_VERSION VERSION_LESS "22.3.0") ++ add_definitions("-DHAVE_POPPLER_PRE_22_3") ++endif() ++ + set(pdf2svg_PART_SRCS PdfImportDebug.cpp PdfImport.cpp SvgOutputDev.cpp ) + + add_library(calligra_filter_pdf2svg MODULE ${pdf2svg_PART_SRCS}) +diff -uprw calligra-3.2.1.orig/filters/karbon/pdf/Pdf2OdgImport.cpp calligra-3.2.1/filters/karbon/pdf/Pdf2OdgImport.cpp +--- calligra-3.2.1.orig/filters/karbon/pdf/Pdf2OdgImport.cpp 2020-05-14 09:51:30.000000000 +0300 ++++ calligra-3.2.1/filters/karbon/pdf/Pdf2OdgImport.cpp 2022-03-02 12:20:35.125605950 +0200 +@@ -86,8 +86,12 @@ KoFilter::ConversionStatus Pdf2OdgImport + if (! globalParams) + return KoFilter::NotImplemented; + ++#ifdef HAVE_POPPLER_PRE_22_3 + GooString * fname = new GooString(QFile::encodeName(m_chain->inputFile()).data()); + PDFDoc * pdfDoc = new PDFDoc(fname, 0, 0, 0); ++#else ++ PDFDoc * pdfDoc = new PDFDoc(std::make_unique(QFile::encodeName(m_chain->inputFile()).data())); ++#endif + if (! pdfDoc) { + #ifdef HAVE_POPPLER_PRE_0_83 + delete globalParams; +diff -uprw calligra-3.2.1.orig/filters/karbon/pdf/PdfImport.cpp calligra-3.2.1/filters/karbon/pdf/PdfImport.cpp +--- calligra-3.2.1.orig/filters/karbon/pdf/PdfImport.cpp 2020-05-14 09:51:30.000000000 +0300 ++++ calligra-3.2.1/filters/karbon/pdf/PdfImport.cpp 2022-03-02 12:21:46.197510028 +0200 +@@ -73,8 +73,12 @@ KoFilter::ConversionStatus PdfImport::co + if (! globalParams) + return KoFilter::NotImplemented; + ++#ifdef HAVE_POPPLER_PRE_22_3 + GooString * fname = new GooString(QFile::encodeName(m_chain->inputFile()).data()); + PDFDoc * pdfDoc = new PDFDoc(fname, 0, 0, 0); ++#else ++ PDFDoc * pdfDoc = new PDFDoc(std::make_unique(QFile::encodeName(m_chain->inputFile()).data())); ++#endif + if (! pdfDoc) { + #ifdef HAVE_POPPLER_PRE_0_83 + delete globalParams; diff --git a/source/kde/kde/patch/calligra/upstream_Fix-compile-with-newer-versions-of-poppler.patch b/source/kde/kde/patch/calligra/upstream_Fix-compile-with-newer-versions-of-poppler.patch new file mode 100644 index 000000000..7074bfcd1 --- /dev/null +++ b/source/kde/kde/patch/calligra/upstream_Fix-compile-with-newer-versions-of-poppler.patch @@ -0,0 +1,22 @@ +From 2f220c6d1418ce7fa509e0dc598a67e66908cbd3 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?=C3=96mer=20Fad=C4=B1l=20Usta?= +Date: Fri, 25 Feb 2022 15:52:31 +0000 +Subject: [PATCH] Fix compile with newer versions of poppler + +--- + CMakeLists.txt | 4 ++++ + 1 file changed, 4 insertions(+) + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -149,6 +149,10 @@ calligra_set_productset(${PRODUCTSET}) + set(REQUIRED_KF5_VERSION "5.7.0") + set(REQUIRED_QT_VERSION "5.3.0") + ++set(CMAKE_CXX_STANDARD 17) ++set(CMAKE_CXX_STANDARD_REQUIRED ON) ++set(CMAKE_CXX_EXTENSIONS OFF) ++ + find_package(ECM 5.19 REQUIRED NO_MODULE) + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) + diff --git a/source/kde/kde/patch/calligra/upstream_Fix-some-more-warnings.patch b/source/kde/kde/patch/calligra/upstream_Fix-some-more-warnings.patch new file mode 100644 index 000000000..0b878b3bd --- /dev/null +++ b/source/kde/kde/patch/calligra/upstream_Fix-some-more-warnings.patch @@ -0,0 +1,443 @@ +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.35.1 + diff --git a/source/kde/kde/patch/calligra/upstream_Partial-update-of-Commit-62f51070-to-make-it-compile.patch b/source/kde/kde/patch/calligra/upstream_Partial-update-of-Commit-62f51070-to-make-it-compile.patch new file mode 100644 index 000000000..3715f3108 --- /dev/null +++ b/source/kde/kde/patch/calligra/upstream_Partial-update-of-Commit-62f51070-to-make-it-compile.patch @@ -0,0 +1,86 @@ +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] 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.33.0 + diff --git a/source/kde/kde/patch/calligra/upstream_Remove-old-std-c-11-setting-for-Vc.patch b/source/kde/kde/patch/calligra/upstream_Remove-old-std-c-11-setting-for-Vc.patch new file mode 100644 index 000000000..3ab8279c3 --- /dev/null +++ b/source/kde/kde/patch/calligra/upstream_Remove-old-std-c-11-setting-for-Vc.patch @@ -0,0 +1,32 @@ +From 19584bed9588860047e3bd04e3fd2cf7e36adc3a Mon Sep 17 00:00:00 2001 +From: Antonio Rojas +Date: Sat, 8 Jan 2022 11:28:37 +0000 +Subject: [PATCH] Remove old -std=c++11 setting for Vc + +This is set by ECM nowadays, and causes issues when a newer standard is needed (eg. for latest poppler) +--- + CMakeLists.txt | 8 -------- + 1 file changed, 8 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3a86ec88f7d..9e87b9bda89 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -520,14 +520,6 @@ if (BUILD_VC) + set(ADDITIONAL_VC_FLAGS "-Wabi -fabi-version=0 -ffp-contract=fast -fPIC") + endif() + +- #Handle Vc master +- if(Vc_COMPILER_IS_GCC OR Vc_COMPILER_IS_CLANG) +- AddCompilerFlag("-std=c++11" _ok) +- if(NOT _ok) +- AddCompilerFlag("-std=c++0x" _ok) +- endif() +- endif() +- + macro(ko_compile_for_all_implementations_no_scalar _objs _src) + if(PACKAGERS_BUILD) + vc_compile_for_all_implementations(${_objs} ${_src} FLAGS ${ADDITIONAL_VC_FLAGS} ONLY SSE2 SSSE3 SSE4_1 AVX AVX2+FMA+BMI2) +-- +2.35.1 + diff --git a/source/kde/kde/patch/calligra/upstream_Small-CMake-modernization.patch b/source/kde/kde/patch/calligra/upstream_Small-CMake-modernization.patch new file mode 100644 index 000000000..c309a99d6 --- /dev/null +++ b/source/kde/kde/patch/calligra/upstream_Small-CMake-modernization.patch @@ -0,0 +1,128 @@ +From 2ac46db52c6ad401f67ae5b5fcd859a5872f0311 Mon Sep 17 00:00:00 2001 +From: Pierre Ducroquet +Date: Sat, 1 May 2021 15:08:57 +0200 +Subject: [PATCH] Small CMake modernization + +Since we are now on CMake 3.2+, we can simplify policies. +And in order to simplify further, remove our use of +deprecated features in CMake. +--- + CMakeLists.txt | 21 +------------------ + cmake/modules/MacroCalligraAddBenchmark.cmake | 2 +- + filters/words/msword-odf/wv2/CMakeLists.txt | 7 +------ + .../wv2/src/generator/CMakeLists.txt | 7 +------ + .../rtf/import/3rdparty/rtf-qt/CMakeLists.txt | 7 +------ + 5 files changed, 5 insertions(+), 39 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index fe6502493ed..b237f68fcb6 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -4,24 +4,9 @@ project(calligra) + + message(STATUS "Using CMake version: ${CMAKE_VERSION}") + +-if (POLICY CMP0002) +- cmake_policy(SET CMP0002 OLD) +-endif() +-if (POLICY CMP0017) +- cmake_policy(SET CMP0017 NEW) +-endif () + if (POLICY CMP0022) + cmake_policy(SET CMP0022 OLD) + endif () +-if (POLICY CMP0026) +- cmake_policy(SET CMP0026 OLD) +-endif() +-if (POLICY CMP0046) +- cmake_policy(SET CMP0046 OLD) +-endif () +-if (POLICY CMP0059) +- cmake_policy(SET CMP0059 OLD) +-endif() + if (POLICY CMP0063) + cmake_policy(SET CMP0063 NEW) + endif() +@@ -105,11 +90,7 @@ endif() + message(STATUS "Release build: ${RELEASE_BUILD}") + + # use CPP-11 +-if (CMAKE_VERSION VERSION_LESS "3.1") +- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") +-else () +- set (CMAKE_CXX_STANDARD 11) +-endif () ++set (CMAKE_CXX_STANDARD 11) + + ############ + ############# +diff --git a/cmake/modules/MacroCalligraAddBenchmark.cmake b/cmake/modules/MacroCalligraAddBenchmark.cmake +index bfd1e1dc938..ad428a8459d 100644 +--- a/cmake/modules/MacroCalligraAddBenchmark.cmake ++++ b/cmake/modules/MacroCalligraAddBenchmark.cmake +@@ -41,7 +41,7 @@ macro (CALLIGRA_ADD_BENCHMARK _test_NAME) + endif() + endforeach(_filename) + +- get_target_property( loc ${_test_NAME} LOCATION ) ++ set(loc $) + if(WIN32) + if(MSVC_IDE) + string(REGEX REPLACE "\\$\\(.*\\)" "\${CTEST_CONFIGURATION_TYPE}" loc "${loc}") +diff --git a/filters/words/msword-odf/wv2/CMakeLists.txt b/filters/words/msword-odf/wv2/CMakeLists.txt +index 6f9cddfe018..421c20b60f1 100644 +--- a/filters/words/msword-odf/wv2/CMakeLists.txt ++++ b/filters/words/msword-odf/wv2/CMakeLists.txt +@@ -1,12 +1,7 @@ +-cmake_minimum_required(VERSION 2.8.0) ++cmake_minimum_required(VERSION 3.2) + + add_definitions(-DUNICODE -D_UNICODE) + +-#cmake_policy CMP0017 was introduced in version 2.8.4 +-if(${CMAKE_VERSION} VERSION_GREATER 2.8.3) +- cmake_policy(SET CMP0017 NEW) +-endif() +- + # wv2 versioning + set( WV2_MAJOR_VERSION 0 ) + set( WV2_MINOR_VERSION 9 ) +diff --git a/filters/words/msword-odf/wv2/src/generator/CMakeLists.txt b/filters/words/msword-odf/wv2/src/generator/CMakeLists.txt +index 7d5086a0ebd..10d1c022e9e 100644 +--- a/filters/words/msword-odf/wv2/src/generator/CMakeLists.txt ++++ b/filters/words/msword-odf/wv2/src/generator/CMakeLists.txt +@@ -1,10 +1,5 @@ + # Generate parsers for some Word structures. +-cmake_minimum_required(VERSION 2.8.0) +- +-#cmake_policy CMP0017 was introduced in version 2.8.4 +-if(${CMAKE_VERSION} VERSION_GREATER 2.8.3) +- cmake_policy(SET CMP0017 NEW) +-endif() ++cmake_minimum_required(VERSION 3.2.0) + + set( scanner_word95 + ${CMAKE_CURRENT_BINARY_DIR}/word95_generated.h +diff --git a/filters/words/rtf/import/3rdparty/rtf-qt/CMakeLists.txt b/filters/words/rtf/import/3rdparty/rtf-qt/CMakeLists.txt +index 41e932d5869..cbd6ad9a83e 100644 +--- a/filters/words/rtf/import/3rdparty/rtf-qt/CMakeLists.txt ++++ b/filters/words/rtf/import/3rdparty/rtf-qt/CMakeLists.txt +@@ -1,14 +1,9 @@ + project( RtfReader ) + +-cmake_minimum_required(VERSION 2.8.12) ++cmake_minimum_required(VERSION 3.2) + + include(GenerateExportHeader) + +-#cmake_policy CMP0017 was introduced in version 2.8.4 +-if(${CMAKE_VERSION} VERSION_GREATER 2.8.3) +- cmake_policy(SET CMP0017 NEW) +-endif() +- + find_package(Qt5 5.2.0 REQUIRED Gui) + + add_subdirectory( src ) +-- +2.35.1 + diff --git a/source/kde/kde/patch/calligra/upstream_Update-Cmake-and-deps-Fix-Freetype-and-FontConfig-Li.patch b/source/kde/kde/patch/calligra/upstream_Update-Cmake-and-deps-Fix-Freetype-and-FontConfig-Li.patch new file mode 100644 index 000000000..5f2718875 --- /dev/null +++ b/source/kde/kde/patch/calligra/upstream_Update-Cmake-and-deps-Fix-Freetype-and-FontConfig-Li.patch @@ -0,0 +1,38 @@ +From 62f510702ef9c34ac50f8d8601a4290ab558464c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?=C3=96mer=20Fad=C4=B1l=20Usta?= +Date: Sun, 6 Jun 2021 08:41:05 +0000 +Subject: [PATCH] Update Cmake and deps, Fix Freetype and FontConfig Linkage + +Cmake to 3.16 +KF to 5.76 +QT to 5.12 +ECM follow KF's version +Update CALLIGRA_YEAR to 2021 +Fix Fontconfig's FOUND variable +Fix Fontconfig's include_dirs variable +Use Correct Target to link FontConfig and Freetype +--- + CMakeLists.txt | 20 +++++++------------- + libs/text/CMakeLists.txt | 4 ++-- + 2 files changed, 9 insertions(+), 15 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b237f68fcb6..cdcc02f0236 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -89,9 +89,6 @@ if(NOT DEFINED RELEASE_BUILD) + endif() + message(STATUS "Release build: ${RELEASE_BUILD}") + +-# use CPP-11 +-set (CMAKE_CXX_STANDARD 11) +- + ############ + ############# + ## Options ## + endif() + + +-- +2.35.1 + diff --git a/source/n/samba/samba.SlackBuild b/source/n/samba/samba.SlackBuild index 71b6212d2..0761cb69d 100755 --- a/source/n/samba/samba.SlackBuild +++ b/source/n/samba/samba.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=samba VERSION=${VERSION:-$(echo samba-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} if [ -e $CWD/machine.conf ]; then . $CWD/machine.conf ] diff --git a/source/n/samba/samba.url b/source/n/samba/samba.url index dcb87a7c9..b6242fc57 100644 --- a/source/n/samba/samba.url +++ b/source/n/samba/samba.url @@ -1,2 +1,2 @@ -https://download.samba.org/pub/samba/stable/samba-4.16.0.tar.gz -https://download.samba.org/pub/samba/stable/samba-4.16.0.tar.asc +https://download.samba.org/pub/samba/stable/samba-4.16.1.tar.gz +https://download.samba.org/pub/samba/stable/samba-4.16.1.tar.asc -- cgit v1.2.3