diff options
Diffstat (limited to 'cad/meshlab/files')
6 files changed, 0 insertions, 69 deletions
diff --git a/cad/meshlab/files/patch-src_external_structuresynth-1.5_ssynth_SyntopiaCore_GLEngine_Raytracer_AtomicCounter.h b/cad/meshlab/files/patch-src_external_structuresynth-1.5_ssynth_SyntopiaCore_GLEngine_Raytracer_AtomicCounter.h deleted file mode 100644 index 4e3530cc5fca..000000000000 --- a/cad/meshlab/files/patch-src_external_structuresynth-1.5_ssynth_SyntopiaCore_GLEngine_Raytracer_AtomicCounter.h +++ /dev/null @@ -1,10 +0,0 @@ ---- src/external/structuresynth-1.5/ssynth/SyntopiaCore/GLEngine/Raytracer/AtomicCounter.h.orig 2020-07-27 23:02:57 UTC -+++ src/external/structuresynth-1.5/ssynth/SyntopiaCore/GLEngine/Raytracer/AtomicCounter.h -@@ -2,6 +2,7 @@ - - #include <QMutex> - #include <QWaitCondition> -+#include <climits> - - namespace SyntopiaCore { - namespace GLEngine { diff --git a/cad/meshlab/files/patch-src_general.pri b/cad/meshlab/files/patch-src_general.pri deleted file mode 100644 index c1a1dfc6f3ed..000000000000 --- a/cad/meshlab/files/patch-src_general.pri +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 deleted file mode 100644 index 21007299b0ca..000000000000 --- a/cad/meshlab/files/patch-src_meshlab_glarea.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- 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 deleted file mode 100644 index e1a9c3cf4a73..000000000000 --- a/cad/meshlab/files/patch-src_meshlab_meshlab.pro +++ /dev/null @@ -1,14 +0,0 @@ ---- 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 deleted file mode 100644 index 8256ba77dd20..000000000000 --- a/cad/meshlab/files/patch-src_meshlabserver_meshlabserver.pro +++ /dev/null @@ -1,13 +0,0 @@ ---- 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 deleted file mode 100644 index 5ae810865418..000000000000 --- a/cad/meshlab/files/patch-src_shared.pri +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 - |