ntrack 016-1 màj port

7 files changed, 143 insertions, 42 deletions

diff --git a/ntrack/.footprint.i686 b/ntrack/.footprint.i686
index 46b36299c..d8b43dee4 100644
--- a/ntrack/.footprint.i686
+++ b/ntrack/.footprint.i686
@@ -44,9 +44,12 @@ lrwxrwxrwx	root/root	usr/lib/libntrack.so.0 -> libntrack.so.0.3.3
 -rwxr-xr-x	root/root	usr/lib/libntrack.so.0.3.3
 drwxr-xr-x	root/root	usr/lib/ntrack/
 drwxr-xr-x	root/root	usr/lib/ntrack/modules/
--rw-r--r--	root/root	usr/lib/ntrack/modules/ntrack-libnl1.a
--rwxr-xr-x	root/root	usr/lib/ntrack/modules/ntrack-libnl1.la
--rwxr-xr-x	root/root	usr/lib/ntrack/modules/ntrack-libnl1.so
+-rw-r--r--	root/root	usr/lib/ntrack/modules/ntrack-libnl2.a
+-rwxr-xr-x	root/root	usr/lib/ntrack/modules/ntrack-libnl2.la
+-rwxr-xr-x	root/root	usr/lib/ntrack/modules/ntrack-libnl2.so
+-rw-r--r--	root/root	usr/lib/ntrack/modules/ntrack-libnl3_x.a
+-rwxr-xr-x	root/root	usr/lib/ntrack/modules/ntrack-libnl3_x.la
+-rwxr-xr-x	root/root	usr/lib/ntrack/modules/ntrack-libnl3_x.so
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/libntrack-glib.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/libntrack-gobject.pc
diff --git a/ntrack/.footprint.x86_64 b/ntrack/.footprint.x86_64
index 46b36299c..d8b43dee4 100644
--- a/ntrack/.footprint.x86_64
+++ b/ntrack/.footprint.x86_64
@@ -44,9 +44,12 @@ lrwxrwxrwx	root/root	usr/lib/libntrack.so.0 -> libntrack.so.0.3.3
 -rwxr-xr-x	root/root	usr/lib/libntrack.so.0.3.3
 drwxr-xr-x	root/root	usr/lib/ntrack/
 drwxr-xr-x	root/root	usr/lib/ntrack/modules/
--rw-r--r--	root/root	usr/lib/ntrack/modules/ntrack-libnl1.a
--rwxr-xr-x	root/root	usr/lib/ntrack/modules/ntrack-libnl1.la
--rwxr-xr-x	root/root	usr/lib/ntrack/modules/ntrack-libnl1.so
+-rw-r--r--	root/root	usr/lib/ntrack/modules/ntrack-libnl2.a
+-rwxr-xr-x	root/root	usr/lib/ntrack/modules/ntrack-libnl2.la
+-rwxr-xr-x	root/root	usr/lib/ntrack/modules/ntrack-libnl2.so
+-rw-r--r--	root/root	usr/lib/ntrack/modules/ntrack-libnl3_x.a
+-rwxr-xr-x	root/root	usr/lib/ntrack/modules/ntrack-libnl3_x.la
+-rwxr-xr-x	root/root	usr/lib/ntrack/modules/ntrack-libnl3_x.so
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/libntrack-glib.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/libntrack-gobject.pc
diff --git a/ntrack/.md5sum.i686 b/ntrack/.md5sum.i686
index d31c0612b..4906689e2 100644
--- a/ntrack/.md5sum.i686
+++ b/ntrack/.md5sum.i686
@@ -1,2 +1,2 @@
-2b31734a40fba5fd2f44c3fec0dcdf73  ntrack-014-link.patch
-d8af7c0f77c030d089bfa5ce0dd1057b  ntrack-014.tar.gz
+21691dac43460a6791cba3decbc68242  ntrack-016.tar.gz
+89edf0df3b7badce7aaf88371a95fdb7  remove-pendantic-Werror.patch
diff --git a/ntrack/.md5sum.x86_64 b/ntrack/.md5sum.x86_64
index d31c0612b..4906689e2 100644
--- a/ntrack/.md5sum.x86_64
+++ b/ntrack/.md5sum.x86_64
@@ -1,2 +1,2 @@
-2b31734a40fba5fd2f44c3fec0dcdf73  ntrack-014-link.patch
-d8af7c0f77c030d089bfa5ce0dd1057b  ntrack-014.tar.gz
+21691dac43460a6791cba3decbc68242  ntrack-016.tar.gz
+89edf0df3b7badce7aaf88371a95fdb7  remove-pendantic-Werror.patch
diff --git a/ntrack/Pkgfile b/ntrack/Pkgfile
index f0ac4f62e..c8e3933f7 100755
--- a/ntrack/Pkgfile
+++ b/ntrack/Pkgfile
@@ -6,15 +6,16 @@
 # Run on: qt,libnl,pyqt
 
 name=ntrack
