CMakeLists.txt | 14 5 + 9 - 0 !
libs/text/CMakeLists.txt | 4 2 + 2 - 0 !
2 files changed, 7 insertions(+), 11 deletions(-)

 [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

filters/libmsooxml/MsooXmlDiagramReader_p.cpp | 1 1 + 0 - 0 !
filters/sheets/csv/csvimport.cc | 2 1 + 1 - 0 !
filters/sheets/excel/sidewinder/excel.cpp | 1 1 + 0 - 0 !
filters/sheets/excel/sidewinder/formulas.cpp | 2 1 + 1 - 0 !
filters/sheets/gnumeric/gnumericexport.cc | 5 2 + 3 - 0 !
filters/sheets/html/htmlexport.cc | 2 0 + 2 - 0 !
filters/sheets/latex/export/latexexport.cc | 1 0 + 1 - 0 !
filters/sheets/latex/export/table.cc | 1 1 + 0 - 0 !
filters/sheets/xlsx/XlsxXmlWorksheetReader.cpp | 1 0 + 1 - 0 !
filters/stage/pptx/PptxXmlDocumentReader.cpp | 2 1 + 1 - 0 !
filters/words/msword-odf/texthandler.cpp | 2 2 + 0 - 0 !
filters/words/msword-odf/wv2/src/parser9x.cpp | 4 3 + 1 - 0 !
filters/words/msword-odf/wv2/src/styles.cpp | 4 1 + 3 - 0 !
filters/words/msword-odf/wv2/src/styles.h | 11 8 + 3 - 0 !
gemini/lib/GeminiMainWindow.cpp | 2 2 + 0 - 0 !
libs/pageapp/KoPAOdfPageSaveHelper.cpp | 2 1 + 1 - 0 !
plugins/spacenavigator/SpaceNavigatorDevice.h | 6 2 + 4 - 0 !
plugins/spacenavigator/SpaceNavigatorEvent.h | 2 1 + 1 - 0 !
plugins/spacenavigator/SpaceNavigatorPollingThread.h | 3 1 + 2 - 0 !
plugins/vectorshape/VectorShape.cpp | 1 1 + 0 - 0 !
sheets/functions/datetime.cpp | 1 1 + 0 - 0 !
sheets/part/Digest.cpp | 8 4 + 4 - 0 !
sheets/shape/TableToolFactory.h | 2 1 + 1 - 0 !
sheets/tests/TestSort.cpp | 4 2 + 2 - 0 !
24 files changed, 38 insertions(+), 32 deletions(-)

 [patch] fix some more warnings

CMakeLists.txt | 21 1 + 20 - 0 !
cmake/modules/MacroCalligraAddBenchmark.cmake | 2 1 + 1 - 0 !
filters/words/msword-odf/wv2/CMakeLists.txt | 7 1 + 6 - 0 !
filters/words/msword-odf/wv2/src/generator/CMakeLists.txt | 7 1 + 6 - 0 !
filters/words/rtf/import/3rdparty/rtf-qt/CMakeLists.txt | 7 1 + 6 - 0 !
5 files changed, 5 insertions(+), 39 deletions(-)

 [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 | 3 0 + 3 - 0 !
1 file changed, 3 deletions(-)

 [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 | 8 0 + 8 - 0 !
1 file changed, 8 deletions(-)

 [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 | 4 4 + 0 - 0 !
1 file changed, 4 insertions(+)

 [patch] fix compile with newer versions of poppler

CMakeLists.txt | 2 1 + 1 - 0 !
filters/karbon/pdf/CMakeLists.txt | 16 0 + 16 - 0 !
filters/karbon/pdf/Pdf2OdgImport.cpp | 19 0 + 19 - 0 !
filters/karbon/pdf/PdfImport.cpp | 21 0 + 21 - 0 !
filters/karbon/pdf/SvgOutputDev.cpp | 40 1 + 39 - 0 !
filters/karbon/pdf/SvgOutputDev.h | 14 0 + 14 - 0 !
6 files changed, 2 insertions(+), 110 deletions(-)

 [patch] raise minimum poppler version to 0.83.0, cleaning up ifdefs

Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

CMakeLists.txt | 1 1 + 0 - 0 !
filters/karbon/pdf/CMakeLists.txt | 2 1 + 1 - 0 !
filters/karbon/pdf/PdfImport.cpp | 9 9 + 0 - 0 !
3 files changed, 11 insertions(+), 1 deletion(-)

 [patch] 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.

filters/karbon/pdf/CMakeLists.txt | 2 1 + 1 - 0 !
filters/karbon/pdf/Pdf2OdgImport.cpp | 9 9 + 0 - 0 !
filters/karbon/pdf/SvgOutputDev.cpp | 9 9 + 0 - 0 !
3 files changed, 19 insertions(+), 1 deletion(-)

 [patch] pdfimport: fix compile with newer poppler

Also fixes odg2pdf filter.

Same solution as commit 236bacbe13739414e919de868283b0caf2df5d8a
by accid@kde.org.

filters/karbon/pdf/SvgOutputDev.cpp | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 [patch] svgoutputdev: fix ifdef version for getfont api change