diff options
| author | ormorph <roma251078@mail.ru> | 2023-06-25 07:06:52 +0300 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2023-07-05 18:30:13 +0200 |
| commit | e1526ec5deacd23d4c780f82459b85d73c5e3e9e (patch) | |
| tree | 16fd951f417e45f73d4a68194101c93239e91c0a /trinity-base/tdm | |
| parent | fe1c01c2898978a5e5a5dfd328b4a770cfd01119 (diff) | |
| download | tde-packaging-gentoo-e1526ec5deacd23d4c780f82459b85d73c5e3e9e.tar.gz tde-packaging-gentoo-e1526ec5deacd23d4c780f82459b85d73c5e3e9e.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>
(cherry picked from commit c704aa006b666ca063b57756e9111f238f5a21fa)
Diffstat (limited to 'trinity-base/tdm')
| -rw-r--r-- | trinity-base/tdm/files/tdm-ioctl.patch | 10 | ||||
| -rw-r--r-- | trinity-base/tdm/tdm-14.0.13.ebuild | 5 | ||||
| -rw-r--r-- | trinity-base/tdm/tdm-14.1.0.ebuild | 5 |
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 |