5 files changed, 59 insertions, 0 deletions
diff --git a/cad/meshlab/files/patch-src_general.pri b/cad/meshlab/files/patch-src_general.pri
new file mode 100644
index 000000000000..c1a1dfc6f3ed
--- /dev/null
+++ b/cad/meshlab/files/patch-src_general.pri
@@ -0,0 +1,11 @@
+--- src/general.pri.orig	2020-05-02 21:17:23 UTC
++++ src/general.pri
+@@ -9,7 +9,7 @@
+ DEFINES += MESHLAB_SCALAR=float
+ 
+ # VCG directory
+-VCGDIR = $$MESHLAB_SOURCE_DIRECTORY/../vcglib
++VCGDIR = %%LOCALBASE%%/include/vcglib
+ 
+ include(find_system_libs.pri)
+ 
diff --git a/cad/meshlab/files/patch-src_meshlab_glarea.cpp b/cad/meshlab/files/patch-src_meshlab_glarea.cpp
new file mode 100644
index 000000000000..21007299b0ca
--- /dev/null
+++ b/cad/meshlab/files/patch-src_meshlab_glarea.cpp
@@ -0,0 +1,10 @@
+--- src/meshlab/glarea.cpp.orig	2020-06-04 09:00:54 UTC
++++ src/meshlab/glarea.cpp
+@@ -34,6 +34,7 @@
+ #include <QFileDialog>
+ #include <QClipboard>
+ #include <QLocale>
++#include <QPainterPath>
+ 
+ #include <wrap/gl/picking.h>
+ #include <wrap/qt/trackball.h>
diff --git a/cad/meshlab/files/patch-src_meshlab_meshlab.pro b/cad/meshlab/files/patch-src_meshlab_meshlab.pro
new file mode 100644
index 000000000000..e1a9c3cf4a73
--- /dev/null
+++ b/cad/meshlab/files/patch-src_meshlab_meshlab.pro
@@ -0,0 +1,14 @@
+--- src/meshlab/meshlab.pro.orig	2020-05-03 08:34:34 UTC
++++ src/meshlab/meshlab.pro
+@@ -143,9 +143,9 @@ macx:QMAKE_POST_LINK += "\
+ #	win32-g++:release:LIBS 		+= -L../common/release -lcommon
+ #}
+ 
+-linux:LIBS += \
++LIBS += \
+     -lmeshlab-common -lGLU \
+-    -L$$MESHLAB_DISTRIB_DIRECTORY/lib/linux -ljhead
++    -L$$MESHLAB_DISTRIB_DIRECTORY/lib -L$$EXIF_DIR -ljhead
+ 
+ !CONFIG(system_glew) {
+ 	INCLUDEPATH *= $$GLEWDIR/include
diff --git a/cad/meshlab/files/patch-src_meshlabserver_meshlabserver.pro b/cad/meshlab/files/patch-src_meshlabserver_meshlabserver.pro
new file mode 100644
index 000000000000..8256ba77dd20
--- /dev/null
+++ b/cad/meshlab/files/patch-src_meshlabserver_meshlabserver.pro
@@ -0,0 +1,13 @@
+--- src/meshlabserver/meshlabserver.pro.orig	2020-05-02 21:24:46 UTC
++++ src/meshlabserver/meshlabserver.pro
+@@ -29,7 +29,9 @@ macx:LIBS += $$MESHLAB_DISTRIB_DIRECTORY/meshlab.app/C
+ 
+ win32-msvc:LIBS += -lopengl32 -lGLU32 -L$$MESHLAB_DISTRIB_DIRECTORY/lib -lmeshlab-common
+ win32-g++:LIBS += -lmeshlab-common
+-linux:LIBS += -lmeshlab-common
++LIBS += -L$$MESHLAB_DISTRIB_DIRECTORY/lib -lmeshlab-common
++
++
+ 
+ win32-msvc:DEFINES += GLEW_STATIC
+ 
diff --git a/cad/meshlab/files/patch-src_shared.pri b/cad/meshlab/files/patch-src_shared.pri
new file mode 100644
index 000000000000..5ae810865418
--- /dev/null
+++ b/cad/meshlab/files/patch-src_shared.pri
@@ -0,0 +1,11 @@
+--- src/shared.pri.orig	2020-05-02 21:26:35 UTC
++++ src/shared.pri
+@@ -12,7 +12,7 @@ QT += script
+ mac:LIBS += $$MESHLAB_DISTRIB_DIRECTORY/lib/libmeshlab-common.dylib
+ win32-msvc:LIBS += $$MESHLAB_DISTRIB_DIRECTORY/lib/meshlab-common.lib -lopengl32 -lGLU32
+ win32-g++:LIBS += -lmeshlab-common -lopengl32 -lGLU32
+-linux:LIBS += -lmeshlab-common -lGL -lGLU
++LIBS += -L$$MESHLAB_DISTRIB_DIRECTORY/lib -lmeshlab-common -lGL -lGLU
+ 
+ win32-msvc:DEFINES += GLEW_STATIC _USE_MATH_DEFINES
+