-version=014
-release=3
+version=016
+release=1
 source=(http://launchpad.net/$name/main/$version/+download/$name-$version.tar.gz 
-	ntrack-014-link.patch)
+	remove-pendantic-Werror.patch)
 
 build() { 
 	unset MAKEFLAGS
 	cd $name-$version
-	patch -Np1 -i ../ntrack-014-link.patch
+	patch -Np1 -i ../remove-pendantic-Werror.patch
+	autoreconf -fi
 
 	PYTHON=python2 ./configure --prefix=/usr\
 		--sysconfdir=/etc \
@@ -22,4 +23,3 @@ build() {
 	make
 	make DESTDIR=$PKG install
 }
-  
diff --git a/ntrack/ntrack-014-link.patch b/ntrack/ntrack-014-link.patch
deleted file mode 100644
index 23ee474ff..000000000
--- a/ntrack/ntrack-014-link.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- ntrack-014/modules/Makefile.am~	2011-04-03 23:14:35.000000000 +0200
-+++ ntrack-014/modules/Makefile.am	2011-04-04 20:03:42.835840583 +0200
-@@ -54,21 +54,21 @@
- if HAVE_LIBNL1
- ntrack_libnl1_la_SOURCES = $(ntrack_libnl_sources)
- ntrack_libnl1_la_CFLAGS = $(LIBNL1_CFLAGS) $(ntrack_libnl_cflags)
--ntrack_libnl1_la_LIBADD = $(LIBNL1_LIBS)
-+ntrack_libnl1_la_LIBADD = $(LIBNL1_LIBS) $(top_builddir)/common/libntrack.la
- ntrack_libnl1_la_LDFLAGS = $(ntrack_libnl_ldflags)
- endif
- 
- if HAVE_LIBNL2
- ntrack_libnl2_la_SOURCES = $(ntrack_libnl_sources)
- ntrack_libnl2_la_CFLAGS = $(LIBNL2_CFLAGS) $(ntrack_libnl_cflags)
--ntrack_libnl2_la_LIBADD = $(LIBNL2_LIBS)
-+ntrack_libnl2_la_LIBADD = $(LIBNL2_LIBS) $(top_builddir)/common/libntrack.la
- ntrack_libnl2_la_LDFLAGS = $(ntrack_libnl_ldflags)
- endif
- 
- if HAVE_LIBNL3
- ntrack_libnl3_la_SOURCES = $(ntrack_libnl_sources)
- ntrack_libnl3_la_CFLAGS = $(LIBNL3_CFLAGS) $(ntrack_libnl_cflags)
--ntrack_libnl3_la_LIBADD = $(LIBNL3_LIBS)
-+ntrack_libnl3_la_LIBADD = $(LIBNL3_LIBS) $(top_builddir)/common/libntrack.la
- ntrack_libnl3_la_LDFLAGS = $(ntrack_libnl_ldflags)
- endif
- 
diff --git a/ntrack/remove-pendantic-Werror.patch b/ntrack/remove-pendantic-Werror.patch
new file mode 100644
index 000000000..0ceceff50
--- /dev/null
+++ b/ntrack/remove-pendantic-Werror.patch
@@ -0,0 +1,122 @@
+Index: glib/Makefile.am
+===================================================================
+--- a/glib/Makefile.am
++++ b/glib/Makefile.am	2011-12-29 08:15:55.053147039 -0300
+@@ -25,8 +25,6 @@
+ 
+ AM_CFLAGS = \
+ 	-Wall \
+-	-Werror \
+-	-pedantic \
+ 	-I$(srcdir)/../common/
+ 
+ AM_LDFLAGS =
+Index: glib/test/Makefile.am
+===================================================================
+--- a/glib/test/Makefile.am
++++ b/glib/test/Makefile.am	2011-12-29 08:16:12.637148030 -0300
+@@ -27,9 +27,7 @@
+ 	../../common/libntrack.la
+ 
+ AM_CFLAGS = \
+-	-pedantic \
+ 	-Wall \
+-	-Werror \
+ 	-I$(srcdir)/.. \
+ 	-I$(srcdir)/../../common \
+ 	$(GLIB_CFLAGS)
+Index: qt4/Makefile.am
+===================================================================
+--- a/qt4/Makefile.am
++++ b/qt4/Makefile.am	2011-12-29 08:17:10.196151274 -0300
+@@ -27,8 +27,6 @@
+ 
+ AM_CFLAGS = \
+ 	-Wall \
+-	-Werror \
+-	-pedantic \
+ 	-isystem $(shell pkg-config --variable=includedir QtCore)
+ 
+ AM_LDFLAGS =
+Index: qt4/test/Makefile.am
+===================================================================
+--- a/qt4/test/Makefile.am
++++ b/qt4/test/Makefile.am	2011-12-29 08:17:20.458151852 -0300
+@@ -26,7 +26,6 @@
+ 
+ AM_CXXFLAGS = \
+ 	-Wall \
+-	-Werror \
+ 	-I$(srcdir)/.. \
+ 	-I$(srcdir)/../../common \
+ 	$(QTCORE_CFLAGS)
+Index: modules/Makefile.am
+===================================================================
+--- a/modules/Makefile.am
++++ b/modules/Makefile.am	2011-12-29 08:16:50.551150167 -0300
+@@ -24,9 +24,7 @@
+ 
+ AM_CFLAGS = \
+ 	-Wall \
+-	-Werror \
+ 	-Wno-variadic-macros \
+-	-pedantic \
+ 	-I$(top_srcdir)/common/
+ 
+ AM_LDFLAGS =
+Index: common/Makefile.am
+===================================================================
+--- a/common/Makefile.am
++++ b/common/Makefile.am	2011-12-29 08:15:19.755145049 -0300
+@@ -25,9 +25,7 @@
+ ntrackmodulesdir = $(pkglibdir)/modules/
+ 
+ AM_CFLAGS = \
+-	-Wall \
+-	-Werror \
+-	-pedantic
++	-Wall 
+ 
+ AM_LDFLAGS =
+ 
+Index: common/test/Makefile.am
+===================================================================
+--- a/common/test/Makefile.am
++++ b/common/test/Makefile.am	2011-12-29 08:15:37.421146045 -0300
+@@ -23,9 +23,7 @@
+ 	../libntrack.la
+ 
+ AM_CFLAGS = \
+-	-pedantic \
+ 	-Wall \
+-	-Werror \
+ 	-I$(srcdir)/..
+ 
+ check_PROGRAMS = \
+Index: gobject/Makefile.am
+===================================================================
+--- a/gobject/Makefile.am
++++ b/gobject/Makefile.am	2011-12-29 08:16:27.872148888 -0300
+@@ -25,8 +25,6 @@
+ 
+ AM_CFLAGS = \
+ 	-Wall \
+-	-Werror \
+-	-pedantic \
+ 	-I$(srcdir)/../common/ \
+ 	-I$(srcdir)/../glib/
+ 
+Index: gobject/test/Makefile.am
+===================================================================
+--- a/gobject/test/Makefile.am
++++ b/gobject/test/Makefile.am	2011-12-29 08:16:37.860149451 -0300
+@@ -28,9 +28,7 @@
+ 	../../common/libntrack.la
+ 
+ AM_CFLAGS = \
+-	-pedantic \
+ 	-Wall \
+-	-Werror \
+ 	-I$(srcdir)/.. \
+ 	-I$(srcdir)/../../common \
+ 	-I$(srcdir)/../../glib \