remove already included patches, fix changes to existing ones

9 files changed, 33 insertions, 83 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0669a0c7d25d..2eb7dce49ab4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = meshlab-git
 	pkgdesc = System for processing and editing of unstructured 3D models arising in 3D scanning (qt5 version)
-	pkgver = 2016.12.r10.g781a39a5
-	pkgrel = 2
+	pkgver = 2016.12.r92.gbcd7f6c7
+	pkgrel = 3
 	url = http://www.meshlab.net
 	install = meshlab-git.install
 	arch = i686
@@ -29,9 +29,7 @@ pkgbase = meshlab-git
 	source = 3ds.patch
 	source = levmar.patch
 	source = muparser.patch
-	source = bzip2.patch
 	source = meshlabserver_GLU.patch
-	source = cpp11_abs.patch
 	source = mpir.patch
 	source = rpath.patch
 	source = meshlab.desktop
@@ -40,14 +38,12 @@ pkgbase = meshlab-git
 	md5sums = f13d58ca07fa74b3d7c8f7f9d4ee6a93
 	md5sums = 753dd4753081ddb428f4db8eaefe9009
 	md5sums = 038494125d7bd422074fc5635c5579ca
-	md5sums = e51b027eb9d78b82de73c4724b3928cf
-	md5sums = 9eb027efe2d8584c693a4314db9e5bb5
-	md5sums = 64caafa96bef4208d641e889099eba26
-	md5sums = 616b0dcf018f46a490867028d6ddc533
+	md5sums = 0b338147c8c222cc4681d804bb4e7ae0
+	md5sums = fedc40ddd411a7e41d4be57dbb452262
+	md5sums = 543c52237d91c1f6012b34579c4f0c74
 	md5sums = ca962601b06fac1fb2b6bf0b408777ad
-	md5sums = 76e48d239b21c23dcea9198c69864f69
-	md5sums = 5df295c21de5bac8d6073528823d975a
-	md5sums = 78bf780b3353fe212a77eb91db6f6b6c
+	md5sums = cb5a75c2f2cdf154ad61f753439f226f
+	md5sums = 07da2fc11c1667e6c6a07f0042a2757d
 	md5sums = 18aed0a21276a22325bf8c32166fb110
 
 pkgname = meshlab-git
diff --git a/3ds.patch b/3ds.patch
index 287f2bd5cb4b..475c9c8e16ea 100644
--- a/3ds.patch
+++ b/3ds.patch
@@ -13,9 +13,9 @@
  win32-msvc2005:LIBS	+= ../../external/lib/win32-msvc2005/3ds.lib
  win32-msvc2008:LIBS	+= ../../external/lib/win32-msvc2008/3ds.lib
  win32-g++:LIBS		+= ../../external/lib/win32-gcc/lib3ds.a
--linux-g++:LIBS += ../../external/lib/linux-g++/lib3ds.a
--linux-g++-32:LIBS += ../../external/lib/linux-g++-32/lib3ds.a
--linux-g++-64:LIBS += ../../external/lib/linux-g++-64/lib3ds.a
+-linux-g++:LIBS += $$PWD/../../external/lib/linux-g++/lib3ds.a
+-linux-g++-32:LIBS += $$PWD/../../external/lib/linux-g++-32/lib3ds.a
+-linux-g++-64:LIBS += $$PWD/../../external/lib/linux-g++-64/lib3ds.a
 +linux-g++:LIBS += -l3ds
 +linux-g++-32:LIBS += -l3ds
 +linux-g++-64:LIBS += -l3ds
diff --git a/PKGBUILD b/PKGBUILD
index d41169cc8f0f..a9d9e218e16d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: bartus <aur@bartus.33mail.com>
 pkgname=meshlab-git
-pkgver=2016.12.r10.g781a39a5
-pkgrel=2
+pkgver=2016.12.r92.gbcd7f6c7
+pkgrel=3
 pkgdesc="System for processing and editing of unstructured 3D models arising in 3D scanning (qt5 version)"
 arch=('i686' 'x86_64')
 url="http://www.meshlab.net"
