fix lib install location and remove now unnecesary hacks for python

also remove gendesk buildep as it isn't used and explicitly add qt5-webchannel dependency
This commit is contained in:
Adrian 2022-05-17 17:00:34 -04:00
parent d96fa65ec3
commit bb8dda6dd4
2 changed files with 16 additions and 39 deletions

View file

@ -1,6 +1,6 @@
pkgbase = freecad-git pkgbase = freecad-git
pkgdesc = A general purpose 3D CAD modeler - git checkout pkgdesc = A general purpose 3D CAD modeler - git checkout
pkgver = 0.20.0.28679.g35913fc695 pkgver = 0.20.0.28901.ga5ff515804
pkgrel = 1 pkgrel = 1
url = https://www.freecadweb.org/ url = https://www.freecadweb.org/
arch = x86_64 arch = x86_64
@ -12,7 +12,6 @@ pkgbase = freecad-git
makedepends = coin makedepends = coin
makedepends = eigen makedepends = eigen
makedepends = gcc-fortran makedepends = gcc-fortran
makedepends = gendesk
makedepends = git makedepends = git
makedepends = ninja makedepends = ninja
makedepends = python-shiboken2 makedepends = python-shiboken2
@ -35,6 +34,7 @@ pkgbase = freecad-git
depends = qt5-tools depends = qt5-tools
depends = qt5-webkit depends = qt5-webkit
depends = qt5-webengine depends = qt5-webengine
depends = qt5-webchannel
depends = qt5-x11extras depends = qt5-x11extras
depends = qt5-xmlpatterns depends = qt5-xmlpatterns
depends = qt5-base depends = qt5-base

View file

@ -1,7 +1,7 @@
# Maintainer: Grey Christoforo <first name at last name dot net> # Maintainer: Grey Christoforo <first name at last name dot net>
pkgname=freecad-git pkgname=freecad-git
pkgver=0.20.0.28679.g35913fc695 pkgver=0.20.0.28901.ga5ff515804
pkgrel=1 pkgrel=1
pkgdesc='A general purpose 3D CAD modeler - git checkout' pkgdesc='A general purpose 3D CAD modeler - git checkout'
arch=('x86_64') arch=('x86_64')
@ -25,6 +25,7 @@ qt5-svg
qt5-tools qt5-tools
qt5-webkit qt5-webkit
qt5-webengine qt5-webengine
qt5-webchannel
qt5-x11extras qt5-x11extras
qt5-xmlpatterns qt5-xmlpatterns
qt5-base qt5-base
@ -38,7 +39,6 @@ cmake
coin coin
eigen eigen
gcc-fortran gcc-fortran
gendesk
git git
ninja ninja
python-shiboken2 python-shiboken2
@ -73,16 +73,8 @@ pkgver() {
prepare() { prepare() {
cd FreeCAD cd FreeCAD
#sed 's,from femexamples.boxanalysis_frequency import setup,return,' -i src/Mod/Fem/femtest/app/test_ccxtools.py
#sed 's,from femexamples.thermomech_flow1d import setup,return,' -i src/Mod/Fem/femtest/app/test_ccxtools.py
#git revert --no-commit 663ac994a794606e56d086cac85598517bd323dc
#git checkout 927fdc9edc
} }
_destdir="/usr"
build() { build() {
cd FreeCAD cd FreeCAD
@ -107,20 +99,18 @@ build() {
-D FREECAD_USE_QT_FILEDIALOG=ON \ -D FREECAD_USE_QT_FILEDIALOG=ON \
-D PYTHON_EXECUTABLE=/usr/bin/python \ -D PYTHON_EXECUTABLE=/usr/bin/python \
-D INSTALL_TO_SITEPACKAGES=ON \ -D INSTALL_TO_SITEPACKAGES=ON \
-D CMAKE_INSTALL_PREFIX="${_destdir}/lib/freecad" \ -D CMAKE_INSTALL_PREFIX='/usr/lib/freecad' \
-D CMAKE_INSTALL_BINDIR=bin \ -D CMAKE_INSTALL_BINDIR='/usr/lib/freecad/bin' \
-D CMAKE_INSTALL_LIBDIR='../../lib' \ -D CMAKE_INSTALL_LIBDIR='/usr/lib/freecad/lib' \
-D CMAKE_INSTALL_DATADIR='../../share/freecad' \ -D CMAKE_INSTALL_DATADIR='/usr/share/freecad' \
-D CMAKE_INSTALL_DATAROOTDIR='../../share' \ -D CMAKE_INSTALL_DATAROOTDIR='/usr/share' \
-D CMAKE_INSTALL_DOCDIR='../../share/doc/freecad' -D CMAKE_INSTALL_DOCDIR='/usr/share/doc/freecad'
cmake --build build_dir cmake --build build_dir
} }
check() { check() {
cd FreeCAD cd FreeCAD/build_dir
unset PATH_TO_FREECAD_LIBDIR
cd build_dir
LD_LIBRARY_PATH=lib bin/FreeCADCmd --console --run-test 0 LD_LIBRARY_PATH=lib bin/FreeCADCmd --console --run-test 0
} }
@ -128,26 +118,13 @@ package() {
cd FreeCAD cd FreeCAD
DESTDIR="${pkgdir}" cmake --install build_dir DESTDIR="${pkgdir}" cmake --install build_dir
# link all the .sos into python site package dir
python_site_packages="$(python -c 'import sys; print(sys.path[-1])')"
mkdir -p "${pkgdir}/${python_site_packages}"
FILES="${pkgdir}${_destdir}"/lib/*.so
for f in $FILES
do
ln -s ${_destdir}/lib/$(basename $f) "${pkgdir}/${python_site_packages}/$(basename $f)"
done
# links for bin # links for bin
mkdir -p "${pkgdir}${_destdir}"/bin mkdir -p "${pkgdir}"/usr/bin
FILES="${pkgdir}${_destdir}"/lib/freecad/bin/* FILES="${pkgdir}"/usr/lib/freecad/bin/*
for f in $FILES for f in $FILES
do do
ln -s '../lib/freecad/bin/'$(basename $f) "${pkgdir}${_destdir}"/bin/$(basename $f) ln -s '../lib/freecad/bin/'$(basename $f) "${pkgdir}"/usr/bin/$(basename $f)
done done
# env var for __init__.py install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 LICENSE
mkdir -p "${pkgdir}"/etc/profile.d
echo "export PATH_TO_FREECAD_LIBDIR=${_destdir}/lib" > "${pkgdir}"/etc/profile.d/freecad.sh
install -Dt "${pkgdir}${_destdir}/share/licenses/${pkgname}" -m644 LICENSE
} }