diff options
| -rw-r--r-- | .SRCINFO | 28 | ||||
| -rw-r--r-- | 3ds.patch | 13 | ||||
| -rw-r--r-- | PKGBUILD | 112 | ||||
| -rw-r--r-- | external.patch | 18 | ||||
| -rw-r--r-- | levmar.patch | 78 | ||||
| -rw-r--r-- | meshlabserver_GLU.patch | 14 | ||||
| -rw-r--r-- | mpir.patch | 10 | ||||
| -rw-r--r-- | muparser.patch | 14 | ||||
| -rw-r--r-- | muparser_drop_unicode.patch | 555 | ||||
| -rw-r--r-- | plugin_dir.patch | 22 | ||||
| -rw-r--r-- | qt5.11.patch | 31 | ||||
| -rw-r--r-- | revert-external.patch | 455 | ||||
| -rw-r--r-- | rpath.patch | 26 | ||||
| -rw-r--r-- | shaders_dir.patch | 89 |
14 files changed, 12 insertions, 1453 deletions
@@ -1,12 +1,14 @@ pkgbase = meshlab-git pkgdesc = System for processing and editing of unstructured 3D models arising in 3D scanning (qt5 version) - pkgver = 2019.12.06.f8778c4.r0.gf8778c44 + pkgver = 2020.01.r0.g84dd7577 pkgrel = 1 url = https://www.meshlab.net install = meshlab-git.install arch = i686 arch = x86_64 license = GPL2 + makedepends = cmake + makedepends = ninja makedepends = git makedepends = muparser makedepends = levmar @@ -29,33 +31,9 @@ pkgbase = meshlab-git conflicts = meshlab source = git+https://github.com/cnr-isti-vclab/meshlab.git source = git+https://github.com/cnr-isti-vclab/vcglib.git#branch=devel - source = revert-external.patch - source = plugin_dir.patch - source = shaders_dir.patch - source = external.patch - source = 3ds.patch - source = levmar.patch - source = muparser.patch - source = muparser_drop_unicode.patch - source = meshlabserver_GLU.patch - source = mpir.patch - source = rpath.patch - source = qt5.11.patch source = meshlab.desktop sha256sums = SKIP sha256sums = SKIP - sha256sums = aeef11fabc93d3dc1b804a400081f35b428ed5cbe270282298dd84b831eb5b96 - sha256sums = 0072605f6547f92f0d0c3abd18ec904d325185a5b6feac500ec0cb34e38b72b4 - sha256sums = 736c7afac25bc7b23703082c4d79a9981782038d23e39b646adfeae345d44374 - sha256sums = 21e9f2fc1c971fbd00cb9d40e773c07ba24de0482197fd1b4ca42908f2097fc9 - sha256sums = 86d6c8c5133fc0823a11289ab9e19c850e4564535c2026787e2da00d7d2b184b - sha256sums = e37a51fe244764b644764387a1d24dcd7262b6aee12386e1d9baa771bf4f8287 - sha256sums = 7c048e5b70bb7be3530392dab606713b04878304ce0a6cde6156b9a84b3261f5 - sha256sums = 48229a56e8b61b8a0c21062e1cfe0ae2417f7609aa1a2ad29debdd636cadae3d - sha256sums = 5a041c414777036ebd8925108a9bb51f66ab435324ff4671012bdcb806fcf400 - sha256sums = 865b318f4196b1a34b17867dc18e116ef5f702b4905bb2d536609eb79af1c1bc - sha256sums = c43cb14de251f369734330e1f93744f71527360e1894c93e9f9f8abe686db050 - sha256sums = 2236863292bf078b2e89d278bad834fd08563613d40e33ec471ae92588132a57 sha256sums = 030ab1dcafb7d793bed3bc455497208addadf1091a4619576fe7e044aed4231a pkgname = meshlab-git diff --git a/3ds.patch b/3ds.patch deleted file mode 100644 index 5f19402c7432..000000000000 --- a/3ds.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/meshlabplugins/io_3ds/io_3ds.pro b/src/meshlabplugins/io_3ds/io_3ds.pro -index 85b4a744..74ba5c6e 100644 ---- a/src/meshlabplugins/io_3ds/io_3ds.pro -+++ b/src/meshlabplugins/io_3ds/io_3ds.pro -@@ -14,7 +14,7 @@ DEFINES += LIB3DS_STATIC - - TARGET = io_3ds - --INCLUDEPATH += ../../external/lib3ds-1.3.0/ -+INCLUDEPATH += /usr/include/lib3ds/ - - # Notes on the paths of lib3ds files. - # Once you have compiled the library put the lib files in a dir named lib/XXX/ @@ -1,6 +1,6 @@ # Maintainer : bartus <arch-user-repoᘓbartus.33mail.com> pkgname=meshlab-git -pkgver=2019.12.06.f8778c4.r0.gf8778c44 +pkgver=2020.01.r0.g84dd7577 pkgrel=1 pkgdesc="System for processing and editing of unstructured 3D models arising in 3D scanning (qt5 version)" arch=('i686' 'x86_64') @@ -9,7 +9,7 @@ conflicts=('meshlab') provides=('meshlab') license=('GPL2') depends=('bzip2' 'desktop-file-utils' 'glu' 'openssl-1.0' 'qt5-base' 'qt5-declarative' 'qt5-script' 'qt5-xmlpatterns') -makedepends=('git' 'muparser' 'levmar' 'lib3ds' 'mpir') +makedepends=('cmake' 'ninja' 'git' 'muparser' 'levmar' 'lib3ds' 'mpir') optdepends=('u3d: for U3D and IDTF file support' 'lib3ds: for Autodesk`s 3D-Studio r3 and r4 .3DS file support' 'levmar: for isoparametrization and mutualcorrs plugins' @@ -19,120 +19,26 @@ optdepends=('u3d: for U3D and IDTF file support' install="${pkgname}.install" source=("git+https://github.com/cnr-isti-vclab/meshlab.git" "git+https://github.com/cnr-isti-vclab/vcglib.git#branch=devel" - "revert-external.patch" - "plugin_dir.patch" - "shaders_dir.patch" - "external.patch" - "3ds.patch" - "levmar.patch" - "muparser.patch" - "muparser_drop_unicode.patch" - "meshlabserver_GLU.patch" - "mpir.patch" - "rpath.patch" - "qt5.11.patch" "meshlab.desktop") sha256sums=('SKIP' 'SKIP' - 'aeef11fabc93d3dc1b804a400081f35b428ed5cbe270282298dd84b831eb5b96' - '0072605f6547f92f0d0c3abd18ec904d325185a5b6feac500ec0cb34e38b72b4' - '736c7afac25bc7b23703082c4d79a9981782038d23e39b646adfeae345d44374' - '21e9f2fc1c971fbd00cb9d40e773c07ba24de0482197fd1b4ca42908f2097fc9' - '86d6c8c5133fc0823a11289ab9e19c850e4564535c2026787e2da00d7d2b184b' - 'e37a51fe244764b644764387a1d24dcd7262b6aee12386e1d9baa771bf4f8287' - '7c048e5b70bb7be3530392dab606713b04878304ce0a6cde6156b9a84b3261f5' - '48229a56e8b61b8a0c21062e1cfe0ae2417f7609aa1a2ad29debdd636cadae3d' - '5a041c414777036ebd8925108a9bb51f66ab435324ff4671012bdcb806fcf400' - '865b318f4196b1a34b17867dc18e116ef5f702b4905bb2d536609eb79af1c1bc' - 'c43cb14de251f369734330e1f93744f71527360e1894c93e9f9f8abe686db050' - '2236863292bf078b2e89d278bad834fd08563613d40e33ec471ae92588132a57' '030ab1dcafb7d793bed3bc455497208addadf1091a4619576fe7e044aed4231a') pkgver() { cd ${srcdir}/${pkgname%-git} - local date=$(git log --tags --simplify-by-decoration --pretty=format:"%ai" -1|cut -d' ' -f1|sed 's/-/\./g') - git describe --long --tags | sed "s/^v//;s/\([^-]*-g\)/r\1/;s/-/./g;s/^/${date}\./g" -} - -prepare() { - cd ${srcdir}/${pkgname%-git} - - # remove bundled headers and libraries - rm -fr meshlab/src/external/{inc,lib} - - msg "revert upstram patch to external lib" - patch -Np1 -i ${srcdir}/revert-external.patch - msg "truncate external lib" - patch -Np1 -i ${srcdir}/external.patch - msg "fix rpath" - patch -Np1 -i ${srcdir}/rpath.patch - msg "fix meshalbserver missing -lGLU" - patch -Np1 -i ${srcdir}/meshlabserver_GLU.patch - msg "using system mpir lib" - patch -Np1 -i ${srcdir}/mpir.patch - msg "using system muparser lib" - patch -Np1 -i ${srcdir}/muparser.patch - msg "using system levmar lib" - patch -Np1 -i ${srcdir}/levmar.patch - msg "using system 3ds lib" - patch -Np1 -i ${srcdir}/3ds.patch - msg "put plugins in /usr/lib/mashlab" - patch -Np1 -i ${srcdir}/plugin_dir.patch - msg "put shaders in /usr/shade/meshlab" - patch -Np1 -i ${srcdir}/shaders_dir.patch - msg "qt(5.11) compatibility" - patch -Np1 -i ${srcdir}/qt5.11.patch - msg "fix muparser unicode string" - patch -Np1 -i ${srcdir}/muparser_drop_unicode.patch - cd ${srcdir}/vcglib + git describe --long --tags | sed 's/Meshlab-\([0-9]*-[0-9]*\)-[a-z0-9]*-/\1-/g;s/\([^-]*-g\)/r\1/;s/-/./g' } build() { - cd "${srcdir}/meshlab/src" - - msg "build external libraries" - cd external - qmake external.pro -r - make - - msg "build meshlab" - cd .. - qmake meshlab_full.pro -r - make + mkdir "${srcdir}/build" + cmake -DCMAKE_INSTALL_PREFIX="/usr" -G Ninja -B "${srcdir}/build" "${srcdir}/meshlab/src" + cd "${srcdir}/build" + ninja $([ -v MAKEFLAGS ] || echo -j1) } package() { - cd ${srcdir}/meshlab/src/distrib - - # install meshlab - install -d -m755 ${pkgdir}/usr/bin - install -d -m755 ${pkgdir}/usr/lib/meshlab - install -d -m755 ${pkgdir}/usr/share/meshlab - install -t ${pkgdir}/usr/bin meshlab* - install -t ${pkgdir}/usr/lib/meshlab libcommon* - - cp -a plugins ${pkgdir}/usr/lib/meshlab - cp -a shaders ${pkgdir}/usr/share/meshlab - cp -a textures ${pkgdir}/usr/share/meshlab - cp -a sample ${pkgdir}/usr/share/meshlab - - # install man pages - install -d -m755 "${pkgdir}/usr/share/man/man1" - install -m644 "${srcdir}/meshlab/docs/meshlab.1" "${pkgdir}"/usr/share/man/man1 - install -m644 "${srcdir}/meshlab/docs/meshlabserver.1" "${pkgdir}"/usr/share/man/man1 - - # install icons - install -d -m755 "${pkgdir}/usr/share/pixmaps" - install -m644 "${srcdir}/meshlab/src/meshlab/images/eye_cropped.png" "${pkgdir}/usr/share/pixmaps/meshlab.png" - - # install desktop entry - install -d -m755 "${pkgdir}/usr/share/applications" - install -m644 "${srcdir}/meshlab.desktop" "${pkgdir}/usr/share/applications" - sed -i "s#Version=.*#Version=$pkgver#" "${pkgdir}/usr/share/applications/meshlab.desktop" - - # add xml symlinks to propper show info in "help>plugin info" dialog - cd ${pkgdir}/usr/lib/meshlab/plugins - for xml in *.xml ; do ln -s $xml lib${xml} ; done + cd "${srcdir}/build" + DESTDIR="$pkgdir" ninja install } # vim:set ts=2 sw=2 et: diff --git a/external.patch b/external.patch deleted file mode 100644 index 11ada8742e98..000000000000 --- a/external.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/src/external/external.pro b/src/external/external.pro -index 7bd97f60..93ed196b 100644 ---- a/src/external/external.pro -+++ b/src/external/external.pro -@@ -2,11 +2,6 @@ config += debug_and_release - - TEMPLATE = subdirs - --SUBDIRS = bzip2-1.0.5/bzip2-1.0.5.pro \ -- muparser_v225/src \ -- levmar-2.3/levmar-2.3.pro \ -- structuresynth-1.5/structuresynth.pro \ -+SUBDIRS = structuresynth-1.5/structuresynth.pro \ - OpenCTM-1.0.3/openctm.pro \ -- jhead-2.95/jhead-2.95.pro \ -- lib3ds-1.3.0/lib3ds/lib3ds.pro --# openkinect/openkinect.pro -+ jhead-2.95/jhead-2.95.pro diff --git a/levmar.patch b/levmar.patch deleted file mode 100644 index d75876acb7eb..000000000000 --- a/levmar.patch +++ /dev/null @@ -1,78 +0,0 @@ -diff --git a/src/meshlabplugins/filter_mutualinfoxml/levmarmethods.h b/src/meshlabplugins/filter_mutualinfoxml/levmarmethods.h -index 484d6dbf..8c0ae176 100644 ---- a/src/meshlabplugins/filter_mutualinfoxml/levmarmethods.h -+++ b/src/meshlabplugins/filter_mutualinfoxml/levmarmethods.h -@@ -12,7 +12,7 @@ sufficient to get a calibrated shot.<br> -
- #include <list>
-
--#include "../../external/levmar-2.3/lm.h"
-+#include <levmar/levmar.h>
-
-
- struct LevmarCorrelation {
-diff --git a/src/meshlabplugins/filter_mutualinfoxml/solver.h b/src/meshlabplugins/filter_mutualinfoxml/solver.h -index c45992b2..4d7b7405 100644 ---- a/src/meshlabplugins/filter_mutualinfoxml/solver.h -+++ b/src/meshlabplugins/filter_mutualinfoxml/solver.h -@@ -5,7 +5,7 @@ - #include "alignset.h"
-
- #include "parameters.h"
--#include "../../external/levmar-2.3/lm.h"
-+#include <levmar/levmar.h>
-
- #include <iostream>
- #include <fstream>
-diff --git a/src/meshlabplugins/edit_mutualcorrs/levmarmethods.h b/src/meshlabplugins/edit_mutualcorrs/levmarmethods.h -index 484d6dbf..8c0ae176 100644 ---- a/src/meshlabplugins/edit_mutualcorrs/levmarmethods.h -+++ b/src/meshlabplugins/edit_mutualcorrs/levmarmethods.h -@@ -12,7 +12,7 @@ sufficient to get a calibrated shot.<br> -
- #include <list>
-
--#include "../../external/levmar-2.3/lm.h"
-+#include <levmar/levmar.h>
-
-
- struct LevmarCorrelation {
-diff --git a/src/meshlabplugins/edit_mutualcorrs/solver.h b/src/meshlabplugins/edit_mutualcorrs/solver.h -index 05e99c5e..81bbb7f2 100644 ---- a/src/meshlabplugins/edit_mutualcorrs/solver.h -+++ b/src/meshlabplugins/edit_mutualcorrs/solver.h -@@ -5,7 +5,7 @@ - #include "alignset.h"
-
- #include "parameters.h"
--#include "../../external/levmar-2.3/lm.h"
-+#include <levmar/levmar.h>
-
- #include <iostream>
- #include <fstream>
-diff --git a/src/meshlabplugins/filter_mutualglobal/levmarmethods.h b/src/meshlabplugins/filter_mutualglobal/levmarmethods.h -index 484d6dbf..8c0ae176 100644 ---- a/src/meshlabplugins/filter_mutualglobal/levmarmethods.h -+++ b/src/meshlabplugins/filter_mutualglobal/levmarmethods.h -@@ -12,7 +12,7 @@ sufficient to get a calibrated shot.<br> -
- #include <list>
-
--#include "../../external/levmar-2.3/lm.h"
-+#include <levmar/levmar.h>
-
-
- struct LevmarCorrelation {
-diff --git a/src/meshlabplugins/filter_mutualglobal/solver.h b/src/meshlabplugins/filter_mutualglobal/solver.h -index c45992b2..4d7b7405 100644 ---- a/src/meshlabplugins/filter_mutualglobal/solver.h -+++ b/src/meshlabplugins/filter_mutualglobal/solver.h -@@ -5,7 +5,7 @@ - #include "alignset.h"
-
- #include "parameters.h"
--#include "../../external/levmar-2.3/lm.h"
-+#include <levmar/levmar.h>
-
- #include <iostream>
- #include <fstream>
diff --git a/meshlabserver_GLU.patch b/meshlabserver_GLU.patch deleted file mode 100644 index 192db47f2458..000000000000 --- a/meshlabserver_GLU.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/src/meshlabserver/meshlabserver.pro b/src/meshlabserver/meshlabserver.pro -index e97962a1..6f3e9f92 100644 ---- a/src/meshlabserver/meshlabserver.pro -+++ b/src/meshlabserver/meshlabserver.pro -@@ -29,8 +29,8 @@ win32-msvc2010: LIBS += -L../distrib -lcommon -lopengl32 -lGLU32 - win32-msvc2012: LIBS += -L../distrib -lcommon -lopengl32 -lGLU32 - win32-msvc2015: LIBS += -L../distrib -lcommon -lopengl32 -lGLU32 - win32-g++: LIBS += -L../distrib -lcommon --linux: LIBS += -L../distrib -lcommon -+linux: LIBS += -L../distrib -lcommon -lGLU - linux:QMAKE_LFLAGS += -Wl,-rpath,/usr/lib/meshlab - #CONFIG (release,debug | release) { - # win32-msvc2005:release: LIBS += -L../common/release -lcommon - # win32-msvc2008:release: LIBS += -L../common/release -lcommon diff --git a/mpir.patch b/mpir.patch deleted file mode 100644 index d8c67dbd5f67..000000000000 --- a/mpir.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff --git a/src/meshlabplugins/filter_csg/filter_csg.pro b/src/meshlabplugins/filter_csg/filter_csg.pro -index 928d7b54..8585c851 100644 ---- a/src/meshlabplugins/filter_csg/filter_csg.pro -+++ b/src/meshlabplugins/filter_csg/filter_csg.pro -@@ -25,4 +25,4 @@ win32-msvc2010:LIBS += ../../external/lib/win32-msvc2008/mpirxx.lib ../../exte - win32-msvc2012:LIBS += ../../external/lib/win32-msvc2008/mpirxx.lib ../../external/lib/win32-msvc2008/mpir.lib - win32-msvc2013: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:INCLUDEPATH += ../../external/inc/linux-g++/mpir-2.4.0 -+linux:LIBS += -lmpirxx -lmpir diff --git a/muparser.patch b/muparser.patch deleted file mode 100644 index c9aecf451446..000000000000 --- a/muparser.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/src/meshlabplugins/filter_func/filter_func.pro b/src/meshlabplugins/filter_func/filter_func.pro -index ef6b654c..7d8d32c8 100644 ---- a/src/meshlabplugins/filter_func/filter_func.pro -+++ b/src/meshlabplugins/filter_func/filter_func.pro -@@ -7,9 +7,6 @@ SOURCES += filter_func.cpp - TARGET = filter_func
-
-
--DEFINES += _UNICODE
--INCLUDEPATH += ../../external/muparser_v225/include
--
- # Note: we need static libs so when building muparser lib use
- # ./configure --enable-shared=no
-
diff --git a/muparser_drop_unicode.patch b/muparser_drop_unicode.patch deleted file mode 100644 index 2a1790d10e02..000000000000 --- a/muparser_drop_unicode.patch +++ /dev/null @@ -1,555 +0,0 @@ -diff --git a/src/meshlabplugins/filter_func/filter_func.cpp b/src/meshlabplugins/filter_func/filter_func.cpp -index 193cd190..e8e1f5c1 100644 ---- a/src/meshlabplugins/filter_func/filter_func.cpp -+++ b/src/meshlabplugins/filter_func/filter_func.cpp -@@ -378,14 +378,13 @@ bool FilterFunctionPlugin::applyFilter(QAction *filter, MeshDocument &md, RichPa - case FF_VERT_SELECTION : - { - std::string expr = par.getString("condSelect").toStdString(); -- std::wstring wexpr = conversion::fromStringToWString(expr); - - // muparser initialization and explicitely define parser variables - Parser p; - setPerVertexVariables(p,m.cm); - - // set expression inserted by user as string (required by muparser) -- p.SetExpr(wexpr); -+ p.SetExpr(expr); - - int numvert = 0; - time_t start = clock(); -@@ -403,7 +402,7 @@ bool FilterFunctionPlugin::applyFilter(QAction *filter, MeshDocument &md, RichPa - try { - selected = p.Eval(); - } catch(Parser::exception_type &e) { -- errorMessage = conversion::fromWStringToString(e.GetMsg()).c_str(); -+ errorMessage = e.GetMsg().c_str(); - return false; - } - -@@ -430,7 +429,7 @@ bool FilterFunctionPlugin::applyFilter(QAction *filter, MeshDocument &md, RichPa - setPerFaceVariables(p,m.cm); - - // set expression inserted by user as string (required by muparser) -- p.SetExpr(conversion::fromStringToWString(select.toStdString())); -+ p.SetExpr(select.toStdString()); - - int numface = 0; - time_t start = clock(); -@@ -448,7 +447,7 @@ bool FilterFunctionPlugin::applyFilter(QAction *filter, MeshDocument &md, RichPa - try { - selected = p.Eval(); - } catch(Parser::exception_type &e) { -- errorMessage = conversion::fromWStringToString(e.GetMsg()).c_str(); -+ errorMessage = e.GetMsg().c_str(); - return false; - } - -@@ -501,10 +500,10 @@ bool FilterFunctionPlugin::applyFilter(QAction *filter, MeshDocument &md, RichPa - setPerVertexVariables(p3,m.cm); - setPerVertexVariables(p4,m.cm); - -- p1.SetExpr(conversion::fromStringToWString(func_x)); -- p2.SetExpr(conversion::fromStringToWString(func_y)); -- p3.SetExpr(conversion::fromStringToWString(func_z)); -- p4.SetExpr(conversion::fromStringToWString(func_a)); -+ p1.SetExpr(func_x); -+ p2.SetExpr(func_y); -+ p3.SetExpr(func_z); -+ p4.SetExpr(func_a); - - double newx=0,newy=0,newz=0,newa=255; - errorMessage = ""; -@@ -580,7 +579,7 @@ bool FilterFunctionPlugin::applyFilter(QAction *filter, MeshDocument &md, RichPa - setPerVertexVariables(p,m.cm); - - // set expression to calc with parser -- p.SetExpr(conversion::fromStringToWString(func_q)); -+ p.SetExpr(func_q); - - // every parser variables is related to vertex coord and attributes. - time_t start = clock(); -@@ -596,7 +595,7 @@ bool FilterFunctionPlugin::applyFilter(QAction *filter, MeshDocument &md, RichPa - try { - (*vi).Q() = p.Eval(); - } catch(Parser::exception_type &e) { -- errorMessage = conversion::fromWStringToString(e.GetMsg()).c_str(); -+ errorMessage = e.GetMsg().c_str(); - return false; - } - } -@@ -642,8 +641,8 @@ bool FilterFunctionPlugin::applyFilter(QAction *filter, MeshDocument &md, RichPa - setPerVertexVariables(pv,m.cm); - - // set expression to calc with parser -- pu.SetExpr(conversion::fromStringToWString(func_u)); -- pv.SetExpr(conversion::fromStringToWString(func_v)); -+ pu.SetExpr(func_u); -+ pv.SetExpr(func_v); - - // every parser variables is related to vertex coord and attributes. - time_t start = clock(); -@@ -660,7 +659,7 @@ bool FilterFunctionPlugin::applyFilter(QAction *filter, MeshDocument &md, RichPa - (*vi).T().U() = pu.Eval(); - (*vi).T().V() = pv.Eval(); - } catch(Parser::exception_type &e) { -- errorMessage = conversion::fromWStringToString(e.GetMsg()).c_str(); -+ errorMessage = e.GetMsg().c_str(); - return false; - } - } -@@ -695,9 +694,9 @@ bool FilterFunctionPlugin::applyFilter(QAction *filter, MeshDocument &md, RichPa - setPerFaceVariables(pu2,m.cm); setPerFaceVariables(pv2,m.cm); - - // set expression to calc with parser -- pu0.SetExpr(conversion::fromStringToWString(func_u0)); pv0.SetExpr(conversion::fromStringToWString(func_v0)); -- pu1.SetExpr(conversion::fromStringToWString(func_u1)); pv1.SetExpr(conversion::fromStringToWString(func_v1)); -- pu2.SetExpr(conversion::fromStringToWString(func_u2)); pv2.SetExpr(conversion::fromStringToWString(func_v2)); -+ pu0.SetExpr(func_u0); pv0.SetExpr(func_v0); -+ pu1.SetExpr(func_u1); pv1.SetExpr(func_v1); -+ pu2.SetExpr(func_u2); pv2.SetExpr(func_v2); - - // every parser variables is related to vertex coord and attributes. - time_t start = clock(); -@@ -715,7 +714,7 @@ bool FilterFunctionPlugin::applyFilter(QAction *filter, MeshDocument &md, RichPa - (*fi).WT(1).U() = pu1.Eval(); (*fi).WT(1).V() = pv1.Eval(); - (*fi).WT(2).U() = pu2.Eval(); (*fi).WT(2).V() = pv2.Eval(); - } catch(Parser::exception_type &e) { -- errorMessage = conversion::fromWStringToString(e.GetMsg()).c_str(); -+ errorMessage = e.GetMsg().c_str(); - return false; - } - } -@@ -750,10 +749,10 @@ bool FilterFunctionPlugin::applyFilter(QAction *filter, MeshDocument &md, RichPa - setPerFaceVariables(p3,m.cm); - setPerFaceVariables(p4,m.cm); - -- p1.SetExpr(conversion::fromStringToWString(func_r)); -- p2.SetExpr(conversion::fromStringToWString(func_g)); -- p3.SetExpr(conversion::fromStringToWString(func_b)); -- p4.SetExpr(conversion::fromStringToWString(func_a)); -+ p1.SetExpr(func_r); -+ p2.SetExpr(func_g); -+ p3.SetExpr(func_b); -+ p4.SetExpr(func_a); - - // RGB is related to every face - CMeshO::FaceIterator fi; -@@ -809,7 +808,7 @@ bool FilterFunctionPlugin::applyFilter(QAction *filter, MeshDocument &md, RichPa - setPerFaceVariables(pf,m.cm); - - // set expression to calc with parser -- pf.SetExpr(conversion::fromStringToWString(func_q)); -+ pf.SetExpr(func_q); - - time_t start = clock(); - errorMessage = ""; -@@ -872,7 +871,7 @@ bool FilterFunctionPlugin::applyFilter(QAction *filter, MeshDocument &md, RichPa - qDebug("Now mesh has %lu vertex float attribute",AllVertexAttribName.size()); - Parser p; - setPerVertexVariables(p,m.cm); -- p.SetExpr(conversion::fromStringToWString(expr)); -+ p.SetExpr(expr); - - time_t start = clock(); - -@@ -886,7 +885,7 @@ bool FilterFunctionPlugin::applyFilter(QAction *filter, MeshDocument &md, RichPa - try { - h[vi] = p.Eval(); - } catch(Parser::exception_type &e) { -- errorMessage = conversion::fromWStringToString(e.GetMsg()).c_str(); -+ errorMessage = e.GetMsg().c_str(); - return false; - } - } -@@ -926,7 +925,7 @@ bool FilterFunctionPlugin::applyFilter(QAction *filter, MeshDocument &md, RichPa - h = tri::Allocator<CMeshO>::AddPerFaceAttribute<float> (m.cm,name); - Parser p; - setPerFaceVariables(p,m.cm); -- p.SetExpr(conversion::fromStringToWString(expr)); -+ p.SetExpr(expr); - - time_t start = clock(); - -@@ -940,7 +939,7 @@ bool FilterFunctionPlugin::applyFilter(QAction *filter, MeshDocument &md, RichPa - try { - h[fi] = p.Eval(); - } catch(Parser::exception_type &e) { -- errorMessage = conversion::fromWStringToString(e.GetMsg()).c_str(); -+ errorMessage = e.GetMsg().c_str(); - return false; - } - } -@@ -1018,11 +1017,11 @@ bool FilterFunctionPlugin::applyFilter(QAction *filter, MeshDocument &md, RichPa - - Parser p; - double x,y,z; -- p.DefineVar(conversion::fromStringToWString("x"), &x); -- p.DefineVar(conversion::fromStringToWString("y"), &y); -- p.DefineVar(conversion::fromStringToWString("z"), &z); -+ p.DefineVar("x", &x); -+ p.DefineVar("y", &y); -+ p.DefineVar("z", &z); - std::string expr = par.getString("expr").toStdString(); -- p.SetExpr(conversion::fromStringToWString(expr)); -+ p.SetExpr(expr); - Log("Filling a Volume of %i %i %i",siz[0],siz[1],siz[2]); - volume.Init(siz,RangeBBox); - for(double i=0;i<siz[0];i++) -@@ -1035,7 +1034,7 @@ bool FilterFunctionPlugin::applyFilter(QAction *filter, MeshDocument &md, RichPa - try { - volume.Val(i,j,k)=p.Eval(); - } catch(Parser::exception_type &e) { -- errorMessage = conversion::fromWStringToString(e.GetMsg()).c_str(); -+ errorMessage = e.GetMsg().c_str(); - return false; - } - } -@@ -1100,7 +1099,7 @@ bool FilterFunctionPlugin::applyFilter(QAction *filter, MeshDocument &md, RichPa - void FilterFunctionPlugin::showParserError(const QString &s, Parser::exception_type &e) - { - errorMessage += s; -- errorMessage += conversion::fromWStringToString(e.GetMsg()).c_str(); -+ errorMessage += e.GetMsg().c_str(); - errorMessage += "\n"; - } - -@@ -1260,23 +1259,23 @@ void FilterFunctionPlugin::setAttributes(CMeshO::FaceIterator &fi, CMeshO &m) - // and q for quality - void FilterFunctionPlugin::setPerVertexVariables(Parser &p, CMeshO &m) - { -- p.DefineVar(conversion::fromStringToWString("x"), &x); -- p.DefineVar(conversion::fromStringToWString("y"), &y); -- p.DefineVar(conversion::fromStringToWString("z"), &z); -- p.DefineVar(conversion::fromStringToWString("nx"), &nx); -- p.DefineVar(conversion::fromStringToWString("ny"), &ny); -- p.DefineVar(conversion::fromStringToWString("nz"), &nz); -- p.DefineVar(conversion::fromStringToWString("r"), &r); -- p.DefineVar(conversion::fromStringToWString("g"), &g); -- p.DefineVar(conversion::fromStringToWString("b"), &b); -- p.DefineVar(conversion::fromStringToWString("a"), &a); -- p.DefineVar(conversion::fromStringToWString("q"), &q); -- p.DefineVar(conversion::fromStringToWString("vi"),&v); -- p.DefineVar(conversion::fromStringToWString("rad"),&rad); -- p.DefineVar(conversion::fromStringToWString("vtu"),&vtu); -- p.DefineVar(conversion::fromStringToWString("vtv"),&vtv); -- p.DefineVar(conversion::fromStringToWString("ti"), &ti); -- p.DefineVar(conversion::fromStringToWString("vsel"), &vsel); -+ p.DefineVar("x", &x); -+ p.DefineVar("y", &y); -+ p.DefineVar("z", &z); -+ p.DefineVar("nx", &nx); -+ p.DefineVar("ny", &ny); -+ p.DefineVar("nz", &nz); -+ p.DefineVar("r", &r); -+ p.DefineVar("g", &g); -+ p.DefineVar("b", &b); -+ p.DefineVar("a", &a); -+ p.DefineVar("q", &q); -+ p.DefineVar("vi",&v); -+ p.DefineVar("rad",&rad); -+ p.DefineVar("vtu",&vtu); -+ p.DefineVar("vtv",&vtv); -+ p.DefineVar("ti", &ti); -+ p.DefineVar("vsel", &vsel); - - // define var for user-defined attributes (if any exists) - // if vector is empty, code won't be executed -@@ -1294,7 +1293,7 @@ void FilterFunctionPlugin::setPerVertexVariables(Parser &p, CMeshO &m) - v_handlers.push_back(hh); - v_attrNames.push_back(AllVertexAttribName[i]); - v_attrValue.push_back(0); -- p.DefineVar(conversion::fromStringToWString(v_attrNames.back()), &v_attrValue.back()); -+ p.DefineVar(v_attrNames.back(), &v_attrValue.back()); - qDebug("Adding custom per vertex float variable %s",v_attrNames.back().c_str()); - } - AllVertexAttribName.clear(); -@@ -1307,15 +1306,15 @@ void FilterFunctionPlugin::setPerVertexVariables(Parser &p, CMeshO &m) - - v3_attrValue.push_back(0); - v3_attrNames.push_back(AllVertexAttribName[i]+"_x"); -- p.DefineVar(conversion::fromStringToWString(v3_attrNames.back()), &v3_attrValue.back()); -+ p.DefineVar(v3_attrNames.back(), &v3_attrValue.back()); - - v3_attrValue.push_back(0); - v3_attrNames.push_back(AllVertexAttribName[i]+"_y"); -- p.DefineVar(conversion::fromStringToWString(v3_attrNames.back()), &v3_attrValue.back()); -+ p.DefineVar(v3_attrNames.back(), &v3_attrValue.back()); - - v3_attrValue.push_back(0); - v3_attrNames.push_back(AllVertexAttribName[i]+"_z"); -- p.DefineVar(conversion::fromStringToWString(v3_attrNames.back()), &v3_attrValue.back()); -+ p.DefineVar(v3_attrNames.back(), &v3_attrValue.back()); - qDebug("Adding custom per vertex Point3f variable %s",v3_attrNames.back().c_str()); - } - } -@@ -1325,85 +1324,85 @@ void FilterFunctionPlugin::setPerVertexVariables(Parser &p, CMeshO &m) - void FilterFunctionPlugin::setPerFaceVariables(Parser &p, CMeshO &m) - { - // coord of the three vertices within a face -- p.DefineVar(conversion::fromStringToWString("x0"), &x0); -- p.DefineVar(conversion::fromStringToWString("y0"), &y0); -- p.DefineVar(conversion::fromStringToWString("z0"), &z0); -- p.DefineVar(conversion::fromStringToWString("x1"), &x1); -- p.DefineVar(conversion::fromStringToWString("y1"), &y1); -- p.DefineVar(conversion::fromStringToWString("z1"), &z1); -- p.DefineVar(conversion::fromStringToWString("x2"), &x2); -- p.DefineVar(conversion::fromStringToWString("y2"), &y2); -- p.DefineVar(conversion::fromStringToWString("z2"), &z2); -+ p.DefineVar("x0", &x0); -+ p.DefineVar("y0", &y0); -+ p.DefineVar("z0", &z0); -+ p.DefineVar("x1", &x1); -+ p.DefineVar("y1", &y1); -+ p.DefineVar("z1", &z1); -+ p.DefineVar("x2", &x2); -+ p.DefineVar("y2", &y2); -+ p.DefineVar("z2", &z2); - - // attributes of the vertices - // normals: -- p.DefineVar(conversion::fromStringToWString("nx0"), &nx0); -- p.DefineVar(conversion::fromStringToWString("ny0"), &ny0); -- p.DefineVar(conversion::fromStringToWString("nz0"), &nz0); -+ p.DefineVar("nx0", &nx0); -+ p.DefineVar("ny0", &ny0); -+ p.DefineVar("nz0", &nz0); - -- p.DefineVar(conversion::fromStringToWString("nx1"), &nx1); -- p.DefineVar(conversion::fromStringToWString("ny1"), &ny1); -- p.DefineVar(conversion::fromStringToWString("nz1"), &nz1); -+ p.DefineVar("nx1", &nx1); -+ p.DefineVar("ny1", &ny1); -+ p.DefineVar("nz1", &nz1); - -- p.DefineVar(conversion::fromStringToWString("nx2"), &nx2); -- p.DefineVar(conversion::fromStringToWString("ny2"), &ny2); -- p.DefineVar(conversion::fromStringToWString("nz2"), &nz2); -+ p.DefineVar("nx2", &nx2); -+ p.DefineVar("ny2", &ny2); -+ p.DefineVar("nz2", &nz2); - - // colors: -- p.DefineVar(conversion::fromStringToWString("r0"), &r0); -- p.DefineVar(conversion::fromStringToWString("g0"), &g0); -- p.DefineVar(conversion::fromStringToWString("b0"), &b0); -- p.DefineVar(conversion::fromStringToWString("a0"), &a0); -+ p.DefineVar("r0", &r0); -+ p.DefineVar("g0", &g0); -+ p.DefineVar("b0", &b0); -+ p.DefineVar("a0", &a0); - -- p.DefineVar(conversion::fromStringToWString("r1"), &r1); -- p.DefineVar(conversion::fromStringToWString("g1"), &g1); -- p.DefineVar(conversion::fromStringToWString("b1"), &b1); -- p.DefineVar(conversion::fromStringToWString("a1"), &a1); -+ p.DefineVar("r1", &r1); -+ p.DefineVar("g1", &g1); -+ p.DefineVar("b1", &b1); -+ p.DefineVar("a1", &a1); - -- p.DefineVar(conversion::fromStringToWString("r2"), &r2); -- p.DefineVar(conversion::fromStringToWString("g2"), &g2); -- p.DefineVar(conversion::fromStringToWString("b2"), &b2); -- p.DefineVar(conversion::fromStringToWString("a2"), &a2); -+ p.DefineVar("r2", &r2); -+ p.DefineVar("g2", &g2); -+ p.DefineVar("b2", &b2); -+ p.DefineVar("a2", &a2); - - // quality -- p.DefineVar(conversion::fromStringToWString("q0"), &q0); -- p.DefineVar(conversion::fromStringToWString("q1"), &q1); -- p.DefineVar(conversion::fromStringToWString("q2"), &q2); -+ p.DefineVar("q0", &q0); -+ p.DefineVar("q1", &q1); -+ p.DefineVar("q2", &q2); - - // face color -- p.DefineVar(conversion::fromStringToWString("fr"), &fr); -- p.DefineVar(conversion::fromStringToWString("fg"), &fg); -- p.DefineVar(conversion::fromStringToWString("fb"), &fb); -- p.DefineVar(conversion::fromStringToWString("fa"), &fa); -+ p.DefineVar("fr", &fr); -+ p.DefineVar("fg", &fg); -+ p.DefineVar("fb", &fb); -+ p.DefineVar("fa", &fa); - - // face normal -- p.DefineVar(conversion::fromStringToWString("fnx"), &fnx); -- p.DefineVar(conversion::fromStringToWString("fny"), &fny); -- p.DefineVar(conversion::fromStringToWString("fnz"), &fnz); -+ p.DefineVar("fnx", &fnx); -+ p.DefineVar("fny", &fny); -+ p.DefineVar("fnz", &fnz); - - // face quality -- p.DefineVar(conversion::fromStringToWString("fq"), &fq); -+ p.DefineVar("fq", &fq); - - // index -- p.DefineVar(conversion::fromStringToWString("fi"),&f); -- p.DefineVar(conversion::fromStringToWString("vi0"),&v0i); -- p.DefineVar(conversion::fromStringToWString("vi1"),&v1i); -- p.DefineVar(conversion::fromStringToWString("vi2"),&v2i); -+ p.DefineVar("fi",&f); -+ p.DefineVar("vi0",&v0i); -+ p.DefineVar("vi1",&v1i); -+ p.DefineVar("vi2",&v2i); - - // texture -- p.DefineVar(conversion::fromStringToWString("wtu0"),&wtu0); -- p.DefineVar(conversion::fromStringToWString("wtv0"),&wtv0); -- p.DefineVar(conversion::fromStringToWString("wtu1"),&wtu1); -- p.DefineVar(conversion::fromStringToWString("wtv1"),&wtv1); -- p.DefineVar(conversion::fromStringToWString("wtu2"),&wtu2); -- p.DefineVar(conversion::fromStringToWString("wtv2"),&wtv2); -- p.DefineVar(conversion::fromStringToWString("ti"), &ti); -+ p.DefineVar("wtu0",&wtu0); -+ p.DefineVar("wtv0",&wtv0); -+ p.DefineVar("wtu1",&wtu1); -+ p.DefineVar("wtv1",&wtv1); -+ p.DefineVar("wtu2",&wtu2); -+ p.DefineVar("wtv2",&wtv2); -+ p.DefineVar("ti", &ti); - - //selection -- p.DefineVar(conversion::fromStringToWString("vsel0"), &vsel0); -- p.DefineVar(conversion::fromStringToWString("vsel1"), &vsel1); -- p.DefineVar(conversion::fromStringToWString("vsel2"), &vsel2); -- p.DefineVar(conversion::fromStringToWString("fsel"), &fsel); -+ p.DefineVar("vsel0", &vsel0); -+ p.DefineVar("vsel1", &vsel1); -+ p.DefineVar("vsel2", &vsel2); -+ p.DefineVar("fsel", &fsel); - - // define var for user-defined attributes (if any exists) - // if vector is empty, code won't be executed -@@ -1418,7 +1417,7 @@ void FilterFunctionPlugin::setPerFaceVariables(Parser &p, CMeshO &m) - f_handlers.push_back(hh); - f_attrNames.push_back(AllFaceAttribName[i]); - f_attrValue.push_back(0); -- p.DefineVar(conversion::fromStringToWString(f_attrNames.back()), &f_attrValue.back()); -+ p.DefineVar(f_attrNames.back(), &f_attrValue.back()); - } - - } -diff --git a/src/meshlabplugins/filter_func/filter_refine.h b/src/meshlabplugins/filter_func/filter_refine.h -index 81a28cac..534bad38 100644 ---- a/src/meshlabplugins/filter_func/filter_refine.h -+++ b/src/meshlabplugins/filter_func/filter_refine.h -@@ -37,9 +37,9 @@ public : - MidPointCustom(MESH_TYPE &_m,std::string expr1, std::string expr2, std::string expr3, bool &error, std::string &msg):m(_m) - { - // expr1, expr2, expr3 are parameters for x,y and z coord respectively -- this->p1.SetExpr(conversion::fromStringToWString(expr1)); -- this->p2.SetExpr(conversion::fromStringToWString(expr2)); -- this->p3.SetExpr(conversion::fromStringToWString(expr3)); -+ this->p1.SetExpr(expr1); -+ this->p2.SetExpr(expr2); -+ this->p3.SetExpr(expr3); - - this->setVars(p1); - this->setVars(p2); -@@ -53,7 +53,7 @@ public : - p2.Eval(); - p3.Eval(); - } catch(Parser::exception_type &e) { -- msg = conversion::fromWStringToString(e.GetMsg()).c_str(); -+ msg = e.GetMsg().c_str(); - error = true; - } - } -@@ -150,12 +150,12 @@ protected: - // parser variables - void setVars(Parser &p) - { -- p.DefineVar(conversion::fromStringToWString("x0"), &x0); -- p.DefineVar(conversion::fromStringToWString("y0"), &y0); -- p.DefineVar(conversion::fromStringToWString("z0"), &z0); -- p.DefineVar(conversion::fromStringToWString("x1"), &x1); -- p.DefineVar(conversion::fromStringToWString("y1"), &y1); -- p.DefineVar(conversion::fromStringToWString("z1"), &z1); -+ p.DefineVar("x0", &x0); -+ p.DefineVar("y0", &y0); -+ p.DefineVar("z0", &z0); -+ p.DefineVar("x1", &x1); -+ p.DefineVar("y1", &y1); -+ p.DefineVar("z1", &z1); - } - }; - -@@ -168,7 +168,7 @@ public: - CustomEdge(std::string expr, bool &error, std::string &msg) - { - // set expression and variables needed by parser -- this->p.SetExpr(conversion::fromStringToWString(expr)); -+ this->p.SetExpr(expr); - this->setVars(p); - this->varDefined = false; - -@@ -176,7 +176,7 @@ public: - try { - p.Eval(); - } catch(Parser::exception_type &e) { -- msg = conversion::fromWStringToString(e.GetMsg()).c_str(); -+ msg = e.GetMsg().c_str(); - error = true; - } - } -@@ -240,30 +240,30 @@ protected: - // parser variables - void setVars(Parser &p) - { -- p.DefineVar(conversion::fromStringToWString("x0"), &x0); -- p.DefineVar(conversion::fromStringToWString("y0"), &y0); -- p.DefineVar(conversion::fromStringToWString("z0"), &z0); -- p.DefineVar(conversion::fromStringToWString("x1"), &x1); -- p.DefineVar(conversion::fromStringToWString("y1"), &y1); -- p.DefineVar(conversion::fromStringToWString("z1"), &z1); -- -- p.DefineVar(conversion::fromStringToWString("nx0"), &nx0); -- p.DefineVar(conversion::fromStringToWString("ny0"), &ny0); -- p.DefineVar(conversion::fromStringToWString("nz0"), &nz0); -- -- p.DefineVar(conversion::fromStringToWString("nx1"), &nx1); -- p.DefineVar(conversion::fromStringToWString("ny1"), &ny1); -- p.DefineVar(conversion::fromStringToWString("nz1"), &nz1); -- -- p.DefineVar(conversion::fromStringToWString("r0"), &r0); -- p.DefineVar(conversion::fromStringToWString("g0"), &g0); -- p.DefineVar(conversion::fromStringToWString("b0"), &b0); -- -- p.DefineVar(conversion::fromStringToWString("r1"), &r1); -- p.DefineVar(conversion::fromStringToWString("g1"), &g1); -- p.DefineVar(conversion::fromStringToWString("b1"), &b1); -- -- p.DefineVar(conversion::fromStringToWString("q0"), &q0); -- p.DefineVar(conversion::fromStringToWString("q1"), &q1); -+ p.DefineVar("x0", &x0); -+ p.DefineVar("y0", &y0); -+ p.DefineVar("z0", &z0); -+ p.DefineVar("x1", &x1); -+ p.DefineVar("y1", &y1); -+ p.DefineVar("z1", &z1); -+ -+ p.DefineVar("nx0", &nx0); -+ p.DefineVar("ny0", &ny0); -+ p.DefineVar("nz0", &nz0); -+ -+ p.DefineVar("nx1", &nx1); -+ p.DefineVar("ny1", &ny1); -+ p.DefineVar("nz1", &nz1); -+ -+ p.DefineVar("r0", &r0); -+ p.DefineVar("g0", &g0); -+ p.DefineVar("b0", &b0); -+ -+ p.DefineVar("r1", &r1); -+ p.DefineVar("g1", &g1); -+ p.DefineVar("b1", &b1); -+ -+ p.DefineVar("q0", &q0); -+ p.DefineVar("q1", &q1); - } - }; diff --git a/plugin_dir.patch b/plugin_dir.patch deleted file mode 100644 index 1c84fdd69203..000000000000 --- a/plugin_dir.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/src/common/pluginmanager.cpp b/src/common/pluginmanager.cpp -index 4fbe1e1a..4ee5c9ce 100644 ---- a/src/common/pluginmanager.cpp -+++ b/src/common/pluginmanager.cpp -@@ -231,7 +231,7 @@ QString PluginManager::osDependentFileBaseName(const QString &plname) - - QString PluginManager::getBaseDirPath() - { -- QDir baseDir(qApp->applicationDirPath()); -+ QDir baseDir("/usr/share/meshlab"); - - #if defined(Q_OS_WIN) - // Windows: -@@ -253,7 +253,7 @@ QString PluginManager::getBaseDirPath() - - QString PluginManager::getDefaultPluginDirPath() - { -- QDir pluginsDir(getBaseDirPath()); -+ QDir pluginsDir("/usr/lib/meshlab"); - if (!pluginsDir.exists("plugins")) - //QMessageBox::warning(0,"Meshlab Initialization","Serious error. Unable to find the plugins directory."); - qDebug("Meshlab Initialization: Serious error. Unable to find the plugins directory."); diff --git a/qt5.11.patch b/qt5.11.patch deleted file mode 100644 index d6c3e6269466..000000000000 --- a/qt5.11.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/src/meshlabplugins/edit_paint/paintbox.cpp b/src/meshlabplugins/edit_paint/paintbox.cpp -index 2097a5ba..09cce489 100644 ---- a/src/meshlabplugins/edit_paint/paintbox.cpp -+++ b/src/meshlabplugins/edit_paint/paintbox.cpp -@@ -32,11 +32,11 @@ Paintbox::Paintbox(QWidget * parent, Qt::WindowFlags flags) : QWidget(parent, fl - - QIcon undo = undo_button->icon(); - undo_button->setDefaultAction(stacks->createUndoAction(undo_button)); -- undo_button->defaultAction()->setIcon(undo); -+ undo_button->setIcon(undo); - - QIcon redo = redo_button->icon(); - redo_button->setDefaultAction(stacks->createRedoAction(redo_button)); -- redo_button->defaultAction()->setIcon(redo); -+ redo_button->setIcon(redo); - - setUndoStack(parent); - -diff --git a/src/meshlabplugins/render_gdp/shaderDialog.h b/src/meshlabplugins/render_gdp/shaderDialog.h -index a62d3b51..9ff9e5a5 100644 ---- a/src/meshlabplugins/render_gdp/shaderDialog.h -+++ b/src/meshlabplugins/render_gdp/shaderDialog.h -@@ -29,6 +29,8 @@ - #include <common/meshmodel.h> - #include <QLabel> - #include <QDockWidget> -+#include <QSlider> -+#include <QLineEdit> - #include "shaderStructs.h" - #include "ui_shaderDialog.h" - #include <QMap> diff --git a/revert-external.patch b/revert-external.patch deleted file mode 100644 index 873079b68c4a..000000000000 --- a/revert-external.patch +++ /dev/null @@ -1,455 +0,0 @@ -From 8660a924bb8c990dab6aea3a72a62cae3be7066a Mon Sep 17 00:00:00 2001 -From: bartus <szczepaniak.bartek+github@gmail.com> -Date: Tue, 10 Dec 2019 00:05:33 +0100 -Subject: [PATCH] Revert "Use some system libraries if desired." - -This reverts commit d4564c341d0f2793b93518946676c8a3c6698d2c. ---- - src/common/common.pro | 13 ++++--------- - src/external/external.pro | 11 ++++------- - src/general.pri | 5 ++--- - src/meshlab/meshlab.pro | 8 ++------ - src/meshlabplugins/edit_align/edit_align.pro | 9 +++------ - src/meshlabplugins/filter_plymc/plymc.pro | 5 ++--- - src/meshlabplugins/io_3ds/io_3ds.pro | 11 ++++++----- - src/meshlabplugins/io_ctm/io_ctm.pro | 3 +-- - .../render_radiance_scaling.pro | 7 +------ - src/meshlabserver/meshlabserver.pro | 6 +----- - .../edit_ocme/src/ocme/ocme_builder.pro | 5 ++--- - .../filter_multiscale_align.pro | 5 ++--- - src/plugins_unsupported/edit_arc3D/edit_arc3D.pro | 12 +++++++++++- - src/plugins_unsupported/edit_fit/edit_fit.pro | 7 ++----- - src/plugins_unsupported/editpaint/editpaint.pro | 5 +---- - .../filter_rangemap/filter_rangemap.pro | 7 ++----- - src/plugins_unsupported/io_epoch/io_epoch.pro | 7 ++++++- - src/plugins_unsupported/render_rm/render_rm.pro | 7 ++----- - src/shared.pri | 6 ++---- - 19 files changed, 56 insertions(+), 83 deletions(-) - -diff --git a/src/common/common.pro b/src/common/common.pro -index 007e7003..cf4cccff 100644 ---- a/src/common/common.pro -+++ b/src/common/common.pro -@@ -1,6 +1,7 @@ - include (../general.pri) - EXIF_DIR = ../external/jhead-2.95 - -+GLEWCODE = $$GLEWDIR/src/glew.c - - win32-msvc2005:DESTDIR = ../distrib - win32-msvc2008:DESTDIR = ../distrib -@@ -43,11 +44,8 @@ fi;\ - INCLUDEPATH *= ../.. \ - $$VCGDIR \ - $$EIGENDIR \ -+ $$GLEWDIR/include \ - $$EXIF_DIR --!CONFIG(system_glew) { -- INCLUDEPATH *= $$GLEWDIR/include -- GLEWCODE = $$GLEWDIR/src/glew.c --} - TEMPLATE = lib - - linux:CONFIG += dll -@@ -71,6 +69,7 @@ QT += script - - TARGET = common - DEPENDPATH += . -+DEFINES += GLEW_STATIC - - win32-msvc:DEFINES += _CRT_SECURE_NO_WARNINGS - -@@ -103,11 +102,7 @@ SOURCES += filterparameter.cpp \ - mlapplication.cpp \ - scriptsyntax.cpp \ - searcher.cpp \ -+ $$GLEWCODE \ - meshlabdocumentxml.cpp \ - meshlabdocumentbundler.cpp \ - ml_shared_data_context.cpp -- --!CONFIG(system_glew) { -- SOURCES += $$GLEWCODE -- DEFINES += GLEW_STATIC --} -diff --git a/src/external/external.pro b/src/external/external.pro -index 966e9888..7bd97f60 100644 ---- a/src/external/external.pro -+++ b/src/external/external.pro -@@ -2,14 +2,11 @@ config += debug_and_release - - TEMPLATE = subdirs - --SUBDIRS = muparser_v225/src \ -+SUBDIRS = bzip2-1.0.5/bzip2-1.0.5.pro \ -+ muparser_v225/src \ - levmar-2.3/levmar-2.3.pro \ - structuresynth-1.5/structuresynth.pro \ -+ OpenCTM-1.0.3/openctm.pro \ - jhead-2.95/jhead-2.95.pro \ -+ lib3ds-1.3.0/lib3ds/lib3ds.pro - # openkinect/openkinect.pro -- --!CONFIG(system_bzip2) SUBDIRS += bzip2-1.0.5/bzip2-1.0.5.pro --!CONFIG(system_openctm) SUBDIRS += OpenCTM-1.0.3/openctm.pro --!CONFIG(system_lib3ds) SUBDIRS += lib3ds-1.3.0/lib3ds/lib3ds.pro -- --# Can't easily make muparser conditional because of the fact it relies on the _UNICODE define -diff --git a/src/general.pri b/src/general.pri -index 1c4f9aea..36193c5a 100644 ---- a/src/general.pri -+++ b/src/general.pri -@@ -6,9 +6,8 @@ - DEFINES += MESHLAB_SCALAR=float - - VCGDIR = ../../../vcglib --CONFIG(system_eigen3): EIGENDIR = /usr/include/eigen3 --!CONFIG(system_eigen3):EIGENDIR = $$VCGDIR/eigenlib --!CONFIG(system_glew): GLEWDIR = ../external/glew-2.1.0 -+EIGENDIR = $$VCGDIR/eigenlib -+GLEWDIR = ../external/glew-2.1.0 - - CONFIG += c++11 - -diff --git a/src/meshlab/meshlab.pro b/src/meshlab/meshlab.pro -index 3e7a99be..5f542b87 100644 ---- a/src/meshlab/meshlab.pro -+++ b/src/meshlab/meshlab.pro -@@ -10,8 +10,8 @@ INCLUDEPATH *= . \ - ../.. \ - $$VCGDIR \ - $$EIGENDIR \ -+ $$GLEWDIR/include \ - $$EXIF_DIR --!CONFIG(system_glew): INCLUDEPATH *= $$GLEWDIR/include - DEPENDPATH += $$VCGDIR \ - $$VCGDIR/vcg \ - $$VCGDIR/wrap -@@ -65,6 +65,7 @@ SOURCES = main.cpp \ - $$VCGDIR/wrap/gui/trackball.cpp \ - $$VCGDIR/wrap/gui/trackmode.cpp \ - $$VCGDIR/wrap/gui/coordinateframe.cpp \ -+ #$$GLEWDIR/src/glew.c \ - glarea_setting.cpp \ - filterthread.cpp - -@@ -156,11 +157,6 @@ win32-g++:LIBS += -L../external/lib/win32-gcc -ljhead -L../distrib -lcom - linux:LIBS += -L$$PWD/../external/lib/linux-g++ -ljhead -L../distrib -lcommon -lGLU - linux:QMAKE_RPATHDIR += ../distrib - --!CONFIG(system_glew) { -- INCLUDEPATH *= $$GLEWDIR/include --} --CONFIG(system_glew): LIBS += -lGLEW -- - # uncomment in your local copy only in emergency cases. - # We should never be too permissive - # win32-g++:QMAKE_CXXFLAGS += -fpermissive -diff --git a/src/meshlabplugins/edit_align/edit_align.pro b/src/meshlabplugins/edit_align/edit_align.pro -index f1009822..2637cf0b 100644 ---- a/src/meshlabplugins/edit_align/edit_align.pro -+++ b/src/meshlabplugins/edit_align/edit_align.pro -@@ -32,12 +32,9 @@ SOURCES = edit_align_factory.cpp \ - ../../meshlab/stdpardialog.cpp \ - $$VCGDIR/wrap/ply/plylib.cpp\ - $$VCGDIR/wrap/gui/trackball.cpp\ -- $$VCGDIR/wrap/gui/trackmode.cpp -- --!CONFIG(system_glew): SOURCES += $$GLEWCODE --CONFIG(system_glew) { -- linux: LIBS += -lGLEW --} -+ $$VCGDIR/wrap/gui/trackmode.cpp \ -+ $$GLEWCODE -+ - - INCLUDEPATH += ../../external - -diff --git a/src/meshlabplugins/filter_plymc/plymc.pro b/src/meshlabplugins/filter_plymc/plymc.pro -index 282fa9ed..b6094191 100755 ---- a/src/meshlabplugins/filter_plymc/plymc.pro -+++ b/src/meshlabplugins/filter_plymc/plymc.pro -@@ -1,6 +1,7 @@ - TARGET = plymc - DEPENDPATH += . --INCLUDEPATH += ../../../../vcglib -+INCLUDEPATH += ../../../../vcglib \ -+ ../../code/lib/glew/include - CONFIG += console \ - stl \ - debug_and_release -@@ -23,7 +24,5 @@ HEADERS = plymc.h \ - simplemeshprovider.h \ - ../../meshlab/alnParser.h - --!CONFIG(system_glew): INCLUDEPATH *= ../../code/lib/glew/include -- - #macx-g++:DEFINES += NDEBUG - -diff --git a/src/meshlabplugins/io_3ds/io_3ds.pro b/src/meshlabplugins/io_3ds/io_3ds.pro -index 620d2653..fd1b44f9 100644 ---- a/src/meshlabplugins/io_3ds/io_3ds.pro -+++ b/src/meshlabplugins/io_3ds/io_3ds.pro -@@ -8,14 +8,13 @@ HEADERS = meshio.h \ - import_3ds.h \ - io_3ds.h - --SOURCES += meshio.cpp -+SOURCES += meshio.cpp \ -+ -+DEFINES += LIB3DS_STATIC - - TARGET = io_3ds - --!CONFIG(system_lib3ds) { -- INCLUDEPATH *= ../../external/lib3ds-1.3.0/ -- DEFINES += LIB3DS_STATIC --} -+INCLUDEPATH += ../../external/lib3ds-1.3.0/ - - # Notes on the paths of lib3ds files. - # Once you have compiled the library put the lib files in a dir named lib/XXX/ -@@ -29,6 +28,8 @@ win32-msvc2008:LIBS += ../../external/lib/win32-msvc2008/3ds.lib - win32-g++:LIBS += ../../external/lib/win32-gcc/lib3ds.a - linux-g++:LIBS += -l3ds - -+# unix:LIBS += -L../../../../code/lib/lib3ds-1.3.0/lib3ds/lib/unix -l3ds -+ - # mac:LIBS -= -l3ds - # mac:LIBS += ../../../../code/lib/lib3ds-1.3.0/lib/mac/lib3ds.a - -diff --git a/src/meshlabplugins/io_ctm/io_ctm.pro b/src/meshlabplugins/io_ctm/io_ctm.pro -index 5a0586c6..7265e035 100644 ---- a/src/meshlabplugins/io_ctm/io_ctm.pro -+++ b/src/meshlabplugins/io_ctm/io_ctm.pro -@@ -3,10 +3,9 @@ HEADERS += io_ctm.h \ - $$VCGDIR/wrap/io_trimesh/import_ctm.h \ - $$VCGDIR/wrap/io_trimesh/export_ctm.h - SOURCES += io_ctm.cpp -+INCLUDEPATH += ../../external/OpenCTM-1.0.3/lib - TARGET = io_ctm - --!CONFIG(system_openctm): INCLUDEPATH *= ../../external/OpenCTM-1.0.3/lib -- - win32-msvc.net:QMAKE_CXXFLAGS += /DOPENCTM_STATIC - win32-msvc2005:QMAKE_CXXFLAGS += /DOPENCTM_STATIC - win32-msvc2008:QMAKE_CXXFLAGS += /DOPENCTM_STATIC -diff --git a/src/meshlabplugins/render_radiance_scaling/render_radiance_scaling.pro b/src/meshlabplugins/render_radiance_scaling/render_radiance_scaling.pro -index bc1b6670..ed7b1fb4 100644 ---- a/src/meshlabplugins/render_radiance_scaling/render_radiance_scaling.pro -+++ b/src/meshlabplugins/render_radiance_scaling/render_radiance_scaling.pro -@@ -1,12 +1,7 @@ - include (../../shared.pri) - - HEADERS = textureParams.h textureFormat.h texture2D.h framebufferObject.h gpuShader.h gpuProgram.h radianceScalingRenderer.h shaderDialog.h --SOURCES = textureParams.cpp textureFormat.cpp framebufferObject.cpp gpuShader.cpp gpuProgram.cpp radianceScalingRenderer.cpp shaderDialog.cpp -- --!CONFIG(system_glew): SOURCES += $$GLEWCODE --CONFIG(system_glew) { -- linux: LIBS += -lGLEW --} -+SOURCES = textureParams.cpp textureFormat.cpp framebufferObject.cpp gpuShader.cpp gpuProgram.cpp radianceScalingRenderer.cpp shaderDialog.cpp $$GLEWCODE - - TARGET = render_radiance_scaling - FORMS = shaderDialog.ui -diff --git a/src/meshlabserver/meshlabserver.pro b/src/meshlabserver/meshlabserver.pro -index 66accaec..e97962a1 100644 ---- a/src/meshlabserver/meshlabserver.pro -+++ b/src/meshlabserver/meshlabserver.pro -@@ -1,8 +1,6 @@ - include (../general.pri) - --INCLUDEPATH += . .. $$VCGDIR $$EIGENDIR -- --!CONFIG(system_glew): INCLUDEPATH *= $$GLEWDIR/include -+INCLUDEPATH += . .. $$VCGDIR $$EIGENDIR $$GLEWDIR/include - - HEADERS = - -@@ -46,8 +44,6 @@ win32-msvc2010:DEFINES += GLEW_STATIC - win32-msvc2012:DEFINES += GLEW_STATIC - win32-msvc2015:DEFINES += GLEW_STATIC - --CONFIG(system_glew):LIBS += -lGLEW -- - #DEFINES += GLEW_STATIC - - # This removes the need of XSERVER to run meshlabserver -diff --git a/src/plugins_experimental/edit_ocme/src/ocme/ocme_builder.pro b/src/plugins_experimental/edit_ocme/src/ocme/ocme_builder.pro -index e7ead0eb..c920a177 100755 ---- a/src/plugins_experimental/edit_ocme/src/ocme/ocme_builder.pro -+++ b/src/plugins_experimental/edit_ocme/src/ocme/ocme_builder.pro -@@ -6,8 +6,7 @@ GLEWDIR = ../../../../external/glew-1.5.1 - win32-msvc2005:DEFINES += GLEW_STATIC - win32-msvc2008:DEFINES += GLEW_STATIC - --INCLUDEPATH *= ../.. $$VCGDIR --!CONFIG(system_glew): INCLUDEPATH *= $$GLEWDIR/include -+INCLUDEPATH *= ../.. $$VCGDIR $$GLEWDIR/include - DEPENDPATH += $$VCGDIR - - # the following line is to hide the hundred of warnings about the deprecated -@@ -110,7 +109,7 @@ QMAKE_CXXFLAGS_RELEASE += -DNDEBUG - LIBS += -lGLEW - LIBS += -lkyotocabinet - --!CONFIG(system_glew): QMAKE_LIBDIR += $$GLEWDIR/lib -+QMAKE_LIBDIR += $$GLEWDIR/lib - QMAKE_LIBDIR += ../../../../external/kyotocabinet-1.2.34 - - -diff --git a/src/plugins_experimental/filter_multiscale_align/filter_multiscale_align.pro b/src/plugins_experimental/filter_multiscale_align/filter_multiscale_align.pro -index f5d5832d..bb0995b4 100644 ---- a/src/plugins_experimental/filter_multiscale_align/filter_multiscale_align.pro -+++ b/src/plugins_experimental/filter_multiscale_align/filter_multiscale_align.pro -@@ -14,9 +14,8 @@ SOURCES += filter_multiscale_align.cpp \ - TARGET = filter_multiscale_align - - ## Dependencies --INCLUDEPATH += lib --!CONFIG(system_eigen3): INCLUDEPATH *= $$VCGDIR/eigenlib #needed by Grenaille --CONFIG(system_eigen3): INCLUDEPATH *= $$EIGENDIR #needed by Grenaille -+INCLUDEPATH += lib \ -+ $$VCGDIR/eigenlib #needed by Grenaille - - - unix: QMAKE_CXXFLAGS += -DQ_OS_LINUX -diff --git a/src/plugins_unsupported/edit_arc3D/edit_arc3D.pro b/src/plugins_unsupported/edit_arc3D/edit_arc3D.pro -index 604cccb2..37ac72a9 100644 ---- a/src/plugins_unsupported/edit_arc3D/edit_arc3D.pro -+++ b/src/plugins_unsupported/edit_arc3D/edit_arc3D.pro -@@ -38,7 +38,17 @@ win32-g++:LIBS += ../../external/lib/win32-gcc/libbz2.a - linux-g++:LIBS += -lbz2
- mac:LIBS += -lbz2
-
--!CONFIG(system_bzip2):INCLUDEPATH += ../../external/bzip2-1.0.5
-+win32-msvc2005:INCLUDEPATH += ../../external/bzip2-1.0.5
-+win32-msvc2008:INCLUDEPATH += ../../external/bzip2-1.0.5
-+win32-msvc2010:INCLUDEPATH += ../../external/bzip2-1.0.5
-+win32-msvc2012:INCLUDEPATH += ../../external/bzip2-1.0.5
-+win32-msvc2013:INCLUDEPATH += ../../external/bzip2-1.0.5
-+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/src/plugins_unsupported/edit_fit/edit_fit.pro b/src/plugins_unsupported/edit_fit/edit_fit.pro -index 3338c831..85bf9e24 100644 ---- a/src/plugins_unsupported/edit_fit/edit_fit.pro -+++ b/src/plugins_unsupported/edit_fit/edit_fit.pro -@@ -13,11 +13,8 @@ HEADERS = edit_fit_factory.h \ - SOURCES = edit_fit_factory.cpp \
- editfit.cpp\
- fittoolbox.cpp\
-- primitive.cpp
--!CONFIG(system_glew): SOURCES += $$GLEWCODE
--CONFIG(system_glew) {
-- linux: LIBS += -lGLEW
--}
-+ primitive.cpp\
-+ $$GLEWCODE
-
- FORMS += fittoolbox.ui
-
-diff --git a/src/plugins_unsupported/editpaint/editpaint.pro b/src/plugins_unsupported/editpaint/editpaint.pro -index 8d022b20..93bf48b2 100755 ---- a/src/plugins_unsupported/editpaint/editpaint.pro -+++ b/src/plugins_unsupported/editpaint/editpaint.pro -@@ -8,11 +8,8 @@ HEADERS = edit_paint_factory.h \ - - SOURCES = edit_paint_factory.h \ - editpaint.cpp \ -+ $$GLEWCODE \ - paintbox.cpp --!CONFIG(system_glew): SOURCES += $$GLEWCODE --CONFIG(system_glew) { -- linux: LIBS += -lGLEW --} - - TARGET = editpaint - -diff --git a/src/plugins_unsupported/filter_rangemap/filter_rangemap.pro b/src/plugins_unsupported/filter_rangemap/filter_rangemap.pro -index 24f279c2..c4119b60 100644 ---- a/src/plugins_unsupported/filter_rangemap/filter_rangemap.pro -+++ b/src/plugins_unsupported/filter_rangemap/filter_rangemap.pro -@@ -3,11 +3,8 @@ include (../../shared.pri) - HEADERS = filter_rangemap.h
-
- SOURCES = filter_rangemap.cpp \
-- ../../meshlab/filterparameter.cpp
--!CONFIG(system_glew): SOURCES += $$GLEWCODE
--CONFIG(system_glew) {
-- linux: LIBS += -lGLEW
--}
-+ ../../meshlab/filterparameter.cpp \
-+ $$GLEWCODE
-
- TARGET = filter_rangemap
-
-diff --git a/src/plugins_unsupported/io_epoch/io_epoch.pro b/src/plugins_unsupported/io_epoch/io_epoch.pro -index 7824f246..933ed59b 100644 ---- a/src/plugins_unsupported/io_epoch/io_epoch.pro -+++ b/src/plugins_unsupported/io_epoch/io_epoch.pro -@@ -32,7 +32,12 @@ win32-msvc2008:LIBS += ../../external/lib/win32-msvc2008/bz2.lib - win32-g++:LIBS += ../../external/lib/win32-gcc/libbz2.a
- linux-g++:LIBS += -lbz2
-
--!CONFIG(system_bz2): INCLUDEPATH *= ../../external/bzip2-1.0.5
-+win32-msvc2005:INCLUDEPATH += ../../external/bzip2-1.0.5
-+win32-msvc2008: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
-
- mac:LIBS += -lbz2
-
-diff --git a/src/plugins_unsupported/render_rm/render_rm.pro b/src/plugins_unsupported/render_rm/render_rm.pro -index 24d21686..575116e1 100644 ---- a/src/plugins_unsupported/render_rm/render_rm.pro -+++ b/src/plugins_unsupported/render_rm/render_rm.pro -@@ -16,11 +16,8 @@ SOURCES = rmmeshrender.cpp \ - glstateholder.cpp \ - parser/RmPass.cpp \ - parser/RmXmlParser.cpp \ -- parser/UniformVar.cpp --!CONFIG(system_glew): SOURCES += $$GLEWCODE --CONFIG(system_glew) { -- linux: LIBS += -lGLEW --} -+ parser/UniformVar.cpp \ -+ $$GLEWCODE - - FORMS = rmShadowDialog.ui - -diff --git a/src/shared.pri b/src/shared.pri -index 4a10924b..2d51ad89 100644 ---- a/src/shared.pri -+++ b/src/shared.pri -@@ -2,8 +2,7 @@ - - include (general.pri) - VCGDIR = ../$$VCGDIR --# only adjust relative path if we're not using system Eigen --!CONFIG(system_eigen3):EIGENDIR = ../$$EIGENDIR -+EIGENDIR = ../$$EIGENDIR - - TEMPLATE = lib - CONFIG += plugin -@@ -28,8 +27,7 @@ win32-msvc2013:DEFINES += GLEW_STATIC _USE_MATH_DEFINES - win32-msvc2015:DEFINES += GLEW_STATIC _USE_MATH_DEFINES - win32-msvc:DEFINES += GLEW_STATIC _USE_MATH_DEFINES - --INCLUDEPATH *= ../.. $$VCGDIR $$EIGENDIR --!CONFIG(system_glew): INCLUDEPATH *= ../$$GLEWDIR/include -+INCLUDEPATH *= ../.. $$VCGDIR $$EIGENDIR ../$$GLEWDIR/include - DEPENDPATH += ../.. $$VCGDIR - - # the following line is to hide the hundred of warnings about the deprecated --- -2.24.0 - diff --git a/rpath.patch b/rpath.patch deleted file mode 100644 index b5ce59f57422..000000000000 --- a/rpath.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/src/meshlab/meshlab.pro b/src/meshlab/meshlab.pro -index cae4cb4f..6b1e3466 100644 ---- a/src/meshlab/meshlab.pro -+++ b/src/meshlab/meshlab.pro -@@ -155,7 +155,7 @@ win32-g++:LIBS += -L../external/lib/win32-gcc -ljhead -L../distrib -lcom - #} - - linux:LIBS += -L$$PWD/../external/lib/linux-g++ -ljhead -L../distrib -lcommon -lGLU --linux:QMAKE_RPATHDIR += ../distrib -+linux:QMAKE_LFLAGS += -Wl,-rpath,/usr/lib/meshlab - - # uncomment in your local copy only in emergency cases. - # We should never be too permissive -diff --git a/src/meshlabserver/meshlabserver.pro b/src/meshlabserver/meshlabserver.pro -index e97962a1..0436a55c 100644 ---- a/src/meshlabserver/meshlabserver.pro -+++ b/src/meshlabserver/meshlabserver.pro -@@ -30,7 +30,7 @@ win32-msvc2012: LIBS += -L../distrib -lcommon -lopengl32 -lGLU32 - win32-msvc2015: LIBS += -L../distrib -lcommon -lopengl32 -lGLU32 - win32-g++: LIBS += -L../distrib -lcommon - linux: LIBS += -L../distrib -lcommon --linux:QMAKE_RPATHDIR += ../distrib -+linux:QMAKE_LFLAGS += -Wl,-rpath,/usr/lib/meshlab - #CONFIG (release,debug | release) { - # win32-msvc2005:release: LIBS += -L../common/release -lcommon - # win32-msvc2008:release: LIBS += -L../common/release -lcommon diff --git a/shaders_dir.patch b/shaders_dir.patch deleted file mode 100644 index 0de70055d249..000000000000 --- a/shaders_dir.patch +++ /dev/null @@ -1,89 +0,0 @@ -diff --git a/src/meshlabplugins/render_gdp/meshrender.cpp b/src/meshlabplugins/render_gdp/meshrender.cpp -index 2d9f7565..f00bcb8c 100644 ---- a/src/meshlabplugins/render_gdp/meshrender.cpp -+++ b/src/meshlabplugins/render_gdp/meshrender.cpp -@@ -29,6 +29,9 @@ - #include <QTextStream> - #include "../../meshlab/glarea.h" - -+#include <common/pluginmanager.h> -+ -+ - using namespace std; - using namespace vcg; - -@@ -38,7 +41,7 @@ void MeshShaderRenderPlugin::initActionList() { - qaNone->setCheckable(false); - actionList << qaNone;*/ - -- QDir shadersDir = QDir(qApp->applicationDirPath()); -+ QDir shadersDir = PluginManager::getBaseDirPath(); - #if defined(Q_OS_WIN) - if (shadersDir.dirName() == "debug" || shadersDir.dirName() == "release" || shadersDir.dirName() == "plugins") - shadersDir.cdUp(); -diff --git a/src/meshlabplugins/render_gdp/shaderDialog.cpp b/src/meshlabplugins/render_gdp/shaderDialog.cpp -index 13157579..1f14b7bf 100644 ---- a/src/meshlabplugins/render_gdp/shaderDialog.cpp -+++ b/src/meshlabplugins/render_gdp/shaderDialog.cpp -@@ -32,6 +32,8 @@ - #include <QCheckBox> - #include <QPushButton> - -+#include <common/pluginmanager.h> -+ - #define DECFACTOR 100000.0f - - using namespace vcg; -@@ -317,7 +319,7 @@ void ShaderDialog::changeTexturePath(int i) { - void ShaderDialog::browseTexturePath(int i) { - QFileDialog fd(0,"Choose new texture"); - -- QDir shadersDir = QDir(qApp->applicationDirPath()); -+ QDir shadersDir = PluginManager::getBaseDirPath(); - #if defined(Q_OS_WIN) - if (shadersDir.dirName() == "debug" || shadersDir.dirName() == "release") - shadersDir.cdUp(); -diff --git a/src/plugins_experimental/render_splatpyramid/dialog.cpp b/src/plugins_experimental/render_splatpyramid/dialog.cpp -index 589ba482..f0225c40 100644 ---- a/src/plugins_experimental/render_splatpyramid/dialog.cpp -+++ b/src/plugins_experimental/render_splatpyramid/dialog.cpp -@@ -3,6 +3,8 @@ - #include <QFileDialog> - #include <QMessageBox> - -+#include <common/pluginmanager.h> -+ - - #define DECFACTOR 100000.0f - -@@ -123,7 +125,7 @@ void Dialog::changeTexturePath(int i) { - void Dialog::browseTexturePath(int i) { - QFileDialog fd(0,"Choose new texture"); - -- QDir shadersDir = QDir(qApp->applicationDirPath()); -+ QDir shadersDir = PluginManager::getBaseDirPath(); - #if defined(Q_OS_WIN) - if (shadersDir.dirName() == "debug" || shadersDir.dirName() == "release") - shadersDir.cdUp(); -diff --git a/src/plugins_experimental/render_splatpyramid/splat_pyramid.cc b/src/plugins_experimental/render_splatpyramid/splat_pyramid.cc -index a4915d10..d6325aa4 100644 ---- a/src/plugins_experimental/render_splatpyramid/splat_pyramid.cc -+++ b/src/plugins_experimental/render_splatpyramid/splat_pyramid.cc -@@ -18,6 +18,8 @@ - #include <QTextStream> - #include <wrap/gl/trimesh.h> - -+#include <common/pluginmanager.h> -+ - //#include <QGLFramebufferObject> - - //#include "GL/glut.h" -@@ -85,7 +87,7 @@ void PyramidPointRendererPlugin::Init(QAction *, MeshDocument &md, RenderMode &, - objects[i].setRendererType( render_mode ); - - /// Sets the path to the meshlab's shaders directory -- QDir shadersDir = QDir(qApp->applicationDirPath()); -+ QDir shadersDir = PluginManager::getBaseDirPath(); - #if defined(Q_OS_WIN) - if (shadersDir.dirName() == "debug" || shadersDir.dirName() == "release" || shadersDir.dirName() == "plugins" ) - shadersDir.cdUp(); |