* Re: [PR PATCH] [Updated] freecad: update to 0.21.1
2023-10-11 0:52 [PR PATCH] freecad: update to 0.21.1 cy1der
@ 2023-10-14 16:49 ` cy1der
2023-10-15 16:00 ` ii8
` (23 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: cy1der @ 2023-10-14 16:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 611 bytes --]
There is an updated pull request by cy1der against master on the void-packages repository
https://github.com/cy1der/void-packages freecad-0.21.1
https://github.com/void-linux/void-packages/pull/46573
freecad: update to 0.21.1
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture: **x86_64-glibc**
- I built this PR locally for these architectures: **Only tried armv6l, but I got "hdf5-devel cannot be cross compiled"**
A patch file from https://github.com/void-linux/void-packages/pull/46573.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-freecad-0.21.1-46573.patch --]
[-- Type: text/x-diff, Size: 12629 bytes --]
From eedd622e5093723c24df3287b702ba087169363d Mon Sep 17 00:00:00 2001
From: Ahmed Al-Taiar <ahmed.altaiar.06@gmail.com>
Date: Tue, 10 Oct 2023 18:56:39 -0400
Subject: [PATCH 1/3] Bump FreeCAD version to 0.21.1
---
srcpkgs/freecad/{patches => }/001-include.patch | 0
.../154-revert-gui-tmp-redirect-stderr.patch | 0
.../fe02d63c8c9b1280978be841d04e68a0a55cceb9.patch | 0
srcpkgs/freecad/template | 9 +++++----
4 files changed, 5 insertions(+), 4 deletions(-)
rename srcpkgs/freecad/{patches => }/001-include.patch (100%)
rename srcpkgs/freecad/{patches => }/154-revert-gui-tmp-redirect-stderr.patch (100%)
rename srcpkgs/freecad/{patches => }/fe02d63c8c9b1280978be841d04e68a0a55cceb9.patch (100%)
diff --git a/srcpkgs/freecad/patches/001-include.patch b/srcpkgs/freecad/001-include.patch
similarity index 100%
rename from srcpkgs/freecad/patches/001-include.patch
rename to srcpkgs/freecad/001-include.patch
diff --git a/srcpkgs/freecad/patches/154-revert-gui-tmp-redirect-stderr.patch b/srcpkgs/freecad/154-revert-gui-tmp-redirect-stderr.patch
similarity index 100%
rename from srcpkgs/freecad/patches/154-revert-gui-tmp-redirect-stderr.patch
rename to srcpkgs/freecad/154-revert-gui-tmp-redirect-stderr.patch
diff --git a/srcpkgs/freecad/patches/fe02d63c8c9b1280978be841d04e68a0a55cceb9.patch b/srcpkgs/freecad/fe02d63c8c9b1280978be841d04e68a0a55cceb9.patch
similarity index 100%
rename from srcpkgs/freecad/patches/fe02d63c8c9b1280978be841d04e68a0a55cceb9.patch
rename to srcpkgs/freecad/fe02d63c8c9b1280978be841d04e68a0a55cceb9.patch
diff --git a/srcpkgs/freecad/template b/srcpkgs/freecad/template
index c135701e38b9a..7f6ed99f1dfe5 100644
--- a/srcpkgs/freecad/template
+++ b/srcpkgs/freecad/template
@@ -1,7 +1,7 @@
# Template file for 'freecad'
pkgname=freecad
-version=0.20.2
-revision=7
+version=0.21.1
+revision=0
build_wrksrc="FreeCAD-${version}"
build_style=cmake
pycompile_dirs="usr/lib/${pkgname}/Mod"
@@ -24,7 +24,8 @@ makedepends="python3-devel boost-devel libxerces-c-devel zlib-devel occt-devel
coin3-devel libshiboken2-devel libspnav-devel pyside2-tools
liblz4-devel libpyside2-python3-devel python3-matplotlib netcdf-devel
jsoncpp-devel qt5-devel qt5-svg-devel qt5-tools-devel qt5-webkit-devel
- qt5-xmlpatterns-devel coin3-doc glew-devel python3-pivy"
+ qt5-xmlpatterns-devel coin3-doc glew-devel python3-pivy qt5-webengine-devel
+ qt5-declarative-devel qt5-webchannel-devel qt5-location-devel"
depends="python3-matplotlib python3-pyside2-webengine python3-pivy"
short_desc="General purpose 3D CAD modeler"
maintainer="yopito <pierre.bourgin@free.fr>"
@@ -35,7 +36,7 @@ distfiles="
https://github.com/FreeCAD/FreeCAD/archive/${version}.tar.gz
${SOURCEFORGE_SITE}/cxx/pycxx-${_pycxxver}.tar.gz
"
-checksum="46922f3a477e742e1a89cd5346692d63aebb2b67af887b3e463e094a4ae055da
+checksum="e9b1fd0323f101268c7f3be52db42e4a29222f2e306ae6c4a6fc309cb418d35a
4b91e1e1141c23fbd5039df635c4bb6e75632168548f56b83ce177193c0c98c6"
python_version=3
patch_args="-Np1 -d ${build_wrksrc}"
From e9f54a971c8c25e17df8fac72bc01b2ba9784c08 Mon Sep 17 00:00:00 2001
From: Ahmed Al-Taiar <ahmed.altaiar.06@gmail.com>
Date: Tue, 10 Oct 2023 18:57:36 -0400
Subject: [PATCH 2/3] Remove unused patches
---
srcpkgs/freecad/001-include.patch | 112 ------------------
.../154-revert-gui-tmp-redirect-stderr.patch | 68 -----------
...d63c8c9b1280978be841d04e68a0a55cceb9.patch | 30 -----
3 files changed, 210 deletions(-)
delete mode 100644 srcpkgs/freecad/001-include.patch
delete mode 100644 srcpkgs/freecad/154-revert-gui-tmp-redirect-stderr.patch
delete mode 100644 srcpkgs/freecad/fe02d63c8c9b1280978be841d04e68a0a55cceb9.patch
diff --git a/srcpkgs/freecad/001-include.patch b/srcpkgs/freecad/001-include.patch
deleted file mode 100644
index 28b5af54999b9..0000000000000
--- a/srcpkgs/freecad/001-include.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-From 9a41845a417189776741297c50a3827ce292bc4f Mon Sep 17 00:00:00 2001
-From: Uwe <donovaly@users.noreply.github.com>
-Date: Sun, 3 Jul 2022 22:51:16 +0200
-Subject: [PATCH] [Part] OCCError.h: remove unneeded includes
-
-- also sort includes
----
- src/Mod/Part/App/OCCError.h | 36 +++----------------------
- src/Mod/Part/App/OffsetCurvePyImp.cpp | 12 ++++-----
- src/Mod/Part/App/OffsetSurfacePyImp.cpp | 10 +++----
- 3 files changed, 12 insertions(+), 46 deletions(-)
-
---- a/src/Mod/Part/App/OCCError.h
-+++ b/src/Mod/Part/App/OCCError.h
-@@ -23,36 +23,8 @@
- #ifndef _OCCError_h_
- #define _OCCError_h_
-
--# include <Standard_Version.hxx>
- # include <Standard_Failure.hxx>
--# include <Standard_AbortiveTransaction.hxx>
--# include <Standard_ConstructionError.hxx>
--# if OCC_VERSION_HEX >= 0x060500
--# include <Standard_DefineException.hxx>
--# endif
--# include <Standard_DimensionError.hxx>
--# include <Standard_DimensionMismatch.hxx>
--# include <Standard_DivideByZero.hxx>
--# include <Standard_DomainError.hxx>
--# include <Standard_ImmutableObject.hxx>
--# include <Standard_LicenseError.hxx>
--# include <Standard_LicenseNotFound.hxx>
--# include <Standard_MultiplyDefined.hxx>
--# include <Standard_NegativeValue.hxx>
--# include <Standard_NoMoreObject.hxx>
--# include <Standard_NoSuchObject.hxx>
--# include <Standard_NotImplemented.hxx>
--# include <Standard_NullObject.hxx>
--# include <Standard_NullValue.hxx>
--# include <Standard_NumericError.hxx>
--# include <Standard_OutOfMemory.hxx>
--# include <Standard_OutOfRange.hxx>
--# include <Standard_Overflow.hxx>
--# include <Standard_ProgramError.hxx>
--# include <Standard_RangeError.hxx>
--# include <Standard_TooManyUsers.hxx>
--# include <Standard_TypeMismatch.hxx>
--# include <Standard_Underflow.hxx>
-+# include <Standard_Version.hxx>
-
- #include <Mod/Part/PartGlobal.h>
- #include <Base/Console.h>
-@@ -88,4 +60,3 @@ PartExport extern PyObject* PartExceptio
-
- #define PY_CATCH_OCC _PY_CATCH_OCC(return(NULL))
- #endif // _OCCError_h_
--
---- a/src/Mod/Part/App/OffsetCurvePyImp.cpp
-+++ b/src/Mod/Part/App/OffsetCurvePyImp.cpp
-@@ -20,20 +20,20 @@
- * *
- ***************************************************************************/
-
--
- #include "PreCompiled.h"
- #ifndef _PreComp_
- # include <Geom_OffsetCurve.hxx>
- #endif
-
--#include "OCCError.h"
--#include "Geometry.h"
-+#include <Base/GeometryPyCXX.h>
-+#include <Base/Vector3D.h>
-+#include <Base/VectorPy.h>
-+
- #include "OffsetCurvePy.h"
- #include "OffsetCurvePy.cpp"
-+#include "Geometry.h"
-+#include "OCCError.h"
-
--#include <Base/GeometryPyCXX.h>
--#include <Base/VectorPy.h>
--#include <Base/Vector3D.h>
-
- using namespace Part;
-
---- a/src/Mod/Part/App/OffsetSurfacePyImp.cpp
-+++ b/src/Mod/Part/App/OffsetSurfacePyImp.cpp
-@@ -20,20 +20,16 @@
- * *
- ***************************************************************************/
-
--
- #include "PreCompiled.h"
- #ifndef _PreComp_
- # include <Geom_OffsetSurface.hxx>
- # include <memory>
- #endif
-
--#include <Base/VectorPy.h>
--#include <Base/Vector3D.h>
--
- #include "OCCError.h"
--#include "Geometry.h"
--#include <Mod/Part/App/OffsetSurfacePy.h>
--#include <Mod/Part/App/OffsetSurfacePy.cpp>
-+#include "OffsetSurfacePy.h"
-+#include "OffsetSurfacePy.cpp"
-+
-
- using namespace Part;
-
diff --git a/srcpkgs/freecad/154-revert-gui-tmp-redirect-stderr.patch b/srcpkgs/freecad/154-revert-gui-tmp-redirect-stderr.patch
deleted file mode 100644
index d6a9adabdec83..0000000000000
--- a/srcpkgs/freecad/154-revert-gui-tmp-redirect-stderr.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-see https://github.com/FreeCAD/FreeCAD/commit/cfe94b00d3434f3e2c8b5114d2909f628c330fa8#commitcomment-71413407
-
-upstream: yes
-
-From 7b377a216b9185960e4cee980a6504dc1a755f50 Mon Sep 17 00:00:00 2001
-From: wmayer <wmayer@users.sourceforge.net>
-Date: Wed, 29 Jun 2022 15:19:18 +0200
-Subject: [PATCH] Gui: remove workaround for spnav 0.23 due to build failure
- with musl libc
-
----
- src/Gui/3Dconnexion/GuiNativeEventLinux.cpp | 27 ---------------------
- 1 file changed, 27 deletions(-)
-
---- a/src/Gui/3Dconnexion/GuiNativeEventLinux.cpp
-+++ b/src/Gui/3Dconnexion/GuiNativeEventLinux.cpp
-@@ -21,42 +21,17 @@
- ***************************************************************************/
-
- #include <FCConfig.h>
--#include <cstdio>
-
- #include "GuiNativeEventLinux.h"
-
- #include "GuiApplicationNativeEventAware.h"
- #include <Base/Console.h>
--#include <Base/FileInfo.h>
- #include <QMainWindow>
-
- #include <QSocketNotifier>
-
- #include <spnav.h>
-
--namespace {
--class RedirectStdErr
--{
--public:
-- RedirectStdErr()
-- : fi(Base::FileInfo::getTempFileName())
-- , file(stderr)
-- {
-- stderr = fopen(fi.filePath().c_str(), "w");
-- }
-- ~RedirectStdErr()
-- {
-- fclose(stderr);
-- fi.deleteFile();
-- stderr = file;
-- }
--
--private:
-- Base::FileInfo fi;
-- FILE* file;
--};
--}
--
- Gui::GuiNativeEvent::GuiNativeEvent(Gui::GUIApplicationNativeEventAware *app)
- : GuiAbstractNativeEvent(app)
- {
-@@ -72,8 +47,6 @@ Gui::GuiNativeEvent::~GuiNativeEvent()
-
- void Gui::GuiNativeEvent::initSpaceball(QMainWindow *window)
- {
-- // tmp. redirect stderr to a file to suppress an error message from spnav_open()
-- RedirectStdErr err;
- Q_UNUSED(window)
- if (spnav_open() == -1) {
- Base::Console().Log("Couldn't connect to spacenav daemon. Please ignore if you don't have a spacemouse.\n");
diff --git a/srcpkgs/freecad/fe02d63c8c9b1280978be841d04e68a0a55cceb9.patch b/srcpkgs/freecad/fe02d63c8c9b1280978be841d04e68a0a55cceb9.patch
deleted file mode 100644
index d4acf370ca0a4..0000000000000
--- a/srcpkgs/freecad/fe02d63c8c9b1280978be841d04e68a0a55cceb9.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From fe02d63c8c9b1280978be841d04e68a0a55cceb9 Mon Sep 17 00:00:00 2001
-From: Roy-043 <70520633+Roy-043@users.noreply.github.com>
-Date: Thu, 29 Dec 2022 23:20:38 +0100
-Subject: [PATCH] Draft: update inspect.getargspec to inspect.getfullargspec
- (#8101)
-
----
- src/Mod/Draft/draftguitools/gui_snapper.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/src/Mod/Draft/draftguitools/gui_snapper.py
-+++ b/src/Mod/Draft/draftguitools/gui_snapper.py
-@@ -1426,7 +1426,7 @@ class Snapper:
- Gui.Snapper.off()
- self.ui.offUi()
- if callback:
-- if len(inspect.getargspec(callback).args) > 1:
-+ if len(inspect.getfullargspec(callback).args) > 1:
- obj = None
- if self.snapInfo and ("Object" in self.snapInfo) and self.snapInfo["Object"]:
- obj = App.ActiveDocument.getObject(self.snapInfo["Object"])
-@@ -1445,7 +1445,7 @@ class Snapper:
- Gui.Snapper.off()
- self.ui.offUi()
- if callback:
-- if len(inspect.getargspec(callback).args) > 1:
-+ if len(inspect.getfullargspec(callback).args) > 1:
- callback(None, None)
- else:
- callback(None)
From 71551b59cbffd2f7d08e32099033575e3b1181c5 Mon Sep 17 00:00:00 2001
From: Ahmed Al-Taiar <ahmed.altaiar.06@gmail.com>
Date: Tue, 10 Oct 2023 20:34:06 -0400
Subject: [PATCH 3/3] xlint suggestions
---
srcpkgs/freecad/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/freecad/template b/srcpkgs/freecad/template
index 7f6ed99f1dfe5..b2c8188aa22aa 100644
--- a/srcpkgs/freecad/template
+++ b/srcpkgs/freecad/template
@@ -1,7 +1,7 @@
# Template file for 'freecad'
pkgname=freecad
version=0.21.1
-revision=0
+revision=1
build_wrksrc="FreeCAD-${version}"
build_style=cmake
pycompile_dirs="usr/lib/${pkgname}/Mod"
@@ -24,7 +24,7 @@ makedepends="python3-devel boost-devel libxerces-c-devel zlib-devel occt-devel
coin3-devel libshiboken2-devel libspnav-devel pyside2-tools
liblz4-devel libpyside2-python3-devel python3-matplotlib netcdf-devel
jsoncpp-devel qt5-devel qt5-svg-devel qt5-tools-devel qt5-webkit-devel
- qt5-xmlpatterns-devel coin3-doc glew-devel python3-pivy qt5-webengine-devel
+ qt5-xmlpatterns-devel coin3-doc glew-devel python3-pivy qt5-webengine-devel
qt5-declarative-devel qt5-webchannel-devel qt5-location-devel"
depends="python3-matplotlib python3-pyside2-webengine python3-pivy"
short_desc="General purpose 3D CAD modeler"
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: freecad: update to 0.21.1
2023-10-11 0:52 [PR PATCH] freecad: update to 0.21.1 cy1der
2023-10-14 16:49 ` [PR PATCH] [Updated] " cy1der
@ 2023-10-15 16:00 ` ii8
2023-10-15 17:05 ` cy1der
` (22 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: ii8 @ 2023-10-15 16:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 410 bytes --]
New comment by ii8 on void-packages repository
https://github.com/void-linux/void-packages/pull/46573#issuecomment-1763433444
Comment:
You should squash the commits and the commit message should be: "freecad: update to 0.21.1."
Have a look here if you don't know how: https://thoughtbot.com/blog/git-interactive-rebase-squash-amend-rewriting-history
Why does it need the webengine stuff now? Just curious.
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: freecad: update to 0.21.1
2023-10-11 0:52 [PR PATCH] freecad: update to 0.21.1 cy1der
2023-10-14 16:49 ` [PR PATCH] [Updated] " cy1der
2023-10-15 16:00 ` ii8
@ 2023-10-15 17:05 ` cy1der
2023-10-15 17:05 ` cy1der
` (21 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: cy1der @ 2023-10-15 17:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 272 bytes --]
New comment by cy1der on void-packages repository
https://github.com/void-linux/void-packages/pull/46573#issuecomment-1763449112
Comment:
> Why does it need the webengine stuff now? Just curious.
Unsure, but my guess is it's for the built in web browsing capabilities.
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: freecad: update to 0.21.1
2023-10-11 0:52 [PR PATCH] freecad: update to 0.21.1 cy1der
` (2 preceding siblings ...)
2023-10-15 17:05 ` cy1der
@ 2023-10-15 17:05 ` cy1der
2023-10-15 17:06 ` cy1der
` (20 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: cy1der @ 2023-10-15 17:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 273 bytes --]
New comment by cy1der on void-packages repository
https://github.com/void-linux/void-packages/pull/46573#issuecomment-1763449112
Comment:
> Why does it need the webengine stuff now? Just curious.
Unsure, but my guess is it's for the built in web browsing capabilities.
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: freecad: update to 0.21.1
2023-10-11 0:52 [PR PATCH] freecad: update to 0.21.1 cy1der
` (3 preceding siblings ...)
2023-10-15 17:05 ` cy1der
@ 2023-10-15 17:06 ` cy1der
2023-10-15 19:15 ` [PR PATCH] [Updated] " cy1der
` (19 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: cy1der @ 2023-10-15 17:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 264 bytes --]
New comment by cy1der on void-packages repository
https://github.com/void-linux/void-packages/pull/46573#issuecomment-1763449274
Comment:
> You should squash the commits and the commit message should be: "freecad: update to 0.21.1."
Sorry about that, will do
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: [PR PATCH] [Updated] freecad: update to 0.21.1.
2023-10-11 0:52 [PR PATCH] freecad: update to 0.21.1 cy1der
` (4 preceding siblings ...)
2023-10-15 17:06 ` cy1der
@ 2023-10-15 19:15 ` cy1der
2023-10-15 19:19 ` cy1der
` (18 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: cy1der @ 2023-10-15 19:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 612 bytes --]
There is an updated pull request by cy1der against master on the void-packages repository
https://github.com/cy1der/void-packages freecad-0.21.1
https://github.com/void-linux/void-packages/pull/46573
freecad: update to 0.21.1.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture: **x86_64-glibc**
- I built this PR locally for these architectures: **Only tried armv6l, but I got "hdf5-devel cannot be cross compiled"**
A patch file from https://github.com/void-linux/void-packages/pull/46573.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-freecad-0.21.1-46573.patch --]
[-- Type: text/x-diff, Size: 12629 bytes --]
From eedd622e5093723c24df3287b702ba087169363d Mon Sep 17 00:00:00 2001
From: Ahmed Al-Taiar <ahmed.altaiar.06@gmail.com>
Date: Tue, 10 Oct 2023 18:56:39 -0400
Subject: [PATCH 1/3] Bump FreeCAD version to 0.21.1
---
srcpkgs/freecad/{patches => }/001-include.patch | 0
.../154-revert-gui-tmp-redirect-stderr.patch | 0
.../fe02d63c8c9b1280978be841d04e68a0a55cceb9.patch | 0
srcpkgs/freecad/template | 9 +++++----
4 files changed, 5 insertions(+), 4 deletions(-)
rename srcpkgs/freecad/{patches => }/001-include.patch (100%)
rename srcpkgs/freecad/{patches => }/154-revert-gui-tmp-redirect-stderr.patch (100%)
rename srcpkgs/freecad/{patches => }/fe02d63c8c9b1280978be841d04e68a0a55cceb9.patch (100%)
diff --git a/srcpkgs/freecad/patches/001-include.patch b/srcpkgs/freecad/001-include.patch
similarity index 100%
rename from srcpkgs/freecad/patches/001-include.patch
rename to srcpkgs/freecad/001-include.patch
diff --git a/srcpkgs/freecad/patches/154-revert-gui-tmp-redirect-stderr.patch b/srcpkgs/freecad/154-revert-gui-tmp-redirect-stderr.patch
similarity index 100%
rename from srcpkgs/freecad/patches/154-revert-gui-tmp-redirect-stderr.patch
rename to srcpkgs/freecad/154-revert-gui-tmp-redirect-stderr.patch
diff --git a/srcpkgs/freecad/patches/fe02d63c8c9b1280978be841d04e68a0a55cceb9.patch b/srcpkgs/freecad/fe02d63c8c9b1280978be841d04e68a0a55cceb9.patch
similarity index 100%
rename from srcpkgs/freecad/patches/fe02d63c8c9b1280978be841d04e68a0a55cceb9.patch
rename to srcpkgs/freecad/fe02d63c8c9b1280978be841d04e68a0a55cceb9.patch
diff --git a/srcpkgs/freecad/template b/srcpkgs/freecad/template
index c135701e38b9a..7f6ed99f1dfe5 100644
--- a/srcpkgs/freecad/template
+++ b/srcpkgs/freecad/template
@@ -1,7 +1,7 @@
# Template file for 'freecad'
pkgname=freecad
-version=0.20.2
-revision=7
+version=0.21.1
+revision=0
build_wrksrc="FreeCAD-${version}"
build_style=cmake
pycompile_dirs="usr/lib/${pkgname}/Mod"
@@ -24,7 +24,8 @@ makedepends="python3-devel boost-devel libxerces-c-devel zlib-devel occt-devel
coin3-devel libshiboken2-devel libspnav-devel pyside2-tools
liblz4-devel libpyside2-python3-devel python3-matplotlib netcdf-devel
jsoncpp-devel qt5-devel qt5-svg-devel qt5-tools-devel qt5-webkit-devel
- qt5-xmlpatterns-devel coin3-doc glew-devel python3-pivy"
+ qt5-xmlpatterns-devel coin3-doc glew-devel python3-pivy qt5-webengine-devel
+ qt5-declarative-devel qt5-webchannel-devel qt5-location-devel"
depends="python3-matplotlib python3-pyside2-webengine python3-pivy"
short_desc="General purpose 3D CAD modeler"
maintainer="yopito <pierre.bourgin@free.fr>"
@@ -35,7 +36,7 @@ distfiles="
https://github.com/FreeCAD/FreeCAD/archive/${version}.tar.gz
${SOURCEFORGE_SITE}/cxx/pycxx-${_pycxxver}.tar.gz
"
-checksum="46922f3a477e742e1a89cd5346692d63aebb2b67af887b3e463e094a4ae055da
+checksum="e9b1fd0323f101268c7f3be52db42e4a29222f2e306ae6c4a6fc309cb418d35a
4b91e1e1141c23fbd5039df635c4bb6e75632168548f56b83ce177193c0c98c6"
python_version=3
patch_args="-Np1 -d ${build_wrksrc}"
From e9f54a971c8c25e17df8fac72bc01b2ba9784c08 Mon Sep 17 00:00:00 2001
From: Ahmed Al-Taiar <ahmed.altaiar.06@gmail.com>
Date: Tue, 10 Oct 2023 18:57:36 -0400
Subject: [PATCH 2/3] Remove unused patches
---
srcpkgs/freecad/001-include.patch | 112 ------------------
.../154-revert-gui-tmp-redirect-stderr.patch | 68 -----------
...d63c8c9b1280978be841d04e68a0a55cceb9.patch | 30 -----
3 files changed, 210 deletions(-)
delete mode 100644 srcpkgs/freecad/001-include.patch
delete mode 100644 srcpkgs/freecad/154-revert-gui-tmp-redirect-stderr.patch
delete mode 100644 srcpkgs/freecad/fe02d63c8c9b1280978be841d04e68a0a55cceb9.patch
diff --git a/srcpkgs/freecad/001-include.patch b/srcpkgs/freecad/001-include.patch
deleted file mode 100644
index 28b5af54999b9..0000000000000
--- a/srcpkgs/freecad/001-include.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-From 9a41845a417189776741297c50a3827ce292bc4f Mon Sep 17 00:00:00 2001
-From: Uwe <donovaly@users.noreply.github.com>
-Date: Sun, 3 Jul 2022 22:51:16 +0200
-Subject: [PATCH] [Part] OCCError.h: remove unneeded includes
-
-- also sort includes
----
- src/Mod/Part/App/OCCError.h | 36 +++----------------------
- src/Mod/Part/App/OffsetCurvePyImp.cpp | 12 ++++-----
- src/Mod/Part/App/OffsetSurfacePyImp.cpp | 10 +++----
- 3 files changed, 12 insertions(+), 46 deletions(-)
-
---- a/src/Mod/Part/App/OCCError.h
-+++ b/src/Mod/Part/App/OCCError.h
-@@ -23,36 +23,8 @@
- #ifndef _OCCError_h_
- #define _OCCError_h_
-
--# include <Standard_Version.hxx>
- # include <Standard_Failure.hxx>
--# include <Standard_AbortiveTransaction.hxx>
--# include <Standard_ConstructionError.hxx>
--# if OCC_VERSION_HEX >= 0x060500
--# include <Standard_DefineException.hxx>
--# endif
--# include <Standard_DimensionError.hxx>
--# include <Standard_DimensionMismatch.hxx>
--# include <Standard_DivideByZero.hxx>
--# include <Standard_DomainError.hxx>
--# include <Standard_ImmutableObject.hxx>
--# include <Standard_LicenseError.hxx>
--# include <Standard_LicenseNotFound.hxx>
--# include <Standard_MultiplyDefined.hxx>
--# include <Standard_NegativeValue.hxx>
--# include <Standard_NoMoreObject.hxx>
--# include <Standard_NoSuchObject.hxx>
--# include <Standard_NotImplemented.hxx>
--# include <Standard_NullObject.hxx>
--# include <Standard_NullValue.hxx>
--# include <Standard_NumericError.hxx>
--# include <Standard_OutOfMemory.hxx>
--# include <Standard_OutOfRange.hxx>
--# include <Standard_Overflow.hxx>
--# include <Standard_ProgramError.hxx>
--# include <Standard_RangeError.hxx>
--# include <Standard_TooManyUsers.hxx>
--# include <Standard_TypeMismatch.hxx>
--# include <Standard_Underflow.hxx>
-+# include <Standard_Version.hxx>
-
- #include <Mod/Part/PartGlobal.h>
- #include <Base/Console.h>
-@@ -88,4 +60,3 @@ PartExport extern PyObject* PartExceptio
-
- #define PY_CATCH_OCC _PY_CATCH_OCC(return(NULL))
- #endif // _OCCError_h_
--
---- a/src/Mod/Part/App/OffsetCurvePyImp.cpp
-+++ b/src/Mod/Part/App/OffsetCurvePyImp.cpp
-@@ -20,20 +20,20 @@
- * *
- ***************************************************************************/
-
--
- #include "PreCompiled.h"
- #ifndef _PreComp_
- # include <Geom_OffsetCurve.hxx>
- #endif
-
--#include "OCCError.h"
--#include "Geometry.h"
-+#include <Base/GeometryPyCXX.h>
-+#include <Base/Vector3D.h>
-+#include <Base/VectorPy.h>
-+
- #include "OffsetCurvePy.h"
- #include "OffsetCurvePy.cpp"
-+#include "Geometry.h"
-+#include "OCCError.h"
-
--#include <Base/GeometryPyCXX.h>
--#include <Base/VectorPy.h>
--#include <Base/Vector3D.h>
-
- using namespace Part;
-
---- a/src/Mod/Part/App/OffsetSurfacePyImp.cpp
-+++ b/src/Mod/Part/App/OffsetSurfacePyImp.cpp
-@@ -20,20 +20,16 @@
- * *
- ***************************************************************************/
-
--
- #include "PreCompiled.h"
- #ifndef _PreComp_
- # include <Geom_OffsetSurface.hxx>
- # include <memory>
- #endif
-
--#include <Base/VectorPy.h>
--#include <Base/Vector3D.h>
--
- #include "OCCError.h"
--#include "Geometry.h"
--#include <Mod/Part/App/OffsetSurfacePy.h>
--#include <Mod/Part/App/OffsetSurfacePy.cpp>
-+#include "OffsetSurfacePy.h"
-+#include "OffsetSurfacePy.cpp"
-+
-
- using namespace Part;
-
diff --git a/srcpkgs/freecad/154-revert-gui-tmp-redirect-stderr.patch b/srcpkgs/freecad/154-revert-gui-tmp-redirect-stderr.patch
deleted file mode 100644
index d6a9adabdec83..0000000000000
--- a/srcpkgs/freecad/154-revert-gui-tmp-redirect-stderr.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-see https://github.com/FreeCAD/FreeCAD/commit/cfe94b00d3434f3e2c8b5114d2909f628c330fa8#commitcomment-71413407
-
-upstream: yes
-
-From 7b377a216b9185960e4cee980a6504dc1a755f50 Mon Sep 17 00:00:00 2001
-From: wmayer <wmayer@users.sourceforge.net>
-Date: Wed, 29 Jun 2022 15:19:18 +0200
-Subject: [PATCH] Gui: remove workaround for spnav 0.23 due to build failure
- with musl libc
-
----
- src/Gui/3Dconnexion/GuiNativeEventLinux.cpp | 27 ---------------------
- 1 file changed, 27 deletions(-)
-
---- a/src/Gui/3Dconnexion/GuiNativeEventLinux.cpp
-+++ b/src/Gui/3Dconnexion/GuiNativeEventLinux.cpp
-@@ -21,42 +21,17 @@
- ***************************************************************************/
-
- #include <FCConfig.h>
--#include <cstdio>
-
- #include "GuiNativeEventLinux.h"
-
- #include "GuiApplicationNativeEventAware.h"
- #include <Base/Console.h>
--#include <Base/FileInfo.h>
- #include <QMainWindow>
-
- #include <QSocketNotifier>
-
- #include <spnav.h>
-
--namespace {
--class RedirectStdErr
--{
--public:
-- RedirectStdErr()
-- : fi(Base::FileInfo::getTempFileName())
-- , file(stderr)
-- {
-- stderr = fopen(fi.filePath().c_str(), "w");
-- }
-- ~RedirectStdErr()
-- {
-- fclose(stderr);
-- fi.deleteFile();
-- stderr = file;
-- }
--
--private:
-- Base::FileInfo fi;
-- FILE* file;
--};
--}
--
- Gui::GuiNativeEvent::GuiNativeEvent(Gui::GUIApplicationNativeEventAware *app)
- : GuiAbstractNativeEvent(app)
- {
-@@ -72,8 +47,6 @@ Gui::GuiNativeEvent::~GuiNativeEvent()
-
- void Gui::GuiNativeEvent::initSpaceball(QMainWindow *window)
- {
-- // tmp. redirect stderr to a file to suppress an error message from spnav_open()
-- RedirectStdErr err;
- Q_UNUSED(window)
- if (spnav_open() == -1) {
- Base::Console().Log("Couldn't connect to spacenav daemon. Please ignore if you don't have a spacemouse.\n");
diff --git a/srcpkgs/freecad/fe02d63c8c9b1280978be841d04e68a0a55cceb9.patch b/srcpkgs/freecad/fe02d63c8c9b1280978be841d04e68a0a55cceb9.patch
deleted file mode 100644
index d4acf370ca0a4..0000000000000
--- a/srcpkgs/freecad/fe02d63c8c9b1280978be841d04e68a0a55cceb9.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From fe02d63c8c9b1280978be841d04e68a0a55cceb9 Mon Sep 17 00:00:00 2001
-From: Roy-043 <70520633+Roy-043@users.noreply.github.com>
-Date: Thu, 29 Dec 2022 23:20:38 +0100
-Subject: [PATCH] Draft: update inspect.getargspec to inspect.getfullargspec
- (#8101)
-
----
- src/Mod/Draft/draftguitools/gui_snapper.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/src/Mod/Draft/draftguitools/gui_snapper.py
-+++ b/src/Mod/Draft/draftguitools/gui_snapper.py
-@@ -1426,7 +1426,7 @@ class Snapper:
- Gui.Snapper.off()
- self.ui.offUi()
- if callback:
-- if len(inspect.getargspec(callback).args) > 1:
-+ if len(inspect.getfullargspec(callback).args) > 1:
- obj = None
- if self.snapInfo and ("Object" in self.snapInfo) and self.snapInfo["Object"]:
- obj = App.ActiveDocument.getObject(self.snapInfo["Object"])
-@@ -1445,7 +1445,7 @@ class Snapper:
- Gui.Snapper.off()
- self.ui.offUi()
- if callback:
-- if len(inspect.getargspec(callback).args) > 1:
-+ if len(inspect.getfullargspec(callback).args) > 1:
- callback(None, None)
- else:
- callback(None)
From 71551b59cbffd2f7d08e32099033575e3b1181c5 Mon Sep 17 00:00:00 2001
From: Ahmed Al-Taiar <ahmed.altaiar.06@gmail.com>
Date: Tue, 10 Oct 2023 20:34:06 -0400
Subject: [PATCH 3/3] xlint suggestions
---
srcpkgs/freecad/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/freecad/template b/srcpkgs/freecad/template
index 7f6ed99f1dfe5..b2c8188aa22aa 100644
--- a/srcpkgs/freecad/template
+++ b/srcpkgs/freecad/template
@@ -1,7 +1,7 @@
# Template file for 'freecad'
pkgname=freecad
version=0.21.1
-revision=0
+revision=1
build_wrksrc="FreeCAD-${version}"
build_style=cmake
pycompile_dirs="usr/lib/${pkgname}/Mod"
@@ -24,7 +24,7 @@ makedepends="python3-devel boost-devel libxerces-c-devel zlib-devel occt-devel
coin3-devel libshiboken2-devel libspnav-devel pyside2-tools
liblz4-devel libpyside2-python3-devel python3-matplotlib netcdf-devel
jsoncpp-devel qt5-devel qt5-svg-devel qt5-tools-devel qt5-webkit-devel
- qt5-xmlpatterns-devel coin3-doc glew-devel python3-pivy qt5-webengine-devel
+ qt5-xmlpatterns-devel coin3-doc glew-devel python3-pivy qt5-webengine-devel
qt5-declarative-devel qt5-webchannel-devel qt5-location-devel"
depends="python3-matplotlib python3-pyside2-webengine python3-pivy"
short_desc="General purpose 3D CAD modeler"
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: [PR PATCH] [Updated] freecad: update to 0.21.1.
2023-10-11 0:52 [PR PATCH] freecad: update to 0.21.1 cy1der
` (5 preceding siblings ...)
2023-10-15 19:15 ` [PR PATCH] [Updated] " cy1der
@ 2023-10-15 19:19 ` cy1der
2023-10-15 20:17 ` ii8
` (17 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: cy1der @ 2023-10-15 19:19 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 612 bytes --]
There is an updated pull request by cy1der against master on the void-packages repository
https://github.com/cy1der/void-packages freecad-0.21.1
https://github.com/void-linux/void-packages/pull/46573
freecad: update to 0.21.1.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture: **x86_64-glibc**
- I built this PR locally for these architectures: **Only tried armv6l, but I got "hdf5-devel cannot be cross compiled"**
A patch file from https://github.com/void-linux/void-packages/pull/46573.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-freecad-0.21.1-46573.patch --]
[-- Type: text/x-diff, Size: 9938 bytes --]
From cbfaeeb33dc18a786e2c6ec8fb3509de8019af1b Mon Sep 17 00:00:00 2001
From: Ahmed Al-Taiar <ahmed.altaiar.06@gmail.com>
Date: Tue, 10 Oct 2023 18:56:39 -0400
Subject: [PATCH] Bump FreeCAD version to 0.21.1
Remove unused patches
xlint suggestions
---
srcpkgs/freecad/patches/001-include.patch | 112 ------------------
.../154-revert-gui-tmp-redirect-stderr.patch | 68 -----------
...d63c8c9b1280978be841d04e68a0a55cceb9.patch | 30 -----
srcpkgs/freecad/template | 9 +-
4 files changed, 5 insertions(+), 214 deletions(-)
delete mode 100644 srcpkgs/freecad/patches/001-include.patch
delete mode 100644 srcpkgs/freecad/patches/154-revert-gui-tmp-redirect-stderr.patch
delete mode 100644 srcpkgs/freecad/patches/fe02d63c8c9b1280978be841d04e68a0a55cceb9.patch
diff --git a/srcpkgs/freecad/patches/001-include.patch b/srcpkgs/freecad/patches/001-include.patch
deleted file mode 100644
index 28b5af54999b9..0000000000000
--- a/srcpkgs/freecad/patches/001-include.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-From 9a41845a417189776741297c50a3827ce292bc4f Mon Sep 17 00:00:00 2001
-From: Uwe <donovaly@users.noreply.github.com>
-Date: Sun, 3 Jul 2022 22:51:16 +0200
-Subject: [PATCH] [Part] OCCError.h: remove unneeded includes
-
-- also sort includes
----
- src/Mod/Part/App/OCCError.h | 36 +++----------------------
- src/Mod/Part/App/OffsetCurvePyImp.cpp | 12 ++++-----
- src/Mod/Part/App/OffsetSurfacePyImp.cpp | 10 +++----
- 3 files changed, 12 insertions(+), 46 deletions(-)
-
---- a/src/Mod/Part/App/OCCError.h
-+++ b/src/Mod/Part/App/OCCError.h
-@@ -23,36 +23,8 @@
- #ifndef _OCCError_h_
- #define _OCCError_h_
-
--# include <Standard_Version.hxx>
- # include <Standard_Failure.hxx>
--# include <Standard_AbortiveTransaction.hxx>
--# include <Standard_ConstructionError.hxx>
--# if OCC_VERSION_HEX >= 0x060500
--# include <Standard_DefineException.hxx>
--# endif
--# include <Standard_DimensionError.hxx>
--# include <Standard_DimensionMismatch.hxx>
--# include <Standard_DivideByZero.hxx>
--# include <Standard_DomainError.hxx>
--# include <Standard_ImmutableObject.hxx>
--# include <Standard_LicenseError.hxx>
--# include <Standard_LicenseNotFound.hxx>
--# include <Standard_MultiplyDefined.hxx>
--# include <Standard_NegativeValue.hxx>
--# include <Standard_NoMoreObject.hxx>
--# include <Standard_NoSuchObject.hxx>
--# include <Standard_NotImplemented.hxx>
--# include <Standard_NullObject.hxx>
--# include <Standard_NullValue.hxx>
--# include <Standard_NumericError.hxx>
--# include <Standard_OutOfMemory.hxx>
--# include <Standard_OutOfRange.hxx>
--# include <Standard_Overflow.hxx>
--# include <Standard_ProgramError.hxx>
--# include <Standard_RangeError.hxx>
--# include <Standard_TooManyUsers.hxx>
--# include <Standard_TypeMismatch.hxx>
--# include <Standard_Underflow.hxx>
-+# include <Standard_Version.hxx>
-
- #include <Mod/Part/PartGlobal.h>
- #include <Base/Console.h>
-@@ -88,4 +60,3 @@ PartExport extern PyObject* PartExceptio
-
- #define PY_CATCH_OCC _PY_CATCH_OCC(return(NULL))
- #endif // _OCCError_h_
--
---- a/src/Mod/Part/App/OffsetCurvePyImp.cpp
-+++ b/src/Mod/Part/App/OffsetCurvePyImp.cpp
-@@ -20,20 +20,20 @@
- * *
- ***************************************************************************/
-
--
- #include "PreCompiled.h"
- #ifndef _PreComp_
- # include <Geom_OffsetCurve.hxx>
- #endif
-
--#include "OCCError.h"
--#include "Geometry.h"
-+#include <Base/GeometryPyCXX.h>
-+#include <Base/Vector3D.h>
-+#include <Base/VectorPy.h>
-+
- #include "OffsetCurvePy.h"
- #include "OffsetCurvePy.cpp"
-+#include "Geometry.h"
-+#include "OCCError.h"
-
--#include <Base/GeometryPyCXX.h>
--#include <Base/VectorPy.h>
--#include <Base/Vector3D.h>
-
- using namespace Part;
-
---- a/src/Mod/Part/App/OffsetSurfacePyImp.cpp
-+++ b/src/Mod/Part/App/OffsetSurfacePyImp.cpp
-@@ -20,20 +20,16 @@
- * *
- ***************************************************************************/
-
--
- #include "PreCompiled.h"
- #ifndef _PreComp_
- # include <Geom_OffsetSurface.hxx>
- # include <memory>
- #endif
-
--#include <Base/VectorPy.h>
--#include <Base/Vector3D.h>
--
- #include "OCCError.h"
--#include "Geometry.h"
--#include <Mod/Part/App/OffsetSurfacePy.h>
--#include <Mod/Part/App/OffsetSurfacePy.cpp>
-+#include "OffsetSurfacePy.h"
-+#include "OffsetSurfacePy.cpp"
-+
-
- using namespace Part;
-
diff --git a/srcpkgs/freecad/patches/154-revert-gui-tmp-redirect-stderr.patch b/srcpkgs/freecad/patches/154-revert-gui-tmp-redirect-stderr.patch
deleted file mode 100644
index d6a9adabdec83..0000000000000
--- a/srcpkgs/freecad/patches/154-revert-gui-tmp-redirect-stderr.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-see https://github.com/FreeCAD/FreeCAD/commit/cfe94b00d3434f3e2c8b5114d2909f628c330fa8#commitcomment-71413407
-
-upstream: yes
-
-From 7b377a216b9185960e4cee980a6504dc1a755f50 Mon Sep 17 00:00:00 2001
-From: wmayer <wmayer@users.sourceforge.net>
-Date: Wed, 29 Jun 2022 15:19:18 +0200
-Subject: [PATCH] Gui: remove workaround for spnav 0.23 due to build failure
- with musl libc
-
----
- src/Gui/3Dconnexion/GuiNativeEventLinux.cpp | 27 ---------------------
- 1 file changed, 27 deletions(-)
-
---- a/src/Gui/3Dconnexion/GuiNativeEventLinux.cpp
-+++ b/src/Gui/3Dconnexion/GuiNativeEventLinux.cpp
-@@ -21,42 +21,17 @@
- ***************************************************************************/
-
- #include <FCConfig.h>
--#include <cstdio>
-
- #include "GuiNativeEventLinux.h"
-
- #include "GuiApplicationNativeEventAware.h"
- #include <Base/Console.h>
--#include <Base/FileInfo.h>
- #include <QMainWindow>
-
- #include <QSocketNotifier>
-
- #include <spnav.h>
-
--namespace {
--class RedirectStdErr
--{
--public:
-- RedirectStdErr()
-- : fi(Base::FileInfo::getTempFileName())
-- , file(stderr)
-- {
-- stderr = fopen(fi.filePath().c_str(), "w");
-- }
-- ~RedirectStdErr()
-- {
-- fclose(stderr);
-- fi.deleteFile();
-- stderr = file;
-- }
--
--private:
-- Base::FileInfo fi;
-- FILE* file;
--};
--}
--
- Gui::GuiNativeEvent::GuiNativeEvent(Gui::GUIApplicationNativeEventAware *app)
- : GuiAbstractNativeEvent(app)
- {
-@@ -72,8 +47,6 @@ Gui::GuiNativeEvent::~GuiNativeEvent()
-
- void Gui::GuiNativeEvent::initSpaceball(QMainWindow *window)
- {
-- // tmp. redirect stderr to a file to suppress an error message from spnav_open()
-- RedirectStdErr err;
- Q_UNUSED(window)
- if (spnav_open() == -1) {
- Base::Console().Log("Couldn't connect to spacenav daemon. Please ignore if you don't have a spacemouse.\n");
diff --git a/srcpkgs/freecad/patches/fe02d63c8c9b1280978be841d04e68a0a55cceb9.patch b/srcpkgs/freecad/patches/fe02d63c8c9b1280978be841d04e68a0a55cceb9.patch
deleted file mode 100644
index d4acf370ca0a4..0000000000000
--- a/srcpkgs/freecad/patches/fe02d63c8c9b1280978be841d04e68a0a55cceb9.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From fe02d63c8c9b1280978be841d04e68a0a55cceb9 Mon Sep 17 00:00:00 2001
-From: Roy-043 <70520633+Roy-043@users.noreply.github.com>
-Date: Thu, 29 Dec 2022 23:20:38 +0100
-Subject: [PATCH] Draft: update inspect.getargspec to inspect.getfullargspec
- (#8101)
-
----
- src/Mod/Draft/draftguitools/gui_snapper.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/src/Mod/Draft/draftguitools/gui_snapper.py
-+++ b/src/Mod/Draft/draftguitools/gui_snapper.py
-@@ -1426,7 +1426,7 @@ class Snapper:
- Gui.Snapper.off()
- self.ui.offUi()
- if callback:
-- if len(inspect.getargspec(callback).args) > 1:
-+ if len(inspect.getfullargspec(callback).args) > 1:
- obj = None
- if self.snapInfo and ("Object" in self.snapInfo) and self.snapInfo["Object"]:
- obj = App.ActiveDocument.getObject(self.snapInfo["Object"])
-@@ -1445,7 +1445,7 @@ class Snapper:
- Gui.Snapper.off()
- self.ui.offUi()
- if callback:
-- if len(inspect.getargspec(callback).args) > 1:
-+ if len(inspect.getfullargspec(callback).args) > 1:
- callback(None, None)
- else:
- callback(None)
diff --git a/srcpkgs/freecad/template b/srcpkgs/freecad/template
index c135701e38b9a..b2c8188aa22aa 100644
--- a/srcpkgs/freecad/template
+++ b/srcpkgs/freecad/template
@@ -1,7 +1,7 @@
# Template file for 'freecad'
pkgname=freecad
-version=0.20.2
-revision=7
+version=0.21.1
+revision=1
build_wrksrc="FreeCAD-${version}"
build_style=cmake
pycompile_dirs="usr/lib/${pkgname}/Mod"
@@ -24,7 +24,8 @@ makedepends="python3-devel boost-devel libxerces-c-devel zlib-devel occt-devel
coin3-devel libshiboken2-devel libspnav-devel pyside2-tools
liblz4-devel libpyside2-python3-devel python3-matplotlib netcdf-devel
jsoncpp-devel qt5-devel qt5-svg-devel qt5-tools-devel qt5-webkit-devel
- qt5-xmlpatterns-devel coin3-doc glew-devel python3-pivy"
+ qt5-xmlpatterns-devel coin3-doc glew-devel python3-pivy qt5-webengine-devel
+ qt5-declarative-devel qt5-webchannel-devel qt5-location-devel"
depends="python3-matplotlib python3-pyside2-webengine python3-pivy"
short_desc="General purpose 3D CAD modeler"
maintainer="yopito <pierre.bourgin@free.fr>"
@@ -35,7 +36,7 @@ distfiles="
https://github.com/FreeCAD/FreeCAD/archive/${version}.tar.gz
${SOURCEFORGE_SITE}/cxx/pycxx-${_pycxxver}.tar.gz
"
-checksum="46922f3a477e742e1a89cd5346692d63aebb2b67af887b3e463e094a4ae055da
+checksum="e9b1fd0323f101268c7f3be52db42e4a29222f2e306ae6c4a6fc309cb418d35a
4b91e1e1141c23fbd5039df635c4bb6e75632168548f56b83ce177193c0c98c6"
python_version=3
patch_args="-Np1 -d ${build_wrksrc}"
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: freecad: update to 0.21.1.
2023-10-11 0:52 [PR PATCH] freecad: update to 0.21.1 cy1der
` (6 preceding siblings ...)
2023-10-15 19:19 ` cy1der
@ 2023-10-15 20:17 ` ii8
2023-10-15 21:00 ` [PR PATCH] [Updated] " cy1der
` (16 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: ii8 @ 2023-10-15 20:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 392 bytes --]
New comment by ii8 on void-packages repository
https://github.com/void-linux/void-packages/pull/46573#issuecomment-1763493986
Comment:
I didn't mean the pull request title. The pull request title doesn't matter so much. I meant the commit message.
You already squashed it correctly so all you have to do to fix the message is:
```
git commit --amend -m 'freecad: update to 0.21.1.'
```
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: [PR PATCH] [Updated] freecad: update to 0.21.1.
2023-10-11 0:52 [PR PATCH] freecad: update to 0.21.1 cy1der
` (7 preceding siblings ...)
2023-10-15 20:17 ` ii8
@ 2023-10-15 21:00 ` cy1der
2023-11-01 15:56 ` robertek
` (15 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: cy1der @ 2023-10-15 21:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 612 bytes --]
There is an updated pull request by cy1der against master on the void-packages repository
https://github.com/cy1der/void-packages freecad-0.21.1
https://github.com/void-linux/void-packages/pull/46573
freecad: update to 0.21.1.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture: **x86_64-glibc**
- I built this PR locally for these architectures: **Only tried armv6l, but I got "hdf5-devel cannot be cross compiled"**
A patch file from https://github.com/void-linux/void-packages/pull/46573.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-freecad-0.21.1-46573.patch --]
[-- Type: text/x-diff, Size: 9893 bytes --]
From edfb4227aa26325f8065302750e487b68e91df6b Mon Sep 17 00:00:00 2001
From: Ahmed Al-Taiar <ahmed.altaiar.06@gmail.com>
Date: Tue, 10 Oct 2023 18:56:39 -0400
Subject: [PATCH] freecad: update to 0.21.1.
---
srcpkgs/freecad/patches/001-include.patch | 112 ------------------
.../154-revert-gui-tmp-redirect-stderr.patch | 68 -----------
...d63c8c9b1280978be841d04e68a0a55cceb9.patch | 30 -----
srcpkgs/freecad/template | 9 +-
4 files changed, 5 insertions(+), 214 deletions(-)
delete mode 100644 srcpkgs/freecad/patches/001-include.patch
delete mode 100644 srcpkgs/freecad/patches/154-revert-gui-tmp-redirect-stderr.patch
delete mode 100644 srcpkgs/freecad/patches/fe02d63c8c9b1280978be841d04e68a0a55cceb9.patch
diff --git a/srcpkgs/freecad/patches/001-include.patch b/srcpkgs/freecad/patches/001-include.patch
deleted file mode 100644
index 28b5af54999b9..0000000000000
--- a/srcpkgs/freecad/patches/001-include.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-From 9a41845a417189776741297c50a3827ce292bc4f Mon Sep 17 00:00:00 2001
-From: Uwe <donovaly@users.noreply.github.com>
-Date: Sun, 3 Jul 2022 22:51:16 +0200
-Subject: [PATCH] [Part] OCCError.h: remove unneeded includes
-
-- also sort includes
----
- src/Mod/Part/App/OCCError.h | 36 +++----------------------
- src/Mod/Part/App/OffsetCurvePyImp.cpp | 12 ++++-----
- src/Mod/Part/App/OffsetSurfacePyImp.cpp | 10 +++----
- 3 files changed, 12 insertions(+), 46 deletions(-)
-
---- a/src/Mod/Part/App/OCCError.h
-+++ b/src/Mod/Part/App/OCCError.h
-@@ -23,36 +23,8 @@
- #ifndef _OCCError_h_
- #define _OCCError_h_
-
--# include <Standard_Version.hxx>
- # include <Standard_Failure.hxx>
--# include <Standard_AbortiveTransaction.hxx>
--# include <Standard_ConstructionError.hxx>
--# if OCC_VERSION_HEX >= 0x060500
--# include <Standard_DefineException.hxx>
--# endif
--# include <Standard_DimensionError.hxx>
--# include <Standard_DimensionMismatch.hxx>
--# include <Standard_DivideByZero.hxx>
--# include <Standard_DomainError.hxx>
--# include <Standard_ImmutableObject.hxx>
--# include <Standard_LicenseError.hxx>
--# include <Standard_LicenseNotFound.hxx>
--# include <Standard_MultiplyDefined.hxx>
--# include <Standard_NegativeValue.hxx>
--# include <Standard_NoMoreObject.hxx>
--# include <Standard_NoSuchObject.hxx>
--# include <Standard_NotImplemented.hxx>
--# include <Standard_NullObject.hxx>
--# include <Standard_NullValue.hxx>
--# include <Standard_NumericError.hxx>
--# include <Standard_OutOfMemory.hxx>
--# include <Standard_OutOfRange.hxx>
--# include <Standard_Overflow.hxx>
--# include <Standard_ProgramError.hxx>
--# include <Standard_RangeError.hxx>
--# include <Standard_TooManyUsers.hxx>
--# include <Standard_TypeMismatch.hxx>
--# include <Standard_Underflow.hxx>
-+# include <Standard_Version.hxx>
-
- #include <Mod/Part/PartGlobal.h>
- #include <Base/Console.h>
-@@ -88,4 +60,3 @@ PartExport extern PyObject* PartExceptio
-
- #define PY_CATCH_OCC _PY_CATCH_OCC(return(NULL))
- #endif // _OCCError_h_
--
---- a/src/Mod/Part/App/OffsetCurvePyImp.cpp
-+++ b/src/Mod/Part/App/OffsetCurvePyImp.cpp
-@@ -20,20 +20,20 @@
- * *
- ***************************************************************************/
-
--
- #include "PreCompiled.h"
- #ifndef _PreComp_
- # include <Geom_OffsetCurve.hxx>
- #endif
-
--#include "OCCError.h"
--#include "Geometry.h"
-+#include <Base/GeometryPyCXX.h>
-+#include <Base/Vector3D.h>
-+#include <Base/VectorPy.h>
-+
- #include "OffsetCurvePy.h"
- #include "OffsetCurvePy.cpp"
-+#include "Geometry.h"
-+#include "OCCError.h"
-
--#include <Base/GeometryPyCXX.h>
--#include <Base/VectorPy.h>
--#include <Base/Vector3D.h>
-
- using namespace Part;
-
---- a/src/Mod/Part/App/OffsetSurfacePyImp.cpp
-+++ b/src/Mod/Part/App/OffsetSurfacePyImp.cpp
-@@ -20,20 +20,16 @@
- * *
- ***************************************************************************/
-
--
- #include "PreCompiled.h"
- #ifndef _PreComp_
- # include <Geom_OffsetSurface.hxx>
- # include <memory>
- #endif
-
--#include <Base/VectorPy.h>
--#include <Base/Vector3D.h>
--
- #include "OCCError.h"
--#include "Geometry.h"
--#include <Mod/Part/App/OffsetSurfacePy.h>
--#include <Mod/Part/App/OffsetSurfacePy.cpp>
-+#include "OffsetSurfacePy.h"
-+#include "OffsetSurfacePy.cpp"
-+
-
- using namespace Part;
-
diff --git a/srcpkgs/freecad/patches/154-revert-gui-tmp-redirect-stderr.patch b/srcpkgs/freecad/patches/154-revert-gui-tmp-redirect-stderr.patch
deleted file mode 100644
index d6a9adabdec83..0000000000000
--- a/srcpkgs/freecad/patches/154-revert-gui-tmp-redirect-stderr.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-see https://github.com/FreeCAD/FreeCAD/commit/cfe94b00d3434f3e2c8b5114d2909f628c330fa8#commitcomment-71413407
-
-upstream: yes
-
-From 7b377a216b9185960e4cee980a6504dc1a755f50 Mon Sep 17 00:00:00 2001
-From: wmayer <wmayer@users.sourceforge.net>
-Date: Wed, 29 Jun 2022 15:19:18 +0200
-Subject: [PATCH] Gui: remove workaround for spnav 0.23 due to build failure
- with musl libc
-
----
- src/Gui/3Dconnexion/GuiNativeEventLinux.cpp | 27 ---------------------
- 1 file changed, 27 deletions(-)
-
---- a/src/Gui/3Dconnexion/GuiNativeEventLinux.cpp
-+++ b/src/Gui/3Dconnexion/GuiNativeEventLinux.cpp
-@@ -21,42 +21,17 @@
- ***************************************************************************/
-
- #include <FCConfig.h>
--#include <cstdio>
-
- #include "GuiNativeEventLinux.h"
-
- #include "GuiApplicationNativeEventAware.h"
- #include <Base/Console.h>
--#include <Base/FileInfo.h>
- #include <QMainWindow>
-
- #include <QSocketNotifier>
-
- #include <spnav.h>
-
--namespace {
--class RedirectStdErr
--{
--public:
-- RedirectStdErr()
-- : fi(Base::FileInfo::getTempFileName())
-- , file(stderr)
-- {
-- stderr = fopen(fi.filePath().c_str(), "w");
-- }
-- ~RedirectStdErr()
-- {
-- fclose(stderr);
-- fi.deleteFile();
-- stderr = file;
-- }
--
--private:
-- Base::FileInfo fi;
-- FILE* file;
--};
--}
--
- Gui::GuiNativeEvent::GuiNativeEvent(Gui::GUIApplicationNativeEventAware *app)
- : GuiAbstractNativeEvent(app)
- {
-@@ -72,8 +47,6 @@ Gui::GuiNativeEvent::~GuiNativeEvent()
-
- void Gui::GuiNativeEvent::initSpaceball(QMainWindow *window)
- {
-- // tmp. redirect stderr to a file to suppress an error message from spnav_open()
-- RedirectStdErr err;
- Q_UNUSED(window)
- if (spnav_open() == -1) {
- Base::Console().Log("Couldn't connect to spacenav daemon. Please ignore if you don't have a spacemouse.\n");
diff --git a/srcpkgs/freecad/patches/fe02d63c8c9b1280978be841d04e68a0a55cceb9.patch b/srcpkgs/freecad/patches/fe02d63c8c9b1280978be841d04e68a0a55cceb9.patch
deleted file mode 100644
index d4acf370ca0a4..0000000000000
--- a/srcpkgs/freecad/patches/fe02d63c8c9b1280978be841d04e68a0a55cceb9.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From fe02d63c8c9b1280978be841d04e68a0a55cceb9 Mon Sep 17 00:00:00 2001
-From: Roy-043 <70520633+Roy-043@users.noreply.github.com>
-Date: Thu, 29 Dec 2022 23:20:38 +0100
-Subject: [PATCH] Draft: update inspect.getargspec to inspect.getfullargspec
- (#8101)
-
----
- src/Mod/Draft/draftguitools/gui_snapper.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/src/Mod/Draft/draftguitools/gui_snapper.py
-+++ b/src/Mod/Draft/draftguitools/gui_snapper.py
-@@ -1426,7 +1426,7 @@ class Snapper:
- Gui.Snapper.off()
- self.ui.offUi()
- if callback:
-- if len(inspect.getargspec(callback).args) > 1:
-+ if len(inspect.getfullargspec(callback).args) > 1:
- obj = None
- if self.snapInfo and ("Object" in self.snapInfo) and self.snapInfo["Object"]:
- obj = App.ActiveDocument.getObject(self.snapInfo["Object"])
-@@ -1445,7 +1445,7 @@ class Snapper:
- Gui.Snapper.off()
- self.ui.offUi()
- if callback:
-- if len(inspect.getargspec(callback).args) > 1:
-+ if len(inspect.getfullargspec(callback).args) > 1:
- callback(None, None)
- else:
- callback(None)
diff --git a/srcpkgs/freecad/template b/srcpkgs/freecad/template
index c135701e38b9a..b2c8188aa22aa 100644
--- a/srcpkgs/freecad/template
+++ b/srcpkgs/freecad/template
@@ -1,7 +1,7 @@
# Template file for 'freecad'
pkgname=freecad
-version=0.20.2
-revision=7
+version=0.21.1
+revision=1
build_wrksrc="FreeCAD-${version}"
build_style=cmake
pycompile_dirs="usr/lib/${pkgname}/Mod"
@@ -24,7 +24,8 @@ makedepends="python3-devel boost-devel libxerces-c-devel zlib-devel occt-devel
coin3-devel libshiboken2-devel libspnav-devel pyside2-tools
liblz4-devel libpyside2-python3-devel python3-matplotlib netcdf-devel
jsoncpp-devel qt5-devel qt5-svg-devel qt5-tools-devel qt5-webkit-devel
- qt5-xmlpatterns-devel coin3-doc glew-devel python3-pivy"
+ qt5-xmlpatterns-devel coin3-doc glew-devel python3-pivy qt5-webengine-devel
+ qt5-declarative-devel qt5-webchannel-devel qt5-location-devel"
depends="python3-matplotlib python3-pyside2-webengine python3-pivy"
short_desc="General purpose 3D CAD modeler"
maintainer="yopito <pierre.bourgin@free.fr>"
@@ -35,7 +36,7 @@ distfiles="
https://github.com/FreeCAD/FreeCAD/archive/${version}.tar.gz
${SOURCEFORGE_SITE}/cxx/pycxx-${_pycxxver}.tar.gz
"
-checksum="46922f3a477e742e1a89cd5346692d63aebb2b67af887b3e463e094a4ae055da
+checksum="e9b1fd0323f101268c7f3be52db42e4a29222f2e306ae6c4a6fc309cb418d35a
4b91e1e1141c23fbd5039df635c4bb6e75632168548f56b83ce177193c0c98c6"
python_version=3
patch_args="-Np1 -d ${build_wrksrc}"
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: freecad: update to 0.21.1.
2023-10-11 0:52 [PR PATCH] freecad: update to 0.21.1 cy1der
` (8 preceding siblings ...)
2023-10-15 21:00 ` [PR PATCH] [Updated] " cy1der
@ 2023-11-01 15:56 ` robertek
2023-11-01 17:09 ` [PR PATCH] [Updated] " cy1der
` (14 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: robertek @ 2023-11-01 15:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 450 bytes --]
New comment by robertek on void-packages repository
https://github.com/void-linux/void-packages/pull/46573#issuecomment-1789210512
Comment:
To be noted when updating the FreeCAD that it would be good to include the `python3-GitPython python3-Markdown` as runtime deps. They are needed for the Addon manager to show correctly the addons.
See my branch:
https://github.com/void-linux/void-packages/compare/master...robertek:void-packages:freecad
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: [PR PATCH] [Updated] freecad: update to 0.21.1.
2023-10-11 0:52 [PR PATCH] freecad: update to 0.21.1 cy1der
` (9 preceding siblings ...)
2023-11-01 15:56 ` robertek
@ 2023-11-01 17:09 ` cy1der
2023-11-01 17:10 ` cy1der
` (13 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: cy1der @ 2023-11-01 17:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 612 bytes --]
There is an updated pull request by cy1der against master on the void-packages repository
https://github.com/cy1der/void-packages freecad-0.21.1
https://github.com/void-linux/void-packages/pull/46573
freecad: update to 0.21.1.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture: **x86_64-glibc**
- I built this PR locally for these architectures: **Only tried armv6l, but I got "hdf5-devel cannot be cross compiled"**
A patch file from https://github.com/void-linux/void-packages/pull/46573.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-freecad-0.21.1-46573.patch --]
[-- Type: text/x-diff, Size: 10026 bytes --]
From 05da26f5f7b94c4ef5a9f28d78775945e079230c Mon Sep 17 00:00:00 2001
From: Ahmed Al-Taiar <ahmed.altaiar.06@gmail.com>
Date: Tue, 10 Oct 2023 18:56:39 -0400
Subject: [PATCH] freecad: update to 0.21.1.
---
srcpkgs/freecad/patches/001-include.patch | 112 ------------------
.../154-revert-gui-tmp-redirect-stderr.patch | 68 -----------
...d63c8c9b1280978be841d04e68a0a55cceb9.patch | 30 -----
srcpkgs/freecad/template | 11 +-
4 files changed, 6 insertions(+), 215 deletions(-)
delete mode 100644 srcpkgs/freecad/patches/001-include.patch
delete mode 100644 srcpkgs/freecad/patches/154-revert-gui-tmp-redirect-stderr.patch
delete mode 100644 srcpkgs/freecad/patches/fe02d63c8c9b1280978be841d04e68a0a55cceb9.patch
diff --git a/srcpkgs/freecad/patches/001-include.patch b/srcpkgs/freecad/patches/001-include.patch
deleted file mode 100644
index 28b5af54999b9..0000000000000
--- a/srcpkgs/freecad/patches/001-include.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-From 9a41845a417189776741297c50a3827ce292bc4f Mon Sep 17 00:00:00 2001
-From: Uwe <donovaly@users.noreply.github.com>
-Date: Sun, 3 Jul 2022 22:51:16 +0200
-Subject: [PATCH] [Part] OCCError.h: remove unneeded includes
-
-- also sort includes
----
- src/Mod/Part/App/OCCError.h | 36 +++----------------------
- src/Mod/Part/App/OffsetCurvePyImp.cpp | 12 ++++-----
- src/Mod/Part/App/OffsetSurfacePyImp.cpp | 10 +++----
- 3 files changed, 12 insertions(+), 46 deletions(-)
-
---- a/src/Mod/Part/App/OCCError.h
-+++ b/src/Mod/Part/App/OCCError.h
-@@ -23,36 +23,8 @@
- #ifndef _OCCError_h_
- #define _OCCError_h_
-
--# include <Standard_Version.hxx>
- # include <Standard_Failure.hxx>
--# include <Standard_AbortiveTransaction.hxx>
--# include <Standard_ConstructionError.hxx>
--# if OCC_VERSION_HEX >= 0x060500
--# include <Standard_DefineException.hxx>
--# endif
--# include <Standard_DimensionError.hxx>
--# include <Standard_DimensionMismatch.hxx>
--# include <Standard_DivideByZero.hxx>
--# include <Standard_DomainError.hxx>
--# include <Standard_ImmutableObject.hxx>
--# include <Standard_LicenseError.hxx>
--# include <Standard_LicenseNotFound.hxx>
--# include <Standard_MultiplyDefined.hxx>
--# include <Standard_NegativeValue.hxx>
--# include <Standard_NoMoreObject.hxx>
--# include <Standard_NoSuchObject.hxx>
--# include <Standard_NotImplemented.hxx>
--# include <Standard_NullObject.hxx>
--# include <Standard_NullValue.hxx>
--# include <Standard_NumericError.hxx>
--# include <Standard_OutOfMemory.hxx>
--# include <Standard_OutOfRange.hxx>
--# include <Standard_Overflow.hxx>
--# include <Standard_ProgramError.hxx>
--# include <Standard_RangeError.hxx>
--# include <Standard_TooManyUsers.hxx>
--# include <Standard_TypeMismatch.hxx>
--# include <Standard_Underflow.hxx>
-+# include <Standard_Version.hxx>
-
- #include <Mod/Part/PartGlobal.h>
- #include <Base/Console.h>
-@@ -88,4 +60,3 @@ PartExport extern PyObject* PartExceptio
-
- #define PY_CATCH_OCC _PY_CATCH_OCC(return(NULL))
- #endif // _OCCError_h_
--
---- a/src/Mod/Part/App/OffsetCurvePyImp.cpp
-+++ b/src/Mod/Part/App/OffsetCurvePyImp.cpp
-@@ -20,20 +20,20 @@
- * *
- ***************************************************************************/
-
--
- #include "PreCompiled.h"
- #ifndef _PreComp_
- # include <Geom_OffsetCurve.hxx>
- #endif
-
--#include "OCCError.h"
--#include "Geometry.h"
-+#include <Base/GeometryPyCXX.h>
-+#include <Base/Vector3D.h>
-+#include <Base/VectorPy.h>
-+
- #include "OffsetCurvePy.h"
- #include "OffsetCurvePy.cpp"
-+#include "Geometry.h"
-+#include "OCCError.h"
-
--#include <Base/GeometryPyCXX.h>
--#include <Base/VectorPy.h>
--#include <Base/Vector3D.h>
-
- using namespace Part;
-
---- a/src/Mod/Part/App/OffsetSurfacePyImp.cpp
-+++ b/src/Mod/Part/App/OffsetSurfacePyImp.cpp
-@@ -20,20 +20,16 @@
- * *
- ***************************************************************************/
-
--
- #include "PreCompiled.h"
- #ifndef _PreComp_
- # include <Geom_OffsetSurface.hxx>
- # include <memory>
- #endif
-
--#include <Base/VectorPy.h>
--#include <Base/Vector3D.h>
--
- #include "OCCError.h"
--#include "Geometry.h"
--#include <Mod/Part/App/OffsetSurfacePy.h>
--#include <Mod/Part/App/OffsetSurfacePy.cpp>
-+#include "OffsetSurfacePy.h"
-+#include "OffsetSurfacePy.cpp"
-+
-
- using namespace Part;
-
diff --git a/srcpkgs/freecad/patches/154-revert-gui-tmp-redirect-stderr.patch b/srcpkgs/freecad/patches/154-revert-gui-tmp-redirect-stderr.patch
deleted file mode 100644
index d6a9adabdec83..0000000000000
--- a/srcpkgs/freecad/patches/154-revert-gui-tmp-redirect-stderr.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-see https://github.com/FreeCAD/FreeCAD/commit/cfe94b00d3434f3e2c8b5114d2909f628c330fa8#commitcomment-71413407
-
-upstream: yes
-
-From 7b377a216b9185960e4cee980a6504dc1a755f50 Mon Sep 17 00:00:00 2001
-From: wmayer <wmayer@users.sourceforge.net>
-Date: Wed, 29 Jun 2022 15:19:18 +0200
-Subject: [PATCH] Gui: remove workaround for spnav 0.23 due to build failure
- with musl libc
-
----
- src/Gui/3Dconnexion/GuiNativeEventLinux.cpp | 27 ---------------------
- 1 file changed, 27 deletions(-)
-
---- a/src/Gui/3Dconnexion/GuiNativeEventLinux.cpp
-+++ b/src/Gui/3Dconnexion/GuiNativeEventLinux.cpp
-@@ -21,42 +21,17 @@
- ***************************************************************************/
-
- #include <FCConfig.h>
--#include <cstdio>
-
- #include "GuiNativeEventLinux.h"
-
- #include "GuiApplicationNativeEventAware.h"
- #include <Base/Console.h>
--#include <Base/FileInfo.h>
- #include <QMainWindow>
-
- #include <QSocketNotifier>
-
- #include <spnav.h>
-
--namespace {
--class RedirectStdErr
--{
--public:
-- RedirectStdErr()
-- : fi(Base::FileInfo::getTempFileName())
-- , file(stderr)
-- {
-- stderr = fopen(fi.filePath().c_str(), "w");
-- }
-- ~RedirectStdErr()
-- {
-- fclose(stderr);
-- fi.deleteFile();
-- stderr = file;
-- }
--
--private:
-- Base::FileInfo fi;
-- FILE* file;
--};
--}
--
- Gui::GuiNativeEvent::GuiNativeEvent(Gui::GUIApplicationNativeEventAware *app)
- : GuiAbstractNativeEvent(app)
- {
-@@ -72,8 +47,6 @@ Gui::GuiNativeEvent::~GuiNativeEvent()
-
- void Gui::GuiNativeEvent::initSpaceball(QMainWindow *window)
- {
-- // tmp. redirect stderr to a file to suppress an error message from spnav_open()
-- RedirectStdErr err;
- Q_UNUSED(window)
- if (spnav_open() == -1) {
- Base::Console().Log("Couldn't connect to spacenav daemon. Please ignore if you don't have a spacemouse.\n");
diff --git a/srcpkgs/freecad/patches/fe02d63c8c9b1280978be841d04e68a0a55cceb9.patch b/srcpkgs/freecad/patches/fe02d63c8c9b1280978be841d04e68a0a55cceb9.patch
deleted file mode 100644
index d4acf370ca0a4..0000000000000
--- a/srcpkgs/freecad/patches/fe02d63c8c9b1280978be841d04e68a0a55cceb9.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From fe02d63c8c9b1280978be841d04e68a0a55cceb9 Mon Sep 17 00:00:00 2001
-From: Roy-043 <70520633+Roy-043@users.noreply.github.com>
-Date: Thu, 29 Dec 2022 23:20:38 +0100
-Subject: [PATCH] Draft: update inspect.getargspec to inspect.getfullargspec
- (#8101)
-
----
- src/Mod/Draft/draftguitools/gui_snapper.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/src/Mod/Draft/draftguitools/gui_snapper.py
-+++ b/src/Mod/Draft/draftguitools/gui_snapper.py
-@@ -1426,7 +1426,7 @@ class Snapper:
- Gui.Snapper.off()
- self.ui.offUi()
- if callback:
-- if len(inspect.getargspec(callback).args) > 1:
-+ if len(inspect.getfullargspec(callback).args) > 1:
- obj = None
- if self.snapInfo and ("Object" in self.snapInfo) and self.snapInfo["Object"]:
- obj = App.ActiveDocument.getObject(self.snapInfo["Object"])
-@@ -1445,7 +1445,7 @@ class Snapper:
- Gui.Snapper.off()
- self.ui.offUi()
- if callback:
-- if len(inspect.getargspec(callback).args) > 1:
-+ if len(inspect.getfullargspec(callback).args) > 1:
- callback(None, None)
- else:
- callback(None)
diff --git a/srcpkgs/freecad/template b/srcpkgs/freecad/template
index c135701e38b9a..f928099d8ae87 100644
--- a/srcpkgs/freecad/template
+++ b/srcpkgs/freecad/template
@@ -1,7 +1,7 @@
# Template file for 'freecad'
pkgname=freecad
-version=0.20.2
-revision=7
+version=0.21.1
+revision=1
build_wrksrc="FreeCAD-${version}"
build_style=cmake
pycompile_dirs="usr/lib/${pkgname}/Mod"
@@ -24,8 +24,9 @@ makedepends="python3-devel boost-devel libxerces-c-devel zlib-devel occt-devel
coin3-devel libshiboken2-devel libspnav-devel pyside2-tools
liblz4-devel libpyside2-python3-devel python3-matplotlib netcdf-devel
jsoncpp-devel qt5-devel qt5-svg-devel qt5-tools-devel qt5-webkit-devel
- qt5-xmlpatterns-devel coin3-doc glew-devel python3-pivy"
-depends="python3-matplotlib python3-pyside2-webengine python3-pivy"
+ qt5-xmlpatterns-devel coin3-doc glew-devel python3-pivy qt5-webengine-devel
+ qt5-declarative-devel qt5-webchannel-devel qt5-location-devel"
+depends="python3-matplotlib python3-pyside2-webengine python3-pivy python3-GitPython python3-Markdown"
short_desc="General purpose 3D CAD modeler"
maintainer="yopito <pierre.bourgin@free.fr>"
license="LGPL-2.0-or-later"
@@ -35,7 +36,7 @@ distfiles="
https://github.com/FreeCAD/FreeCAD/archive/${version}.tar.gz
${SOURCEFORGE_SITE}/cxx/pycxx-${_pycxxver}.tar.gz
"
-checksum="46922f3a477e742e1a89cd5346692d63aebb2b67af887b3e463e094a4ae055da
+checksum="e9b1fd0323f101268c7f3be52db42e4a29222f2e306ae6c4a6fc309cb418d35a
4b91e1e1141c23fbd5039df635c4bb6e75632168548f56b83ce177193c0c98c6"
python_version=3
patch_args="-Np1 -d ${build_wrksrc}"
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: freecad: update to 0.21.1.
2023-10-11 0:52 [PR PATCH] freecad: update to 0.21.1 cy1der
` (10 preceding siblings ...)
2023-11-01 17:09 ` [PR PATCH] [Updated] " cy1der
@ 2023-11-01 17:10 ` cy1der
2023-11-14 21:49 ` zlice
` (12 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: cy1der @ 2023-11-01 17:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 172 bytes --]
New comment by cy1der on void-packages repository
https://github.com/void-linux/void-packages/pull/46573#issuecomment-1789336023
Comment:
Done, thanks for the suggestion
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: freecad: update to 0.21.1.
2023-10-11 0:52 [PR PATCH] freecad: update to 0.21.1 cy1der
` (11 preceding siblings ...)
2023-11-01 17:10 ` cy1der
@ 2023-11-14 21:49 ` zlice
2023-11-14 22:45 ` cy1der
` (11 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: zlice @ 2023-11-14 21:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2165 bytes --]
New comment by zlice on void-packages repository
https://github.com/void-linux/void-packages/pull/46573#issuecomment-1811378519
Comment:
anyone else get python 3.12 issues? not sure if those need patched or what
the first ones are mods i pulled, but the bottom ones are from the install
```
##### #### ### ####
# # # # # #
# ## #### #### # # # # #
#### # # # # # # # ##### # #
# # #### #### # # # # #
# # # # # # # # # ## ## ##
# # #### #### ### # # #### ## ## ##
<string>:439: SyntaxWarning: invalid escape sequence '\s'
During initialization the error "No module named 'imp'" occurred in /home/zlice/.local/share/FreeCAD/Mod/kicadStepUpMod/./InitGui.py
Please look into the log file for further information
<string>:172: SyntaxWarning: invalid escape sequence '\s'
During initialization the error "No module named 'imp'" occurred in /home/zlice/.local/share/FreeCAD/Mod/Manipulator/./InitGui.py
Please look into the log file for further information
The `.FCStd#` backup format is deprecated as of v0.21 and may be removed in future versions.
To update, check the 'Preferences->General->Document->Use date and FCBak extension' option.
Traceback (most recent call last):
File "/usr/lib/freecad/Mod/Draft/draftviewproviders/view_base.py", line 179, in attach
self.onChanged(vobj, "Pattern")
File "/usr/lib/freecad/Mod/Draft/draftviewproviders/view_base.py", line 286, in onChanged
if str(vobj.Pattern) in list(utils.svg_patterns().keys()):
^^^^^^^^^^^^^^^^^^^^
File "/usr/lib/freecad/Mod/Draft/draftutils/utils.py", line 789, in svg_patterns
loadSvgPatterns()
File "/usr/lib/freecad/Mod/Draft/draftutils/utils.py", line 763, in load_svg_patterns
p = importSVG.getContents(file, 'pattern')
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/usr/lib/freecad/Mod/Draft/importSVG.py", line 1705, in getContents
f = pythonopen(filename)
^^^^^^^^^^
<class 'NameError'>: name 'pythonopen' is not defined
```
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: freecad: update to 0.21.1.
2023-10-11 0:52 [PR PATCH] freecad: update to 0.21.1 cy1der
` (12 preceding siblings ...)
2023-11-14 21:49 ` zlice
@ 2023-11-14 22:45 ` cy1der
2023-11-16 13:46 ` [PR REVIEW] " ahesford
` (10 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: cy1der @ 2023-11-14 22:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 277 bytes --]
New comment by cy1der on void-packages repository
https://github.com/void-linux/void-packages/pull/46573#issuecomment-1811511086
Comment:
Python 3.12 works just fine for me, but I don't have the "Manipulator" and "kicadStepUpMod".
Have you tried disabling or removing them?
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: [PR REVIEW] freecad: update to 0.21.1.
2023-10-11 0:52 [PR PATCH] freecad: update to 0.21.1 cy1der
` (13 preceding siblings ...)
2023-11-14 22:45 ` cy1der
@ 2023-11-16 13:46 ` ahesford
2023-11-16 14:17 ` [PR PATCH] [Updated] " cy1der
` (9 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: ahesford @ 2023-11-16 13:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 174 bytes --]
New review comment by ahesford on void-packages repository
https://github.com/void-linux/void-packages/pull/46573#discussion_r1395716990
Comment:
Wrap lines at 80 columns.
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: [PR PATCH] [Updated] freecad: update to 0.21.1.
2023-10-11 0:52 [PR PATCH] freecad: update to 0.21.1 cy1der
` (14 preceding siblings ...)
2023-11-16 13:46 ` [PR REVIEW] " ahesford
@ 2023-11-16 14:17 ` cy1der
2023-12-08 16:53 ` zlice
` (8 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: cy1der @ 2023-11-16 14:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 612 bytes --]
There is an updated pull request by cy1der against master on the void-packages repository
https://github.com/cy1der/void-packages freecad-0.21.1
https://github.com/void-linux/void-packages/pull/46573
freecad: update to 0.21.1.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture: **x86_64-glibc**
- I built this PR locally for these architectures: **Only tried armv6l, but I got "hdf5-devel cannot be cross compiled"**
A patch file from https://github.com/void-linux/void-packages/pull/46573.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-freecad-0.21.1-46573.patch --]
[-- Type: text/x-diff, Size: 10029 bytes --]
From 79df2768ac96518df1f16009a7a745bad5427f8a Mon Sep 17 00:00:00 2001
From: Ahmed Al-Taiar <ahmed.altaiar.06@gmail.com>
Date: Tue, 10 Oct 2023 18:56:39 -0400
Subject: [PATCH] freecad: update to 0.21.1.
---
srcpkgs/freecad/patches/001-include.patch | 112 ------------------
.../154-revert-gui-tmp-redirect-stderr.patch | 68 -----------
...d63c8c9b1280978be841d04e68a0a55cceb9.patch | 30 -----
srcpkgs/freecad/template | 12 +-
4 files changed, 7 insertions(+), 215 deletions(-)
delete mode 100644 srcpkgs/freecad/patches/001-include.patch
delete mode 100644 srcpkgs/freecad/patches/154-revert-gui-tmp-redirect-stderr.patch
delete mode 100644 srcpkgs/freecad/patches/fe02d63c8c9b1280978be841d04e68a0a55cceb9.patch
diff --git a/srcpkgs/freecad/patches/001-include.patch b/srcpkgs/freecad/patches/001-include.patch
deleted file mode 100644
index 28b5af54999b9..0000000000000
--- a/srcpkgs/freecad/patches/001-include.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-From 9a41845a417189776741297c50a3827ce292bc4f Mon Sep 17 00:00:00 2001
-From: Uwe <donovaly@users.noreply.github.com>
-Date: Sun, 3 Jul 2022 22:51:16 +0200
-Subject: [PATCH] [Part] OCCError.h: remove unneeded includes
-
-- also sort includes
----
- src/Mod/Part/App/OCCError.h | 36 +++----------------------
- src/Mod/Part/App/OffsetCurvePyImp.cpp | 12 ++++-----
- src/Mod/Part/App/OffsetSurfacePyImp.cpp | 10 +++----
- 3 files changed, 12 insertions(+), 46 deletions(-)
-
---- a/src/Mod/Part/App/OCCError.h
-+++ b/src/Mod/Part/App/OCCError.h
-@@ -23,36 +23,8 @@
- #ifndef _OCCError_h_
- #define _OCCError_h_
-
--# include <Standard_Version.hxx>
- # include <Standard_Failure.hxx>
--# include <Standard_AbortiveTransaction.hxx>
--# include <Standard_ConstructionError.hxx>
--# if OCC_VERSION_HEX >= 0x060500
--# include <Standard_DefineException.hxx>
--# endif
--# include <Standard_DimensionError.hxx>
--# include <Standard_DimensionMismatch.hxx>
--# include <Standard_DivideByZero.hxx>
--# include <Standard_DomainError.hxx>
--# include <Standard_ImmutableObject.hxx>
--# include <Standard_LicenseError.hxx>
--# include <Standard_LicenseNotFound.hxx>
--# include <Standard_MultiplyDefined.hxx>
--# include <Standard_NegativeValue.hxx>
--# include <Standard_NoMoreObject.hxx>
--# include <Standard_NoSuchObject.hxx>
--# include <Standard_NotImplemented.hxx>
--# include <Standard_NullObject.hxx>
--# include <Standard_NullValue.hxx>
--# include <Standard_NumericError.hxx>
--# include <Standard_OutOfMemory.hxx>
--# include <Standard_OutOfRange.hxx>
--# include <Standard_Overflow.hxx>
--# include <Standard_ProgramError.hxx>
--# include <Standard_RangeError.hxx>
--# include <Standard_TooManyUsers.hxx>
--# include <Standard_TypeMismatch.hxx>
--# include <Standard_Underflow.hxx>
-+# include <Standard_Version.hxx>
-
- #include <Mod/Part/PartGlobal.h>
- #include <Base/Console.h>
-@@ -88,4 +60,3 @@ PartExport extern PyObject* PartExceptio
-
- #define PY_CATCH_OCC _PY_CATCH_OCC(return(NULL))
- #endif // _OCCError_h_
--
---- a/src/Mod/Part/App/OffsetCurvePyImp.cpp
-+++ b/src/Mod/Part/App/OffsetCurvePyImp.cpp
-@@ -20,20 +20,20 @@
- * *
- ***************************************************************************/
-
--
- #include "PreCompiled.h"
- #ifndef _PreComp_
- # include <Geom_OffsetCurve.hxx>
- #endif
-
--#include "OCCError.h"
--#include "Geometry.h"
-+#include <Base/GeometryPyCXX.h>
-+#include <Base/Vector3D.h>
-+#include <Base/VectorPy.h>
-+
- #include "OffsetCurvePy.h"
- #include "OffsetCurvePy.cpp"
-+#include "Geometry.h"
-+#include "OCCError.h"
-
--#include <Base/GeometryPyCXX.h>
--#include <Base/VectorPy.h>
--#include <Base/Vector3D.h>
-
- using namespace Part;
-
---- a/src/Mod/Part/App/OffsetSurfacePyImp.cpp
-+++ b/src/Mod/Part/App/OffsetSurfacePyImp.cpp
-@@ -20,20 +20,16 @@
- * *
- ***************************************************************************/
-
--
- #include "PreCompiled.h"
- #ifndef _PreComp_
- # include <Geom_OffsetSurface.hxx>
- # include <memory>
- #endif
-
--#include <Base/VectorPy.h>
--#include <Base/Vector3D.h>
--
- #include "OCCError.h"
--#include "Geometry.h"
--#include <Mod/Part/App/OffsetSurfacePy.h>
--#include <Mod/Part/App/OffsetSurfacePy.cpp>
-+#include "OffsetSurfacePy.h"
-+#include "OffsetSurfacePy.cpp"
-+
-
- using namespace Part;
-
diff --git a/srcpkgs/freecad/patches/154-revert-gui-tmp-redirect-stderr.patch b/srcpkgs/freecad/patches/154-revert-gui-tmp-redirect-stderr.patch
deleted file mode 100644
index d6a9adabdec83..0000000000000
--- a/srcpkgs/freecad/patches/154-revert-gui-tmp-redirect-stderr.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-see https://github.com/FreeCAD/FreeCAD/commit/cfe94b00d3434f3e2c8b5114d2909f628c330fa8#commitcomment-71413407
-
-upstream: yes
-
-From 7b377a216b9185960e4cee980a6504dc1a755f50 Mon Sep 17 00:00:00 2001
-From: wmayer <wmayer@users.sourceforge.net>
-Date: Wed, 29 Jun 2022 15:19:18 +0200
-Subject: [PATCH] Gui: remove workaround for spnav 0.23 due to build failure
- with musl libc
-
----
- src/Gui/3Dconnexion/GuiNativeEventLinux.cpp | 27 ---------------------
- 1 file changed, 27 deletions(-)
-
---- a/src/Gui/3Dconnexion/GuiNativeEventLinux.cpp
-+++ b/src/Gui/3Dconnexion/GuiNativeEventLinux.cpp
-@@ -21,42 +21,17 @@
- ***************************************************************************/
-
- #include <FCConfig.h>
--#include <cstdio>
-
- #include "GuiNativeEventLinux.h"
-
- #include "GuiApplicationNativeEventAware.h"
- #include <Base/Console.h>
--#include <Base/FileInfo.h>
- #include <QMainWindow>
-
- #include <QSocketNotifier>
-
- #include <spnav.h>
-
--namespace {
--class RedirectStdErr
--{
--public:
-- RedirectStdErr()
-- : fi(Base::FileInfo::getTempFileName())
-- , file(stderr)
-- {
-- stderr = fopen(fi.filePath().c_str(), "w");
-- }
-- ~RedirectStdErr()
-- {
-- fclose(stderr);
-- fi.deleteFile();
-- stderr = file;
-- }
--
--private:
-- Base::FileInfo fi;
-- FILE* file;
--};
--}
--
- Gui::GuiNativeEvent::GuiNativeEvent(Gui::GUIApplicationNativeEventAware *app)
- : GuiAbstractNativeEvent(app)
- {
-@@ -72,8 +47,6 @@ Gui::GuiNativeEvent::~GuiNativeEvent()
-
- void Gui::GuiNativeEvent::initSpaceball(QMainWindow *window)
- {
-- // tmp. redirect stderr to a file to suppress an error message from spnav_open()
-- RedirectStdErr err;
- Q_UNUSED(window)
- if (spnav_open() == -1) {
- Base::Console().Log("Couldn't connect to spacenav daemon. Please ignore if you don't have a spacemouse.\n");
diff --git a/srcpkgs/freecad/patches/fe02d63c8c9b1280978be841d04e68a0a55cceb9.patch b/srcpkgs/freecad/patches/fe02d63c8c9b1280978be841d04e68a0a55cceb9.patch
deleted file mode 100644
index d4acf370ca0a4..0000000000000
--- a/srcpkgs/freecad/patches/fe02d63c8c9b1280978be841d04e68a0a55cceb9.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From fe02d63c8c9b1280978be841d04e68a0a55cceb9 Mon Sep 17 00:00:00 2001
-From: Roy-043 <70520633+Roy-043@users.noreply.github.com>
-Date: Thu, 29 Dec 2022 23:20:38 +0100
-Subject: [PATCH] Draft: update inspect.getargspec to inspect.getfullargspec
- (#8101)
-
----
- src/Mod/Draft/draftguitools/gui_snapper.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/src/Mod/Draft/draftguitools/gui_snapper.py
-+++ b/src/Mod/Draft/draftguitools/gui_snapper.py
-@@ -1426,7 +1426,7 @@ class Snapper:
- Gui.Snapper.off()
- self.ui.offUi()
- if callback:
-- if len(inspect.getargspec(callback).args) > 1:
-+ if len(inspect.getfullargspec(callback).args) > 1:
- obj = None
- if self.snapInfo and ("Object" in self.snapInfo) and self.snapInfo["Object"]:
- obj = App.ActiveDocument.getObject(self.snapInfo["Object"])
-@@ -1445,7 +1445,7 @@ class Snapper:
- Gui.Snapper.off()
- self.ui.offUi()
- if callback:
-- if len(inspect.getargspec(callback).args) > 1:
-+ if len(inspect.getfullargspec(callback).args) > 1:
- callback(None, None)
- else:
- callback(None)
diff --git a/srcpkgs/freecad/template b/srcpkgs/freecad/template
index c135701e38b9a..2f83e55174101 100644
--- a/srcpkgs/freecad/template
+++ b/srcpkgs/freecad/template
@@ -1,7 +1,7 @@
# Template file for 'freecad'
pkgname=freecad
-version=0.20.2
-revision=7
+version=0.21.1
+revision=1
build_wrksrc="FreeCAD-${version}"
build_style=cmake
pycompile_dirs="usr/lib/${pkgname}/Mod"
@@ -24,8 +24,10 @@ makedepends="python3-devel boost-devel libxerces-c-devel zlib-devel occt-devel
coin3-devel libshiboken2-devel libspnav-devel pyside2-tools
liblz4-devel libpyside2-python3-devel python3-matplotlib netcdf-devel
jsoncpp-devel qt5-devel qt5-svg-devel qt5-tools-devel qt5-webkit-devel
- qt5-xmlpatterns-devel coin3-doc glew-devel python3-pivy"
-depends="python3-matplotlib python3-pyside2-webengine python3-pivy"
+ qt5-xmlpatterns-devel coin3-doc glew-devel python3-pivy qt5-webengine-devel
+ qt5-declarative-devel qt5-webchannel-devel qt5-location-devel"
+depends="python3-matplotlib python3-pyside2-webengine python3-pivy
+ python3-GitPython python3-Markdown"
short_desc="General purpose 3D CAD modeler"
maintainer="yopito <pierre.bourgin@free.fr>"
license="LGPL-2.0-or-later"
@@ -35,7 +37,7 @@ distfiles="
https://github.com/FreeCAD/FreeCAD/archive/${version}.tar.gz
${SOURCEFORGE_SITE}/cxx/pycxx-${_pycxxver}.tar.gz
"
-checksum="46922f3a477e742e1a89cd5346692d63aebb2b67af887b3e463e094a4ae055da
+checksum="e9b1fd0323f101268c7f3be52db42e4a29222f2e306ae6c4a6fc309cb418d35a
4b91e1e1141c23fbd5039df635c4bb6e75632168548f56b83ce177193c0c98c6"
python_version=3
patch_args="-Np1 -d ${build_wrksrc}"
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: freecad: update to 0.21.1.
2023-10-11 0:52 [PR PATCH] freecad: update to 0.21.1 cy1der
` (15 preceding siblings ...)
2023-11-16 14:17 ` [PR PATCH] [Updated] " cy1der
@ 2023-12-08 16:53 ` zlice
2023-12-09 16:21 ` zlice
` (7 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: zlice @ 2023-12-08 16:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 349 bytes --]
New comment by zlice on void-packages repository
https://github.com/void-linux/void-packages/pull/46573#issuecomment-1847519402
Comment:
> Have you tried disabling or removing them?
I really can't get work done without them. AppImage has been working fine though. About to do a rebuild tonight so I'll try to check and see if it still happens.
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: freecad: update to 0.21.1.
2023-10-11 0:52 [PR PATCH] freecad: update to 0.21.1 cy1der
` (16 preceding siblings ...)
2023-12-08 16:53 ` zlice
@ 2023-12-09 16:21 ` zlice
2023-12-09 16:37 ` cy1der
` (6 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: zlice @ 2023-12-09 16:21 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 239 bytes --]
New comment by zlice on void-packages repository
https://github.com/void-linux/void-packages/pull/46573#issuecomment-1848453741
Comment:
Does look like something to fix with the Mods. Moving my mod dir gets rid of all the python errors.
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: freecad: update to 0.21.1.
2023-10-11 0:52 [PR PATCH] freecad: update to 0.21.1 cy1der
` (17 preceding siblings ...)
2023-12-09 16:21 ` zlice
@ 2023-12-09 16:37 ` cy1der
2023-12-09 16:53 ` zlice
` (5 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: cy1der @ 2023-12-09 16:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 186 bytes --]
New comment by cy1der on void-packages repository
https://github.com/void-linux/void-packages/pull/46573#issuecomment-1848538609
Comment:
Anything I need to do to the template or nah?
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: freecad: update to 0.21.1.
2023-10-11 0:52 [PR PATCH] freecad: update to 0.21.1 cy1der
` (18 preceding siblings ...)
2023-12-09 16:37 ` cy1der
@ 2023-12-09 16:53 ` zlice
2023-12-09 16:56 ` zlice
` (4 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: zlice @ 2023-12-09 16:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 796 bytes --]
New comment by zlice on void-packages repository
https://github.com/void-linux/void-packages/pull/46573#issuecomment-1848577244
Comment:
Actually looking at it again, just fixing the Manipulator mod isn't enough.
I think the FreeCAD Draft/importSVG mod needs patched ~1705
```
--- ./src/Mod/Draft/importSVG.py 2023-08-30 22:32:05.000000000 -0400
+++ /lib/freecad/Mod/Draft/importSVG.py 2023-12-09 11:41:56.315252658 -0500
@@ -1702,7 +1702,10 @@
contents = filename
else:
# Use the native Python open which was saved as `pythonopen`
- f = pythonopen(filename)
+ if (sys.version_info < (3, 12)): #py3
+ f = pythonopen(filename)
+ else:
+ f = open(filename)
contents = f.read()
f.close()
```
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: freecad: update to 0.21.1.
2023-10-11 0:52 [PR PATCH] freecad: update to 0.21.1 cy1der
` (19 preceding siblings ...)
2023-12-09 16:53 ` zlice
@ 2023-12-09 16:56 ` zlice
2023-12-09 17:33 ` zlice
` (3 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: zlice @ 2023-12-09 16:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 926 bytes --]
New comment by zlice on void-packages repository
https://github.com/void-linux/void-packages/pull/46573#issuecomment-1848577244
Comment:
Actually looking at it again, just fixing the Manipulator mod isn't enough.
I think the FreeCAD Draft/importSVG mod needs patched ~1705
```
--- ./src/Mod/Draft/importSVG.py 2023-08-30 22:32:05.000000000 -0400
+++ /lib/freecad/Mod/Draft/importSVG.py 2023-12-09 11:41:56.315252658 -0500
@@ -1702,7 +1702,10 @@
contents = filename
else:
# Use the native Python open which was saved as `pythonopen`
- f = pythonopen(filename)
+ if (sys.version_info < (3, 12)): #py3
+ f = pythonopen(filename)
+ else:
+ f = open(filename)
contents = f.read()
f.close()
```
\*sigh* looking at it again, there's tons of regex strings that 3.12 isn't happy about. So prolly fine to do changes in another PR
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: freecad: update to 0.21.1.
2023-10-11 0:52 [PR PATCH] freecad: update to 0.21.1 cy1der
` (20 preceding siblings ...)
2023-12-09 16:56 ` zlice
@ 2023-12-09 17:33 ` zlice
2023-12-09 17:42 ` zlice
` (2 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: zlice @ 2023-12-09 17:33 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1126 bytes --]
New comment by zlice on void-packages repository
https://github.com/void-linux/void-packages/pull/46573#issuecomment-1848577244
Comment:
Actually looking at it again, just fixing the Manipulator mod isn't enough.
I think the FreeCAD Draft/importSVG mod needs patched ~1705
```
--- ./src/Mod/Draft/importSVG.py 2023-08-30 22:32:05.000000000 -0400
+++ /lib/freecad/Mod/Draft/importSVG.py 2023-12-09 11:41:56.315252658 -0500
@@ -1702,7 +1702,10 @@
contents = filename
else:
# Use the native Python open which was saved as `pythonopen`
- f = pythonopen(filename)
+ if (sys.version_info < (3, 12)): #py3
+ f = pythonopen(filename)
+ else:
+ f = open(filename)
contents = f.read()
f.close()
```
\*sigh* looking at it again, there's tons of regex strings that 3.12 isn't happy about. So prolly fine to do changes in another PR
sry for yet more noise but, this seems to get rid of errors with plugins for me
[patchimportsvg.patch.txt](https://github.com/void-linux/void-packages/files/13625117/patchimportsvg.patch.txt)
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: freecad: update to 0.21.1.
2023-10-11 0:52 [PR PATCH] freecad: update to 0.21.1 cy1der
` (21 preceding siblings ...)
2023-12-09 17:33 ` zlice
@ 2023-12-09 17:42 ` zlice
2024-03-09 1:43 ` github-actions
2024-03-23 1:44 ` [PR PATCH] [Closed]: " github-actions
24 siblings, 0 replies; 26+ messages in thread
From: zlice @ 2023-12-09 17:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1126 bytes --]
New comment by zlice on void-packages repository
https://github.com/void-linux/void-packages/pull/46573#issuecomment-1848577244
Comment:
Actually looking at it again, just fixing the Manipulator mod isn't enough.
I think the FreeCAD Draft/importSVG mod needs patched ~1705
```
--- ./src/Mod/Draft/importSVG.py 2023-08-30 22:32:05.000000000 -0400
+++ /lib/freecad/Mod/Draft/importSVG.py 2023-12-09 11:41:56.315252658 -0500
@@ -1702,7 +1702,10 @@
contents = filename
else:
# Use the native Python open which was saved as `pythonopen`
- f = pythonopen(filename)
+ if (sys.version_info < (3, 12)): #py3
+ f = pythonopen(filename)
+ else:
+ f = open(filename)
contents = f.read()
f.close()
```
\*sigh* looking at it again, there's tons of regex strings that 3.12 isn't happy about. So prolly fine to do changes in another PR
sry for yet more noise but, this seems to get rid of errors with plugins for me
[patchimportsvg.patch.txt](https://github.com/void-linux/void-packages/files/13625166/patchimportsvg.patch.txt)
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: freecad: update to 0.21.1.
2023-10-11 0:52 [PR PATCH] freecad: update to 0.21.1 cy1der
` (22 preceding siblings ...)
2023-12-09 17:42 ` zlice
@ 2024-03-09 1:43 ` github-actions
2024-03-23 1:44 ` [PR PATCH] [Closed]: " github-actions
24 siblings, 0 replies; 26+ messages in thread
From: github-actions @ 2024-03-09 1:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 305 bytes --]
New comment by github-actions[bot] on void-packages repository
https://github.com/void-linux/void-packages/pull/46573#issuecomment-1986683423
Comment:
Pull Requests become stale 90 days after last activity and are closed 14 days after that. If this pull request is still relevant bump it or assign it.
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: [PR PATCH] [Closed]: freecad: update to 0.21.1.
2023-10-11 0:52 [PR PATCH] freecad: update to 0.21.1 cy1der
` (23 preceding siblings ...)
2024-03-09 1:43 ` github-actions
@ 2024-03-23 1:44 ` github-actions
24 siblings, 0 replies; 26+ messages in thread
From: github-actions @ 2024-03-23 1:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 451 bytes --]
There's a closed pull request on the void-packages repository
freecad: update to 0.21.1.
https://github.com/void-linux/void-packages/pull/46573
Description:
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture: **x86_64-glibc**
- I built this PR locally for these architectures: **Only tried armv6l, but I got "hdf5-devel cannot be cross compiled"**
^ permalink raw reply [flat|nested] 26+ messages in thread