summaryrefslogtreecommitdiffstats
path: root/trinity-base/tdm
diff options
context:
space:
mode:
authorormorph <roma251078@mail.ru>2023-06-25 07:06:52 +0300
committerormorph <roma251078@mail.ru>2023-07-05 05:11:58 +0300
commitc704aa006b666ca063b57756e9111f238f5a21fa (patch)
tree16fd951f417e45f73d4a68194101c93239e91c0a /trinity-base/tdm
parentddec2f3c25dfb9858854be4d00ab63720442427a (diff)
downloadtde-packaging-gentoo-c704aa006b666ca063b57756e9111f238f5a21fa.tar.gz
tde-packaging-gentoo-c704aa006b666ca063b57756e9111f238f5a21fa.zip
Adding patches for ksysguard, kcheckpass and tdm for stable ebuilds, fix issue #299
This resolves FTBFS - see issue TDE/tde-packaging-gentoo#299. Adds detection and optionally a prototype for strlcat and strlcpy for ksysguard and kcheckpass. It also adds an include <sys/ioctl.h> for the ioctl() prototype in tdm. The absence of these prototypes results in a build error with some compilers. Signed-off-by: ormorph <roma251078@mail.ru>
Diffstat (limited to 'trinity-base/tdm')
-rw-r--r--trinity-base/tdm/files/tdm-ioctl.patch10
-rw-r--r--trinity-base/tdm/tdm-14.0.13.ebuild5
-rw-r--r--trinity-base/tdm/tdm-14.1.0.ebuild5
3 files changed, 20 insertions, 0 deletions
diff --git a/trinity-base/tdm/files/tdm-ioctl.patch b/trinity-base/tdm/files/tdm-ioctl.patch
new file mode 100644
index 00000000..3ca1a9ac
--- /dev/null
+++ b/trinity-base/tdm/files/tdm-ioctl.patch
@@ -0,0 +1,10 @@
+--- a/tdm/backend/ctrl.c 2023-07-04 20:45:46.142304481 +0300
++++ b/tdm/backend/ctrl.c 2023-07-04 20:46:57.086306320 +0300
+@@ -41,6 +41,7 @@
+ #include <string.h>
+ #include <signal.h>
+ #include <pwd.h>
++#include <sys/ioctl.h>
+ #include <sys/stat.h>
+
+ #ifdef __linux__
diff --git a/trinity-base/tdm/tdm-14.0.13.ebuild b/trinity-base/tdm/tdm-14.0.13.ebuild
index a8e8a3a2..6816b720 100644
--- a/trinity-base/tdm/tdm-14.0.13.ebuild
+++ b/trinity-base/tdm/tdm-14.0.13.ebuild
@@ -35,6 +35,11 @@ pkg_setup() {
use sak && TRINITY_SUBMODULE+=" tsak"
}
+src_prepare() {
+ eapply "${FILESDIR}/${PN}-ioctl.patch"
+ trinity-meta-2_src_prepare
+}
+
src_configure() {
local mycmakeargs=(
-DWITH_XTEST=ON
diff --git a/trinity-base/tdm/tdm-14.1.0.ebuild b/trinity-base/tdm/tdm-14.1.0.ebuild
index 1787b8af..7cdadc93 100644
--- a/trinity-base/tdm/tdm-14.1.0.ebuild
+++ b/trinity-base/tdm/tdm-14.1.0.ebuild
@@ -35,6 +35,11 @@ pkg_setup() {
use sak && TRINITY_SUBMODULE+=" tsak"
}
+src_prepare() {
+ eapply "${FILESDIR}/${PN}-ioctl.patch"
+ trinity-meta-2_src_prepare
+}
+
src_configure() {
local mycmakeargs=(
-DWITH_XTEST=ON