From f66bb46430da821158ded9004b9e96d0313b947b Mon Sep 17 00:00:00 2001 From: Alexander Golubev Date: Tue, 7 Jul 2026 20:48:22 +0300 Subject: trinity-base/kcontrol: fix build against media-libs/fontconfig-2.18+ #2 Closes: https://mirror.git.trinitydesktop.org/gitea/TDE/tde-packaging-gentoo/issues/514 Signed-off-by: Alexander Golubev --- ...6-fix-compilation-against-fontconfig-2.18.patch | 39 +++++++++++++++++++--- 1 file changed, 35 insertions(+), 4 deletions(-) diff --git a/trinity-base/kcontrol/files/kcontrol-14.1.6-fix-compilation-against-fontconfig-2.18.patch b/trinity-base/kcontrol/files/kcontrol-14.1.6-fix-compilation-against-fontconfig-2.18.patch index 9ba9b97f..85b2deb8 100644 --- a/trinity-base/kcontrol/files/kcontrol-14.1.6-fix-compilation-against-fontconfig-2.18.patch +++ b/trinity-base/kcontrol/files/kcontrol-14.1.6-fix-compilation-against-fontconfig-2.18.patch @@ -1,4 +1,4 @@ -From 07649e69d5b19c5bc9601a702ccfe945f70310f8 Mon Sep 17 00:00:00 2001 +From 7f9659ea3ac02cc46df154e40f8f818d7941ad0a Mon Sep 17 00:00:00 2001 From: Alexander Golubev Date: Mon, 6 Jul 2026 02:46:01 +0300 Subject: [PATCH] kcontrol: fix compilation against fontconfig-2.18 @@ -9,13 +9,32 @@ doc[1] we should include both headers anyway. [1]: https://www.freedesktop.org/software/fontconfig/fontconfig-devel/fcfreetypequery.html +This patch is a squash of: + 07649e69d # kcontrol: fix compilation against fontconfig-2.18 + c5442702d # kcontrol: fix compilation against fontconfig-2.18 #2 + Bug: https://mirror.git.trinitydesktop.org/gitea/TDE/tde-packaging-gentoo/issues/512 +Bug: https://mirror.git.trinitydesktop.org/gitea/TDE/tde-packaging-gentoo/issues/514 Signed-off-by: Alexander Golubev --- - kcontrol/tdefontinst/lib/FcEngine.cpp | 2 ++ - kcontrol/tdefontinst/tdeio/KioFonts.cpp | 1 + - 2 files changed, 3 insertions(+) + kcontrol/tdefontinst/lib/CMakeLists.txt | 1 + + kcontrol/tdefontinst/lib/FcEngine.cpp | 2 ++ + kcontrol/tdefontinst/tdeio/CMakeLists.txt | 1 + + kcontrol/tdefontinst/tdeio/KioFonts.cpp | 1 + + 4 files changed, 5 insertions(+) +diff --git a/kcontrol/tdefontinst/lib/CMakeLists.txt b/kcontrol/tdefontinst/lib/CMakeLists.txt +index 1076cb03c..fdd982198 100644 +--- a/kcontrol/tdefontinst/lib/CMakeLists.txt ++++ b/kcontrol/tdefontinst/lib/CMakeLists.txt +@@ -14,6 +14,7 @@ include_directories( + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} + ${FREETYPE_INCLUDE_DIRS} ++ ${FONTCONFIG_INCLUDE_DIRS} + ) + + link_directories( diff --git a/kcontrol/tdefontinst/lib/FcEngine.cpp b/kcontrol/tdefontinst/lib/FcEngine.cpp index 987a44174..a95eba5d8 100644 --- a/kcontrol/tdefontinst/lib/FcEngine.cpp @@ -29,6 +48,18 @@ index 987a44174..a95eba5d8 100644 #include "FcEngine.h" #include "KfiConstants.h" #ifdef HAVE_XFT +diff --git a/kcontrol/tdefontinst/tdeio/CMakeLists.txt b/kcontrol/tdefontinst/tdeio/CMakeLists.txt +index becd8c15a..5cb00988e 100644 +--- a/kcontrol/tdefontinst/tdeio/CMakeLists.txt ++++ b/kcontrol/tdefontinst/tdeio/CMakeLists.txt +@@ -16,6 +16,7 @@ include_directories( + ${CMAKE_SOURCE_DIR}/kcontrol/fonts + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} ++ ${FONTCONFIG_INCLUDE_DIRS} + ) + + link_directories( diff --git a/kcontrol/tdefontinst/tdeio/KioFonts.cpp b/kcontrol/tdefontinst/tdeio/KioFonts.cpp index 753e412cd..c66578851 100644 --- a/kcontrol/tdefontinst/tdeio/KioFonts.cpp -- cgit v1.2.3