Fix Freecad build :

* Reorganize, add and clean dependencies
* Remove now unused patch for c++ placeholders
* Add thumbnailers.

3 files changed, 7 insertions, 189 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 83cb9e7a3a9e..309e766aaf9b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = freecad-linkstage3-git
 	pkgdesc = A general purpose 3D CAD modeler - LinkStage3 dev branch, git checkout
-	pkgver = asm3.0.11.r3435.gb7d3346e00
+	pkgver = asm3.0.11.r4461.ge6c5ae83e2
 	pkgrel = 1
 	url = http://www.freecadweb.org/
 	arch = x86_64
@@ -36,16 +36,15 @@ pkgbase = freecad-linkstage3-git
 	depends = python-pyside2
 	depends = python-matplotlib
 	depends = pyside2-tools
+	depends = shiboken2
 	optdepends = python-matplotlib
 	optdepends = graphviz
 	optdepends = openscad
 	conflicts = freecad
 	source = git+https://github.com/realthunder/FreeCAD.git#branch=LinkStage3
 	source = patch_std_gnupp14.patch
-	source = patch_boost_placeholders.patch
 	sha256sums = SKIP
 	sha256sums = d2a3a4c157741089c5ffbdd7c502be04414b8256081cd01208c94f2b0ed06ce3
-	sha256sums = 84b9f47fd643a5b01a9b5af8bd1e75c94842d8b564613286e2f145a85793a91e
 
 pkgname = freecad-linkstage3-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 93d440c712f4..eda43ffa70e8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Salamandar <felix@piedallu.me>
 
 pkgname=freecad-linkstage3-git
-pkgver=asm3.0.11.r3435.gb7d3346e00
+pkgver=asm3.0.11.r4461.ge6c5ae83e2
 pkgrel=1
 pkgdesc='A general purpose 3D CAD modeler - LinkStage3 dev branch, git checkout'
 arch=('x86_64')
@@ -13,22 +13,13 @@ depends=(
     'boost-libs' 'curl' 'opencascade>=7.2' 'xerces-c' 'libspnav' 'glew' 'netcdf'
     'shared-mime-info' 'hicolor-icon-theme' 'jsoncpp' 'qt5-base' 'qt5-declarative'
     'qt5-svg' 'qt5-tools' 'qt5-x11extras' 'qt5-xmlpatterns' 'qt5-webkit' 'med' 'python-pivy'
-    'python-pyside2' 'python-matplotlib' 'pyside2-tools'
-
-
+    'python-pyside2' 'python-matplotlib' 'pyside2-tools' 'shiboken2'     
+    # 'netgen-git'
+    # 'pybind11'
     # 'calculix'
     # 'coin'
     # 'gmsh'
-    # 'netgen-git'
     # 'vtk'
-    # 'shiboken2'
-    #
-    # # libxmu-dev
-    # # libxmu-headers
-    # # libxmu6
-    # # libxmuu-dev
-    # # libxmuu1
-    #
     # 'python-shiboken2'
 
 )
@@ -49,12 +40,10 @@ _gitname='FreeCAD'
 source=(
     "git+https://github.com/realthunder/FreeCAD.git#branch=LinkStage3"
     'patch_std_gnupp14.patch'
-    'patch_boost_placeholders.patch'
 )
 sha256sums=(
     'SKIP'
     'd2a3a4c157741089c5ffbdd7c502be04414b8256081cd01208c94f2b0ed06ce3'
-    '84b9f47fd643a5b01a9b5af8bd1e75c94842d8b564613286e2f145a85793a91e'
 )
 
 
