From 9a76c13fddb55b0f202e048df62c939e06f39559 Mon Sep 17 00:00:00 2001
From: ormorph <roma251078@mail.ru>
Date: Sun, 24 Mar 2024 21:53:58 +0300
Subject: Solving the problem of building tdewebdev packages with ninja

Signed-off-by: ormorph <roma251078@mail.ru>
(cherry picked from commit 2769940be476aca58d96f626ecab898409ad8b48)
---
 trinity-base/klinkstatus/files/tdewebdev-ninja.patch | 10 ++++++++++
 trinity-base/klinkstatus/klinkstatus-14.1.0.ebuild   |  4 ++++
 trinity-base/klinkstatus/klinkstatus-14.1.1.ebuild   |  4 ++++
 trinity-base/kxsldbg/files/tdewebdev-ninja.patch     | 10 ++++++++++
 trinity-base/kxsldbg/kxsldbg-14.1.0.ebuild           |  1 +
 trinity-base/kxsldbg/kxsldbg-14.1.1.ebuild           |  1 +
 trinity-base/quanta/files/tdewebdev-ninja.patch      | 10 ++++++++++
 trinity-base/quanta/quanta-14.1.0.ebuild             |  1 +
 trinity-base/quanta/quanta-14.1.1.ebuild             |  1 +
 9 files changed, 42 insertions(+)
 create mode 100644 trinity-base/klinkstatus/files/tdewebdev-ninja.patch
 create mode 100644 trinity-base/kxsldbg/files/tdewebdev-ninja.patch
 create mode 100644 trinity-base/quanta/files/tdewebdev-ninja.patch

diff --git a/trinity-base/klinkstatus/files/tdewebdev-ninja.patch b/trinity-base/klinkstatus/files/tdewebdev-ninja.patch
new file mode 100644
index 00000000..1d2a04ba
--- /dev/null
+++ b/trinity-base/klinkstatus/files/tdewebdev-ninja.patch
@@ -0,0 +1,10 @@
+--- a/ConfigureChecks.cmake	2024-03-24 21:40:09.165729665 +0300
++++ b/ConfigureChecks.cmake	2024-03-24 21:41:43.299725728 +0300
+@@ -59,6 +59,7 @@
+     tde_execute_process(
+         COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=CXXFLAGS icu-uc
+         OUTPUT_VARIABLE ICU_CXXFLAGS
++        OUTPUT_STRIP_TRAILING_WHITESPACE
+     )
+ 
+ 
diff --git a/trinity-base/klinkstatus/klinkstatus-14.1.0.ebuild b/trinity-base/klinkstatus/klinkstatus-14.1.0.ebuild
index 2a7b4d26..94e37fe9 100644
--- a/trinity-base/klinkstatus/klinkstatus-14.1.0.ebuild
+++ b/trinity-base/klinkstatus/klinkstatus-14.1.0.ebuild
@@ -17,6 +17,10 @@ if [[ ${PV} != *9999* ]] ; then
 	KEYWORDS="~amd64 ~arm64 ~x86"
 fi
 
