From 44c45e84a13f4d5b0a53a583b0e9ca696df0ceb2 Mon Sep 17 00:00:00 2001 From: Adrian Insaurralde Date: Mon, 26 Dec 2022 23:44:42 -0300 Subject: [PATCH 01/10] fix CMAKE_INSTALL paths --- .SRCINFO | 2 +- PKGBUILD | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index b22b680..cd109a0 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = freecad-git pkgdesc = A general purpose 3D CAD modeler - git checkout - pkgver = 0.21.0.31043.g7a8a453746 + pkgver = 0.21.0.31436.g14994bd9f7 pkgrel = 1 url = https://www.freecad.org/ arch = x86_64 diff --git a/PKGBUILD b/PKGBUILD index 0972d0f..01728cc 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Adrian Insaurralde pkgname=freecad-git -pkgver=0.21.0.31043.g7a8a453746 +pkgver=0.21.0.31436.g14994bd9f7 pkgrel=1 pkgdesc='A general purpose 3D CAD modeler - git checkout' arch=('x86_64') @@ -97,8 +97,8 @@ build() { -D INSTALL_TO_SITEPACKAGES=ON \ -D CMAKE_INSTALL_PREFIX='/usr/lib/freecad' \ -D CMAKE_INSTALL_DATADIR='../../share/freecad' \ - -D CMAKE_INSTALL_DATAROOTDIR='../../share' \ - -D CMAKE_INSTALL_DOCDIR='../../doc/freecad' + -D CMAKE_INSTALL_DATAROOTDIR='/usr/share' \ + -D CMAKE_INSTALL_DOCDIR='/usr/share/doc/freecad' cmake --build build } From 9d76b840d3b158eaef8436104b7e12936c9d051d Mon Sep 17 00:00:00 2001 From: Adrian Insaurralde Date: Wed, 8 Mar 2023 23:27:24 -0300 Subject: [PATCH 02/10] Add fmt as runtime dependency --- .SRCINFO | 2 +- PKGBUILD | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index cd109a0..00cae5e 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -5,7 +5,6 @@ pkgbase = freecad-git url = https://www.freecad.org/ arch = x86_64 license = LGPL - checkdepends = fmt checkdepends = pugixml makedepends = boost makedepends = cmake @@ -17,6 +16,7 @@ pkgbase = freecad-git makedepends = shiboken2 makedepends = swig depends = boost-libs + depends = fmt depends = glew depends = jsoncpp depends = med diff --git a/PKGBUILD b/PKGBUILD index 01728cc..3cbd919 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -10,6 +10,7 @@ url='https://www.freecad.org/' license=('LGPL') depends=( boost-libs +fmt glew jsoncpp med @@ -46,7 +47,6 @@ shiboken2 swig ) checkdepends=( -fmt pugixml ) optdepends=( From cbe287b59333365ae1057010760b409c8bfe0f7a Mon Sep 17 00:00:00 2001 From: Adrian Insaurralde Date: Wed, 8 Mar 2023 23:58:43 -0300 Subject: [PATCH 03/10] Add verdict as dependency (optional for vtk, but smesh build fails without it) --- .SRCINFO | 1 + PKGBUILD | 1 + 2 files changed, 2 insertions(+) diff --git a/.SRCINFO b/.SRCINFO index 00cae5e..cc5c621 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -40,6 +40,7 @@ pkgbase = freecad-git depends = shared-mime-info depends = xerces-c depends = vtk + depends = verdict optdepends = povray: ray tracing support optdepends = luxcorerender: ray tracing support optdepends = libspnav: 3D mouse support diff --git a/PKGBUILD b/PKGBUILD index 3cbd919..2707539 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -34,6 +34,7 @@ qt5-base shared-mime-info xerces-c vtk +verdict ) makedepends=( boost From f643cde5af70ab2aed8b6cc6630ef4eb0849bada Mon Sep 17 00:00:00 2001 From: Adrian Insaurralde Date: Wed, 8 Mar 2023 23:59:09 -0300 Subject: [PATCH 04/10] remove useless PYTHON_EXECUTABLE cmake option --- PKGBUILD | 1 - 1 file changed, 1 deletion(-) diff --git a/PKGBUILD b/PKGBUILD index 2707539..2262163 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -94,7 +94,6 @@ build() { -D CMAKE_CXX_FLAGS="${CXXFLAGS} -fPIC -w" \ -D FREECAD_USE_EXTERNAL_PIVY=ON \ -D FREECAD_USE_QT_FILEDIALOG=ON \ - -D PYTHON_EXECUTABLE=/usr/bin/python \ -D INSTALL_TO_SITEPACKAGES=ON \ -D CMAKE_INSTALL_PREFIX='/usr/lib/freecad' \ -D CMAKE_INSTALL_DATADIR='../../share/freecad' \ From f8553cc7fa43638cea14250d04b6805bd63acfcc Mon Sep 17 00:00:00 2001 From: Adrian Insaurralde Date: Thu, 9 Mar 2023 00:05:01 -0300 Subject: [PATCH 05/10] Add adios2 dependency (optional for vtk, but cmake configuration fails without it) --- .SRCINFO | 1 + PKGBUILD | 1 + 2 files changed, 2 insertions(+) diff --git a/.SRCINFO b/.SRCINFO index cc5c621..8646ebb 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -15,6 +15,7 @@ pkgbase = freecad-git makedepends = python-shiboken2 makedepends = shiboken2 makedepends = swig + depends = adios2 depends = boost-libs depends = fmt depends = glew diff --git a/PKGBUILD b/PKGBUILD index 2262163..d773fc5 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -9,6 +9,7 @@ arch=('x86_64') url='https://www.freecad.org/' license=('LGPL') depends=( +adios2 boost-libs fmt glew From 4ac518c3b08e10ebf7cfae468fbb2f1d960b18a2 Mon Sep 17 00:00:00 2001 From: Adrian Insaurralde Date: Mon, 2 Oct 2023 22:09:22 -0300 Subject: [PATCH 06/10] Update dependencies and pkgver --- .SRCINFO | 9 ++++----- PKGBUILD | 9 ++++----- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 8646ebb..6f0a931 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = freecad-git pkgdesc = A general purpose 3D CAD modeler - git checkout - pkgver = 0.21.0.31436.g14994bd9f7 + pkgver = 0.22.0.34522.gd8636dd058 pkgrel = 1 url = https://www.freecad.org/ arch = x86_64 @@ -12,10 +12,10 @@ pkgbase = freecad-git makedepends = eigen makedepends = git makedepends = ninja + makedepends = nlohmann-json makedepends = python-shiboken2 makedepends = shiboken2 makedepends = swig - depends = adios2 depends = boost-libs depends = fmt depends = glew @@ -39,16 +39,15 @@ pkgbase = freecad-git depends = qt5-xmlpatterns depends = qt5-base depends = shared-mime-info - depends = xerces-c depends = vtk depends = verdict + depends = xerces-c + depends = yaml-cpp optdepends = povray: ray tracing support optdepends = luxcorerender: ray tracing support optdepends = libspnav: 3D mouse support optdepends = openscad: OpenSCAD support optdepends = graphviz: dependency graph support - optdepends = python-markdown: markdown support in addon manager - optdepends = python-gitpython: support downloading addons with git optdepends = python-pip: support installing python dependencies for addons optdepends = calculix-ccx: FEM solver backend provides = freecad diff --git a/PKGBUILD b/PKGBUILD index d773fc5..2b9d6ed 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,14 +2,13 @@ # Maintainer: Adrian Insaurralde pkgname=freecad-git -pkgver=0.21.0.31436.g14994bd9f7 +pkgver=0.22.0.34522.gd8636dd058 pkgrel=1 pkgdesc='A general purpose 3D CAD modeler - git checkout' arch=('x86_64') url='https://www.freecad.org/' license=('LGPL') depends=( -adios2 boost-libs fmt glew @@ -33,9 +32,10 @@ qt5-x11extras qt5-xmlpatterns qt5-base shared-mime-info -xerces-c vtk verdict +xerces-c +yaml-cpp ) makedepends=( boost @@ -44,6 +44,7 @@ coin eigen git ninja +nlohmann-json python-shiboken2 shiboken2 swig @@ -57,8 +58,6 @@ optdepends=( 'libspnav: 3D mouse support' 'openscad: OpenSCAD support' 'graphviz: dependency graph support' -'python-markdown: markdown support in addon manager' -'python-gitpython: support downloading addons with git' 'python-pip: support installing python dependencies for addons' 'calculix-ccx: FEM solver backend' ) From 15eb519d188b2e54203565554dc1fa81a17380a6 Mon Sep 17 00:00:00 2001 From: Adrian Insaurralde Date: Tue, 14 Nov 2023 15:36:48 -0300 Subject: [PATCH 07/10] Update PKGBUILD to pull submodules --- .SRCINFO | 2 +- PKGBUILD | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 6f0a931..783b69e 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = freecad-git pkgdesc = A general purpose 3D CAD modeler - git checkout - pkgver = 0.22.0.34522.gd8636dd058 + pkgver = 0.22.0.35039.ge937cc1efc pkgrel = 1 url = https://www.freecad.org/ arch = x86_64 diff --git a/PKGBUILD b/PKGBUILD index 2b9d6ed..49a573a 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Adrian Insaurralde pkgname=freecad-git -pkgver=0.22.0.34522.gd8636dd058 +pkgver=0.22.0.35039.ge937cc1efc pkgrel=1 pkgdesc='A general purpose 3D CAD modeler - git checkout' arch=('x86_64') @@ -76,6 +76,7 @@ pkgver() { prepare() { cd FreeCAD + git submodule update --init } build() { From 8667fd6a3bf88386c7fcf949f92089f230d7a70b Mon Sep 17 00:00:00 2001 From: Adrian Insaurralde Date: Tue, 23 Apr 2024 11:38:21 -0400 Subject: [PATCH 08/10] Build with qt6 and make pkgbuild more similar to official stable pkgbuild --- .SRCINFO | 23 ++++++----------- PKGBUILD | 79 +++++++++++++++++++++++--------------------------------- 2 files changed, 41 insertions(+), 61 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 783b69e..9b4fa3a 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = freecad-git pkgdesc = A general purpose 3D CAD modeler - git checkout - pkgver = 0.22.0.35039.ge937cc1efc + pkgver = 0.22.0.36965.geb3e83b97a pkgrel = 1 url = https://www.freecad.org/ arch = x86_64 @@ -8,15 +8,14 @@ pkgbase = freecad-git checkdepends = pugixml makedepends = boost makedepends = cmake - makedepends = coin makedepends = eigen makedepends = git makedepends = ninja makedepends = nlohmann-json - makedepends = python-shiboken2 - makedepends = shiboken2 + makedepends = shiboken6 makedepends = swig depends = boost-libs + depends = coin depends = fmt depends = glew depends = jsoncpp @@ -24,27 +23,21 @@ pkgbase = freecad-git depends = netcdf depends = opencascade depends = openmpi - depends = pyside2 - depends = pyside2-tools + depends = pyside6 + depends = pyside6-tools depends = python-yaml depends = python-matplotlib depends = python-packaging depends = python-pivy depends = python-ply - depends = qt5-svg - depends = qt5-tools - depends = qt5-webengine - depends = qt5-webchannel - depends = qt5-x11extras - depends = qt5-xmlpatterns - depends = qt5-base + depends = qt6-svg + depends = qt6-tools + depends = qt6-base depends = shared-mime-info depends = vtk depends = verdict depends = xerces-c depends = yaml-cpp - optdepends = povray: ray tracing support - optdepends = luxcorerender: ray tracing support optdepends = libspnav: 3D mouse support optdepends = openscad: OpenSCAD support optdepends = graphviz: dependency graph support diff --git a/PKGBUILD b/PKGBUILD index 49a573a..94cb2a2 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Adrian Insaurralde pkgname=freecad-git -pkgver=0.22.0.35039.ge937cc1efc +pkgver=0.22.0.36999.ged77603af9 pkgrel=1 pkgdesc='A general purpose 3D CAD modeler - git checkout' arch=('x86_64') @@ -10,6 +10,7 @@ url='https://www.freecad.org/' license=('LGPL') depends=( boost-libs +coin fmt glew jsoncpp @@ -17,20 +18,16 @@ med netcdf opencascade openmpi -pyside2 -pyside2-tools +pyside6 +pyside6-tools python-yaml python-matplotlib python-packaging python-pivy python-ply -qt5-svg -qt5-tools -qt5-webengine -qt5-webchannel -qt5-x11extras -qt5-xmlpatterns -qt5-base +qt6-svg +qt6-tools +qt6-base shared-mime-info vtk verdict @@ -40,21 +37,17 @@ yaml-cpp makedepends=( boost cmake -coin eigen git ninja nlohmann-json -python-shiboken2 -shiboken2 +shiboken6 swig ) checkdepends=( pugixml ) optdepends=( -'povray: ray tracing support' -'luxcorerender: ray tracing support' 'libspnav: 3D mouse support' 'openscad: OpenSCAD support' 'graphviz: dependency graph support' @@ -80,49 +73,43 @@ prepare() { } build() { - cd FreeCAD - - cmake -Wno-dev -G Ninja -B build -S . \ - -D BUILD_ENABLE_CXX_STD=C++17 \ - -D BUILD_FEM=ON \ - -D BUILD_MESH=ON \ + cmake \ + -B build \ -D BUILD_FLAT_MESH=ON \ - -D BUILD_MESH_PART=ON \ - -D BUILD_SHIP=ON \ -D BUILD_DESIGNER_PLUGIN=ON \ - -D CMAKE_BUILD_TYPE=None \ - -D CMAKE_C_FLAGS="${CFLAGS} -fPIC -w" \ - -D CMAKE_CXX_FLAGS="${CXXFLAGS} -fPIC -w" \ + -D FREECAD_QT_VERSION=6 \ + -D CMAKE_BUILD_TYPE=Release \ + -D CMAKE_C_FLAGS="$CFLAGS -ffat-lto-objects -fPIC -w" \ + -D CMAKE_CXX_FLAGS="$CXXFLAGS -ffat-lto-objects -fPIC -w" \ + -D CMAKE_INSTALL_DATADIR=/usr/share/freecad \ + -D CMAKE_INSTALL_DATAROOTDIR=/usr/share \ + -D CMAKE_INSTALL_DOCDIR=/usr/share/freecad/doc \ + -D CMAKE_INSTALL_PREFIX=/usr/lib/freecad \ -D FREECAD_USE_EXTERNAL_PIVY=ON \ -D FREECAD_USE_QT_FILEDIALOG=ON \ -D INSTALL_TO_SITEPACKAGES=ON \ - -D CMAKE_INSTALL_PREFIX='/usr/lib/freecad' \ - -D CMAKE_INSTALL_DATADIR='../../share/freecad' \ - -D CMAKE_INSTALL_DATAROOTDIR='/usr/share' \ - -D CMAKE_INSTALL_DOCDIR='/usr/share/doc/freecad' - - cmake --build build + -D ENABLE_DEVELOPER_TESTS=OFF \ + -G Ninja \ + -S FreeCAD \ + -W no-dev + ninja -C build } check() { - cd FreeCAD/build + cd build LD_LIBRARY_PATH=lib bin/FreeCADCmd --console --run-test 0 } package() { - cd FreeCAD - DESTDIR="${pkgdir}" cmake --install build + DESTDIR="$pkgdir" ninja -C build install - # package thumbnailer - install src/Tools/freecad-thumbnailer "${pkgdir}/usr/lib/freecad/bin/freecad-thumbnailer" - - # links for bin - mkdir -p "${pkgdir}"/usr/bin - FILES="${pkgdir}"/usr/lib/freecad/bin/* - for f in $FILES - do - ln -s '../lib/freecad/bin/'$(basename $f) "${pkgdir}"/usr/bin/$(basename $f) - done + # tools + install -Dm755 FreeCAD/src/Tools/{freecad-thumbnailer,fcinfo} -t "$pkgdir/usr/bin/" - install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 LICENSE + # symlinks + install -d "$pkgdir/usr/bin" + ln -sf /usr/lib/freecad/bin/FreeCAD "$pkgdir/usr/bin/freecad" + ln -sf /usr/lib/freecad/bin/FreeCAD "$pkgdir/usr/bin/FreeCAD" + ln -sf /usr/lib/freecad/bin/FreeCADCmd "$pkgdir/usr/bin/freecadcmd" + ln -sf /usr/lib/freecad/bin/FreeCADCmd "$pkgdir/usr/bin/FreeCADCmd" } From a0b12aade083c9e634d114653f37b826a72f3f14 Mon Sep 17 00:00:00 2001 From: Adrian Insaurralde Date: Mon, 29 Apr 2024 20:28:57 -0400 Subject: [PATCH 09/10] Add missing qt6-5compat dependency --- .SRCINFO | 3 ++- PKGBUILD | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.SRCINFO b/.SRCINFO index 9b4fa3a..c1740e3 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = freecad-git pkgdesc = A general purpose 3D CAD modeler - git checkout - pkgver = 0.22.0.36965.geb3e83b97a + pkgver = 0.22.0.36999.ged77603af9 pkgrel = 1 url = https://www.freecad.org/ arch = x86_64 @@ -33,6 +33,7 @@ pkgbase = freecad-git depends = qt6-svg depends = qt6-tools depends = qt6-base + depends = qt6-5compat depends = shared-mime-info depends = vtk depends = verdict diff --git a/PKGBUILD b/PKGBUILD index 94cb2a2..c66187c 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -28,6 +28,7 @@ python-ply qt6-svg qt6-tools qt6-base +qt6-5compat shared-mime-info vtk verdict From d2457d806e5e0d70e5ad661e1d5cc81aca72d447 Mon Sep 17 00:00:00 2001 From: lod Date: Sun, 15 Sep 2024 19:39:48 +0200 Subject: [PATCH 10/10] rc1 build --- PKGBUILD | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index c66187c..dc4850c 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Adrian Insaurralde pkgname=freecad-git -pkgver=0.22.0.36999.ged77603af9 +pkgver=1.0rc1 pkgrel=1 pkgdesc='A general purpose 3D CAD modeler - git checkout' arch=('x86_64') @@ -57,17 +57,9 @@ optdepends=( ) provides=('freecad') conflicts=('freecad' 'freecad-appimage' 'freecad-appimage-git') -source=("git+https://github.com/FreeCAD/FreeCAD.git") +source=("git+https://github.com/FreeCAD/FreeCAD.git#tag=$pkgver") md5sums=('SKIP') -pkgver() { - cd FreeCAD - read -d$'/n' -r major minor patch < <(grep -Po "set\(PACKAGE_VERSION_(MAJOR|MINOR|PATCH) \"\K[0-9]*" CMakeLists.txt) || true - count=$((24266 + $(git rev-list --count d29fd7d..HEAD) )) - hash=$(git rev-parse --short HEAD) - printf "%d.%d.%d.%d.g%s" "$major" "$minor" "$patch" "$count" "$hash" -} - prepare() { cd FreeCAD git submodule update --init @@ -96,10 +88,10 @@ build() { ninja -C build } -check() { - cd build - LD_LIBRARY_PATH=lib bin/FreeCADCmd --console --run-test 0 -} +# check() { +# cd build +# LD_LIBRARY_PATH=lib bin/FreeCADCmd --console --run-test 0 +# } package() { DESTDIR="$pkgdir" ninja -C build install