diff options
author | ormorph <roma251078@mail.ru> | 2023-12-31 18:39:26 +0300 |
---|---|---|
committer | Slávek Banko <slavek.banko@axis.cz> | 2024-01-01 03:01:33 +0100 |
commit | cf97bcc21d119c3e97091b222ed994a9f244a07b (patch) | |
tree | 6840ae0d3416e2ece90189a17a7b6d2b6a2f918c | |
parent | e2b50265ef4d7c51281a602db3de3247254ca5b3 (diff) | |
download | tde-packaging-gentoo-cf97bcc21d119c3e97091b222ed994a9f244a07b.tar.gz tde-packaging-gentoo-cf97bcc21d119c3e97091b222ed994a9f244a07b.zip |
Adding patches for compatibility with glibc-2.38
Signed-off-by: ormorph <roma251078@mail.ru>
(cherry picked from commit 75781374864d2810908644e1ed2e5cd3835307d8)
70 files changed, 1010 insertions, 0 deletions
diff --git a/trinity-base/ark/ark-14.1.1.ebuild b/trinity-base/ark/ark-14.1.1.ebuild index 5dc0d16b..2c61d6db 100644 --- a/trinity-base/ark/ark-14.1.1.ebuild +++ b/trinity-base/ark/ark-14.1.1.ebuild @@ -14,6 +14,11 @@ if [[ ${PV} != *9999* ]] ; then KEYWORDS="~amd64 ~arm64 ~x86" fi +src_prepare() { + eapply "${FILESDIR}/tdeutils-strlcpy.patch" + trinity-meta-2_src_prepare +} + pkg_postinst(){ elog "You may want to install app-arch/lha, app-arch/p7zip, app-arch/rar," elog "app-arch/zip or app-arch/zoo for support of these archive types." diff --git a/trinity-base/ark/files/tdeutils-strlcpy.patch b/trinity-base/ark/files/tdeutils-strlcpy.patch new file mode 100644 index 00000000..997a4010 --- /dev/null +++ b/trinity-base/ark/files/tdeutils-strlcpy.patch @@ -0,0 +1,19 @@ +--- a/ConfigureChecks.cmake 2023-11-20 07:43:31.808978636 +0300 ++++ b/ConfigureChecks.cmake 2023-11-20 07:47:59.756967430 +0300 +@@ -28,13 +28,9 @@ + tde_setup_gcc_visibility( ) + endif( ) + +- +-##### ark ####################################### +- +-if( BUILD_ARK ) +- check_symbol_exists( strlcpy string.h HAVE_STRLCPY_PROTO ) +- check_symbol_exists( strlcat string.h HAVE_STRLCAT_PROTO ) +-endif( BUILD_ARK ) ++# strlcat and strlcpy check ++check_symbol_exists( strlcpy string.h HAVE_STRLCPY_PROTO ) ++check_symbol_exists( strlcat string.h HAVE_STRLCAT_PROTO ) + + + ##### kcalc ##################################### diff --git a/trinity-base/drkonqi/drkonqi-14.1.1.ebuild b/trinity-base/drkonqi/drkonqi-14.1.1.ebuild index 6365b77b..601a1460 100644 --- a/trinity-base/drkonqi/drkonqi-14.1.1.ebuild +++ b/trinity-base/drkonqi/drkonqi-14.1.1.ebuild @@ -18,6 +18,11 @@ IUSE="+hwlib" RDEPEND="sys-devel/gdb" +src_prepare() { + eapply "${FILESDIR}/tdebase-strlcpy.patch" + trinity-meta-2_src_prepare +} + src_configure() { local mycmakeargs=( -DWITH_TDEHWLIB="$(usex hwlib)" diff --git a/trinity-base/drkonqi/files/tdebase-strlcpy.patch b/trinity-base/drkonqi/files/tdebase-strlcpy.patch new file mode 100644 index 00000000..c117154d --- /dev/null +++ b/trinity-base/drkonqi/files/tdebase-strlcpy.patch @@ -0,0 +1,29 @@ +--- a/ConfigureChecks.cmake 2023-11-13 20:24:40.136525876 +0300 ++++ b/ConfigureChecks.cmake 2023-11-13 20:30:04.069534276 +0300 +@@ -23,6 +23,10 @@ + find_package( TQt ) + find_package( TDE ) + ++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 ) + + ##### look for the usb.ids file, Its location can be set EG: -DWITH_USBIDS="/opt/share/misc/usb.ids" + +@@ -387,15 +391,6 @@ + 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/kcalc/files/tdeutils-strlcpy.patch b/trinity-base/kcalc/files/tdeutils-strlcpy.patch new file mode 100644 index 00000000..997a4010 --- /dev/null +++ b/trinity-base/kcalc/files/tdeutils-strlcpy.patch @@ -0,0 +1,19 @@ +--- a/ConfigureChecks.cmake 2023-11-20 07:43:31.808978636 +0300 ++++ b/ConfigureChecks.cmake 2023-11-20 07:47:59.756967430 +0300 +@@ -28,13 +28,9 @@ + tde_setup_gcc_visibility( ) + endif( ) + +- +-##### ark ####################################### +- +-if( BUILD_ARK ) +- check_symbol_exists( strlcpy string.h HAVE_STRLCPY_PROTO ) +- check_symbol_exists( strlcat string.h HAVE_STRLCAT_PROTO ) +-endif( BUILD_ARK ) ++# strlcat and strlcpy check ++check_symbol_exists( strlcpy string.h HAVE_STRLCPY_PROTO ) ++check_symbol_exists( strlcat string.h HAVE_STRLCAT_PROTO ) + + + ##### kcalc ##################################### diff --git a/trinity-base/kcalc/kcalc-14.1.1.ebuild b/trinity-base/kcalc/kcalc-14.1.1.ebuild index 1b687204..794547bf 100644 --- a/trinity-base/kcalc/kcalc-14.1.1.ebuild +++ b/trinity-base/kcalc/kcalc-14.1.1.ebuild @@ -16,3 +16,8 @@ fi DEPEND="dev-libs/gmp:*" RDEPEND="${DEPEND}" + +src_prepare() { + eapply "${FILESDIR}/tdeutils-strlcpy.patch" + trinity-meta-2_src_prepare +} diff --git a/trinity-base/kcharselect/files/tdeutils-strlcpy.patch b/trinity-base/kcharselect/files/tdeutils-strlcpy.patch new file mode 100644 index 00000000..997a4010 --- /dev/null +++ b/trinity-base/kcharselect/files/tdeutils-strlcpy.patch @@ -0,0 +1,19 @@ +--- a/ConfigureChecks.cmake 2023-11-20 07:43:31.808978636 +0300 ++++ b/ConfigureChecks.cmake 2023-11-20 07:47:59.756967430 +0300 +@@ -28,13 +28,9 @@ + tde_setup_gcc_visibility( ) + endif( ) + +- +-##### ark ####################################### +- +-if( BUILD_ARK ) +- check_symbol_exists( strlcpy string.h HAVE_STRLCPY_PROTO ) +- check_symbol_exists( strlcat string.h HAVE_STRLCAT_PROTO ) +-endif( BUILD_ARK ) ++# strlcat and strlcpy check ++check_symbol_exists( strlcpy string.h HAVE_STRLCPY_PROTO ) ++check_symbol_exists( strlcat string.h HAVE_STRLCAT_PROTO ) + + + ##### kcalc ##################################### diff --git a/trinity-base/kcharselect/kcharselect-14.1.1.ebuild b/trinity-base/kcharselect/kcharselect-14.1.1.ebuild index eb325613..ede1d28f 100644 --- a/trinity-base/kcharselect/kcharselect-14.1.1.ebuild +++ b/trinity-base/kcharselect/kcharselect-14.1.1.ebuild @@ -14,3 +14,8 @@ DESCRIPTION="Trinity character selection utility and panel applet" if [[ ${PV} != *9999* ]] ; then KEYWORDS="~amd64 ~arm64 ~x86" fi + +src_prepare() { + eapply "${FILESDIR}/tdeutils-strlcpy.patch" + trinity-meta-2_src_prepare +} diff --git a/trinity-base/kcheckpass/files/tdebase-strlcpy.patch b/trinity-base/kcheckpass/files/tdebase-strlcpy.patch new file mode 100644 index 00000000..c117154d --- /dev/null +++ b/trinity-base/kcheckpass/files/tdebase-strlcpy.patch @@ -0,0 +1,29 @@ +--- a/ConfigureChecks.cmake 2023-11-13 20:24:40.136525876 +0300 ++++ b/ConfigureChecks.cmake 2023-11-13 20:30:04.069534276 +0300 +@@ -23,6 +23,10 @@ + find_package( TQt ) + find_package( TDE ) + ++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 ) + + ##### look for the usb.ids file, Its location can be set EG: -DWITH_USBIDS="/opt/share/misc/usb.ids" + +@@ -387,15 +391,6 @@ + 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/kcheckpass/kcheckpass-14.1.1.ebuild b/trinity-base/kcheckpass/kcheckpass-14.1.1.ebuild index 314c95bb..5b48ea01 100644 --- a/trinity-base/kcheckpass/kcheckpass-14.1.1.ebuild +++ b/trinity-base/kcheckpass/kcheckpass-14.1.1.ebuild @@ -17,6 +17,11 @@ IUSE="pam" RDEPEND="pam? ( trinity-base/tdebase-pam )" DEPEND="${RDEPEND}" +src_prepare() { + eapply "${FILESDIR}/tdebase-strlcpy.patch" + trinity-meta-2_src_prepare +} + src_configure() { local mycmakeargs=( -DWITH_SHADOW=ON diff --git a/trinity-base/kcontrol/files/tdebase-strlcpy.patch b/trinity-base/kcontrol/files/tdebase-strlcpy.patch new file mode 100644 index 00000000..c117154d --- /dev/null +++ b/trinity-base/kcontrol/files/tdebase-strlcpy.patch @@ -0,0 +1,29 @@ +--- a/ConfigureChecks.cmake 2023-11-13 20:24:40.136525876 +0300 ++++ b/ConfigureChecks.cmake 2023-11-13 20:30:04.069534276 +0300 +@@ -23,6 +23,10 @@ + find_package( TQt ) + find_package( TDE ) + ++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 ) + + ##### look for the usb.ids file, Its location can be set EG: -DWITH_USBIDS="/opt/share/misc/usb.ids" + +@@ -387,15 +391,6 @@ + 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/kcontrol/kcontrol-14.1.1.ebuild b/trinity-base/kcontrol/kcontrol-14.1.1.ebuild index 520b7d2f..b5173fc2 100644 --- a/trinity-base/kcontrol/kcontrol-14.1.1.ebuild +++ b/trinity-base/kcontrol/kcontrol-14.1.1.ebuild @@ -37,6 +37,11 @@ RDEPEND="${DEPEND} svg? ( media-libs/libart_lgpl ) " +src_prepare() { + eapply "${FILESDIR}/tdebase-strlcpy.patch" + trinity-meta-2_src_prepare +} + src_configure() { local mycmakeargs=( -DWITH_XCURSOR=ON diff --git a/trinity-base/kdesktop/files/tdebase-strlcpy.patch b/trinity-base/kdesktop/files/tdebase-strlcpy.patch new file mode 100644 index 00000000..c117154d --- /dev/null +++ b/trinity-base/kdesktop/files/tdebase-strlcpy.patch @@ -0,0 +1,29 @@ +--- a/ConfigureChecks.cmake 2023-11-13 20:24:40.136525876 +0300 ++++ b/ConfigureChecks.cmake 2023-11-13 20:30:04.069534276 +0300 +@@ -23,6 +23,10 @@ + find_package( TQt ) + find_package( TDE ) + ++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 ) + + ##### look for the usb.ids file, Its location can be set EG: -DWITH_USBIDS="/opt/share/misc/usb.ids" + +@@ -387,15 +391,6 @@ + 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/kdesktop/kdesktop-14.1.1.ebuild b/trinity-base/kdesktop/kdesktop-14.1.1.ebuild index a234cc7f..92e07f70 100644 --- a/trinity-base/kdesktop/kdesktop-14.1.1.ebuild +++ b/trinity-base/kdesktop/kdesktop-14.1.1.ebuild @@ -33,6 +33,11 @@ RDEPEND="${COMMON_DEPEND} ~trinity-base/konqueror-${PV} pam? ( trinity-base/tdebase-pam )" +src_prepare() { + eapply "${FILESDIR}/tdebase-strlcpy.patch" + trinity-meta-2_src_prepare +} + src_configure() { local mycmakeargs=( -DWITH_XCURSOR=ON diff --git a/trinity-base/kdf/files/tdeutils-strlcpy.patch b/trinity-base/kdf/files/tdeutils-strlcpy.patch new file mode 100644 index 00000000..997a4010 --- /dev/null +++ b/trinity-base/kdf/files/tdeutils-strlcpy.patch @@ -0,0 +1,19 @@ +--- a/ConfigureChecks.cmake 2023-11-20 07:43:31.808978636 +0300 ++++ b/ConfigureChecks.cmake 2023-11-20 07:47:59.756967430 +0300 +@@ -28,13 +28,9 @@ + tde_setup_gcc_visibility( ) + endif( ) + +- +-##### ark ####################################### +- +-if( BUILD_ARK ) +- check_symbol_exists( strlcpy string.h HAVE_STRLCPY_PROTO ) +- check_symbol_exists( strlcat string.h HAVE_STRLCAT_PROTO ) +-endif( BUILD_ARK ) ++# strlcat and strlcpy check ++check_symbol_exists( strlcpy string.h HAVE_STRLCPY_PROTO ) ++check_symbol_exists( strlcat string.h HAVE_STRLCAT_PROTO ) + + + ##### kcalc ##################################### diff --git a/trinity-base/kdf/kdf-14.1.1.ebuild b/trinity-base/kdf/kdf-14.1.1.ebuild index 48b64844..cbf2cb36 100644 --- a/trinity-base/kdf/kdf-14.1.1.ebuild +++ b/trinity-base/kdf/kdf-14.1.1.ebuild @@ -13,3 +13,8 @@ DESCRIPTION="Trinity free disk space utility" if [[ ${PV} != *9999* ]] ; then KEYWORDS="~amd64 ~arm64 ~x86" fi + +src_prepare() { + eapply "${FILESDIR}/tdeutils-strlcpy.patch" + trinity-meta-2_src_prepare +} diff --git a/trinity-base/kedit/files/tdeutils-strlcpy.patch b/trinity-base/kedit/files/tdeutils-strlcpy.patch new file mode 100644 index 00000000..997a4010 --- /dev/null +++ b/trinity-base/kedit/files/tdeutils-strlcpy.patch @@ -0,0 +1,19 @@ +--- a/ConfigureChecks.cmake 2023-11-20 07:43:31.808978636 +0300 ++++ b/ConfigureChecks.cmake 2023-11-20 07:47:59.756967430 +0300 +@@ -28,13 +28,9 @@ + tde_setup_gcc_visibility( ) + endif( ) + +- +-##### ark ####################################### +- +-if( BUILD_ARK ) +- check_symbol_exists( strlcpy string.h HAVE_STRLCPY_PROTO ) +- check_symbol_exists( strlcat string.h HAVE_STRLCAT_PROTO ) +-endif( BUILD_ARK ) ++# strlcat and strlcpy check ++check_symbol_exists( strlcpy string.h HAVE_STRLCPY_PROTO ) ++check_symbol_exists( strlcat string.h HAVE_STRLCAT_PROTO ) + + + ##### kcalc ##################################### diff --git a/trinity-base/kedit/kedit-14.1.1.ebuild b/trinity-base/kedit/kedit-14.1.1.ebuild index 0aaa57bb..03be9d49 100644 --- a/trinity-base/kedit/kedit-14.1.1.ebuild +++ b/trinity-base/kedit/kedit-14.1.1.ebuild @@ -13,3 +13,8 @@ DESCRIPTION="Very simple text editor for Trinity" if [[ ${PV} != *9999* ]] ; then KEYWORDS="~amd64 ~arm64 ~x86" fi + +src_prepare() { + eapply "${FILESDIR}/tdeutils-strlcpy.patch" + trinity-meta-2_src_prepare +} diff --git a/trinity-base/kfloppy/files/tdeutils-strlcpy.patch b/trinity-base/kfloppy/files/tdeutils-strlcpy.patch new file mode 100644 index 00000000..997a4010 --- /dev/null +++ b/trinity-base/kfloppy/files/tdeutils-strlcpy.patch @@ -0,0 +1,19 @@ +--- a/ConfigureChecks.cmake 2023-11-20 07:43:31.808978636 +0300 ++++ b/ConfigureChecks.cmake 2023-11-20 07:47:59.756967430 +0300 +@@ -28,13 +28,9 @@ + tde_setup_gcc_visibility( ) + endif( ) + +- +-##### ark ####################################### +- +-if( BUILD_ARK ) +- check_symbol_exists( strlcpy string.h HAVE_STRLCPY_PROTO ) +- check_symbol_exists( strlcat string.h HAVE_STRLCAT_PROTO ) +-endif( BUILD_ARK ) ++# strlcat and strlcpy check ++check_symbol_exists( strlcpy string.h HAVE_STRLCPY_PROTO ) ++check_symbol_exists( strlcat string.h HAVE_STRLCAT_PROTO ) + + + ##### kcalc ##################################### diff --git a/trinity-base/kfloppy/kfloppy-14.1.1.ebuild b/trinity-base/kfloppy/kfloppy-14.1.1.ebuild index 024cbca9..a1cadf4c 100644 --- a/trinity-base/kfloppy/kfloppy-14.1.1.ebuild +++ b/trinity-base/kfloppy/kfloppy-14.1.1.ebuild @@ -13,3 +13,8 @@ DESCRIPTION="KFloppy - formats disks and puts a DOS or ext2fs filesystem on them if [[ ${PV} != *9999* ]] ; then KEYWORDS="~amd64 ~arm64 ~x86" fi + +src_prepare() { + eapply "${FILESDIR}/tdeutils-strlcpy.patch" + trinity-meta-2_src_prepare +} diff --git a/trinity-base/kgpg/files/tdeutils-strlcpy.patch b/trinity-base/kgpg/files/tdeutils-strlcpy.patch new file mode 100644 index 00000000..997a4010 --- /dev/null +++ b/trinity-base/kgpg/files/tdeutils-strlcpy.patch @@ -0,0 +1,19 @@ +--- a/ConfigureChecks.cmake 2023-11-20 07:43:31.808978636 +0300 ++++ b/ConfigureChecks.cmake 2023-11-20 07:47:59.756967430 +0300 +@@ -28,13 +28,9 @@ + tde_setup_gcc_visibility( ) + endif( ) + +- +-##### ark ####################################### +- +-if( BUILD_ARK ) +- check_symbol_exists( strlcpy string.h HAVE_STRLCPY_PROTO ) +- check_symbol_exists( strlcat string.h HAVE_STRLCAT_PROTO ) +-endif( BUILD_ARK ) ++# strlcat and strlcpy check ++check_symbol_exists( strlcpy string.h HAVE_STRLCPY_PROTO ) ++check_symbol_exists( strlcat string.h HAVE_STRLCAT_PROTO ) + + + ##### kcalc ##################################### diff --git a/trinity-base/kgpg/kgpg-14.1.1.ebuild b/trinity-base/kgpg/kgpg-14.1.1.ebuild index 8ec16211..92dc27af 100644 --- a/trinity-base/kgpg/kgpg-14.1.1.ebuild +++ b/trinity-base/kgpg/kgpg-14.1.1.ebuild @@ -21,3 +21,8 @@ RDEPEND="app-crypt/gnupg app-crypt/pinentry[gtk] app-crypt/pinentry[tqt(-)] )" + +src_prepare() { + eapply "${FILESDIR}/tdeutils-strlcpy.patch" + trinity-meta-2_src_prepare +} diff --git a/trinity-base/khexedit/files/tdeutils-strlcpy.patch b/trinity-base/khexedit/files/tdeutils-strlcpy.patch new file mode 100644 index 00000000..997a4010 --- /dev/null +++ b/trinity-base/khexedit/files/tdeutils-strlcpy.patch @@ -0,0 +1,19 @@ +--- a/ConfigureChecks.cmake 2023-11-20 07:43:31.808978636 +0300 ++++ b/ConfigureChecks.cmake 2023-11-20 07:47:59.756967430 +0300 +@@ -28,13 +28,9 @@ + tde_setup_gcc_visibility( ) + endif( ) + +- +-##### ark ####################################### +- +-if( BUILD_ARK ) +- check_symbol_exists( strlcpy string.h HAVE_STRLCPY_PROTO ) +- check_symbol_exists( strlcat string.h HAVE_STRLCAT_PROTO ) +-endif( BUILD_ARK ) ++# strlcat and strlcpy check ++check_symbol_exists( strlcpy string.h HAVE_STRLCPY_PROTO ) ++check_symbol_exists( strlcat string.h HAVE_STRLCAT_PROTO ) + + + ##### kcalc ##################################### diff --git a/trinity-base/khexedit/khexedit-14.1.1.ebuild b/trinity-base/khexedit/khexedit-14.1.1.ebuild index c78be866..2817a09d 100644 --- a/trinity-base/khexedit/khexedit-14.1.1.ebuild +++ b/trinity-base/khexedit/khexedit-14.1.1.ebuild @@ -13,3 +13,8 @@ DESCRIPTION="Trinity hex editor" if [[ ${PV} != *9999* ]] ; then KEYWORDS="~amd64 ~arm64 ~x86" fi + +src_prepare() { + eapply "${FILESDIR}/tdeutils-strlcpy.patch" + trinity-meta-2_src_prepare +} diff --git a/trinity-base/khotkeys/files/tdebase-strlcpy.patch b/trinity-base/khotkeys/files/tdebase-strlcpy.patch new file mode 100644 index 00000000..c117154d --- /dev/null +++ b/trinity-base/khotkeys/files/tdebase-strlcpy.patch @@ -0,0 +1,29 @@ +--- a/ConfigureChecks.cmake 2023-11-13 20:24:40.136525876 +0300 ++++ b/ConfigureChecks.cmake 2023-11-13 20:30:04.069534276 +0300 +@@ -23,6 +23,10 @@ + find_package( TQt ) + find_package( TDE ) + ++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 ) + + ##### look for the usb.ids file, Its location can be set EG: -DWITH_USBIDS="/opt/share/misc/usb.ids" + +@@ -387,15 +391,6 @@ + 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/khotkeys/khotkeys-14.1.1.ebuild b/trinity-base/khotkeys/khotkeys-14.1.1.ebuild index 7e603419..a945bc79 100644 --- a/trinity-base/khotkeys/khotkeys-14.1.1.ebuild +++ b/trinity-base/khotkeys/khotkeys-14.1.1.ebuild @@ -18,6 +18,11 @@ fi DEPEND="x11-libs/libXtst" RDEPEND="${DEPEND}" +src_prepare() { + eapply "${FILESDIR}/tdebase-strlcpy.patch" + trinity-meta-2_src_prepare +} + src_configure() { local mycmakeargs=( -DWITH_XTEST=ON diff --git a/trinity-base/kicker/files/tdebase-strlcpy.patch b/trinity-base/kicker/files/tdebase-strlcpy.patch new file mode 100644 index 00000000..c117154d --- /dev/null +++ b/trinity-base/kicker/files/tdebase-strlcpy.patch @@ -0,0 +1,29 @@ +--- a/ConfigureChecks.cmake 2023-11-13 20:24:40.136525876 +0300 ++++ b/ConfigureChecks.cmake 2023-11-13 20:30:04.069534276 +0300 +@@ -23,6 +23,10 @@ + find_package( TQt ) + find_package( TDE ) + ++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 ) + + ##### look for the usb.ids file, Its location can be set EG: -DWITH_USBIDS="/opt/share/misc/usb.ids" + +@@ -387,15 +391,6 @@ + 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/kicker/kicker-14.1.1.ebuild b/trinity-base/kicker/kicker-14.1.1.ebuild index e2524380..0a93ae62 100644 --- a/trinity-base/kicker/kicker-14.1.1.ebuild +++ b/trinity-base/kicker/kicker-14.1.1.ebuild @@ -25,6 +25,11 @@ DEPEND="~trinity-base/libkonq-${PV} RDEPEND="${DEPEND} ~trinity-base/kmenuedit-${PV}" +src_prepare() { + eapply "${FILESDIR}/tdebase-strlcpy.patch" + trinity-meta-2_src_prepare +} + src_configure() { local mycmakeargs=( -DWITH_XFIXES="$(usex xcomposite)" diff --git a/trinity-base/kjots/files/tdeutils-strlcpy.patch b/trinity-base/kjots/files/tdeutils-strlcpy.patch new file mode 100644 index 00000000..997a4010 --- /dev/null +++ b/trinity-base/kjots/files/tdeutils-strlcpy.patch @@ -0,0 +1,19 @@ +--- a/ConfigureChecks.cmake 2023-11-20 07:43:31.808978636 +0300 ++++ b/ConfigureChecks.cmake 2023-11-20 07:47:59.756967430 +0300 +@@ -28,13 +28,9 @@ + tde_setup_gcc_visibility( ) + endif( ) + +- +-##### ark ####################################### +- +-if( BUILD_ARK ) +- check_symbol_exists( strlcpy string.h HAVE_STRLCPY_PROTO ) +- check_symbol_exists( strlcat string.h HAVE_STRLCAT_PROTO ) +-endif( BUILD_ARK ) ++# strlcat and strlcpy check ++check_symbol_exists( strlcpy string.h HAVE_STRLCPY_PROTO ) ++check_symbol_exists( strlcat string.h HAVE_STRLCAT_PROTO ) + + + ##### kcalc ##################################### diff --git a/trinity-base/kjots/kjots-14.1.1.ebuild b/trinity-base/kjots/kjots-14.1.1.ebuild index e9a39781..20b35d03 100644 --- a/trinity-base/kjots/kjots-14.1.1.ebuild +++ b/trinity-base/kjots/kjots-14.1.1.ebuild @@ -13,3 +13,8 @@ DESCRIPTION="Trinity note taking utility" if [[ ${PV} != *9999* ]] ; then KEYWORDS="~amd64 ~arm64 ~x86" fi + +src_prepare() { + eapply "${FILESDIR}/tdeutils-strlcpy.patch" + trinity-meta-2_src_prepare +} diff --git a/trinity-base/klaptopdaemon/files/tdeutils-strlcpy.patch b/trinity-base/klaptopdaemon/files/tdeutils-strlcpy.patch new file mode 100644 index 00000000..997a4010 --- /dev/null +++ b/trinity-base/klaptopdaemon/files/tdeutils-strlcpy.patch @@ -0,0 +1,19 @@ +--- a/ConfigureChecks.cmake 2023-11-20 07:43:31.808978636 +0300 ++++ b/ConfigureChecks.cmake 2023-11-20 07:47:59.756967430 +0300 +@@ -28,13 +28,9 @@ + tde_setup_gcc_visibility( ) + endif( ) + +- +-##### ark ####################################### +- +-if( BUILD_ARK ) +- check_symbol_exists( strlcpy string.h HAVE_STRLCPY_PROTO ) +- check_symbol_exists( strlcat string.h HAVE_STRLCAT_PROTO ) +-endif( BUILD_ARK ) ++# strlcat and strlcpy check ++check_symbol_exists( strlcpy string.h HAVE_STRLCPY_PROTO ) ++check_symbol_exists( strlcat string.h HAVE_STRLCAT_PROTO ) + + + ##### kcalc ##################################### diff --git a/trinity-base/klaptopdaemon/klaptopdaemon-14.1.1.ebuild b/trinity-base/klaptopdaemon/klaptopdaemon-14.1.1.ebuild index 777d1b6a..3bb6c625 100644 --- a/trinity-base/klaptopdaemon/klaptopdaemon-14.1.1.ebuild +++ b/trinity-base/klaptopdaemon/klaptopdaemon-14.1.1.ebuild @@ -22,6 +22,11 @@ DEPEND="${RDEPEND} virtual/os-headers " +src_prepare() { + eapply "${FILESDIR}/tdeutils-strlcpy.patch" + trinity-meta-2_src_prepare +} + src_configure() { local mycmakeargs=( -DWITH_DPMS=ON diff --git a/trinity-base/klipper/files/tdebase-strlcpy.patch b/trinity-base/klipper/files/tdebase-strlcpy.patch new file mode 100644 index 00000000..c117154d --- /dev/null +++ b/trinity-base/klipper/files/tdebase-strlcpy.patch @@ -0,0 +1,29 @@ +--- a/ConfigureChecks.cmake 2023-11-13 20:24:40.136525876 +0300 ++++ b/ConfigureChecks.cmake 2023-11-13 20:30:04.069534276 +0300 +@@ -23,6 +23,10 @@ + find_package( TQt ) + find_package( TDE ) + ++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 ) + + ##### look for the usb.ids file, Its location can be set EG: -DWITH_USBIDS="/opt/share/misc/usb.ids" + +@@ -387,15 +391,6 @@ + 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/klipper/klipper-14.1.1.ebuild b/trinity-base/klipper/klipper-14.1.1.ebuild index 62182574..d409f1cc 100644 --- a/trinity-base/klipper/klipper-14.1.1.ebuild +++ b/trinity-base/klipper/klipper-14.1.1.ebuild @@ -16,6 +16,11 @@ fi DEPEND="x11-libs/libXfixes" RDEPEND="${DEPEND}" +src_prepare() { + eapply "${FILESDIR}/tdebase-strlcpy.patch" + trinity-meta-2_src_prepare +} + src_configure() { local mycmakeargs=( -DWITH_XFIXES=ON diff --git a/trinity-base/kmilo/files/tdeutils-strlcpy.patch b/trinity-base/kmilo/files/tdeutils-strlcpy.patch new file mode 100644 index 00000000..997a4010 --- /dev/null +++ b/trinity-base/kmilo/files/tdeutils-strlcpy.patch @@ -0,0 +1,19 @@ +--- a/ConfigureChecks.cmake 2023-11-20 07:43:31.808978636 +0300 ++++ b/ConfigureChecks.cmake 2023-11-20 07:47:59.756967430 +0300 +@@ -28,13 +28,9 @@ + tde_setup_gcc_visibility( ) + endif( ) + +- +-##### ark ####################################### +- +-if( BUILD_ARK ) +- check_symbol_exists( strlcpy string.h HAVE_STRLCPY_PROTO ) +- check_symbol_exists( strlcat string.h HAVE_STRLCAT_PROTO ) +-endif( BUILD_ARK ) ++# strlcat and strlcpy check ++check_symbol_exists( strlcpy string.h HAVE_STRLCPY_PROTO ) ++check_symbol_exists( strlcat string.h HAVE_STRLCAT_PROTO ) + + + ##### kcalc ##################################### diff --git a/trinity-base/kmilo/kmilo-14.1.1.ebuild b/trinity-base/kmilo/kmilo-14.1.1.ebuild index d2404bef..7b1ef9e6 100644 --- a/trinity-base/kmilo/kmilo-14.1.1.ebuild +++ b/trinity-base/kmilo/kmilo-14.1.1.ebuild @@ -19,6 +19,11 @@ DEPEND="powerbook-laptop? ( app-laptop/pbbuttonsd )" RDEPEND="${DEPEND} lm-sensors? ( sys-apps/lm-sensors )" +src_prepare() { + eapply "${FILESDIR}/tdeutils-strlcpy.patch" + trinity-meta-2_src_prepare +} + src_configure() { local mycmakeargs=( -DWITH_ASUS="$(usex asus-laptop)" diff --git a/trinity-base/konsole/files/tdebase-strlcpy.patch b/trinity-base/konsole/files/tdebase-strlcpy.patch new file mode 100644 index 00000000..c117154d --- /dev/null +++ b/trinity-base/konsole/files/tdebase-strlcpy.patch @@ -0,0 +1,29 @@ +--- a/ConfigureChecks.cmake 2023-11-13 20:24:40.136525876 +0300 ++++ b/ConfigureChecks.cmake 2023-11-13 20:30:04.069534276 +0300 +@@ -23,6 +23,10 @@ + find_package( TQt ) + find_package( TDE ) + ++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 ) + + ##### look for the usb.ids file, Its location can be set EG: -DWITH_USBIDS="/opt/share/misc/usb.ids" + +@@ -387,15 +391,6 @@ + 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/konsole/konsole-14.1.1.ebuild b/trinity-base/konsole/konsole-14.1.1.ebuild index a3b25e92..27f6ce47 100644 --- a/trinity-base/konsole/konsole-14.1.1.ebuild +++ b/trinity-base/konsole/konsole-14.1.1.ebuild @@ -24,6 +24,11 @@ RDEPEND="${DEPEND} x11-apps/bdftopcf sudo? ( app-admin/sudo )" +src_prepare() { + eapply "${FILESDIR}/tdebase-strlcpy.patch" + trinity-meta-2_src_prepare +} + src_configure() { local mycmakeargs=( -DWITH_XRENDER=ON diff --git a/trinity-base/kregexpeditor/files/tdeutils-strlcpy.patch b/trinity-base/kregexpeditor/files/tdeutils-strlcpy.patch new file mode 100644 index 00000000..997a4010 --- /dev/null +++ b/trinity-base/kregexpeditor/files/tdeutils-strlcpy.patch @@ -0,0 +1,19 @@ +--- a/ConfigureChecks.cmake 2023-11-20 07:43:31.808978636 +0300 ++++ b/ConfigureChecks.cmake 2023-11-20 07:47:59.756967430 +0300 +@@ -28,13 +28,9 @@ + tde_setup_gcc_visibility( ) + endif( ) + +- +-##### ark ####################################### +- +-if( BUILD_ARK ) +- check_symbol_exists( strlcpy string.h HAVE_STRLCPY_PROTO ) +- check_symbol_exists( strlcat string.h HAVE_STRLCAT_PROTO ) +-endif( BUILD_ARK ) ++# strlcat and strlcpy check ++check_symbol_exists( strlcpy string.h HAVE_STRLCPY_PROTO ) ++check_symbol_exists( strlcat string.h HAVE_STRLCAT_PROTO ) + + + ##### kcalc ##################################### diff --git a/trinity-base/kregexpeditor/kregexpeditor-14.1.1.ebuild b/trinity-base/kregexpeditor/kregexpeditor-14.1.1.ebuild index bcf8d166..36335feb 100644 --- a/trinity-base/kregexpeditor/kregexpeditor-14.1.1.ebuild +++ b/trinity-base/kregexpeditor/kregexpeditor-14.1.1.ebuild @@ -13,3 +13,8 @@ DESCRIPTION="Trinity: Editor for Regular Expressions" if [[ ${PV} != *9999* ]] ; then KEYWORDS="~amd64 ~arm64 ~x86" fi + +src_prepare() { + eapply "${FILESDIR}/tdeutils-strlcpy.patch" + trinity-meta-2_src_prepare +} diff --git a/trinity-base/ksim/files/tdeutils-strlcpy.patch b/trinity-base/ksim/files/tdeutils-strlcpy.patch new file mode 100644 index 00000000..997a4010 --- /dev/null +++ b/trinity-base/ksim/files/tdeutils-strlcpy.patch @@ -0,0 +1,19 @@ +--- a/ConfigureChecks.cmake 2023-11-20 07:43:31.808978636 +0300 ++++ b/ConfigureChecks.cmake 2023-11-20 07:47:59.756967430 +0300 +@@ -28,13 +28,9 @@ + tde_setup_gcc_visibility( ) + endif( ) + +- +-##### ark ####################################### +- +-if( BUILD_ARK ) +- check_symbol_exists( strlcpy string.h HAVE_STRLCPY_PROTO ) +- check_symbol_exists( strlcat string.h HAVE_STRLCAT_PROTO ) +-endif( BUILD_ARK ) ++# strlcat and strlcpy check ++check_symbol_exists( strlcpy string.h HAVE_STRLCPY_PROTO ) ++check_symbol_exists( strlcat string.h HAVE_STRLCAT_PROTO ) + + + ##### kcalc ##################################### diff --git a/trinity-base/ksim/ksim-14.1.1.ebuild b/trinity-base/ksim/ksim-14.1.1.ebuild index 63619937..1156bd5d 100644 --- a/trinity-base/ksim/ksim-14.1.1.ebuild +++ b/trinity-base/ksim/ksim-14.1.1.ebuild @@ -21,6 +21,11 @@ DEPEND=" RDEPEND="${DEPEND} lm-sensors? ( sys-apps/lm-sensors )" +src_prepare() { + eapply "${FILESDIR}/tdeutils-strlcpy.patch" + trinity-meta-2_src_prepare +} + src_configure() { local mycmakeargs=( -DWITH_I8K="$(usex dell-laptop)" diff --git a/trinity-base/ksmserver/files/tdebase-strlcpy.patch b/trinity-base/ksmserver/files/tdebase-strlcpy.patch new file mode 100644 index 00000000..c117154d --- /dev/null +++ b/trinity-base/ksmserver/files/tdebase-strlcpy.patch @@ -0,0 +1,29 @@ +--- a/ConfigureChecks.cmake 2023-11-13 20:24:40.136525876 +0300 ++++ b/ConfigureChecks.cmake 2023-11-13 20:30:04.069534276 +0300 +@@ -23,6 +23,10 @@ + find_package( TQt ) + find_package( TDE ) + ++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 ) + + ##### look for the usb.ids file, Its location can be set EG: -DWITH_USBIDS="/opt/share/misc/usb.ids" + +@@ -387,15 +391,6 @@ + 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/ksmserver/ksmserver-14.1.1.ebuild b/trinity-base/ksmserver/ksmserver-14.1.1.ebuild index 4652f407..688d1beb 100644 --- a/trinity-base/ksmserver/ksmserver-14.1.1.ebuild +++ b/trinity-base/ksmserver/ksmserver-14.1.1.ebuild @@ -14,6 +14,11 @@ if [[ ${PV} != *9999* ]] ; then fi IUSE="+hwlib" +src_prepare() { + eapply "${FILESDIR}/tdebase-strlcpy.patch" + trinity-meta-2_src_prepare +} + src_configure() { local mycmakeargs=( -DWITH_TDEHWLIB="$(usex hwlib)" diff --git a/trinity-base/ksplashml/files/tdebase-strlcpy.patch b/trinity-base/ksplashml/files/tdebase-strlcpy.patch new file mode 100644 index 00000000..c117154d --- /dev/null +++ b/trinity-base/ksplashml/files/tdebase-strlcpy.patch @@ -0,0 +1,29 @@ +--- a/ConfigureChecks.cmake 2023-11-13 20:24:40.136525876 +0300 ++++ b/ConfigureChecks.cmake 2023-11-13 20:30:04.069534276 +0300 +@@ -23,6 +23,10 @@ + find_package( TQt ) + find_package( TDE ) + ++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 ) + + ##### look for the usb.ids file, Its location can be set EG: -DWITH_USBIDS="/opt/share/misc/usb.ids" + +@@ -387,15 +391,6 @@ + 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/ksplashml/ksplashml-14.1.1.ebuild b/trinity-base/ksplashml/ksplashml-14.1.1.ebuild index 9f971c7c..a58b8704 100644 --- a/trinity-base/ksplashml/ksplashml-14.1.1.ebuild +++ b/trinity-base/ksplashml/ksplashml-14.1.1.ebuild @@ -18,6 +18,11 @@ IUSE="xinerama" DEPEND="xinerama? ( x11-base/xorg-proto )" RDEPEND="${DEPEND}" +src_prepare() { + eapply "${FILESDIR}/tdebase-strlcpy.patch" + trinity-meta-2_src_prepare +} + src_configure() { local mycmakeargs=( -DWITH_XINERAMA="$(usex xinerama)" diff --git a/trinity-base/ksysguard/files/tdebase-strlcpy.patch b/trinity-base/ksysguard/files/tdebase-strlcpy.patch new file mode 100644 index 00000000..c117154d --- /dev/null +++ b/trinity-base/ksysguard/files/tdebase-strlcpy.patch @@ -0,0 +1,29 @@ +--- a/ConfigureChecks.cmake 2023-11-13 20:24:40.136525876 +0300 ++++ b/ConfigureChecks.cmake 2023-11-13 20:30:04.069534276 +0300 +@@ -23,6 +23,10 @@ + find_package( TQt ) + find_package( TDE ) + ++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 ) + + ##### look for the usb.ids file, Its location can be set EG: -DWITH_USBIDS="/opt/share/misc/usb.ids" + +@@ -387,15 +391,6 @@ + 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/ksysguard-14.1.1.ebuild b/trinity-base/ksysguard/ksysguard-14.1.1.ebuild index 6a47f295..d5900284 100644 --- a/trinity-base/ksysguard/ksysguard-14.1.1.ebuild +++ b/trinity-base/ksysguard/ksysguard-14.1.1.ebuild @@ -18,6 +18,11 @@ IUSE="dell-laptop lm-sensors" DEPEND="lm-sensors? ( sys-apps/lm-sensors )" RDEPEND="${DEPEND}" +src_prepare() { + eapply "${FILESDIR}/tdebase-strlcpy.patch" + trinity-meta-2_src_prepare +} + src_configure() { local mycmakeargs=( -DWITH_I8K="$(usex dell-laptop)" diff --git a/trinity-base/ktimer/files/tdeutils-strlcpy.patch b/trinity-base/ktimer/files/tdeutils-strlcpy.patch new file mode 100644 index 00000000..997a4010 --- /dev/null +++ b/trinity-base/ktimer/files/tdeutils-strlcpy.patch @@ -0,0 +1,19 @@ +--- a/ConfigureChecks.cmake 2023-11-20 07:43:31.808978636 +0300 ++++ b/ConfigureChecks.cmake 2023-11-20 07:47:59.756967430 +0300 +@@ -28,13 +28,9 @@ + tde_setup_gcc_visibility( ) + endif( ) + +- +-##### ark ####################################### +- +-if( BUILD_ARK ) +- check_symbol_exists( strlcpy string.h HAVE_STRLCPY_PROTO ) +- check_symbol_exists( strlcat string.h HAVE_STRLCAT_PROTO ) +-endif( BUILD_ARK ) ++# strlcat and strlcpy check ++check_symbol_exists( strlcpy string.h HAVE_STRLCPY_PROTO ) ++check_symbol_exists( strlcat string.h HAVE_STRLCAT_PROTO ) + + + ##### kcalc ##################################### diff --git a/trinity-base/ktimer/ktimer-14.1.1.ebuild b/trinity-base/ktimer/ktimer-14.1.1.ebuild index 147d9b22..95e2de95 100644 --- a/trinity-base/ktimer/ktimer-14.1.1.ebuild +++ b/trinity-base/ktimer/ktimer-14.1.1.ebuild @@ -13,3 +13,8 @@ DESCRIPTION="Trinity Timer" if [[ ${PV} != *9999* ]] ; then KEYWORDS="~amd64 ~arm64 ~x86" fi + +src_prepare() { + eapply "${FILESDIR}/tdeutils-strlcpy.patch" + trinity-meta-2_src_prepare +} diff --git a/trinity-base/kxkb/files/tdebase-strlcpy.patch b/trinity-base/kxkb/files/tdebase-strlcpy.patch new file mode 100644 index 00000000..c117154d --- /dev/null +++ b/trinity-base/kxkb/files/tdebase-strlcpy.patch @@ -0,0 +1,29 @@ +--- a/ConfigureChecks.cmake 2023-11-13 20:24:40.136525876 +0300 ++++ b/ConfigureChecks.cmake 2023-11-13 20:30:04.069534276 +0300 +@@ -23,6 +23,10 @@ + find_package( TQt ) + find_package( TDE ) + ++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 ) + + ##### look for the usb.ids file, Its location can be set EG: -DWITH_USBIDS="/opt/share/misc/usb.ids" + +@@ -387,15 +391,6 @@ + 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/kxkb/kxkb-14.1.1.ebuild b/trinity-base/kxkb/kxkb-14.1.1.ebuild index 939b4039..47cffa19 100644 --- a/trinity-base/kxkb/kxkb-14.1.1.ebuild +++ b/trinity-base/kxkb/kxkb-14.1.1.ebuild @@ -19,6 +19,11 @@ RDEPEND="${DEPEND} x11-misc/xkeyboard-config x11-apps/setxkbmap" +src_prepare() { + eapply "${FILESDIR}/tdebase-strlcpy.patch" + trinity-meta-2_src_prepare +} + src_configure() { local mycmakeargs=( -DWITH_XTEST=ON diff --git a/trinity-base/superkaramba/files/tdeutils-strlcpy.patch b/trinity-base/superkaramba/files/tdeutils-strlcpy.patch new file mode 100644 index 00000000..997a4010 --- /dev/null +++ b/trinity-base/superkaramba/files/tdeutils-strlcpy.patch @@ -0,0 +1,19 @@ +--- a/ConfigureChecks.cmake 2023-11-20 07:43:31.808978636 +0300 ++++ b/ConfigureChecks.cmake 2023-11-20 07:47:59.756967430 +0300 +@@ -28,13 +28,9 @@ + tde_setup_gcc_visibility( ) + endif( ) + +- +-##### ark ####################################### +- +-if( BUILD_ARK ) +- check_symbol_exists( strlcpy string.h HAVE_STRLCPY_PROTO ) +- check_symbol_exists( strlcat string.h HAVE_STRLCAT_PROTO ) +-endif( BUILD_ARK ) ++# strlcat and strlcpy check ++check_symbol_exists( strlcpy string.h HAVE_STRLCPY_PROTO ) ++check_symbol_exists( strlcat string.h HAVE_STRLCAT_PROTO ) + + + ##### kcalc ##################################### diff --git a/trinity-base/superkaramba/superkaramba-14.1.1.ebuild b/trinity-base/superkaramba/superkaramba-14.1.1.ebuild index 3aa2925b..08723b2b 100644 --- a/trinity-base/superkaramba/superkaramba-14.1.1.ebuild +++ b/trinity-base/superkaramba/superkaramba-14.1.1.ebuild @@ -17,6 +17,11 @@ fi # RDEPEND="xmms? (media-sound/xmms2)" +src_prepare() { + eapply "${FILESDIR}/tdeutils-strlcpy.patch" + trinity-meta-2_src_prepare +} + src_configure() { local mycmakeargs=( # -DWITH_XMMS="$(usex xmms)" diff --git a/trinity-base/tdebase-tdeioslaves/files/tdebase-strlcpy.patch b/trinity-base/tdebase-tdeioslaves/files/tdebase-strlcpy.patch new file mode 100644 index 00000000..c117154d --- /dev/null +++ b/trinity-base/tdebase-tdeioslaves/files/tdebase-strlcpy.patch @@ -0,0 +1,29 @@ +--- a/ConfigureChecks.cmake 2023-11-13 20:24:40.136525876 +0300 ++++ b/ConfigureChecks.cmake 2023-11-13 20:30:04.069534276 +0300 +@@ -23,6 +23,10 @@ + find_package( TQt ) + find_package( TDE ) + ++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 ) + + ##### look for the usb.ids file, Its location can be set EG: -DWITH_USBIDS="/opt/share/misc/usb.ids" + +@@ -387,15 +391,6 @@ + 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-tdeioslaves/tdebase-tdeioslaves-14.1.1.ebuild b/trinity-base/tdebase-tdeioslaves/tdebase-tdeioslaves-14.1.1.ebuild index bddc05bb..d5d97a6e 100644 --- a/trinity-base/tdebase-tdeioslaves/tdebase-tdeioslaves-14.1.1.ebuild +++ b/trinity-base/tdebase-tdeioslaves/tdebase-tdeioslaves-14.1.1.ebuild @@ -29,6 +29,11 @@ RDEPEND="${DEPEND} ~trinity-base/tdeeject-${PV} net-libs/libssh" +src_prepare() { + eapply "${FILESDIR}/tdebase-strlcpy.patch" + trinity-meta-2_src_prepare +} + src_configure() { local mycmakeargs=( -DWITH_XCURSOR=ON diff --git a/trinity-base/tdefilereplace/files/tdeutils-strlcpy.patch b/trinity-base/tdefilereplace/files/tdeutils-strlcpy.patch new file mode 100644 index 00000000..997a4010 --- /dev/null +++ b/trinity-base/tdefilereplace/files/tdeutils-strlcpy.patch @@ -0,0 +1,19 @@ +--- a/ConfigureChecks.cmake 2023-11-20 07:43:31.808978636 +0300 ++++ b/ConfigureChecks.cmake 2023-11-20 07:47:59.756967430 +0300 +@@ -28,13 +28,9 @@ + tde_setup_gcc_visibility( ) + endif( ) + +- +-##### ark ####################################### +- +-if( BUILD_ARK ) +- check_symbol_exists( strlcpy string.h HAVE_STRLCPY_PROTO ) +- check_symbol_exists( strlcat string.h HAVE_STRLCAT_PROTO ) +-endif( BUILD_ARK ) ++# strlcat and strlcpy check ++check_symbol_exists( strlcpy string.h HAVE_STRLCPY_PROTO ) ++check_symbol_exists( strlcat string.h HAVE_STRLCAT_PROTO ) + + + ##### kcalc ##################################### diff --git a/trinity-base/tdefilereplace/tdefilereplace-14.1.1.ebuild b/trinity-base/tdefilereplace/tdefilereplace-14.1.1.ebuild index 8c19e6e7..fff02997 100644 --- a/trinity-base/tdefilereplace/tdefilereplace-14.1.1.ebuild +++ b/trinity-base/tdefilereplace/tdefilereplace-14.1.1.ebuild @@ -13,3 +13,8 @@ DESCRIPTION="A batch search and replace tool for TDE" if [[ ${PV} != *9999* ]] ; then KEYWORDS="~amd64 ~arm64 ~x86" fi + +src_prepare() { + eapply "${FILESDIR}/tdeutils-strlcpy.patch" + trinity-meta-2_src_prepare +} diff --git a/trinity-base/tdelirc/files/tdeutils-strlcpy.patch b/trinity-base/tdelirc/files/tdeutils-strlcpy.patch new file mode 100644 index 00000000..997a4010 --- /dev/null +++ b/trinity-base/tdelirc/files/tdeutils-strlcpy.patch @@ -0,0 +1,19 @@ +--- a/ConfigureChecks.cmake 2023-11-20 07:43:31.808978636 +0300 ++++ b/ConfigureChecks.cmake 2023-11-20 07:47:59.756967430 +0300 +@@ -28,13 +28,9 @@ + tde_setup_gcc_visibility( ) + endif( ) + +- +-##### ark ####################################### +- +-if( BUILD_ARK ) +- check_symbol_exists( strlcpy string.h HAVE_STRLCPY_PROTO ) +- check_symbol_exists( strlcat string.h HAVE_STRLCAT_PROTO ) +-endif( BUILD_ARK ) ++# strlcat and strlcpy check ++check_symbol_exists( strlcpy string.h HAVE_STRLCPY_PROTO ) ++check_symbol_exists( strlcat string.h HAVE_STRLCAT_PROTO ) + + + ##### kcalc ##################################### diff --git a/trinity-base/tdelirc/tdelirc-14.1.1.ebuild b/trinity-base/tdelirc/tdelirc-14.1.1.ebuild index 79c79406..fc3da386 100644 --- a/trinity-base/tdelirc/tdelirc-14.1.1.ebuild +++ b/trinity-base/tdelirc/tdelirc-14.1.1.ebuild @@ -12,3 +12,8 @@ DESCRIPTION="TDElirc - Trinity Frontend to lirc" if [[ ${PV} != *9999* ]] ; then KEYWORDS="~amd64 ~arm64 ~x86" fi + +src_prepare() { + eapply "${FILESDIR}/tdeutils-strlcpy.patch" + trinity-meta-2_src_prepare +} diff --git a/trinity-base/tdescreensaver/files/tdebase-strlcpy.patch b/trinity-base/tdescreensaver/files/tdebase-strlcpy.patch new file mode 100644 index 00000000..c117154d --- /dev/null +++ b/trinity-base/tdescreensaver/files/tdebase-strlcpy.patch @@ -0,0 +1,29 @@ +--- a/ConfigureChecks.cmake 2023-11-13 20:24:40.136525876 +0300 ++++ b/ConfigureChecks.cmake 2023-11-13 20:30:04.069534276 +0300 +@@ -23,6 +23,10 @@ + find_package( TQt ) + find_package( TDE ) + ++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 ) + + ##### look for the usb.ids file, Its location can be set EG: -DWITH_USBIDS="/opt/share/misc/usb.ids" + +@@ -387,15 +391,6 @@ + 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/tdescreensaver/tdescreensaver-14.1.1.ebuild b/trinity-base/tdescreensaver/tdescreensaver-14.1.1.ebuild index 8532391a..878a021a 100644 --- a/trinity-base/tdescreensaver/tdescreensaver-14.1.1.ebuild +++ b/trinity-base/tdescreensaver/tdescreensaver-14.1.1.ebuild @@ -20,6 +20,11 @@ DEPEND="x11-libs/libXt krootbacking? ( ~trinity-base/krootbacking-${PV} )" RDEPEND="${DEPEND}" +src_prepare() { + eapply "${FILESDIR}/tdebase-strlcpy.patch" + trinity-meta-2_src_prepare +} + src_configure () { local mycmakeargs=( -DWITH_OPENGL="$(usex opengl)" diff --git a/trinity-base/tdesu/files/tdebase-strlcpy.patch b/trinity-base/tdesu/files/tdebase-strlcpy.patch new file mode 100644 index 00000000..c117154d --- /dev/null +++ b/trinity-base/tdesu/files/tdebase-strlcpy.patch @@ -0,0 +1,29 @@ +--- a/ConfigureChecks.cmake 2023-11-13 20:24:40.136525876 +0300 ++++ b/ConfigureChecks.cmake 2023-11-13 20:30:04.069534276 +0300 +@@ -23,6 +23,10 @@ + find_package( TQt ) + find_package( TDE ) + ++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 ) + + ##### look for the usb.ids file, Its location can be set EG: -DWITH_USBIDS="/opt/share/misc/usb.ids" + +@@ -387,15 +391,6 @@ + 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/tdesu/tdesu-14.1.1.ebuild b/trinity-base/tdesu/tdesu-14.1.1.ebuild index 72a37cf7..926a66d8 100644 --- a/trinity-base/tdesu/tdesu-14.1.1.ebuild +++ b/trinity-base/tdesu/tdesu-14.1.1.ebuild @@ -17,6 +17,11 @@ IUSE="sudo" DEPEND="sudo? ( app-admin/sudo )" RDEPEND="${DEPEND}" +src_prepare() { + eapply "${FILESDIR}/tdebase-strlcpy.patch" + trinity-meta-2_src_prepare +} + src_configure () { local mycmakeargs=( -DWITH_SUDO_TDESU_BACKEND="$(usex sudo)" diff --git a/trinity-base/tdewallet/files/tdeutils-strlcpy.patch b/trinity-base/tdewallet/files/tdeutils-strlcpy.patch new file mode 100644 index 00000000..997a4010 --- /dev/null +++ b/trinity-base/tdewallet/files/tdeutils-strlcpy.patch @@ -0,0 +1,19 @@ +--- a/ConfigureChecks.cmake 2023-11-20 07:43:31.808978636 +0300 ++++ b/ConfigureChecks.cmake 2023-11-20 07:47:59.756967430 +0300 +@@ -28,13 +28,9 @@ + tde_setup_gcc_visibility( ) + endif( ) + +- +-##### ark ####################################### +- +-if( BUILD_ARK ) +- check_symbol_exists( strlcpy string.h HAVE_STRLCPY_PROTO ) +- check_symbol_exists( strlcat string.h HAVE_STRLCAT_PROTO ) +-endif( BUILD_ARK ) ++# strlcat and strlcpy check ++check_symbol_exists( strlcpy string.h HAVE_STRLCPY_PROTO ) ++check_symbol_exists( strlcat string.h HAVE_STRLCAT_PROTO ) + + + ##### kcalc ##################################### diff --git a/trinity-base/tdewallet/tdewallet-14.1.1.ebuild b/trinity-base/tdewallet/tdewallet-14.1.1.ebuild index 21c0003c..ef026241 100644 --- a/trinity-base/tdewallet/tdewallet-14.1.1.ebuild +++ b/trinity-base/tdewallet/tdewallet-14.1.1.ebuild @@ -13,3 +13,8 @@ DESCRIPTION="Trinity Wallet Management Tool" if [[ ${PV} != *9999* ]] ; then KEYWORDS="~amd64 ~arm64 ~x86" fi + +src_prepare() { + eapply "${FILESDIR}/tdeutils-strlcpy.patch" + trinity-meta-2_src_prepare +} diff --git a/trinity-base/tdm/files/tdebase-strlcpy.patch b/trinity-base/tdm/files/tdebase-strlcpy.patch new file mode 100644 index 00000000..c117154d --- /dev/null +++ b/trinity-base/tdm/files/tdebase-strlcpy.patch @@ -0,0 +1,29 @@ +--- a/ConfigureChecks.cmake 2023-11-13 20:24:40.136525876 +0300 ++++ b/ConfigureChecks.cmake 2023-11-13 20:30:04.069534276 +0300 +@@ -23,6 +23,10 @@ + find_package( TQt ) + find_package( TDE ) + ++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 ) + + ##### look for the usb.ids file, Its location can be set EG: -DWITH_USBIDS="/opt/share/misc/usb.ids" + +@@ -387,15 +391,6 @@ + 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/tdm/tdm-14.1.1.ebuild b/trinity-base/tdm/tdm-14.1.1.ebuild index 1787b8af..dbc5cc46 100644 --- a/trinity-base/tdm/tdm-14.1.1.ebuild +++ b/trinity-base/tdm/tdm-14.1.1.ebuild @@ -35,6 +35,11 @@ pkg_setup() { use sak && TRINITY_SUBMODULE+=" tsak" } +src_prepare() { + eapply "${FILESDIR}/tdebase-strlcpy.patch" + trinity-meta-2_src_prepare +} + src_configure() { local mycmakeargs=( -DWITH_XTEST=ON diff --git a/trinity-base/twin/files/tdebase-strlcpy.patch b/trinity-base/twin/files/tdebase-strlcpy.patch new file mode 100644 index 00000000..c117154d --- /dev/null +++ b/trinity-base/twin/files/tdebase-strlcpy.patch @@ -0,0 +1,29 @@ +--- a/ConfigureChecks.cmake 2023-11-13 20:24:40.136525876 +0300 ++++ b/ConfigureChecks.cmake 2023-11-13 20:30:04.069534276 +0300 +@@ -23,6 +23,10 @@ + find_package( TQt ) + find_package( TDE ) + ++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 ) + + ##### look for the usb.ids file, Its location can be set EG: -DWITH_USBIDS="/opt/share/misc/usb.ids" + +@@ -387,15 +391,6 @@ + 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/twin/twin-14.1.1.ebuild b/trinity-base/twin/twin-14.1.1.ebuild index 0790dca6..ccfda0be 100644 --- a/trinity-base/twin/twin-14.1.1.ebuild +++ b/trinity-base/twin/twin-14.1.1.ebuild @@ -26,6 +26,11 @@ DEPEND="x11-libs/libXext pcre? ( dev-libs/libpcre[jit] )" RDEPEND="${DEPEND}" +src_prepare() { + eapply "${FILESDIR}/tdebase-strlcpy.patch" + trinity-meta-2_src_prepare +} + src_configure() { local mycmakeargs=( -DWITH_XCOMPOSITE="$(usex xcomposite)" |