Fix build
This commit is contained in:
parent
acf90fdbbe
commit
1fc4159ed2
4 changed files with 3 additions and 115 deletions
|
|
@ -44,14 +44,11 @@ makedepends="
|
|||
vtk-dev
|
||||
xerces-c-dev
|
||||
"
|
||||
options="!check" # Failing test units upstream as well
|
||||
checkdepends="xvfb-run mesa mesa-dri-gallium font-opensans"
|
||||
source="https://github.com/FreeCAD/FreeCAD/archive/$pkgver/freecad-$pkgver.tar.gz
|
||||
$pkgname-python3.11-1.patch::https://github.com/FreeCAD/FreeCAD/commit/fe02d63c8c9b1280978be841d04e68a0a55cceb9.patch
|
||||
numpy-1.20.patch
|
||||
$pkgname-cstdint.patch::https://github.com/FreeCAD/FreeCAD/commit/f8f02f089537497a1bf46bc1057f01659b6636c1.patch
|
||||
no-execinfo.patch
|
||||
no-workaround-spnav.patch
|
||||
resourceDirectory.patch
|
||||
tests.patch
|
||||
"
|
||||
builddir="$srcdir/FreeCAD-$pkgver"
|
||||
|
||||
|
|
@ -94,10 +91,6 @@ package() {
|
|||
|
||||
sha512sums="
|
||||
f5b4428217d9abd18aed1dcd8a5c77132b90173d07627ff9164919a87f04d242f9d616e9655751ec06ff57fc3e242090cc4d7e1d7045fdae9bc2e281e7855281 freecad-0.21.0.tar.gz
|
||||
75a237f7ed7a89a98c0e5bdb3d3f0788749602daf718089aa0814e05f93ced1e15ad5867c7c87f170b48c5984f9ace1bbc95c4f386ce72bfb8d616323b47f1e5 freecad-python3.11-1.patch
|
||||
80b08b031810fce7b6d698c662f64fa4f8a904f283f46b478b1d718529164c0ee61ce190f633abf04e03212720480f3f0603b0c1e160af79d7b6bb82da3bd0e4 numpy-1.20.patch
|
||||
27dffdbb124096e7fcbec3589cdcfc587ea09bf039c1c1108edb68a9a4fd1278f66a39642636f98b8759a44da92485fd748f8b3d615b0625bc37fc717130e237 freecad-cstdint.patch
|
||||
73aaba7015dce7048eb7d2456131b5b5ba4673cc980503331987be54d99daed5f61db015ca33d7d2ef0f02bd3192da8ce122c103c3b93f9959927deb4f0b933e no-execinfo.patch
|
||||
15696bdaaf77482f1b5d3806535a8004c8cec7d598d62092d9f0394b4ca9e2ad6cedd77c4b86a83a06324d16678c1c6bbf3a390b807729717a2f513e858afd50 no-workaround-spnav.patch
|
||||
8ba13b17bad66316757d180c1b9e9e72a24382627eac7c43a2264b3b5101e6e8f701775f2b805ed733f500fbcd8b0e8e422ec58a9ab3d948d613b666157d4c52 resourceDirectory.patch
|
||||
5db19e0aa2ca1fd21f4c56afc9db54390a799262aaa0a741704c2c304b0068fd6ca1dcc086465e12e9c0cfe06aac750aaf9b8f5f4db324539af4dd3394803ff9 tests.patch
|
||||
"
|
||||
|
|
|
|||
|
|
@ -1,69 +0,0 @@
|
|||
Patch-Source: https://github.com/FreeCAD/FreeCAD/commit/7b377a216b9185960e4cee980a6504dc1a755f50
|
||||
fixes stderr reassignment
|
||||
--
|
||||
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(-)
|
||||
|
||||
diff --git a/src/Gui/3Dconnexion/GuiNativeEventLinux.cpp b/src/Gui/3Dconnexion/GuiNativeEventLinux.cpp
|
||||
index 7f0ddd75d262..455ece0b36bd 100644
|
||||
--- 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");
|
||||
|
|
@ -1,25 +0,0 @@
|
|||
Patch-Source: https://github.com/FreeCAD/FreeCAD/commit/8b0df1dc936b544091f6a2d68df1c1a14ae3de5b
|
||||
--
|
||||
From 8b0df1dc936b544091f6a2d68df1c1a14ae3de5b Mon Sep 17 00:00:00 2001
|
||||
From: lorenz <looooo@users.noreply.github.com>
|
||||
Date: Tue, 27 Dec 2022 04:59:35 +0100
|
||||
Subject: [PATCH] FEM: femmesh: fix AttributeError: module 'numpy' has no
|
||||
attribute 'int'
|
||||
|
||||
---
|
||||
src/Mod/Fem/femmesh/meshtools.py | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/Mod/Fem/femmesh/meshtools.py b/src/Mod/Fem/femmesh/meshtools.py
|
||||
index dd8671b..d2e2b0a 100644
|
||||
--- a/src/Mod/Fem/femmesh/meshtools.py
|
||||
+++ b/src/Mod/Fem/femmesh/meshtools.py
|
||||
@@ -485,7 +485,7 @@ def get_femelement_sets(
|
||||
# fem_objects = FreeCAD FEM document objects
|
||||
# get femelements for reference shapes of each obj.References
|
||||
count_femelements = 0
|
||||
- referenced_femelements = np.zeros((max(femelement_table.keys())+1,),dtype=np.int)
|
||||
+ referenced_femelements = np.zeros((max(femelement_table.keys())+1,),dtype=int)
|
||||
has_remaining_femelements = None
|
||||
for fem_object_i, fem_object in enumerate(fem_objects):
|
||||
obj = fem_object["Object"]
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
--- ./cMake/FreeCAD_Helpers/ConfigureCMakeVariables.cmake.orig
|
||||
+++ ./cMake/FreeCAD_Helpers/ConfigureCMakeVariables.cmake
|
||||
@@ -23,7 +23,7 @@
|
||||
"Path to the directory containing PyCXX's cxxextensions.c source file")
|
||||
|
||||
# used as compiler defines
|
||||
- set(RESOURCEDIR "${CMAKE_INSTALL_DATADIR}")
|
||||
+ set(RESOURCEDIR "../../share/freecad")
|
||||
set(LIBRARYDIR "${CMAKE_INSTALL_LIBDIR}")
|
||||
set(DOCDIR "${CMAKE_INSTALL_DOCDIR}")
|
||||
|
||||
Loading…
Reference in a new issue