Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package calligra for openSUSE:Factory checked in at 2021-06-13 23:06:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/calligra (Old) and /work/SRC/openSUSE:Factory/.calligra.new.32437 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "calligra" Sun Jun 13 23:06:15 2021 rev:79 rq:899819 version:3.2.1 Changes: -------- --- /work/SRC/openSUSE:Factory/calligra/calligra.changes 2021-06-01 10:34:56.224555147 +0200 +++ /work/SRC/openSUSE:Factory/.calligra.new.32437/calligra.changes 2021-06-13 23:06:44.739733938 +0200 @@ -1,0 +2,6 @@ +Sun Jun 13 14:21:18 UTC 2021 - Wolfgang Bauer <[email protected]> + +- Add Fix-Freetype-and-FontConfig-Linkage.patch to fix build with + KDE Frameworks 5.83 + +------------------------------------------------------------------- New: ---- Fix-Freetype-and-FontConfig-Linkage.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ calligra.spec ++++++ --- /var/tmp/diff_new_pack.KQPNga/_old 2021-06-13 23:06:45.291734936 +0200 +++ /var/tmp/diff_new_pack.KQPNga/_new 2021-06-13 23:06:45.295734943 +0200 @@ -28,6 +28,8 @@ Group: Productivity/Office/Suite URL: https://www.calligra.org/ Source0: https://download.kde.org/stable/%{name}/%{version}/%{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM +Patch0: Fix-Freetype-and-FontConfig-Linkage.patch BuildRequires: OpenEXR-devel BuildRequires: extra-cmake-modules BuildRequires: fdupes ++++++ Fix-Freetype-and-FontConfig-Linkage.patch ++++++ >From c7636fb343c848000300a9429410b74d17a4d54d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=96mer=20Fad=C4=B1l=20Usta?= <[email protected]> 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() -- GitLab
