summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichal Ulianko2018-06-24 01:38:36 +0200
committerMichal Ulianko2018-06-24 01:39:50 +0200
commit493c466e86b0fea8aa78c77ba0d55bd4b6c90db8 (patch)
tree33d3f2321f846fd06ade0d8ba858736447a779aa
parent16bd57bcee579336215faed3f39f2ed8640f2912 (diff)
downloadaur-493c466e86b0fea8aa78c77ba0d55bd4b6c90db8.tar.gz
Use python-pyside2 instead of -git. rcc, uic provided by qt5-base.
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD9
2 files changed, 4 insertions, 8 deletions
diff --git a/.SRCINFO b/.SRCINFO
index bb2d7bee3d33..ea09f2a20ca8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -11,7 +11,6 @@ pkgbase = freecad-python3-git
makedepends = eigen
makedepends = desktop-file-utils
makedepends = qt5-tools
- makedepends = python-pyside2-tools-git
depends = netcdf
depends = boost-libs
depends = coin-hg
@@ -23,7 +22,7 @@ pkgbase = freecad-python3-git
depends = qt5-webkit
depends = jsoncpp
depends = hicolor-icon-theme
- depends = python-pyside2-git
+ depends = python-pyside2
depends = python-pivy-git
depends = glew
source = freecad-python3::git+https://github.com/FreeCAD/FreeCAD.git
diff --git a/PKGBUILD b/PKGBUILD
index 64beedad6aed..586d4df7f789 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,9 +10,8 @@ url='http://www.freecadweb.org/'
license=('LGPL')
depends=('netcdf' 'boost-libs' 'coin-hg' 'med' 'opencascade7' 'python-numpy'
'xerces-c' 'qt5-svg' 'qt5-webkit' 'jsoncpp' 'hicolor-icon-theme'
- 'python-pyside2-git' 'python-pivy-git' 'glew')
-makedepends=('git' 'cmake' 'boost' 'eigen' 'desktop-file-utils' 'qt5-tools'
- 'python-pyside2-tools-git')
+ 'python-pyside2' 'python-pivy-git' 'glew')
+makedepends=('git' 'cmake' 'boost' 'eigen' 'desktop-file-utils' 'qt5-tools')
source=("${_appname}::git+https://github.com/FreeCAD/FreeCAD.git"
"python_version.patch"
"FreeCAD-Python3"
@@ -46,9 +45,7 @@ build() {
-DCMAKE_PREFIX_PATH="/opt/opencascade7" \
-DCMAKE_INCLUDE_PATH="/opt/opencascade7/include/opencascade" \
-DCMAKE_LIBRARY_PATH="/opt/opencascade7/lib" \
- -DCMAKE_INSTALL_RPATH="/opt/opencascade7/lib;/usr/lib" \
- -DPYSIDE2RCCBINARY="/usr/bin/pyside2-rcc" \
- -DPYSIDE2UICBINARY="/usr/bin/pyside2-uic"
+ -DCMAKE_INSTALL_RPATH="/opt/opencascade7/lib;/usr/lib"
make
}