[arch-commits] Commit in nethogs/trunk (PKGBUILD gcc44.patch)

Kyle Keen kkeen at archlinux.org
Tue Jun 28 03:28:15 UTC 2016


    Date: Tuesday, June 28, 2016 @ 03:28:15
  Author: kkeen
Revision: 181459

upgpkg: nethogs 0.8.2-1

Modified:
  nethogs/trunk/PKGBUILD
Deleted:
  nethogs/trunk/gcc44.patch

-------------+
 PKGBUILD    |   23 ++++++++++++++---------
 gcc44.patch |   11 -----------
 2 files changed, 14 insertions(+), 20 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-06-28 03:02:35 UTC (rev 181458)
+++ PKGBUILD	2016-06-28 03:28:15 UTC (rev 181459)
@@ -3,7 +3,7 @@
 # Contributor: ViNS <gladiator at fastwebnet.it>
 # Contributor: Daenyth
 pkgname=nethogs
-pkgver=0.8.1
+pkgver=0.8.2
 pkgrel=1
 pkgdesc="A net top tool which displays traffic used per process instead of per IP or interface"
 url="http://nethogs.sourceforge.net"
@@ -11,19 +11,24 @@
 depends=('libpcap' 'ncurses' 'gcc-libs')
 arch=('i686' 'x86_64')
 #source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
-source=(https://github.com/raboof/nethogs/archive/v$pkgver.tar.gz
-        gcc44.patch)
-md5sums=('cc0aed87c4cc67fc2ffc5f60aa67bf3d'
-         '62eb824fbbadd1c60d0749593c16d293')
+source=(https://github.com/raboof/nethogs/archive/v$pkgver.tar.gz)
+md5sums=('f38db5f08c2dd2b030727ba4ecf58e06')
 
-build() {
+prepare() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  sed -i 's/sbin/bin/g' Makefile
+  sed -i 's|/sbin|/bin|' src/MakeApp.mk
+  sed -i 's|/local||'  Makefile
 
-  # Patch the code to work with gcc 4.4
-  patch -Np1 -i "$srcdir/gcc44.patch"
+  # bug in 0.8.2?
+  # .so file is unversioned
+  sed -i 's/$(LIB[^)]*ION)/0/g' src/MakeLib.mk
+}
 
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  unset CFLAGS
+  unset CXXFLAGS
   make prefix="/usr"
 }
 

Deleted: gcc44.patch
===================================================================
--- gcc44.patch	2016-06-28 03:02:35 UTC (rev 181458)
+++ gcc44.patch	2016-06-28 03:28:15 UTC (rev 181459)
@@ -1,11 +0,0 @@
-diff -ruN nethogs-old/conninode.cpp nethogs/conninode.cpp
---- nethogs-old/conninode.cpp	2009-05-17 09:05:32.000000000 -0400
-+++ nethogs/conninode.cpp	2009-05-17 09:06:47.000000000 -0400
-@@ -1,6 +1,7 @@
- #include <netinet/in.h>
- #include <map>
- #include <stdlib.h>
-+#include <cstdio>
- 
- #include "nethogs.h"
- #include "conninode.h"



More information about the arch-commits mailing list