[neon/extras/calligra/Neon/release] debian: fix build with newer CMake

[Pino Toscano]

Git commit 93aa606a24952543a48da76772b677d6b4c53a9b by Pino Toscano.
Committed on 26/09/2021 at 06:22.
Pushed by jriddell into branch 'Neon/release'.

fix build with newer CMake

backport upstream commit c7636fb343c848000300a9429410b74d17a4d54d;
bump cmake B-D

M  +4    -0    debian/changelog
M  +1    -1    debian/control
A  +1    -0    debian/patches/series
A  +86   -0    debian/patches/upstream_Partial-update-of-Commit-62f51070-to-make-it-compile.patch

https://invent.kde.org/neon/extras/calligra/commit/93aa606a24952543a48da76772b677d6b4c53a9b

diff --git a/debian/changelog b/debian/changelog
index 3c0e2cd..071fee2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,10 @@ calligra (1:3.2.1+dfsg-3) UNRELEASED; urgency=medium
   * Remove the explicit as-needed linking, as it is done by binutils now.
   * Use execute_after_dh_auto_install to avoid invoking dh_auto_install
     manually.
+  * Backport upstream commit c7636fb343c848000300a9429410b74d17a4d54d to fix
+    build with newer CMake; patch
+    upstream_Partial-update-of-Commit-62f51070-to-make-it-compile.patch
+    - bump the cmake build dependency to 3.16 accordingly
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 21 Aug 2021 17:45:15 +0200
 
diff --git a/debian/control b/debian/control
index 43f3c29..a166b68 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Adrien Grellier <perso at adrieng.fr>,
            Raúl Sánchez Siles <rasasi78 at gmail.com>,
            Maximiliano Curia <maxy at debian.org>
-Build-Depends: cmake,
+Build-Depends: cmake (>= 3.16~),
                debhelper-compat (= 12),
                extra-cmake-modules (>= 5.19.0),
                gettext,
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..557bfb2
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+upstream_Partial-update-of-Commit-62f51070-to-make-it-compile.patch
diff --git a/debian/patches/upstream_Partial-update-of-Commit-62f51070-to-make-it-compile.patch b/debian/patches/upstream_Partial-update-of-Commit-62f51070-to-make-it-compile.patch
new file mode 100644
index 0000000..3715f31
--- /dev/null
+++ b/debian/patches/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?= <omerusta at gmail.com>
+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
+