diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2022-05-02 20:02:49 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2022-05-03 06:59:59 +0200 |
commit | d887d95d31ec0141a83144ef07f78983e84cefb7 (patch) | |
tree | ad86fe4adcadc71b170a9f3ec3fd7efa958c99a0 /source/kde/kde/patch/calligra/upstream_Partial-update-of-Commit-62f51070-to-make-it-compile.patch | |
parent | fad84f0c7eabe4dcb52f921090b9a8dc258ad175 (diff) | |
download | current-d887d95d31ec0141a83144ef07f78983e84cefb7.tar.gz current-d887d95d31ec0141a83144ef07f78983e84cefb7.tar.xz |
Mon May 2 20:02:49 UTC 202220220502200249
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/
Diffstat (limited to 'source/kde/kde/patch/calligra/upstream_Partial-update-of-Commit-62f51070-to-make-it-compile.patch')
-rw-r--r-- | source/kde/kde/patch/calligra/upstream_Partial-update-of-Commit-62f51070-to-make-it-compile.patch | 86 |
1 files changed, 86 insertions, 0 deletions
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?= <omerusta@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 + |