summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreyson Christoforo2022-04-11 11:07:50 +0100
committerGreyson Christoforo2022-04-11 11:07:50 +0100
commit2498280e13ca6362fc5c31db486cdc9a85a5d636 (patch)
treefdd2a5b2927c1ea4d4c736f06e48512d26e08cf6
parentb634531f6600b41b86d31445f40703d10a80185d (diff)
downloadaur-2498280e13ca6362fc5c31db486cdc9a85a5d636.tar.gz
remove one packaging workaround see https://github.com/FreeCAD/FreeCAD/commit/15c069a7b7
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD8
2 files changed, 4 insertions, 8 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ad8f476071cc..35d3b9b4eea2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,7 @@
pkgbase = freecad-git
pkgdesc = A general purpose 3D CAD modeler - git checkout
- pkgver = 0.20.0.r3237.ga6f0f69ed6
+ pkgver = 0.20.0.28679.g35913fc695
pkgrel = 1
- epoch = 0
url = https://www.freecadweb.org/
arch = x86_64
license = LGPL
@@ -35,6 +34,7 @@ pkgbase = freecad-git
depends = qt5-svg
depends = qt5-tools
depends = qt5-webkit
+ depends = qt5-webengine
depends = qt5-x11extras
depends = qt5-xmlpatterns
depends = qt5-base
diff --git a/PKGBUILD b/PKGBUILD
index c8c2bf83698d..5d90ccc0e4f0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,8 @@
# Maintainer: Grey Christoforo <first name at last name dot net>
pkgname=freecad-git
-pkgver=0.20.0.r3237.ga6f0f69ed6
+pkgver=0.20.0.28679.g35913fc695
pkgrel=1
-epoch=0
pkgdesc='A general purpose 3D CAD modeler - git checkout'
arch=('x86_64')
url='https://www.freecadweb.org/'
@@ -25,6 +24,7 @@ python-ply
qt5-svg
qt5-tools
qt5-webkit
+qt5-webengine
qt5-x11extras
qt5-xmlpatterns
qt5-base
@@ -127,10 +127,6 @@ package() {
cd FreeCAD
DESTDIR="${pkgdir}" cmake --install build_dir
- # get python site package folder in the right place
- cp -a "${pkgdir}${_destdir}"/lib/freecad/lib "${pkgdir}${_destdir}"
- rm -rf "${pkgdir}${_destdir}"/lib/freecad/lib
-
# 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}"