diff --git a/extra/freecad/.SRCINFO b/extra/freecad/.SRCINFO index e8d84e818..2123f03f3 100644 --- a/extra/freecad/.SRCINFO +++ b/extra/freecad/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = freecad pkgdesc = Feature based parametric 3D CAD modeler - pkgver = 1.0rc2 + pkgver = 1.0rc4 pkgrel = 3 url = https://freecadweb.org/ arch = x86_64 @@ -25,20 +25,16 @@ pkgbase = freecad makedepends = utf8cpp makedepends = dos2unix makedepends = microsoft-gsl - depends = asciidoctor depends = boost-libs depends = coin depends = fmt depends = glew - depends = jsoncpp depends = libspnav depends = med-openmpi - depends = netcdf depends = opencascade depends = openmpi depends = pugixml depends = pyside6 - depends = python-gitpython depends = yaml-cpp depends = python-markdown depends = python-matplotlib @@ -48,16 +44,13 @@ pkgbase = freecad depends = python-yaml depends = qt6-svg depends = qt6-tools - depends = qt6-webengine depends = verdict depends = xerces-c optdepends = graphviz: dependency graph support optdepends = opencamlib: CAM workbench support optdepends = openscad: OpenSCAD support options = !lto - source = git+https://github.com/freecad/freecad#tag=1.0rc2 - source = freecad-16863.patch::https://github.com/FreeCAD/FreeCAD/pull/16863.patch - b2sums = 39688b03ab2c5fb130cba0518ebbe5f1948836638459eebc4c37e6e39a6f505c1835250f7213095de04c89704a0a940cac976ab461a909496d237b31dc5a4245 - b2sums = aac1bf1d7af1d03b44078359d7024831a430b5034519deb18c6e6fa4e01325e129dda2d2a8a9d0e49709c25fadff7682088bbe095bd99e9130c8ae9708fbe920 + source = git+https://github.com/freecad/freecad#tag=1.0rc4 + b2sums = b635c36455bee5fcf75c94db51b4f0840de1cee0cf95f13a1f4f6410b514341a8f5aca02394c0ee94d02910f19d5f1b74fe0d886fd52f22fd4e38a445ca695da pkgname = freecad diff --git a/extra/freecad/PKGBUILD b/extra/freecad/PKGBUILD index 4b80a3166..7b1d49a60 100644 --- a/extra/freecad/PKGBUILD +++ b/extra/freecad/PKGBUILD @@ -20,16 +20,16 @@ buildarch=8 highmem=1 pkgname=freecad -pkgver=1.0rc2 # https://gitlab.archlinux.org/archlinux/packaging/packages/freecad/-/issues/10#note_211023 +pkgver=1.0rc4 # https://gitlab.archlinux.org/archlinux/packaging/packages/freecad/-/issues/10#note_211023 pkgrel=3 pkgdesc='Feature based parametric 3D CAD modeler' arch=(x86_64) url='https://freecadweb.org/' license=(LGPL) -depends=(asciidoctor boost-libs coin fmt glew jsoncpp libspnav med-openmpi - netcdf opencascade openmpi pugixml pyside6 python-gitpython yaml-cpp +depends=(boost-libs coin fmt glew libspnav med-openmpi + opencascade openmpi pugixml pyside6 yaml-cpp python-markdown python-matplotlib python-pip python-pivy python-ply - python-yaml qt6-svg qt6-tools qt6-webengine verdict xerces-c) + python-yaml qt6-svg qt6-tools verdict xerces-c) makedepends=(boost cgns cmake eigen git libharu liblas ninja nlohmann-json openvdb openvr pdal postgresql-libs python-mpi4py shiboken6 swig utf8cpp dos2unix microsoft-gsl) @@ -37,15 +37,12 @@ optdepends=('graphviz: dependency graph support' 'opencamlib: CAM workbench support' 'openscad: OpenSCAD support') options=(!lto) -source=("git+https://github.com/$pkgname/$pkgname#tag=$pkgver" - freecad-16863.patch::https://github.com/FreeCAD/FreeCAD/pull/16863.patch) -b2sums=('39688b03ab2c5fb130cba0518ebbe5f1948836638459eebc4c37e6e39a6f505c1835250f7213095de04c89704a0a940cac976ab461a909496d237b31dc5a4245' - 'aac1bf1d7af1d03b44078359d7024831a430b5034519deb18c6e6fa4e01325e129dda2d2a8a9d0e49709c25fadff7682088bbe095bd99e9130c8ae9708fbe920') +source=("git+https://github.com/$pkgname/$pkgname#tag=$pkgver") +b2sums=('b635c36455bee5fcf75c94db51b4f0840de1cee0cf95f13a1f4f6410b514341a8f5aca02394c0ee94d02910f19d5f1b74fe0d886fd52f22fd4e38a445ca695da') prepare() { cd freecad git submodule update --init --recursive - patch -Np1 -i "$srcdir"/freecad-16863.patch } build() {