From 2cc7a093ac9753b0978f9b0479c35e24451be779 Mon Sep 17 00:00:00 2001 From: ormorph Date: Sat, 30 Dec 2023 20:41:23 +0300 Subject: [PATCH] Removing unused patches Signed-off-by: ormorph (cherry picked from commit 187e714ba6c40fa9bd349eafa410b8ea9aa555bd) --- .../files/tdebase-starttde-14-gentoo.patch | 32 ------------------- .../tdelibs/files/tdelibs-backtrace.patch | 12 ------- .../tdelibs/files/tdelibs-hwlib.patch | 20 ------------ .../tdelibs/files/tdelibs-malloc.patch | 11 ------- 4 files changed, 75 deletions(-) delete mode 100644 trinity-base/tdebase-starttde/files/tdebase-starttde-14-gentoo.patch delete mode 100644 trinity-base/tdelibs/files/tdelibs-backtrace.patch delete mode 100644 trinity-base/tdelibs/files/tdelibs-hwlib.patch delete mode 100644 trinity-base/tdelibs/files/tdelibs-malloc.patch diff --git a/trinity-base/tdebase-starttde/files/tdebase-starttde-14-gentoo.patch b/trinity-base/tdebase-starttde/files/tdebase-starttde-14-gentoo.patch deleted file mode 100644 index 8d91f88c..00000000 --- a/trinity-base/tdebase-starttde/files/tdebase-starttde-14-gentoo.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- starttde 2019-01-27 13:01:05.443907841 +0300 -+++ starttde.gentoo 2019-01-27 13:01:48.203621371 +0300 -@@ -178,7 +178,7 @@ - - # Modify the following environment variables only as necessary. - -- if ! is_in_path PATH "$TDEDIR/games" ; then -+# if ! is_in_path PATH "$TDEDIR/games" ; then - # Respect the traditional path order. Don't blindly place $TDEDIR/games - # first in the path. Only place $TDEDIR/games before /usr/games. If packagers - # are adding $TDEDIR/games elsewhere, then they need to ensure the traditional -@@ -190,9 +190,9 @@ - else - export PATH=$TDEDIR/games:$PATH - fi -- fi -+# fi - -- if ! is_in_path PATH "$TDEDIR/bin" ]; then -+# if ! is_in_path PATH "$TDEDIR/bin" ]; then - # Respect the traditional path order. Don't blindly place $TDEDIR/bin - # first in the path. Only place $TDEDIR/bin before /usr/bin. This order is - # consistent with tdelibs/tdesu/stub.cpp. If packagers are adding $TDEDIR/bin -@@ -204,7 +204,7 @@ - else - export PATH=$TDEDIR/bin:$PATH - fi -- fi -+# fi - - if [ -x /usr/bin/manpath ]; then - if [ "`manpath 2>/dev/null | grep \"$TDEDIR/share/man\"`" = "" ]; then diff --git a/trinity-base/tdelibs/files/tdelibs-backtrace.patch b/trinity-base/tdelibs/files/tdelibs-backtrace.patch deleted file mode 100644 index 21020b46..00000000 --- a/trinity-base/tdelibs/files/tdelibs-backtrace.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -374,6 +374,9 @@ - find_package( Backtrace ) - if ( Backtrace_FOUND ) - set ( HAVE_BACKTRACE 1 ) -+ else () -+ set ( Backtrace_LIBRARY "" ) -+ set ( Backtrace_HEADER "" ) - endif () - endif () - check_cxx_source_compiles( "#include diff --git a/trinity-base/tdelibs/files/tdelibs-hwlib.patch b/trinity-base/tdelibs/files/tdelibs-hwlib.patch deleted file mode 100644 index 911f9c04..00000000 --- a/trinity-base/tdelibs/files/tdelibs-hwlib.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/tdecore/tdehw/tdehardwaredevices.cpp -+++ b/tdecore/tdehw/tdehardwaredevices.cpp -@@ -2906,7 +2906,7 @@ - ndevice->internalSetIpV6Netmask(address); - } - } -- s = getnameinfo(ifa->ifa_ifu.ifu_broadaddr, (family == AF_INET) ? sizeof(struct sockaddr_in) : sizeof(struct sockaddr_in6), host, NI_MAXHOST, NULL, 0, NI_NUMERICHOST); -+ s = ifa->ifa_ifu.ifu_broadaddr ? getnameinfo(ifa->ifa_ifu.ifu_broadaddr, (family == AF_INET) ? sizeof(struct sockaddr_in) : sizeof(struct sockaddr_in6), host, NI_MAXHOST, NULL, 0, NI_NUMERICHOST) : EAI_NONAME; - if (s == 0) { - TQString address(host); - if (family == AF_INET) { -@@ -2917,7 +2917,7 @@ - ndevice->internalSetIpV6Broadcast(address); - } - } -- s = getnameinfo(ifa->ifa_ifu.ifu_dstaddr, (family == AF_INET) ? sizeof(struct sockaddr_in) : sizeof(struct sockaddr_in6), host, NI_MAXHOST, NULL, 0, NI_NUMERICHOST); -+ s = ifa->ifa_ifu.ifu_dstaddr ? getnameinfo(ifa->ifa_ifu.ifu_dstaddr, (family == AF_INET) ? sizeof(struct sockaddr_in) : sizeof(struct sockaddr_in6), host, NI_MAXHOST, NULL, 0, NI_NUMERICHOST) : EAI_NONAME; - if (s == 0) { - TQString address(host); - if (family == AF_INET) { diff --git a/trinity-base/tdelibs/files/tdelibs-malloc.patch b/trinity-base/tdelibs/files/tdelibs-malloc.patch deleted file mode 100644 index 9e4ebeb5..00000000 --- a/trinity-base/tdelibs/files/tdelibs-malloc.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/tdecore/malloc/malloc.c -+++ b/tdecore/malloc/malloc.c -@@ -4306,7 +4306,7 @@ - remainder_size = chunksize(p); - - if (opts & 0x2) { /* optionally clear the elements */ -- memset(mem, 0, remainder_size - SIZE_SZ - array_size) -+ memset(mem, 0, remainder_size - SIZE_SZ - array_size); - } - - /* If not provided, allocate the pointer array as final part of chunk */