Skip to content

freecad: update to 1.1.0 #59945

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zlice wants to merge 1 commit into
base: master
Choose a base branch
from
Open

freecad: update to 1.1.0 #59945

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions common/shlibs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3425,6 +3425,7 @@ libvtkTestingCore-9.5.so.1 vtk-9.5.0_1
libvtktoken-9.5.so.1 vtk-9.5.0_1
libvtkverdict-9.5.so.1 vtk-9.5.0_1
libvtkWrappingTools-9.5.so.1 vtk-9.5.0_1
libvtkWrappingPythonCore3.14-9.5.so.1 vtk-python3-9.5.0_1
libvolume_key.so.1 volume_key-0.3.9_1
libxxhash.so.0 libxxHash-0.6.5_2
libcapnp_c.so.0 c-capnproto-0.3_1
Expand Down
11 changes: 0 additions & 11 deletions srcpkgs/freecad/patches/boost-1.89.patch
View file
Open in desktop

This file was deleted.

10 changes: 10 additions & 0 deletions srcpkgs/freecad/patches/i686.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
--- a/src/3rdParty/libE57Format/src/ReaderImpl.cpp
+++ b/src/3rdParty/libE57Format/src/ReaderImpl.cpp
@@ -29,6 +29,7 @@
#include "ReaderImpl.h"
#include "Common.h"
#include "StringFunctions.h"
+#include <limits>

namespace e57
{
20 changes: 0 additions & 20 deletions srcpkgs/freecad/patches/includes.patch
View file
Open in desktop

This file was deleted.

10 changes: 10 additions & 0 deletions srcpkgs/freecad/patches/musl.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
--- a/src/Base/UnlimitedUnsigned.h
+++ b/src/Base/UnlimitedUnsigned.h
@@ -31,6 +31,7 @@
#include <vector>
#include <string>
#include <stdexcept>
+#include <cstdint>

// ----------------------------------------------------------------------------

13 changes: 0 additions & 13 deletions srcpkgs/freecad/patches/occ790.patch
View file
Open in desktop

This file was deleted.

47 changes: 0 additions & 47 deletions srcpkgs/freecad/patches/pyregex.patch
View file
Open in desktop

This file was deleted.

30 changes: 17 additions & 13 deletions srcpkgs/freecad/template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
# Template file for 'freecad'
pkgname=freecad
version=1.0.2
revision=9
_pycxx_ver=7.1.8
_ondsel_ver=09d6175a2ba69e7016fcecc4f384946a2f84f92d
version=1.1.0
revision=1
_pycxx_ver=7.2.0
_ondsel_ver=9e8a88547e1ee7db534df1921dd694aa3b690d04
_addon_ver=291366f293c8b1c073e7b1f300e04e38dc40c7fe
build_style=cmake
pycompile_dirs="usr/lib/${pkgname}/Mod"
_inst_prefix=/usr/lib/${pkgname}
Expand All @@ -12,7 +13,8 @@ configure_args="-DPYTHON_EXECUTABLE=/usr/bin/python3 -DBUILD_GUI=ON
-DENABLE_DEVELOPER_TESTS=OFF -DBUILD_TEST=OFF
-DFREECAD_USE_EXTERNAL_PIVY=ON -DCMAKE_INSTALL_PREFIX=${_inst_prefix}
-DCMAKE_INSTALL_DATAROOTDIR=/usr/share -DCMAKE_INSTALL_DATADIR=/usr/share/${pkgname}
-DMEDFILE_INCLUDE_DIRS=/usr/include/med -DCOIN3D_INCLUDE_DIRS=/usr/include/Coin3"
-DMEDFILE_INCLUDE_DIRS=/usr/include/med -DCOIN3D_INCLUDE_DIRS=/usr/include/Coin3
-DFREECAD_USE_EXTERNAL_PYCXX=ON -DPYCXX_INCLUDE_DIRS=pycxx"
hostmakedepends="pkg-config swig doxygen graphviz python3-setuptools
python3-matplotlib python3-pivy"
makedepends="boost-devel-minimal boost-python3 libboost_filesystem
Expand All @@ -21,7 +23,7 @@ makedepends="boost-devel-minimal boost-python3 libboost_filesystem
hdf5-devel libgomp-devel libmed-devel eigen double-conversion-devel
coin3-devel libspnav-devel liblz4-devel netcdf-devel jsoncpp-devel
glew-devel python3-devel yaml-cpp-devel guidelines-support-library
qt6-base-devel qt6-svg-devel qt6-tools-devel libpyside6-devel"
qt6-base-devel qt6-svg-devel qt6-tools-devel libpyside6-devel python3-pybind11"
depends="python3-matplotlib python3-pivy python3-GitPython python3-Markdown
python3-pyside6-gui python3-pyside6-network python3-pyside6-printsupport
python3-pyside6-ui-tools python3-pyside6-widgets"
Expand All @@ -31,13 +33,16 @@ license="LGPL-2.0-or-later"
homepage="https://freecadweb.org/"
distfiles="https://github.com/FreeCAD/FreeCAD/archive/${version}.tar.gz
${SOURCEFORGE_SITE}/cxx/pycxx-${_pycxx_ver}.tar.gz
https://github.com/FreeCAD/OndselSolver/archive/${_ondsel_ver}.tar.gz>OndselSolver-${_ondsel_ver}.tar.gz"
checksum="228ee52f00627c7d8fa61998179deb01865ece69390829feb1300228d24f7e9e
4b91e1e1141c23fbd5039df635c4bb6e75632168548f56b83ce177193c0c98c6
890fb6ddeb1b42face95854689ff7b96c926c368b7d616d9e31e4b35f79ddde8"
https://github.com/FreeCAD/OndselSolver/archive/${_ondsel_ver}.tar.gz>OndselSolver-${_ondsel_ver}.tar.gz
https://github.com/FreeCAD/AddOnManager/archive/${_addon_ver}.tar.gz>AddOnManager-${_addon_ver}.tar.gz"
checksum="b99b932037eb801a66b5f66ac46968a0da3654a1774ee12f28781b43de34daf6
4140ca17c39e7f3d8c9a426d12126a037a27dc148e50d3f98f0d334513fcbbb2
29b9b61d94c5d2bb64689b2ddc2045c1dbdd837a0b5a928e08b76b8905ced078
3c6ab90d90e536814fac20a390f7d63cd9b784184f50add7b5c56d8303be9837"
python_version=3
skip_extraction="pycxx-${_pycxx_ver}.tar.gz
OndselSolver-${_ondsel_ver}.tar.gz"
OndselSolver-${_ondsel_ver}.tar.gz
AddOnManager-${_addon_ver}.tar.gz"

if [ "$XBPS_TARGET_LIBC" = musl ]; then
makedepends+=" libexecinfo-devel"
Expand All @@ -49,8 +54,7 @@ CXXFLAGS="-DPYCXX_PYTHON_2TO3"
post_extract() {
vsrcextract -C src/3rdParty/OndselSolver "OndselSolver-${_ondsel_ver}.tar.gz"
vsrcextract -C pycxx "pycxx-${_pycxx_ver}.tar.gz"
rm -r src/CXX
ln -Tsr ./pycxx/CXX src/CXX
vsrcextract -C src/Mod/AddonManager "AddOnManager-${_addon_ver}.tar.gz"
}

post_patch() {
Expand Down