Fix dependencies

This commit is contained in:
Sebastiaan Lokhorst 2019-03-15 20:13:11 +01:00
parent 46613dbe35
commit f31297b899
2 changed files with 24 additions and 24 deletions

View file

@ -1,17 +1,16 @@
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.17.r1484.g1e6818b6f pkgver = 0.18.r26.g51fcdd2c0
pkgrel = 1 pkgrel = 1
epoch = 1 epoch = 1
url = http://www.freecadweb.org/ url = https://www.freecadweb.org/
arch = i686
arch = x86_64 arch = x86_64
license = LGPL license = LGPL
makedepends = git makedepends = git
makedepends = boost makedepends = boost
makedepends = cmake makedepends = cmake
makedepends = coin makedepends = desktop-file-utils
makedepends = python2-pyside-tools makedepends = pyside2-tools
makedepends = desktop-file-utils makedepends = desktop-file-utils
makedepends = eigen makedepends = eigen
makedepends = gcc-fortran makedepends = gcc-fortran
@ -21,14 +20,16 @@ pkgbase = freecad-git
depends = hicolor-icon-theme depends = hicolor-icon-theme
depends = libspnav depends = libspnav
depends = opencascade depends = opencascade
depends = med depends = coin
depends = xerces-c
depends = python2-pivy
depends = python2-pyside
depends = qtwebkit
depends = libtheora depends = libtheora
depends = shared-mime-info depends = med
depends = jsoncpp depends = jsoncpp
depends = xerces-c
depends = python2-netcdf4
depends = python2-pivy
depends = python2-pyside2
depends = qt5-svg
depends = qt5-webkit
optdepends = python2-matplotlib optdepends = python2-matplotlib
optdepends = pycollada-git: Create, edit and load COLLADA documents. optdepends = pycollada-git: Create, edit and load COLLADA documents.
provides = freecad provides = freecad

View file

@ -2,17 +2,18 @@
_appname=freecad _appname=freecad
pkgname="${_appname}-git" pkgname="${_appname}-git"
pkgver=0.17.r1484.g1e6818b6f pkgver=0.18.r26.g51fcdd2c0
pkgrel=1 pkgrel=2
epoch=1 epoch=1
pkgdesc='A general purpose 3D CAD modeler - git checkout' pkgdesc='A general purpose 3D CAD modeler - git checkout'
arch=('i686' 'x86_64') arch=('x86_64')
url='http://www.freecadweb.org/' url='https://www.freecadweb.org/'
license=('LGPL') license=('LGPL')
depends=('boost-libs' 'curl' 'hicolor-icon-theme' 'libspnav' 'opencascade' depends=('boost-libs' 'curl' 'hicolor-icon-theme' 'libspnav' 'opencascade'
'med' 'xerces-c' 'python2-pivy' 'python2-pyside' 'qtwebkit' 'coin' 'libtheora' 'med' 'jsoncpp' 'xerces-c'
'libtheora' 'shared-mime-info' 'jsoncpp' ) 'python2-netcdf4' 'python2-pivy' 'python2-pyside2'
makedepends=('git' 'boost' 'cmake' 'coin' 'python2-pyside-tools' 'qt5-svg' 'qt5-webkit')
makedepends=('git' 'boost' 'cmake' 'desktop-file-utils' 'pyside2-tools'
'desktop-file-utils' 'eigen' 'gcc-fortran' 'swig') 'desktop-file-utils' 'eigen' 'gcc-fortran' 'swig')
optdepends=('python2-matplotlib' optdepends=('python2-matplotlib'
'pycollada-git: Create, edit and load COLLADA documents.') 'pycollada-git: Create, edit and load COLLADA documents.')
@ -33,14 +34,12 @@ pkgver() {
build() { build() {
cd "${srcdir}/${pkgname}" cd "${srcdir}/${pkgname}"
cmake -DCMAKE_BUILD_TYPE=Release \ cmake . \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX="/opt/${_appname}" \ -DCMAKE_INSTALL_PREFIX="/opt/${_appname}" \
-DFREECAD_USE_OCC_VARIANT="Official Version" \ -DFREECAD_USE_OCC_VARIANT="Official Version" \
-DFREECAD_USE_EXTERNAL_PIVY=ON \
-DBUILD_QT5=ON \
-DBUILD_QT5_WEBKIT=OFF \
-DPYTHON_EXECUTABLE=/usr/bin/python2 \ -DPYTHON_EXECUTABLE=/usr/bin/python2 \
-DBUILD_WEB=OFF -DBUILD_QT5=ON
make make
} }