From fc8bf12cbb329b5ae34a6baddd8d9655e2f536cd Mon Sep 17 00:00:00 2001 From: maxice8 Date: Wed, 18 Oct 2017 13:55:30 -0200 Subject: [PATCH] ksysguard: fix musl build. --- ...tion-with-strict-libc-(such-as-musl).patch | 126 ++++++++++++++++++ srcpkgs/ksysguard/template | 4 - 2 files changed, 126 insertions(+), 4 deletions(-) create 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 new file mode 100644 index 00000000000..c7f15f845ab --- /dev/null +++ b/srcpkgs/ksysguard/patches/Fix-compilation-with-strict-libc-(such-as-musl).patch @@ -0,0 +1,126 @@ +--- 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 c09fea095d3..80853b9b4b9 100644 --- a/srcpkgs/ksysguard/template +++ b/srcpkgs/ksysguard/template @@ -13,7 +13,3 @@ 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 - -case "$XBPS_TARGET_MACHINE" in - *-musl) broken="https://build.voidlinux.eu/builders/x86_64-musl_builder/builds/4687/steps/shell_3/logs/stdio";; -esac