@@ -19,9 +19,7 @@ source=("git+https://github.com/cnr-isti-vclab/meshlab.git"
         "3ds.patch"
         "levmar.patch"
         "muparser.patch"
-        "bzip2.patch"
         "meshlabserver_GLU.patch"
-        "cpp11_abs.patch"
         "mpir.patch"
         "rpath.patch"
         "meshlab.desktop")
@@ -30,14 +28,12 @@ md5sums=('SKIP'
          'f13d58ca07fa74b3d7c8f7f9d4ee6a93'
          '753dd4753081ddb428f4db8eaefe9009'
          '038494125d7bd422074fc5635c5579ca'
-         'e51b027eb9d78b82de73c4724b3928cf'
-         '9eb027efe2d8584c693a4314db9e5bb5'
-         '64caafa96bef4208d641e889099eba26'
-         '616b0dcf018f46a490867028d6ddc533'
+         '0b338147c8c222cc4681d804bb4e7ae0'
+         'fedc40ddd411a7e41d4be57dbb452262'
+         '543c52237d91c1f6012b34579c4f0c74'
          'ca962601b06fac1fb2b6bf0b408777ad'
-         '76e48d239b21c23dcea9198c69864f69'
-         '5df295c21de5bac8d6073528823d975a'
-         '78bf780b3353fe212a77eb91db6f6b6c'
+         'cb5a75c2f2cdf154ad61f753439f226f'
+         '07da2fc11c1667e6c6a07f0042a2757d'
          '18aed0a21276a22325bf8c32166fb110')
 
 pkgver() {
@@ -57,12 +53,8 @@ prepare() {
   patch -Np0 -i rpath.patch
   msg "fix meshalbserver missing -lGLU"
   patch -Np0 -i meshlabserver_GLU.patch
-  msg "fix cpp11 abs()"
-  patch -Np0 -i cpp11_abs.patch
   msg "using system mpir lib"
   patch -Np0 -i mpir.patch
-  msg "using system bzip2 lib"
-  patch -Np0 -i bzip2.patch
   msg "using system muparser lib"
   patch -Np0 -i muparser.patch
   msg "using system levmar lib"
diff --git a/bzip2.patch b/bzip2.patch
deleted file mode 100644
index 49a822aa746e..000000000000
--- a/bzip2.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -Naur -r meshlab.orig/src/meshlabplugins/edit_arc3D/edit_arc3D.pro meshlab/src/meshlabplugins/edit_arc3D/edit_arc3D.pro
---- meshlab.orig/src/meshlabplugins/edit_arc3D/edit_arc3D.pro	2016-10-31 21:31:43.301625217 +0100
-+++ meshlab/src/meshlabplugins/edit_arc3D/edit_arc3D.pro	2016-10-31 21:36:46.694965117 +0100
-@@ -35,9 +35,9 @@
- win32-msvc2013:LIBS	   += ../../external/lib/win32-msvc2013/bz2.lib

- win32-msvc2015:LIBS	   += ../../external/lib/win32-msvc2015/bz2.lib

- win32-g++:LIBS	+= ../../external/lib/win32-gcc/libbz2.a

--linux-g++:LIBS	+= ../../external/lib/linux-g++/libbz2.a

--linux-g++-32:LIBS	+= ../../external/lib/linux-g++-32/libbz2.a

--linux-g++-64:LIBS	+= ../../external/lib/linux-g++-64/libbz2.a

-+linux-g++:LIBS	+= -lbz2

-+linux-g++-32:LIBS	+= -lbz2

-+linux-g++-64:LIBS	+= -lbz2

- mac:LIBS   += -lbz2

- 

- win32-msvc2005:INCLUDEPATH += ../../external/bzip2-1.0.5

-@@ -48,9 +48,6 @@
- win32-msvc2015:INCLUDEPATH += ../../external/bzip2-1.0.5

- 

- win32-g++:INCLUDEPATH  += ../../external/bzip2-1.0.5

--linux-g++:INCLUDEPATH	+= ../../external/bzip2-1.0.5

--linux-g++-32:INCLUDEPATH	+= ../../external/bzip2-1.0.5

--linux-g++-64:INCLUDEPATH	+= ../../external/bzip2-1.0.5

- 

- 

- CONFIG(release, debug|release) {

diff --git a/cpp11_abs.patch b/cpp11_abs.patch
deleted file mode 100644
index c07bf69f3a6c..000000000000
--- a/cpp11_abs.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur meshlab.orig/src/meshlabplugins/edit_quality/eqhandle.cpp meshlab/src/meshlabplugins/edit_quality/eqhandle.cpp
---- meshlab.orig/src/meshlabplugins/edit_quality/eqhandle.cpp	2016-10-30 14:07:42.211338698 +0100
-+++ meshlab/src/meshlabplugins/edit_quality/eqhandle.cpp	2016-10-30 14:08:26.774164177 +0100
-
-@@ -30,6 +30,7 @@
- #include "eqhandle.h"
- #include <QMouseEvent>
- #include <QGraphicsSceneMouseEvent>
-+#include <cmath>
- 
- EqHandle::EqHandle(CHART_INFO *environment_info, QColor color, QPointF position, 
- 				   EQUALIZER_HANDLE_TYPE type, EqHandle** handles, qreal* midHandlePercentilePosition, QDoubleSpinBox* spinbox,
diff --git a/levmar.patch b/levmar.patch
index 7cdde9b7290f..5cbd7953428d 100644
--- a/levmar.patch
+++ b/levmar.patch
@@ -4,9 +4,9 @@
  win32-msvc2012:LIBS	+= ../../external/lib/win32-msvc2012/levmar.lib

  win32-msvc2015:LIBS	+= ../../external/lib/win32-msvc2015/levmar.lib

  win32-g++:LIBS		+= -L../../external/lib/win32-gcc -llevmar

--linux-g++:LIBS		+= -L../../external/lib/linux-g++ -llevmar

--linux-g++-32:LIBS		+= -L../../external/lib/linux-g++-32 -llevmar

--linux-g++-64:LIBS		+= -L../../external/lib/linux-g++-64 -llevmar

+-linux-g++:LIBS		+= -L$$PWD/../../external/lib/linux-g++ -llevmar

+-linux-g++-32:LIBS		+= -L$$PWD/../../external/lib/linux-g++-32 -llevmar

+-linux-g++-64:LIBS		+= -L$$PWD/../../external/lib/linux-g++-64 -llevmar

 +linux-g++:LIBS		+= -llevmar

 +linux-g++-32:LIBS		+=  -llevmar

 +linux-g++-64:LIBS		+=  -llevmar

@@ -93,9 +93,9 @@ index 049bec6..84f6ca9 100644
  win32-msvc2013:  LIBS += ../../external/lib/win32-msvc2013/levmar.lib

  win32-msvc2015:  LIBS += ../../external/lib/win32-msvc2015/levmar.lib

  win32-g++:LIBS += -L../../external -llevmar

--linux-g++:LIBS += -L../../external/lib/linux-g++ -llevmar

--linux-g++-32:LIBS += -L../../external/lib/linux-g++-32 -llevmar

--linux-g++-64:LIBS += -L../../external/lib/linux-g++-64 -llevmar

+-linux-g++:LIBS += -L$$PWD/../../external/lib/linux-g++ -llevmar

+-linux-g++-32:LIBS += -L$$PWD/../../external/lib/linux-g++-32 -llevmar

+-linux-g++-64:LIBS += -L$$PWD/../../external/lib/linux-g++-64 -llevmar

 +linux-g++:LIBS += -llevmar

 +linux-g++-32:LIBS += -llevmar

 +linux-g++-64:LIBS += -llevmar

diff --git a/mpir.patch b/mpir.patch
index 9e0829b6942c..30f342e7158d 100644
--- a/mpir.patch
+++ b/mpir.patch
@@ -1,15 +1,15 @@
 diff --git a/src/meshlabplugins/filter_csg/filter_csg.pro b/src/meshlabplugins/filter_csg/filter_csg.pro
-index 52147b1..f41385d 100644
---- meshlab.orig/src/meshlabplugins/filter_csg/filter_csg.pro
-+++ meshlab/src/meshlabplugins/filter_csg/filter_csg.pro
+index 57ed6060..f41385d4 100644
+--- meshlab/src/meshlabplugins/filter_csg/filter_csg.pro
++++ b/src/meshlabplugins/filter_csg/filter_csg.pro
 @@ -20,7 +20,7 @@ win32-msvc2008:LIBS		 += ../../external/lib/win32-msvc2008/mpirxx.lib ../../exte
  win32-msvc2010:LIBS		 += ../../external/lib/win32-msvc2008/mpirxx.lib ../../external/lib/win32-msvc2008/mpir.lib
  win32-msvc2012:LIBS		 += ../../external/lib/win32-msvc2008/mpirxx.lib ../../external/lib/win32-msvc2008/mpir.lib
  win32-msvc2015:LIBS		 += ../../external/lib/win32-msvc2015/mpirxx.lib ../../external/lib/win32-msvc2015/mpir.lib
 -linux-g++:INCLUDEPATH += ../../external/inc/linux-g++/mpir-2.4.0
--linux-g++:LIBS += ../../external/lib/linux-g++/libmpirxx.a ../../external/lib/linux-g++/libmpir.a
--linux-g++-64:INCLUDEPATH += ../../external/inc/linux-g++/mpir-2.4.0
--linux-g++-64:LIBS += ../../external/lib/linux-g++-64/libmpirxx.a ../../external/lib/linux-g++-64/libmpir.a
+-#linux-g++:LIBS += $$PWD/../../external/lib/linux-g++/libmpirxx.a $$PWD/../../external/lib/linux-g++/libmpir.a
+-#linux-g++-64:INCLUDEPATH += $$PWD/../../external/inc/linux-g++/mpir-2.4.0
+-#linux-g++-64:LIBS += $$PWD/../../external/lib/linux-g++-64/libmpirxx.a $$PWD/../../external/lib/linux-g++-64/libmpir.a
 +unix:LIBS += -lmpirxx -lmpir
 +linux-g++-:LIBS += -lmpirxx -lmpir
 +linux-g++-32:LIBS += -lmpirxx -lmpir
diff --git a/muparser.patch b/muparser.patch
index d500a17d767f..dcd6c5298c6e 100644
--- a/muparser.patch
+++ b/muparser.patch
@@ -5,9 +5,9 @@ diff -Naur ../meshlab/src/meshlabplugins/filter_func/filter_func.pro meshlab/src
  win32-msvc2015:LIBS += ../../external/lib/win32-msvc2015/muparser.lib

  

  macx:LIBS            += $$MACLIBDIR/libmuparser.a

--linux-g++:LIBS       += ../../external/lib/linux-g++/libmuparser.a

--linux-g++-32:LIBS       += ../../external/lib/linux-g++-32/libmuparser.a

--linux-g++-64:LIBS       += ../../external/lib/linux-g++-64/libmuparser.a

+-linux-g++:LIBS       += $$PWD/../../external/lib/linux-g++/libmuparser.a

+-linux-g++-32:LIBS       += $$PWD/../../external/lib/linux-g++-32/libmuparser.a

+-linux-g++-64:LIBS       += $$PWD/../../external/lib/linux-g++-64/libmuparser.a

 +linux-g++:LIBS       += -lmuparser

 +linux-g++-32:LIBS       += -lmuparser

 +linux-g++-64:LIBS       += -lmuparser

diff --git a/rpath.patch b/rpath.patch
index 393c609b9988..f5d9e64e5963 100644
--- a/rpath.patch
+++ b/rpath.patch
@@ -4,7 +4,7 @@ diff -Nur meshlab.orig/src/meshlab/meshlab.pro meshlab/src/meshlab/meshlab.pro
 @@ -130,11 +130,11 @@
  #}
  
- linux-g++:LIBS += -L../external/lib/linux-g++ -ljhead -L../distrib -lcommon -lGLU
+ linux-g++:LIBS += -L$$PWD/../external/lib/linux-g++ -ljhead -L../distrib -lcommon -lGLU
 -linux-g++:QMAKE_RPATHDIR += ../distrib
 +linux-g++:QMAKE_LFLAGS += -Wl,-rpath,/usr/lib/meshlab
  linux-g++-32:LIBS += -L../external/lib/linux-g++-32 -ljhead -L../distrib -lcommon -lGLU