diff --git a/srcpkgs/libgtop/patches/fix-includes.patch b/srcpkgs/libgtop/patches/fix-includes.patch new file mode 100644 index 0000000000..877f949bdf --- /dev/null +++ b/srcpkgs/libgtop/patches/fix-includes.patch @@ -0,0 +1,27 @@ +--- sysdeps/linux/netload.c ++++ sysdeps/linux/netload.c +@@ -34,8 +34,6 @@ + #include <sys/socket.h> + #include <sys/ioctl.h> + +-#if !defined (_LIBC) && defined (__GNU_LIBRARY__) && __GNU_LIBRARY__ > 1 +-/* GNU LibC */ + #include <net/if.h> + #include <netinet/ip_icmp.h> + #include <netinet/in.h> +@@ -43,15 +41,6 @@ + #include <netinet/tcp.h> + #include <netinet/udp.h> + #include <net/if.h> +-#else /* Libc 5 */ +-#include <linux/if.h> +-#include <linux/in.h> +-#include <linux/ip.h> +-#include <linux/icmp.h> +-#include <linux/tcp.h> +-#include <linux/udp.h> +-#endif +- + + #ifdef HAVE_IFADDRS_H + /* needed for IPV6 support */ diff --git a/srcpkgs/libgtop/template b/srcpkgs/libgtop/template index f75ba89943..230c355d75 100644 --- a/srcpkgs/libgtop/template +++ b/srcpkgs/libgtop/template @@ -1,10 +1,10 @@ # Template build file for 'libgtop'. pkgname=libgtop version=2.30.0 -revision=1 +revision=2 build_style=gnu-configure -configure_args="-with-libgtop-smp" -hostmakedepends="pkg-config intltool" +configure_args="--with-libgtop-smp $(vopt_enable gir introspection)" +hostmakedepends="pkg-config intltool $(vopt_if gir gobject-introspection)" makedepends="libglib-devel libXau-devel" short_desc="Library to retrieve system information, used in GNOME" maintainer="Juan RP <xtraeme@voidlinux.eu>" @@ -21,13 +21,6 @@ if [ -z "$CROSS_BUILD" ]; then build_options_default="gir" fi -if [ "$build_option_gir" ]; then - configure_args+=" --enable-introspection" - makedepends+=" gobject-introspection" -else - configure_args+=" --disable-introspection" -fi - libgtop-devel_package() { depends="libglib-devel libXau-devel ${sourcepkg}>=${version}_${revision}" short_desc+=" - development files"