From: cy1der <cy1der@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] freecad: update to 0.21.1.
Date: Sun, 15 Oct 2023 21:19:58 +0200 [thread overview]
Message-ID: <20231015191958.JdfR_Zx4VRVda6zhTWGNDEt_pvhswVqQ16wsnJMHVYo@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-46573@inbox.vuxu.org>
[-- 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}"
next prev parent reply other threads:[~2023-10-15 19:19 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-11 0:52 [PR PATCH] " 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
2023-10-15 17:06 ` cy1der
2023-10-15 19:15 ` [PR PATCH] [Updated] " cy1der
2023-10-15 19:19 ` cy1der [this message]
2023-10-15 20:17 ` ii8
2023-10-15 21:00 ` [PR PATCH] [Updated] " cy1der
2023-11-01 15:56 ` robertek
2023-11-01 17:09 ` [PR PATCH] [Updated] " cy1der
2023-11-01 17:10 ` cy1der
2023-11-14 21:49 ` zlice
2023-11-14 22:45 ` cy1der
2023-11-16 13:46 ` [PR REVIEW] " ahesford
2023-11-16 14:17 ` [PR PATCH] [Updated] " cy1der
2023-12-08 16:53 ` zlice
2023-12-09 16:21 ` zlice
2023-12-09 16:37 ` cy1der
2023-12-09 16:53 ` zlice
2023-12-09 16:56 ` zlice
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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231015191958.JdfR_Zx4VRVda6zhTWGNDEt_pvhswVqQ16wsnJMHVYo@z \
--to=cy1der@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).