+PATCHES=(
+	"${FILESDIR}/tdewebdev-ninja.patch"
+)
+
 src_configure() {
 	append-cxxflags "-std=c++11"
 	trinity-meta-2_src_configure
diff --git a/trinity-base/klinkstatus/klinkstatus-14.1.1.ebuild b/trinity-base/klinkstatus/klinkstatus-14.1.1.ebuild
index 2a7b4d26..94e37fe9 100644
--- a/trinity-base/klinkstatus/klinkstatus-14.1.1.ebuild
+++ b/trinity-base/klinkstatus/klinkstatus-14.1.1.ebuild
@@ -17,6 +17,10 @@ if [[ ${PV} != *9999* ]] ; then
 	KEYWORDS="~amd64 ~arm64 ~x86"
 fi
 
+PATCHES=(
+	"${FILESDIR}/tdewebdev-ninja.patch"
+)
+
 src_configure() {
 	append-cxxflags "-std=c++11"
 	trinity-meta-2_src_configure
diff --git a/trinity-base/kxsldbg/files/tdewebdev-ninja.patch b/trinity-base/kxsldbg/files/tdewebdev-ninja.patch
new file mode 100644
index 00000000..1d2a04ba
--- /dev/null
+++ b/trinity-base/kxsldbg/files/tdewebdev-ninja.patch
@@ -0,0 +1,10 @@
+--- a/ConfigureChecks.cmake	2024-03-24 21:40:09.165729665 +0300
++++ b/ConfigureChecks.cmake	2024-03-24 21:41:43.299725728 +0300
+@@ -59,6 +59,7 @@
+     tde_execute_process(
+         COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=CXXFLAGS icu-uc
+         OUTPUT_VARIABLE ICU_CXXFLAGS
++        OUTPUT_STRIP_TRAILING_WHITESPACE
+     )
+ 
+ 
diff --git a/trinity-base/kxsldbg/kxsldbg-14.1.0.ebuild b/trinity-base/kxsldbg/kxsldbg-14.1.0.ebuild
index e75bb2bd..dc8dc2fb 100644
--- a/trinity-base/kxsldbg/kxsldbg-14.1.0.ebuild
+++ b/trinity-base/kxsldbg/kxsldbg-14.1.0.ebuild
@@ -26,6 +26,7 @@ RDEPEND="${DEPEND}"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-add-headers.patch"
+	"${FILESDIR}/tdewebdev-ninja.patch"
 )
 
 src_configure() {
diff --git a/trinity-base/kxsldbg/kxsldbg-14.1.1.ebuild b/trinity-base/kxsldbg/kxsldbg-14.1.1.ebuild
index e75bb2bd..dc8dc2fb 100644
--- a/trinity-base/kxsldbg/kxsldbg-14.1.1.ebuild
+++ b/trinity-base/kxsldbg/kxsldbg-14.1.1.ebuild
@@ -26,6 +26,7 @@ RDEPEND="${DEPEND}"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-add-headers.patch"
+	"${FILESDIR}/tdewebdev-ninja.patch"
 )
 
 src_configure() {
diff --git a/trinity-base/quanta/files/tdewebdev-ninja.patch b/trinity-base/quanta/files/tdewebdev-ninja.patch
new file mode 100644
index 00000000..1d2a04ba
--- /dev/null
+++ b/trinity-base/quanta/files/tdewebdev-ninja.patch
@@ -0,0 +1,10 @@
+--- a/ConfigureChecks.cmake	2024-03-24 21:40:09.165729665 +0300
++++ b/ConfigureChecks.cmake	2024-03-24 21:41:43.299725728 +0300
+@@ -59,6 +59,7 @@
+     tde_execute_process(
+         COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=CXXFLAGS icu-uc
+         OUTPUT_VARIABLE ICU_CXXFLAGS
++        OUTPUT_STRIP_TRAILING_WHITESPACE
+     )
+ 
+ 
diff --git a/trinity-base/quanta/quanta-14.1.0.ebuild b/trinity-base/quanta/quanta-14.1.0.ebuild
index e587c136..75077812 100644
--- a/trinity-base/quanta/quanta-14.1.0.ebuild
+++ b/trinity-base/quanta/quanta-14.1.0.ebuild
@@ -37,6 +37,7 @@ RDEPEND="${DEPEND}"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-xml2.patch"
+	"${FILESDIR}/tdewebdev-ninja.patch"
 )
 
 src_unpack() {
diff --git a/trinity-base/quanta/quanta-14.1.1.ebuild b/trinity-base/quanta/quanta-14.1.1.ebuild
index e587c136..75077812 100644
--- a/trinity-base/quanta/quanta-14.1.1.ebuild
+++ b/trinity-base/quanta/quanta-14.1.1.ebuild
@@ -37,6 +37,7 @@ RDEPEND="${DEPEND}"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-xml2.patch"
+	"${FILESDIR}/tdewebdev-ninja.patch"
 )
 
 src_unpack() {
-- 
cgit v1.2.1