diff options
| author |   Amy Liffey <amynka@gentoo.org> | 2017-12-27 17:16:45 +0100 |
|---|---|---|
| committer | Amy Liffey <amynka@gentoo.org> | 2017-12-27 17:21:15 +0100 |
| commit | b5adf61fc5ab5b1d96143e1ebb5f62d7ea26b5f0 (patch) | |
| tree | 63d2e70519af137713df33a7413c4e82e6db056c /media-gfx/meshlab/files | |
| parent | I forgot to also mask net-libs/h323plus (consumer of ptlib) after use.masking... (diff) | |
| download | gentoo-b5adf61fc5ab5b1d96143e1ebb5f62d7ea26b5f0.tar.gz gentoo-b5adf61fc5ab5b1d96143e1ebb5f62d7ea26b5f0.tar.bz2 gentoo-b5adf61fc5ab5b1d96143e1ebb5f62d7ea26b5f0.zip | |
media-gfx/meshlab: fix align and plugin path
- Align fix -> Submitted-by:luc_pierard_de_maujouy@yahoo.fr
Closes: https://bugs.gentoo.org/638796
Package-Manager: Portage-2.3.13, Repoman-2.3.3
Diffstat (limited to 'media-gfx/meshlab/files')
3 files changed, 44 insertions, 0 deletions
diff --git a/media-gfx/meshlab/files/2016.12/meshlab-2016.12-align1.patch b/media-gfx/meshlab/files/2016.12/meshlab-2016.12-align1.patch new file mode 100644 index 000000000000..cdba89c0ac36 --- /dev/null +++ b/media-gfx/meshlab/files/2016.12/meshlab-2016.12-align1.patch @@ -0,0 +1,16 @@ +--- a/meshlabplugins/edit_align/align/AlignGlobal.cpp 2016-12-23 13:24:59.000000000 +0300 ++++ b/meshlabplugins/edit_align/align/AlignGlobal.cpp 2017-11-26 03:05:11.010113483 +0300 +@@ -429,11 +429,11 @@ + + ******************************/ + +-bool AlignGlobal::GlobalAlign(const std::map<int,string> &Names, const double epsilon, int maxiter, bool Rigid, FILE *elfp, CallBack* cb ) ++bool AlignGlobal::GlobalAlign(const std::map<int,string> &Names, const double epsilon, int maxiter, bool Rigid, FILE *elfp, CallBackPos* cb ) + { + double change; + int step, localmaxiter; +- cb("Global Alignment..."); ++ cb(0,"Global Alignment..."); + LOG(elfp,"----------------\n----------------\nGlobalAlignment (target eps %7.3f)\n",epsilon); + + queue<AlignGlobal::Node *> Q; diff --git a/media-gfx/meshlab/files/2016.12/meshlab-2016.12-align2.patch b/media-gfx/meshlab/files/2016.12/meshlab-2016.12-align2.patch new file mode 100644 index 000000000000..455eec096c83 --- /dev/null +++ b/media-gfx/meshlab/files/2016.12/meshlab-2016.12-align2.patch @@ -0,0 +1,11 @@ +--- a/meshlabplugins/edit_align/align/AlignGlobal.h 2016-12-23 13:24:59.000000000 +0300 ++++ b/meshlabplugins/edit_align/align/AlignGlobal.h 2017-11-26 03:10:09.210116792 +0300 +@@ -115,7 +115,7 @@ + Node *ChooseDormantWithMostActiveLink (); + void MakeAllDormant(); + void Clear(); +- bool GlobalAlign(const std::map<int,std::string> &Names, const double epsilon, int maxiter, bool Rigid, FILE *elfp=0, CallBack * cb=DummyCallBack ); ++ bool GlobalAlign(const std::map<int,std::string> &Names, const double epsilon, int maxiter, bool Rigid, FILE *elfp=0, CallBackPos * cb=DummyCallBackPos ); + + bool CheckGraph(); + diff --git a/media-gfx/meshlab/files/2016.12/meshlab-2016.12-fix-plugins-path.patch b/media-gfx/meshlab/files/2016.12/meshlab-2016.12-fix-plugins-path.patch new file mode 100644 index 000000000000..d7b17fe904bc --- /dev/null +++ b/media-gfx/meshlab/files/2016.12/meshlab-2016.12-fix-plugins-path.patch @@ -0,0 +1,17 @@ +diff --git a/common/pluginmanager.cpp b/common/pluginmanager.cpp +index 5354055..9a523d4 100644 +--- a/common/pluginmanager.cpp ++++ b/common/pluginmanager.cpp +@@ -189,7 +189,11 @@ QString PluginManager::osDependentFileBaseName(const QString &plname) + + QString PluginManager::getBaseDirPath() + { +- QDir baseDir(qApp->applicationDirPath()); ++ #if defined(Q_OS_LINUX) ++ QDir baseDir("/usr/share/meshlab"); ++ #else ++ QDir baseDir(qApp->applicationDirPath()); ++ #endif + + #if defined(Q_OS_WIN) + // Windows: |