From eabd3598acecbac73f5f12bd73708f0bcfff0481 Mon Sep 17 00:00:00 2001
From: Alexander Golubev <fatzer2@gmail.com>
Date: Mon, 6 Jul 2026 05:45:10 +0300
Subject: trinity-base/kcontrol: fix build against media-libs/fontconfig-2.18+

Closes: https://mirror.git.trinitydesktop.org/gitea/TDE/tde-packaging-gentoo/issues/512
Signed-off-by: Alexander Golubev <fatzer2@gmail.com>
---
 ...6-fix-compilation-against-fontconfig-2.18.patch | 46 ++++++++++++++++++++++
 trinity-base/kcontrol/kcontrol-14.1.5.ebuild       |  1 +
 trinity-base/kcontrol/kcontrol-14.1.6.ebuild       |  1 +
 3 files changed, 48 insertions(+)
 create mode 100644 trinity-base/kcontrol/files/kcontrol-14.1.6-fix-compilation-against-fontconfig-2.18.patch

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
new file mode 100644
index 00000000..9ba9b97f
--- /dev/null
+++ b/trinity-base/kcontrol/files/kcontrol-14.1.6-fix-compilation-against-fontconfig-2.18.patch
@@ -0,0 +1,46 @@
+From 07649e69d5b19c5bc9601a702ccfe945f70310f8 Mon Sep 17 00:00:00 2001
+From: Alexander Golubev <fatzer2@gmail.com>
+Date: Mon, 6 Jul 2026 02:46:01 +0300
+Subject: [PATCH] kcontrol: fix compilation against fontconfig-2.18
+
+Upstream moved definitions of FcFreeTypeQuery and probably some other
+functions form `fontconfig.h` to `fcfreetype.h`. But according to the
+doc[1] we should include both headers anyway.
+
+[1]: https://www.freedesktop.org/software/fontconfig/fontconfig-devel/fcfreetypequery.html
+
+Bug: https://mirror.git.trinitydesktop.org/gitea/TDE/tde-packaging-gentoo/issues/512
+Signed-off-by: Alexander Golubev <fatzer2@gmail.com>
+---
+ kcontrol/tdefontinst/lib/FcEngine.cpp   | 2 ++
+ kcontrol/tdefontinst/tdeio/KioFonts.cpp | 1 +
+ 2 files changed, 3 insertions(+)
+
+diff --git a/kcontrol/tdefontinst/lib/FcEngine.cpp b/kcontrol/tdefontinst/lib/FcEngine.cpp
+index 987a44174..a95eba5d8 100644
+--- a/kcontrol/tdefontinst/lib/FcEngine.cpp
++++ b/kcontrol/tdefontinst/lib/FcEngine.cpp
+@@ -8,6 +8,8 @@
+ #include <tdeglobalsettings.h>
+ #include <tdeio/netaccess.h>
+ #include <math.h>
++#include <fontconfig/fontconfig.h>
++#include <fontconfig/fcfreetype.h>
+ #include "FcEngine.h"
+ #include "KfiConstants.h"
+ #ifdef HAVE_XFT
+diff --git a/kcontrol/tdefontinst/tdeio/KioFonts.cpp b/kcontrol/tdefontinst/tdeio/KioFonts.cpp
+index 753e412cd..c66578851 100644
+--- a/kcontrol/tdefontinst/tdeio/KioFonts.cpp
++++ b/kcontrol/tdefontinst/tdeio/KioFonts.cpp
+@@ -65,6 +65,7 @@
+ #include <ktar.h>
+ #include <kxftconfig.h>
+ #include <fontconfig/fontconfig.h>
++#include <fontconfig/fcfreetype.h>
+ #include "KfiConstants.h"
+ #include "FcEngine.h"
+ #include "Misc.h"
+-- 
+2.54.0
+
diff --git a/trinity-base/kcontrol/kcontrol-14.1.5.ebuild b/trinity-base/kcontrol/kcontrol-14.1.5.ebuild
index 23021fd8..678217ae 100644
--- a/trinity-base/kcontrol/kcontrol-14.1.5.ebuild
+++ b/trinity-base/kcontrol/kcontrol-14.1.5.ebuild
@@ -39,6 +39,7 @@ RDEPEND="${DEPEND}
 
 PATCHES=(
 	"$FILESDIR/${PN}-14.1.6-joystick-Fix-build-issues-with-GCC-16.x.patch"
+	"$FILESDIR/${PN}-14.1.6-fix-compilation-against-fontconfig-2.18.patch"
 )
 
 src_configure() {
diff --git a/trinity-base/kcontrol/kcontrol-14.1.6.ebuild b/trinity-base/kcontrol/kcontrol-14.1.6.ebuild
index 42efa6b6..ccf07d49 100644
--- a/trinity-base/kcontrol/kcontrol-14.1.6.ebuild
+++ b/trinity-base/kcontrol/kcontrol-14.1.6.ebuild
@@ -39,6 +39,7 @@ RDEPEND="${DEPEND}
 
 PATCHES=(
 	"$FILESDIR/${P}-joystick-Fix-build-issues-with-GCC-16.x.patch"
+	"$FILESDIR/${P}-fix-compilation-against-fontconfig-2.18.patch"
 )
 
 src_configure() {
-- 
cgit v1.2.3