summaryrefslogtreecommitdiffstats
path: root/trinity-base
diff options
context:
space:
mode:
Diffstat (limited to 'trinity-base')
-rw-r--r--trinity-base/kcheckpass/files/kcheckpass-strlcpy-14.1.0.patch54
-rw-r--r--trinity-base/ksysguard/files/ksysguard-strlcpy-14.1.0.patch54
-rw-r--r--trinity-base/tdebase-starttde/Manifest1
-rw-r--r--trinity-base/tdebase-starttde/tdebase-starttde-14.1.0-r1.ebuild86
4 files changed, 0 insertions, 195 deletions
diff --git a/trinity-base/kcheckpass/files/kcheckpass-strlcpy-14.1.0.patch b/trinity-base/kcheckpass/files/kcheckpass-strlcpy-14.1.0.patch
deleted file mode 100644
index 8901b1b2..00000000
--- a/trinity-base/kcheckpass/files/kcheckpass-strlcpy-14.1.0.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- a/config.h.cmake 2023-07-04 20:10:53.550250219 +0300
-+++ b/config.h.cmake 2023-07-04 20:18:18.312261752 +0300
-@@ -130,6 +130,33 @@
- // kcontrol/input
- #cmakedefine HAVE_LIBUSB 1
-
-+// ksysguard, kcheckpass
-+#cmakedefine HAVE_STRLCAT 1
-+#cmakedefine HAVE_STRLCAT_PROTO 1
-+#cmakedefine HAVE_STRLCPY 1
-+#cmakedefine HAVE_STRLCPY_PROTO 1
-+
-+#if !defined(HAVE_STRLCAT_PROTO)
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+unsigned long strlcat(char*, const char*, unsigned long);
-+#ifdef __cplusplus
-+}
-+#endif
-+#endif
-+
-+#if !defined(HAVE_STRLCPY_PROTO)
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+unsigned long strlcpy(char*, const char*, unsigned long);
-+#ifdef __cplusplus
-+}
-+#endif
-+#endif
-+
-+
- // tdeprint
- #cmakedefine HAVE_SIGACTION 1
- #cmakedefine HAVE_SIGSET 1
---- a/ConfigureChecks.cmake 2023-07-04 20:10:53.550250219 +0300
-+++ b/ConfigureChecks.cmake 2023-07-04 20:16:46.905259381 +0300
-@@ -381,6 +381,15 @@
- endif( )
-
-
-+# strlcat, strlcpy
-+if( BUILD_KSYSGUARD OR BUILD_KCHECKPASS )
-+ check_function_exists( strlcat HAVE_STRLCAT )
-+ check_symbol_exists( strlcat "string.h" HAVE_STRLCAT_PROTO )
-+ check_function_exists( strlcpy HAVE_STRLCPY )
-+ check_symbol_exists( strlcpy "string.h" HAVE_STRLCPY_PROTO )
-+endif( )
-+
-+
- # getifaddrs (kcontrol, tdm)
- if( BUILD_KCONTROL OR BUILD_TDM )
- check_function_exists( getifaddrs HAVE_GETIFADDRS )
diff --git a/trinity-base/ksysguard/files/ksysguard-strlcpy-14.1.0.patch b/trinity-base/ksysguard/files/ksysguard-strlcpy-14.1.0.patch
deleted file mode 100644
index 8901b1b2..00000000
--- a/trinity-base/ksysguard/files/ksysguard-strlcpy-14.1.0.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- a/config.h.cmake 2023-07-04 20:10:53.550250219 +0300
-+++ b/config.h.cmake 2023-07-04 20:18:18.312261752 +0300
-@@ -130,6 +130,33 @@
- // kcontrol/input
- #cmakedefine HAVE_LIBUSB 1
-
-+// ksysguard, kcheckpass
-+#cmakedefine HAVE_STRLCAT 1
-+#cmakedefine HAVE_STRLCAT_PROTO 1
-+#cmakedefine HAVE_STRLCPY 1
-+#cmakedefine HAVE_STRLCPY_PROTO 1
-+
-+#if !defined(HAVE_STRLCAT_PROTO)
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+unsigned long strlcat(char*, const char*, unsigned long);
-+#ifdef __cplusplus
-+}
-+#endif
-+#endif
-+
-+#if !defined(HAVE_STRLCPY_PROTO)
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+unsigned long strlcpy(char*, const char*, unsigned long);
-+#ifdef __cplusplus
-+}
-+#endif
-+#endif
-+
-+
- // tdeprint
- #cmakedefine HAVE_SIGACTION 1
- #cmakedefine HAVE_SIGSET 1
---- a/ConfigureChecks.cmake 2023-07-04 20:10:53.550250219 +0300
-+++ b/ConfigureChecks.cmake 2023-07-04 20:16:46.905259381 +0300
-@@ -381,6 +381,15 @@
- endif( )
-
-
-+# strlcat, strlcpy
-+if( BUILD_KSYSGUARD OR BUILD_KCHECKPASS )
-+ check_function_exists( strlcat HAVE_STRLCAT )
-+ check_symbol_exists( strlcat "string.h" HAVE_STRLCAT_PROTO )
-+ check_function_exists( strlcpy HAVE_STRLCPY )
-+ check_symbol_exists( strlcpy "string.h" HAVE_STRLCPY_PROTO )
-+endif( )
-+
-+
- # getifaddrs (kcontrol, tdm)
- if( BUILD_KCONTROL OR BUILD_TDM )
- check_function_exists( getifaddrs HAVE_GETIFADDRS )
diff --git a/trinity-base/tdebase-starttde/Manifest b/trinity-base/tdebase-starttde/Manifest
index 946d63c0..623b3cf4 100644
--- a/trinity-base/tdebase-starttde/Manifest
+++ b/trinity-base/tdebase-starttde/Manifest
@@ -1,2 +1 @@
-DIST tdebase-trinity-14.1.0.tar.xz 30722632 BLAKE2B 1f4b87be37730aaa93fc579c130d7af7c408d20512ff8642d8313abaa7ccf6a012c8b52c595641e8ff820f709d68471224f2ceb1f898769b36e386345924b948 SHA512 8fcbb5d4bbaefc9acafa5d1926d6f22b1c087a7af63f0d9e2438c95730e82e6d6e9555afdf336bd01c296adedef5665c571d00c6738d071ed069243d47f30674
DIST tdebase-trinity-14.1.1.tar.xz 30746484 BLAKE2B 4d2fdd9e3f5007c7482e938badad381a3e314b458b262dd346c05c91a9a4b974d8f1244152b833a34f7edad246bd4a8af0e054279a1556cebac6319a1a011a09 SHA512 d733f20719a0c9a949540e95f4d60fe03e096efbd7ac54187c5ee9b9f9b644318ee2dd9c8fd0d2e6eee660f7a7ad827e66bc06fb9a36c9e56e3ae16bdd47910c
diff --git a/trinity-base/tdebase-starttde/tdebase-starttde-14.1.0-r1.ebuild b/trinity-base/tdebase-starttde/tdebase-starttde-14.1.0-r1.ebuild
deleted file mode 100644
index 8215e74a..00000000
--- a/trinity-base/tdebase-starttde/tdebase-starttde-14.1.0-r1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Copyright 2020-2023 The Trinity Desktop Project
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-TRINITY_MODULE_NAME="tdebase"
-TRINITY_MODULE_TYPE="core"
-TSM_EXTRACT="starttde README.pam INSTALL AUTHORS COPYING COPYING-DOCS tdm r14-xdg-update migratekde3"
-inherit trinity-meta-2
-
-DESCRIPTION="Starttde script, which starts a complete Trinity session, and associated scripts"
-if [[ ${PV} != *9999* ]] ; then
- KEYWORDS="~amd64 ~arm64 ~x86"
-fi
-
-RDEPEND="x11-apps/xmessage
- x11-apps/xsetroot
- x11-apps/xset
- x11-apps/xrandr
- x11-apps/mkfontscale
- x11-apps/xprop
- ~trinity-base/kdesktop-${PV}
- ~trinity-base/kcminit-${PV}
- ~trinity-base/ksmserver-${PV}
- ~trinity-base/twin-${PV}
- ~trinity-base/kpersonalizer-${PV}
- ~trinity-base/kreadconfig-${PV}
- ~trinity-base/ksplashml-${PV}
- ~trinity-base/tdeinit-${PV}"
-
-PATCHES=( "${FILESDIR}/${PN}-14-gentoo.patch" )
-
-src_prepare() {
- trinity-base-2_src_prepare
-}
-
-src_configure() {
- echo -n "";
-}
-
-src_compile() {
- # List all the multilib libdirs
- local _libdir _libdirs
- for _libdir in $(get_all_libdirs); do
- _libdirs="${_libdirs}:${TDEDIR}/${_libdir}"
- done
- _libdirs=${_libdirs#:}
-}
-
-src_install() {
- # starttde script
- exeinto "${TDEDIR}/bin"
- doexe starttde
- doexe r14-xdg-update
- doexe migratekde3
-
- # startup and shutdown scripts
- exeinto "${TDEDIR}/env"
- doexe "${FILESDIR}/agent-startup.sh"
-
- exeinto "${TDEDIR}/shutdown"
- doexe "${FILESDIR}/agent-shutdown.sh"
-
- # x11 session script
- cat <<EOF > "${T}/tde-${SLOT}"
-#!/bin/sh
-exec ${TDEDIR}/bin/starttde
-EOF
- exeinto /etc/X11/Sessions
- doexe "${T}/tde-${SLOT}" # FIXME: change script branding to trinity
-
- # (not really) freedesktop compliant session script
- sed -e "s:@TDE_BINDIR@:${TDEDIR}/bin:g;s:Name=Trinity:Name=Trinity ${SLOT}:" \
- "${S}/tdm/kfrontend/sessions/tde.desktop.in" > "${T}/tde-${SLOT}.desktop"
- insinto /usr/share/xsessions
- doins "${T}/tde-${SLOT}.desktop"
-}
-
-pkg_postinst () {
- echo
- elog "To enable gpg-agent and/or ssh-agent in Trinity sessions,"
- elog "edit ${TDEDIR}/env/agent-startup.sh and"
- elog "${TDEDIR}/shutdown/agent-shutdown.sh"
- echo
-}