diff options
| -rw-r--r-- | .SRCINFO | 5 | ||||
| -rw-r--r-- | PKGBUILD | 33 |
2 files changed, 31 insertions, 7 deletions
@@ -1,6 +1,6 @@ pkgbase = freecad pkgdesc = A general purpose 3D CAD modeler - pkgver = 0.18.16111 + pkgver = 0.18.16158 pkgrel = 1 url = https://www.freecadweb.org/ arch = x86_64 @@ -24,6 +24,7 @@ pkgbase = freecad depends = libspnav depends = glew depends = netcdf + depends = openmpi depends = shared-mime-info depends = hicolor-icon-theme depends = jsoncpp @@ -41,7 +42,7 @@ pkgbase = freecad optdepends = python-matplotlib optdepends = graphviz optdepends = openscad - source = git+https://github.com/FreeCAD/FreeCAD.git#commit=0dc75267fee2af948c3085002a2cc61758cc5b30 + source = git+https://github.com/FreeCAD/FreeCAD.git#commit=783e1346c7a078f5265c3f0c6a927d09a8c1fe70 source = freecad.desktop source = freecad.xml sha256sums = SKIP @@ -9,15 +9,15 @@ pkgname=freecad _pkgver=0.18 -_count=16111 -_commit=0dc75267fee2af948c3085002a2cc61758cc5b30 +_count=16158 +_commit=783e1346c7a078f5265c3f0c6a927d09a8c1fe70 pkgver=$_pkgver.$_count pkgrel=1 pkgdesc='A general purpose 3D CAD modeler' arch=('x86_64') url='https://www.freecadweb.org/' license=('LGPL') -depends=('boost-libs' 'curl' 'opencascade>=7.2' 'xerces-c' 'libspnav' 'glew' 'netcdf' +depends=('boost-libs' 'curl' 'opencascade>=7.2' 'xerces-c' 'libspnav' 'glew' 'netcdf' 'openmpi' 'shared-mime-info' 'hicolor-icon-theme' 'jsoncpp' 'qt5-base' 'qt5-declarative' 'qt5-svg' 'qt5-tools' 'qt5-x11extras' 'qt5-webkit' 'med' 'python-pivy' 'python-pyside2' 'python-matplotlib' 'pyside2-tools') makedepends=('boost' 'eigen' 'gcc-fortran' 'swig' 'xerces-c' 'desktop-file-utils' 'git' @@ -29,8 +29,31 @@ sha256sums=('SKIP' '617968d7bbd1da71bdedaed1b66c5d6eaf24e0fb34678b93f5d925d370c66296' '1d98fa4e62f352966eb357c93f54b1f0bf562931e8323bf70a83b5e221a5fb14') +_backports=( + 299368b1b278f94f579c110be179cf6023882ca5 # Workaround for messy SHIBOKEN_MICRO_VERSION definition. + 17ed2b196a58afbbc3cc1bb99f6eb76060171ad2 # [Cmake] Update FindPySide2Tools for PySide2 5.14 - issue #4229 + 1666b28836baa79b26b707afb1e97c2a0855eb1f # Change IF(...LESS...) into IF(...VERSION_LESS...) + 6eacb17b3e03d20039b85c9daebab9e44386d6bf # Update swigpyrun.in for Python 3.8 +) + +prepare() { + cd "${srcdir}/FreeCAD" + + if ((${#_backports[@]})); then + git cherry-pick --quit + git cherry-pick -n -x -Xours -Xignore-space-change "${_backports[@]}" + fi + + # Sigh… Why can't upstream backport properly? + sed -i '38a using namespace std\;\r' src/Mod/Raytracing/App/RayFeature.cpp # Fixup d13e777 by partial application of 5095703 + + # Fix for Qt 5.15 + sed -i 's/\(.*\)include <QPainter>$/&\n\1include <QPainterPath>/' src/Mod/Image/Gui/OpenGLImageBox.cpp +} + build() { cd "${srcdir}/FreeCAD" + PATH=/usr/bin:$PATH # OpenCascade has problems if /bin comes before /usr/bin in the $PATH cmake . \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX="/usr/lib/freecad" \ @@ -41,13 +64,13 @@ build() { -DFREECAD_USE_QT_FILEDIALOG=ON \ -DBUILD_QT5=ON \ -DPYTHON_EXECUTABLE=/usr/bin/python - make + cmake --build . } package() { cd "${srcdir}/FreeCAD" - make DESTDIR="${pkgdir}" install + DESTDIR="${pkgdir}" cmake --install . # Symlink to /usr/bin install -dm755 "${pkgdir}/usr/bin" |