From 95aff3e863a35ba80f7e11c4406ea3426eda5dd2 Mon Sep 17 00:00:00 2001 From: Alexander Golubev Date: Thu, 21 Aug 2025 21:43:44 +0300 Subject: trinity-apps/*: fix build on a system with minimal-ish config Several packages were failing to build on a system with minimal-ish config i.e. with all possible tqt and tdelibs flags disabled. This set of patches fixes it. Signed-off-by: Alexander Golubev --- trinity-apps/chalk/chalk-14.1.1.ebuild | 6 +++- trinity-apps/chalk/chalk-14.1.2.ebuild | 6 +++- ...14.1.4-chalk-add-missing-include-in-a-.ui.patch | 28 ++++++++++++++++ ...clude-rather-than-includehint-in-.ui-file.patch | 39 ++++++++++++++++++++++ trinity-apps/kommando/kommando-14.1.1.ebuild | 6 +++- trinity-apps/kommando/kommando-14.1.2.ebuild | 6 +++- ...-tde-14.1.4-Add-missing-includes-in-a-.ui.patch | 29 ++++++++++++++++ .../polkit-agent-tde-14.1.1.ebuild | 6 +++- .../polkit-agent-tde-14.1.2.ebuild | 6 +++- ...ster-14.1.4-Add-missing-includes-in-a-.ui.patch | 30 +++++++++++++++++ .../tde-style-polyester-14.1.2.ebuild | 4 +++ 11 files changed, 160 insertions(+), 6 deletions(-) create mode 100644 trinity-apps/chalk/files/chalk-14.1.4-chalk-add-missing-include-in-a-.ui.patch create mode 100644 trinity-apps/kommando/files/kommando-14.1.4-Use-include-rather-than-includehint-in-.ui-file.patch create mode 100644 trinity-apps/polkit-agent-tde/files/polkit-agent-tde-14.1.4-Add-missing-includes-in-a-.ui.patch create mode 100644 trinity-apps/tde-style-polyester/files/tde-style-polyester-14.1.4-Add-missing-includes-in-a-.ui.patch diff --git a/trinity-apps/chalk/chalk-14.1.1.ebuild b/trinity-apps/chalk/chalk-14.1.1.ebuild index 453d9ba1..9c4f2a84 100644 --- a/trinity-apps/chalk/chalk-14.1.1.ebuild +++ b/trinity-apps/chalk/chalk-14.1.1.ebuild @@ -1,5 +1,5 @@ # Copyright 1999-2023 Gentoo Authors -# Copyright 2022-2023 The Trinity Desktop Project +# Copyright 2022-2025 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 EAPI="8" @@ -49,6 +49,10 @@ KMCOPYLIB=" libkrossapi lib/kross/api libkrossmain lib/kross/main" +PATCHES=( + "${FILESDIR}/${PN}-14.1.4-chalk-add-missing-include-in-a-.ui.patch" +) + src_prepare() { # FIXME - disable broken tests for now sed -i -e "s:TESTSDIR =.*:TESTSDIR=:" "${S}"/chalk/core/Makefile.am \ diff --git a/trinity-apps/chalk/chalk-14.1.2.ebuild b/trinity-apps/chalk/chalk-14.1.2.ebuild index 7073551f..dcf80b45 100644 --- a/trinity-apps/chalk/chalk-14.1.2.ebuild +++ b/trinity-apps/chalk/chalk-14.1.2.ebuild @@ -1,5 +1,5 @@ # Copyright 1999-2024 Gentoo Authors -# Copyright 2022-2024 The Trinity Desktop Project +# Copyright 2022-2025 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 EAPI="8" @@ -49,6 +49,10 @@ KMCOPYLIB=" libkrossapi lib/kross/api libkrossmain lib/kross/main" +PATCHES=( + "${FILESDIR}/${PN}-14.1.4-chalk-add-missing-include-in-a-.ui.patch" +) + src_prepare() { # FIXME - disable broken tests for now sed -i -e "s:TESTSDIR =.*:TESTSDIR=:" "${S}"/chalk/core/Makefile.am \ diff --git a/trinity-apps/chalk/files/chalk-14.1.4-chalk-add-missing-include-in-a-.ui.patch b/trinity-apps/chalk/files/chalk-14.1.4-chalk-add-missing-include-in-a-.ui.patch new file mode 100644 index 00000000..c3e8122a --- /dev/null +++ b/trinity-apps/chalk/files/chalk-14.1.4-chalk-add-missing-include-in-a-.ui.patch @@ -0,0 +1,28 @@ +From de246aff6e92dac9803fb04b463cc552ccadaecf Mon Sep 17 00:00:00 2001 +From: Alexander Golubev +Date: Wed, 20 Aug 2025 11:55:20 +0300 +Subject: [PATCH] chalk: add missing include in a .ui + +This fixes FTBFS on a system with minimal-ish configuration of +tqt/tdelibs. + +Signed-off-by: Alexander Golubev +--- + chalk/ui/wdgautogradient.ui | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/chalk/ui/wdgautogradient.ui b/chalk/ui/wdgautogradient.ui +index 2db08d5bbc..25615bef60 100644 +--- a/chalk/ui/wdgautogradient.ui ++++ b/chalk/ui/wdgautogradient.ui +@@ -394,6 +394,7 @@ + + + ++ knuminput.h + kcolorbutton.h + + +-- +2.49.1 + diff --git a/trinity-apps/kommando/files/kommando-14.1.4-Use-include-rather-than-includehint-in-.ui-file.patch b/trinity-apps/kommando/files/kommando-14.1.4-Use-include-rather-than-includehint-in-.ui-file.patch new file mode 100644 index 00000000..9acdc3b6 --- /dev/null +++ b/trinity-apps/kommando/files/kommando-14.1.4-Use-include-rather-than-includehint-in-.ui-file.patch @@ -0,0 +1,39 @@ +From cc7db76b2ac4073e2a4274b854cc8f9f12d89d66 Mon Sep 17 00:00:00 2001 +From: Alexander Golubev +Date: Wed, 20 Aug 2025 12:36:34 +0300 +Subject: [PATCH] Use rather than in .ui file + +This fixes FTBFS on a system with minimal-ish configuration of +tqt/tdelibs. + +Note: tqtdesigner also wants to resave thees as +. I suspect the former one were used by some earlier versions +of designer. + +Signed-off-by: Alexander Golubev +--- + src/configdialog.ui | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/src/configdialog.ui b/src/configdialog.ui +index 7315486..7a707a7 100644 +--- a/src/configdialog.ui ++++ b/src/configdialog.ui +@@ -997,9 +997,9 @@ + slotRemoveListViewClicked() + + +- +- kicondialog.h +- kcolorbutton.h +- kkeybutton.h +- ++ ++ kicondialog.h ++ kcolorbutton.h ++ kkeybutton.h ++ + +-- +2.49.1 + diff --git a/trinity-apps/kommando/kommando-14.1.1.ebuild b/trinity-apps/kommando/kommando-14.1.1.ebuild index 020ea4a1..ea357f7b 100644 --- a/trinity-apps/kommando/kommando-14.1.1.ebuild +++ b/trinity-apps/kommando/kommando-14.1.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2023 The Trinity Desktop Project +# Copyright 2023-2025 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 EAPI="8" @@ -19,6 +19,10 @@ if [[ ${PV} != *9999* ]] ; then KEYWORDS="~amd64 ~arm64 ~x86" fi +PATCHES=( + "${FILESDIR}/${PN}-14.1.4-Use-include-rather-than-includehint-in-.ui-file.patch" +) + src_configure() { local mycmakeargs=( -DBUILD_TRANSLATIONS=ON diff --git a/trinity-apps/kommando/kommando-14.1.2.ebuild b/trinity-apps/kommando/kommando-14.1.2.ebuild index 54d52869..ea357f7b 100644 --- a/trinity-apps/kommando/kommando-14.1.2.ebuild +++ b/trinity-apps/kommando/kommando-14.1.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 2023-2024 The Trinity Desktop Project +# Copyright 2023-2025 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 EAPI="8" @@ -19,6 +19,10 @@ if [[ ${PV} != *9999* ]] ; then KEYWORDS="~amd64 ~arm64 ~x86" fi +PATCHES=( + "${FILESDIR}/${PN}-14.1.4-Use-include-rather-than-includehint-in-.ui-file.patch" +) + src_configure() { local mycmakeargs=( -DBUILD_TRANSLATIONS=ON diff --git a/trinity-apps/polkit-agent-tde/files/polkit-agent-tde-14.1.4-Add-missing-includes-in-a-.ui.patch b/trinity-apps/polkit-agent-tde/files/polkit-agent-tde-14.1.4-Add-missing-includes-in-a-.ui.patch new file mode 100644 index 00000000..7a08a2f9 --- /dev/null +++ b/trinity-apps/polkit-agent-tde/files/polkit-agent-tde-14.1.4-Add-missing-includes-in-a-.ui.patch @@ -0,0 +1,29 @@ +From e22b0d6c24f15c76ca99a8a659f0a43c767a8a92 Mon Sep 17 00:00:00 2001 +From: Alexander Golubev +Date: Wed, 20 Aug 2025 14:32:38 +0300 +Subject: [PATCH] Add missing in a .ui + +This fixes FTBFS on a system with minimal-ish configuration of +tqt/tdelibs. + +Signed-off-by: Alexander Golubev +--- + src/AuthDialogWidget.ui | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/AuthDialogWidget.ui b/src/AuthDialogWidget.ui +index daf4cb2..ae9bb8b 100644 +--- a/src/AuthDialogWidget.ui ++++ b/src/AuthDialogWidget.ui +@@ -158,4 +158,8 @@ + userCB + lePassword + ++ ++ kcombobox.h ++ klineedit.h ++ + +-- +2.49.1 + diff --git a/trinity-apps/polkit-agent-tde/polkit-agent-tde-14.1.1.ebuild b/trinity-apps/polkit-agent-tde/polkit-agent-tde-14.1.1.ebuild index 1265d313..c281be03 100644 --- a/trinity-apps/polkit-agent-tde/polkit-agent-tde-14.1.1.ebuild +++ b/trinity-apps/polkit-agent-tde/polkit-agent-tde-14.1.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2023 The Trinity Desktop Project +# Copyright 2023-2025 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 EAPI="8" @@ -25,6 +25,10 @@ fi DEPEND="~trinity-base/polkit-tqt-${PV}" RDEPEND="${DEPEND}" +PATCHES=( + "${FILESDIR}/${PN}-14.1.4-Add-missing-includes-in-a-.ui.patch" +) + src_configure() { local mycmakeargs=( -DBUILD_TRANSLATIONS=ON diff --git a/trinity-apps/polkit-agent-tde/polkit-agent-tde-14.1.2.ebuild b/trinity-apps/polkit-agent-tde/polkit-agent-tde-14.1.2.ebuild index ceea46d0..c281be03 100644 --- a/trinity-apps/polkit-agent-tde/polkit-agent-tde-14.1.2.ebuild +++ b/trinity-apps/polkit-agent-tde/polkit-agent-tde-14.1.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 2023-2024 The Trinity Desktop Project +# Copyright 2023-2025 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 EAPI="8" @@ -25,6 +25,10 @@ fi DEPEND="~trinity-base/polkit-tqt-${PV}" RDEPEND="${DEPEND}" +PATCHES=( + "${FILESDIR}/${PN}-14.1.4-Add-missing-includes-in-a-.ui.patch" +) + src_configure() { local mycmakeargs=( -DBUILD_TRANSLATIONS=ON diff --git a/trinity-apps/tde-style-polyester/files/tde-style-polyester-14.1.4-Add-missing-includes-in-a-.ui.patch b/trinity-apps/tde-style-polyester/files/tde-style-polyester-14.1.4-Add-missing-includes-in-a-.ui.patch new file mode 100644 index 00000000..b03cdb29 --- /dev/null +++ b/trinity-apps/tde-style-polyester/files/tde-style-polyester-14.1.4-Add-missing-includes-in-a-.ui.patch @@ -0,0 +1,30 @@ +From 211f4d99ed7e69be39c9286e85ec3cbcce6153e1 Mon Sep 17 00:00:00 2001 +From: Alexander Golubev +Date: Wed, 20 Aug 2025 15:13:20 +0300 +Subject: [PATCH] Add missing in a .ui + +This fixes FTBFS on a system with minimal-ish configuration of +tqt/tdelibs. + +Signed-off-by: Alexander Golubev +--- + style/config/configdialog.ui | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/style/config/configdialog.ui b/style/config/configdialog.ui +index b93740d..4b2ed5e 100644 +--- a/style/config/configdialog.ui ++++ b/style/config/configdialog.ui +@@ -1125,6 +1125,9 @@ + setEnabled(bool) + + ++ ++ kcolorbutton.h ++ + + animateButton_toggled( bool ) + +-- +2.49.1 + diff --git a/trinity-apps/tde-style-polyester/tde-style-polyester-14.1.2.ebuild b/trinity-apps/tde-style-polyester/tde-style-polyester-14.1.2.ebuild index 3b0dd920..e3c0e497 100644 --- a/trinity-apps/tde-style-polyester/tde-style-polyester-14.1.2.ebuild +++ b/trinity-apps/tde-style-polyester/tde-style-polyester-14.1.2.ebuild @@ -22,6 +22,10 @@ DEPEND=" " RDEPEND="$DEPEND" +PATCHES=( + "${FILESDIR}/${PN}-14.1.4-Add-missing-includes-in-a-.ui.patch" +) + src_prepare() { sed 's/twin_polyester/twin3_polyester/' -i "${S}/client/CMakeLists.txt" || die sed 's/twin_polyester/twin3_polyester/' -i "${S}/client/polyester.desktop" || die -- cgit v1.2.3