gentoo resync : 07.05.2021

4 files changed, 86 insertions, 0 deletions

diff --git a/media-gfx/freecad/files/99freecad b/media-gfx/freecad/files/99freecad
new file mode 100644
index 000000000000..81104107c22e
--- /dev/null
+++ b/media-gfx/freecad/files/99freecad
@@ -0,0 +1 @@
+PYTHONPATH=/usr/lib64/freecad/Ext:/usr/lib64/freecad/Mod:/usr/lib64/freecad/lib64
diff --git a/media-gfx/freecad/files/freecad-0.19.2-0001-fix-failing-test-workbench-testcase.patch b/media-gfx/freecad/files/freecad-0.19.2-0001-fix-failing-test-workbench-testcase.patch
new file mode 100644
index 000000000000..58107fb544d1
--- /dev/null
+++ b/media-gfx/freecad/files/freecad-0.19.2-0001-fix-failing-test-workbench-testcase.patch
@@ -0,0 +1,26 @@
+From dc04c745ea1e7dc277ab06fab69a2b91fbf543c5 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Sun, 25 Apr 2021 23:02:39 +0200
+Subject: [PATCH] fix failing test workbench testcase
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+---
+ src/Mod/Test/Document.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/Mod/Test/Document.py b/src/Mod/Test/Document.py
+index e41375c..fd5eb15 100644
+--- a/src/Mod/Test/Document.py
++++ b/src/Mod/Test/Document.py
+@@ -1307,7 +1307,7 @@ class DocumentFileIncludeCases(unittest.TestCase):
+     # copy file from L5 which is in the same directory

+     L7 = doc2.addObject("App::DocumentObjectFileIncluded","FileObject3")

+     L7.File = (L5.File,"Copy.txt")

+-    self.failUnless(os.path.exists(L5.File))

++    self.failUnless(os.path.exists(L7.File))

+     FreeCAD.closeDocument("Doc2")

+ 

+ 

+-- 
+2.31.1
+
diff --git a/media-gfx/freecad/files/freecad-0.19.2-0002-fix-femtest-failure-with-yaml-load.patch b/media-gfx/freecad/files/freecad-0.19.2-0002-fix-femtest-failure-with-yaml-load.patch
new file mode 100644
index 000000000000..17da18c2b12c
--- /dev/null
+++ b/media-gfx/freecad/files/freecad-0.19.2-0002-fix-femtest-failure-with-yaml-load.patch
@@ -0,0 +1,26 @@
+From a8314fdc56bb39f5af85e1678a03d613bfb9ee03 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Mon, 26 Apr 2021 19:32:54 +0200
+Subject: [PATCH] fix femtest failure with yaml load
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+---
+ src/Mod/Fem/feminout/importYamlJsonMesh.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/Mod/Fem/feminout/importYamlJsonMesh.py b/src/Mod/Fem/feminout/importYamlJsonMesh.py
+index 9886248..aff83a5 100644
+--- a/src/Mod/Fem/feminout/importYamlJsonMesh.py
++++ b/src/Mod/Fem/feminout/importYamlJsonMesh.py
+@@ -162,7 +162,7 @@ def read(
+             or fileExtension.lower() == ".yml"
+     ) and has_yaml:
+         fp = pyopen(fileString, "rt")
+-        raw_mesh_data = yaml.load(fp)
++        raw_mesh_data = yaml.load(fp, Loader=yaml.SafeLoader)
+         fp.close()
+     else:
+         Console.PrintError(
+-- 
+2.31.1
+
diff --git a/media-gfx/freecad/files/freecad-0.19.2-0003-fix-test-when-built-without-GUI.patch b/media-gfx/freecad/files/freecad-0.19.2-0003-fix-test-when-built-without-GUI.patch
new file mode 100644
index 000000000000..33892ade6d5a
--- /dev/null
+++ b/media-gfx/freecad/files/freecad-0.19.2-0003-fix-test-when-built-without-GUI.patch
@@ -0,0 +1,33 @@
+From d7ea5a0f20888a2ddae3eb48e508e9067662cdc7 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Wed, 28 Apr 2021 08:57:53 +0200
+Subject: [PATCH] fix test when built without GUI
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+---
+ src/Mod/Arch/ArchRoof.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/Mod/Arch/ArchRoof.py b/src/Mod/Arch/ArchRoof.py
+index 99130d0..e2c2955 100644
+--- a/src/Mod/Arch/ArchRoof.py
++++ b/src/Mod/Arch/ArchRoof.py
+@@ -22,7 +22,6 @@
+ import math
+ 
+ import ArchComponent
+-import Arch_rc
+ import Draft
+ import DraftGeomUtils
+ import DraftVecUtils
+@@ -32,6 +31,7 @@ import Part
+ from FreeCAD import Vector
+ 
+ if FreeCAD.GuiUp:
++    import Arch_rc
+     import FreeCADGui
+     from PySide import QtCore, QtGui
+     from DraftTools import translate
+-- 
+2.31.1
+