From e482acaf4c8da2867a64686d3f1c4eedaf97b0bd Mon Sep 17 00:00:00 2001 From: Sir_Boops Date: Sat, 21 Oct 2017 07:55:37 -0600 Subject: [PATCH] ksysguard: update to 5.11.1 --- ...tion-with-strict-libc-(such-as-musl).patch | 126 ------------------ srcpkgs/ksysguard/template | 4 +- 2 files changed, 2 insertions(+), 128 deletions(-) delete mode 100644 srcpkgs/ksysguard/patches/Fix-compilation-with-strict-libc-(such-as-musl).patch diff --git a/srcpkgs/ksysguard/patches/Fix-compilation-with-strict-libc-(such-as-musl).patch b/srcpkgs/ksysguard/patches/Fix-compilation-with-strict-libc-(such-as-musl).patch deleted file mode 100644 index c7f15f845ab..00000000000 --- a/srcpkgs/ksysguard/patches/Fix-compilation-with-strict-libc-(such-as-musl).patch +++ /dev/null @@ -1,126 +0,0 @@ ---- ksysguardd/Command.c -+++ ksysguardd/Command.c -@@ -19,6 +19,7 @@ - - */ - -+#define _POSIX_C_SOURCE /* sig.*set */ - #include - #include - #include ---- ksysguardd/Linux/ProcessList.c -+++ ksysguardd/Linux/ProcessList.c -@@ -18,6 +18,9 @@ - - */ - -+#define _BSD_SOURCE /* kill, syscall */ -+#define _DEFAULT_SOURCE /* Eliminate warning from prev */ -+ - #include - #include - #include -@@ -29,6 +32,7 @@ - #include - #include - #include -+#include - #include - #include - ---- ksysguardd/Linux/diskstat.c -+++ ksysguardd/Linux/diskstat.c -@@ -20,6 +20,8 @@ - - #include - -+#define _XOPEN_SOURCE /* isascii */ -+ - #include - #include - #include -@@ -63,8 +65,10 @@ char *getMntPnt( const char* cmd ) - memset( device, 0, sizeof( device ) ); - sscanf( cmd, "partitions%1024s", device ); - -- ptr = (char*)rindex( device, '/' ); -- *ptr = '\0'; -+ ptr = strrchr( device, '/' ); -+ if( ptr ) { -+ *ptr = '\0'; -+ } - - return (char*)device; - } ---- ksysguardd/Linux/netstat.c -+++ ksysguardd/Linux/netstat.c -@@ -20,8 +20,11 @@ - - #include - -+#define _POSIX_SOURCE /* expose old gethostbyaddr(3) call */ - #include - #include -+#include -+#include - #include - #include - #include -@@ -264,10 +267,10 @@ updateNetStatTcpUdpRaw(const char *cmd) - { - FILE *netstat; - char buffer[1024]; -- uint local_addr, local_port; -- uint remote_addr, remote_port; -+ unsigned local_addr, local_port; -+ unsigned remote_addr, remote_port; - int uid; -- uint state; -+ unsigned state; - SocketInfo *socket_info; - - if (strstr(cmd, "tcp")) { ---- ksysguardd/Linux/softraid.c -+++ ksysguardd/Linux/softraid.c -@@ -21,6 +21,7 @@ - #include "ksysguardd.h" - #include "softraid.h" - -+#define _POSIX_C_SOURCE 200809L /* strndup */ - #include /* for strlen, strcat and strcmp */ - #include /* for sprintf */ - #include /* for open */ ---- ksysguardd/PWUIDCache.c -+++ ksysguardd/PWUIDCache.c -@@ -18,6 +18,8 @@ - - */ - -+#define _POSIX_C_SOURCE 200809L /* strdup */ -+ - #include - #include - #include ---- ksysguardd/conf.c -+++ ksysguardd/conf.c -@@ -20,6 +20,7 @@ - - #include "config-ksysguardd.h" - -+#define _POSIX_C_SOURCE 200809L /* strdup */ - #include - #include - #include ---- ksysguardd/ksysguardd.c -+++ ksysguardd/ksysguardd.c -@@ -22,6 +22,9 @@ - - */ - -+/* strdup, fileno, fdopen */ -+#define _POSIX_C_SOURCE 200809L -+ - #include - #include - #include - diff --git a/srcpkgs/ksysguard/template b/srcpkgs/ksysguard/template index 80853b9b4b9..5ce1f58a629 100644 --- a/srcpkgs/ksysguard/template +++ b/srcpkgs/ksysguard/template @@ -1,6 +1,6 @@ # Template file for 'ksysguard' pkgname=ksysguard -version=5.8.7 +version=5.11.1 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -12,4 +12,4 @@ maintainer="Denis Revin " license="GPL-2" homepage="https://projects.kde.org/projects/plasma/ksysguard" distfiles="http://download.kde.org/stable/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=ab69a8f3c8d21422b17e689dc0cf1b2137723dafded343ad3ea8db1802014080 +checksum=e11b75b4ccfe325cb988eca0e6c8070438c457b240bfa7f82b014559124fe287