From 8550a4b31229982ab6bcef64d868e90c228e23d1 Mon Sep 17 00:00:00 2001 From: lemmi Date: Fri, 20 Mar 2020 08:07:26 +0100 Subject: [PATCH] ifstatus: update to 2.0.0. --- .../ifstatus/patches/ifstatus-1.1.0-gcc43.patch | 10 ---------- srcpkgs/ifstatus/patches/ifstatus-1.1.0-gcc6.patch | 14 -------------- .../ifstatus/patches/ifstatus-1.1.0-tinfo.patch | 5 +++-- srcpkgs/ifstatus/template | 10 +++++----- 4 files changed, 8 insertions(+), 31 deletions(-) delete mode 100644 srcpkgs/ifstatus/patches/ifstatus-1.1.0-gcc43.patch delete mode 100644 srcpkgs/ifstatus/patches/ifstatus-1.1.0-gcc6.patch diff --git a/srcpkgs/ifstatus/patches/ifstatus-1.1.0-gcc43.patch b/srcpkgs/ifstatus/patches/ifstatus-1.1.0-gcc43.patch deleted file mode 100644 index 27111d7576f..00000000000 --- a/srcpkgs/ifstatus/patches/ifstatus-1.1.0-gcc43.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/Main.h -+++ b/Main.h -@@ -38,6 +38,7 @@ - #include - #include - #include -+#include - - #include - #include diff --git a/srcpkgs/ifstatus/patches/ifstatus-1.1.0-gcc6.patch b/srcpkgs/ifstatus/patches/ifstatus-1.1.0-gcc6.patch deleted file mode 100644 index 760a09fbf2c..00000000000 --- a/srcpkgs/ifstatus/patches/ifstatus-1.1.0-gcc6.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/Interface.h -+++ b/Interface.h -@@ -57,7 +57,11 @@ - - InterfaceData & operator=(InterfaceData & rInterfaceData); - InterfaceData operator-(InterfaceData & rInterfaceData); - -+#if __cplusplus >= 201103L -+ InterfaceData & operator=(InterfaceData && rInterfaceData) = default; -+ InterfaceData(const InterfaceData&) = default; -+#endif - private: - - unsigned long long m_ullReceived[eTotalTypes]; diff --git a/srcpkgs/ifstatus/patches/ifstatus-1.1.0-tinfo.patch b/srcpkgs/ifstatus/patches/ifstatus-1.1.0-tinfo.patch index b618f4f638b..b21c696e232 100644 --- a/srcpkgs/ifstatus/patches/ifstatus-1.1.0-tinfo.patch +++ b/srcpkgs/ifstatus/patches/ifstatus-1.1.0-tinfo.patch @@ -12,10 +12,11 @@ BIN = ifstatus OBJ = BorderDecorator.o\ @@ -30,7 +28,7 @@ - all : ifstatus printdone +-all : ifstatus printdone ++all : ifstatus ifstatus : $(OBJ) -- $(GCC) $(CFLAGS) $(LDFLAGS) $^ -o $@ +- $(GCC) $(CFLAGS) $^ -o $@ $(LDFLAGS) + $(LINK.cc) $^ $(LDLIBS) -o $@ printdone: diff --git a/srcpkgs/ifstatus/template b/srcpkgs/ifstatus/template index 3f70ab3b863..f1e9d9f4d80 100644 --- a/srcpkgs/ifstatus/template +++ b/srcpkgs/ifstatus/template @@ -1,8 +1,8 @@ # Template file for 'ifstatus' pkgname=ifstatus -version=1.1.0 -revision=3 -wrksrc=ifstatus +version=2.0.0 +revision=1 +wrksrc=ifstatus-v${version} build_style=gnu-makefile patch_args="-Np1" hostmakedepends="pkg-config" @@ -11,8 +11,8 @@ short_desc="Display network traffic on console" maintainer="lemmi " license="GPL-2" homepage="http://ifstatus.sourceforge.net/graphic/index.html" -distfiles="${SOURCEFORGE_SITE}/ifstatus/ifstatus/ifstatus%20v${version}/ifstatus-v${version}.tar.gz" -checksum=0ca8a8655a1edf07698efbd5e1d4adc962dbb1bfb078b4899062e89bb05eac10 +distfiles="http://ifstatus.sourceforge.net/download/ifstatus-v${version}.tar.gz" +checksum=7b4a6124b02e41b4fe532a634bbc66e5749145d1963455190c20f5518513c258 do_install() { vbin ifstatus