@@ -66,7 +55,6 @@ pkgver() {
 prepare() {
     cd "${srcdir}/${_gitname}"
     git apply < "$srcdir/patch_std_gnupp14.patch"
-    git apply < "$srcdir/patch_boost_placeholders.patch"
 }
 
 build() {
@@ -108,7 +96,7 @@ package() {
         ln -sf "/usr/lib/freecad/bin/FreeCADCmd"    "usr/bin/FreeCADCmd"
 
         # Move data from /usr/lib/freecad/share to /usr/share
-        mv "usr/lib/freecad/share/"{icons,pixmaps,mime,metainfo,applications} \
+        mv "usr/lib/freecad/share/"{icons,pixmaps,mime,metainfo,applications,thumbnailers} \
             "usr/share"
 
         rmdir "usr/lib/freecad/share"
diff --git a/patch_boost_placeholders.patch b/patch_boost_placeholders.patch
deleted file mode 100644
index 5c47af2c98cc..000000000000
--- a/patch_boost_placeholders.patch
+++ /dev/null
@@ -1,169 +0,0 @@
-diff --git a/src/Mod/PartDesign/Gui/Command.cpp b/src/Mod/PartDesign/Gui/Command.cpp
-index bb9f5d0682..aa2cfe088b 100644
---- a/src/Mod/PartDesign/Gui/Command.cpp
-+++ b/src/Mod/PartDesign/Gui/Command.cpp
-@@ -377,7 +377,7 @@ CmdPartDesignSubShapeBinder::CmdPartDesignSubShapeBinder()
-     sPixmap         = "PartDesign_SubShapeBinder";
- 
-     Gui::Application::Instance->commandManager().registerCallback(
--            boost::bind(&commandOverride, this, 0, _1, _2), "Part_MakeFace");
-+            boost::bind(&commandOverride, this, 0, boost::placeholders::_1, boost::placeholders::_2), "Part_MakeFace");
- }
- 
- void CmdPartDesignSubShapeBinder::activated(int iMsg)
-@@ -1278,7 +1278,7 @@ CmdPartDesignPad::CmdPartDesignPad()
-     sPixmap       = "PartDesign_Pad";
- 
-     Gui::Application::Instance->commandManager().registerCallback(
--            boost::bind(&commandOverride, this, 0, _1, _2), "Part_Extrude");
-+            boost::bind(&commandOverride, this, 0, boost::placeholders::_1, boost::placeholders::_2), "Part_Extrude");
- }
- 
- void CmdPartDesignPad::activated(int iMsg)
-@@ -1476,7 +1476,7 @@ CmdPartDesignRevolution::CmdPartDesignRevolution()
-     sPixmap       = "PartDesign_Revolution";
- 
-     Gui::Application::Instance->commandManager().registerCallback(
--            boost::bind(&commandOverride, this, 0, _1, _2), "Part_MakeRevolve");
-+            boost::bind(&commandOverride, this, 0, boost::placeholders::_1, boost::placeholders::_2), "Part_MakeRevolve");
- }
- 
- void CmdPartDesignRevolution::activated(int iMsg)
-@@ -1603,7 +1603,7 @@ CmdPartDesignAdditivePipe::CmdPartDesignAdditivePipe()
-     sPixmap       = "PartDesign_Additive_Pipe";
- 
-     Gui::Application::Instance->commandManager().registerCallback(
--            boost::bind(&commandOverride, this, 0, _1, _2), "Part_Sweep");
-+            boost::bind(&commandOverride, this, 0, boost::placeholders::_1, boost::placeholders::_2), "Part_Sweep");
- }
- 
- void CmdPartDesignAdditivePipe::activated(int iMsg)
-@@ -1706,7 +1706,7 @@ CmdPartDesignAdditiveLoft::CmdPartDesignAdditiveLoft()
-     sPixmap       = "PartDesign_Additive_Loft";
- 
-     Gui::Application::Instance->commandManager().registerCallback(
--            boost::bind(&commandOverride, this, 0, _1, _2), "Part_Loft");
-+            boost::bind(&commandOverride, this, 0, boost::placeholders::_1, boost::placeholders::_2), "Part_Loft");
- }
- 
- void CmdPartDesignAdditiveLoft::activated(int iMsg)
-@@ -1907,7 +1907,7 @@ CmdPartDesignFillet::CmdPartDesignFillet()
-     sPixmap       = "PartDesign_Fillet";
- 
-     Gui::Application::Instance->commandManager().registerCallback(
--            boost::bind(&commandOverride, this, 0, _1, _2), "Part_Fillet");
-+            boost::bind(&commandOverride, this, 0, boost::placeholders::_1, boost::placeholders::_2), "Part_Fillet");
- }
- 
- void CmdPartDesignFillet::activated(int iMsg)
-@@ -1938,7 +1938,7 @@ CmdPartDesignChamfer::CmdPartDesignChamfer()
-     sPixmap       = "PartDesign_Chamfer";
- 
-     Gui::Application::Instance->commandManager().registerCallback(
--            boost::bind(&commandOverride, this, 0, _1, _2), "Part_Chamfer");
-+            boost::bind(&commandOverride, this, 0, boost::placeholders::_1, boost::placeholders::_2), "Part_Chamfer");
- }
- 
- void CmdPartDesignChamfer::activated(int iMsg)
-@@ -2027,7 +2027,7 @@ CmdPartDesignThickness::CmdPartDesignThickness()
-     sPixmap       = "PartDesign_Thickness";
- 
-     Gui::Application::Instance->commandManager().registerCallback(
--            boost::bind(&commandOverride, this, 0, _1, _2), "Part_Thickness");
-+            boost::bind(&commandOverride, this, 0, boost::placeholders::_1, boost::placeholders::_2), "Part_Thickness");
- }
- 
- void CmdPartDesignThickness::activated(int iMsg)
-@@ -2144,7 +2144,7 @@ CmdPartDesignMirrored::CmdPartDesignMirrored()
-     sPixmap       = "PartDesign_Mirrored";
- 
-     Gui::Application::Instance->commandManager().registerCallback(
--            boost::bind(&commandOverride, this, 0, _1, _2), "Part_Mirror");
-+            boost::bind(&commandOverride, this, 0, boost::placeholders::_1, boost::placeholders::_2), "Part_Mirror");
- }
- 
- void CmdPartDesignMirrored::activated(int iMsg)
-@@ -2536,13 +2536,13 @@ CmdPartDesignBoolean::CmdPartDesignBoolean()
-     sPixmap         = "PartDesign_Boolean";
- 
-     Gui::Application::Instance->commandManager().registerCallback(
--            boost::bind(&commandOverride, this, 0, _1, _2), "Part_Boolean");
-+            boost::bind(&commandOverride, this, 0, boost::placeholders::_1, boost::placeholders::_2), "Part_Boolean");
- 
-     Gui::Application::Instance->commandManager().registerCallback(
--            boost::bind(&commandOverride, this, 1, _1, _2), "Part_Cut");
-+            boost::bind(&commandOverride, this, 1, boost::placeholders::_1, boost::placeholders::_2), "Part_Cut");
-                     
-     Gui::Application::Instance->commandManager().registerCallback(
--            boost::bind(&commandOverride, this, 2, _1, _2), "Part_Common");
-+            boost::bind(&commandOverride, this, 2, boost::placeholders::_1, boost::placeholders::_2), "Part_Common");
- }
- 
- 
-@@ -2685,16 +2685,16 @@ CmdPartDesignSplit::CmdPartDesignSplit()
-     sPixmap         = "PartDesign_Split";
- 
-     Gui::Application::Instance->commandManager().registerCallback(
--            boost::bind(&commandOverride, this, 1, _1, _2), "Part_BooleanFragments");
-+            boost::bind(&commandOverride, this, 1, boost::placeholders::_1, boost::placeholders::_2), "Part_BooleanFragments");
- 
-     Gui::Application::Instance->commandManager().registerCallback(
--            boost::bind(&commandOverride, this, 0, _1, _2), "Part_Slice");
-+            boost::bind(&commandOverride, this, 0, boost::placeholders::_1, boost::placeholders::_2), "Part_Slice");
-                     
-     Gui::Application::Instance->commandManager().registerCallback(
--            boost::bind(&commandOverride, this, 0, _1, _2), "Part_SliceApart");
-+            boost::bind(&commandOverride, this, 0, boost::placeholders::_1, boost::placeholders::_2), "Part_SliceApart");
- 
-     Gui::Application::Instance->commandManager().registerCallback(
--            boost::bind(&commandOverride, this, 0, _1, _2), "Part_ExplodeCompound");
-+            boost::bind(&commandOverride, this, 0, boost::placeholders::_1, boost::placeholders::_2), "Part_ExplodeCompound");
- }
- 
- void CmdPartDesignSplit::activated(int iMsg)
-diff --git a/src/Mod/PartDesign/Gui/CommandPrimitive.cpp b/src/Mod/PartDesign/Gui/CommandPrimitive.cpp
-index 397e38fcac..e6a6fb0b10 100644
---- a/src/Mod/PartDesign/Gui/CommandPrimitive.cpp
-+++ b/src/Mod/PartDesign/Gui/CommandPrimitive.cpp
-@@ -85,15 +85,15 @@ CmdPrimtiveCompAdditive::CmdPrimtiveCompAdditive()
-     eType           = ForEdit;
- 
-     Gui::Application::Instance->commandManager().registerCallback(
--            boost::bind(&commandOverride, this, 0, false, _1, _2), "Part_Box");
-+            boost::bind(&commandOverride, this, 0, false, boost::placeholders::_1, boost::placeholders::_2), "Part_Box");
-     Gui::Application::Instance->commandManager().registerCallback(
--            boost::bind(&commandOverride, this, 1, false, _1, _2), "Part_Cylinder");
-+            boost::bind(&commandOverride, this, 1, false, boost::placeholders::_1, boost::placeholders::_2), "Part_Cylinder");
-     Gui::Application::Instance->commandManager().registerCallback(
--            boost::bind(&commandOverride, this, 2, false, _1, _2), "Part_Sphere");
-+            boost::bind(&commandOverride, this, 2, false, boost::placeholders::_1, boost::placeholders::_2), "Part_Sphere");
-     Gui::Application::Instance->commandManager().registerCallback(
--            boost::bind(&commandOverride, this, 3, false, _1, _2), "Part_Cone");
-+            boost::bind(&commandOverride, this, 3, false, boost::placeholders::_1, boost::placeholders::_2), "Part_Cone");
-     Gui::Application::Instance->commandManager().registerCallback(
--            boost::bind(&commandOverride, this, 5, false, _1, _2), "Part_Torus");
-+            boost::bind(&commandOverride, this, 5, false, boost::placeholders::_1, boost::placeholders::_2), "Part_Torus");
- }
- 
- void CmdPrimtiveCompAdditive::activated(int iMsg)
-@@ -267,15 +267,15 @@ CmdPrimtiveCompSubtractive::CmdPrimtiveCompSubtractive()
-     eType           = ForEdit;
- 
-     Gui::Application::Instance->commandManager().registerCallback(
--            boost::bind(&commandOverride, this, 0, true, _1, _2), "Part_Box");
-+            boost::bind(&commandOverride, this, 0, true, boost::placeholders::_1, boost::placeholders::_2), "Part_Box");
-     Gui::Application::Instance->commandManager().registerCallback(
--            boost::bind(&commandOverride, this, 1, true, _1, _2), "Part_Cylinder");
-+            boost::bind(&commandOverride, this, 1, true, boost::placeholders::_1, boost::placeholders::_2), "Part_Cylinder");
-     Gui::Application::Instance->commandManager().registerCallback(
--            boost::bind(&commandOverride, this, 2, true, _1, _2), "Part_Sphere");
-+            boost::bind(&commandOverride, this, 2, true, boost::placeholders::_1, boost::placeholders::_2), "Part_Sphere");
-     Gui::Application::Instance->commandManager().registerCallback(
--            boost::bind(&commandOverride, this, 3, true, _1, _2), "Part_Cone");
-+            boost::bind(&commandOverride, this, 3, true, boost::placeholders::_1, boost::placeholders::_2), "Part_Cone");
-     Gui::Application::Instance->commandManager().registerCallback(
--            boost::bind(&commandOverride, this, 5, true, _1, _2), "Part_Torus");
-+            boost::bind(&commandOverride, this, 5, true, boost::placeholders::_1, boost::placeholders::_2), "Part_Torus");
- }
- 
- void CmdPrimtiveCompSubtractive::activated(int iMsg)