fix the build

This commit is contained in:
Grey Christoforo 2019-12-27 19:27:04 +00:00
parent aa24b5fbf0
commit 3ea5de2c5a
2 changed files with 18 additions and 6 deletions

View file

@ -1,8 +1,8 @@
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.18.r2685.gf55cf3ef10 pkgver = 0.18.r3000.g9e4710d679
pkgrel = 1 pkgrel = 1
epoch = 2 epoch = 0
url = https://www.freecadweb.org/ url = https://www.freecadweb.org/
arch = x86_64 arch = x86_64
license = LGPL license = LGPL
@ -27,15 +27,19 @@ pkgbase = freecad-git
depends = shiboken2 depends = shiboken2
depends = xerces-c depends = xerces-c
depends = pyside2 depends = pyside2
depends = pyside2-tools
depends = python-matplotlib depends = python-matplotlib
depends = python-netcdf4 depends = python-netcdf4
depends = python-pivy depends = python-pivy
depends = qt5-svg depends = qt5-svg
depends = qt5-webkit depends = qt5-webkit
depends = qt5-webengine depends = qt5-webengine
depends = qt5-base
optdepends = pycollada: Create, edit and load COLLADA documents. optdepends = pycollada: Create, edit and load COLLADA documents.
provides = freecad provides = freecad
conflicts = freecad conflicts = freecad
conflicts = freecad-appimage
conflicts = freecad-appimage-git
source = freecad-git::git+https://github.com/FreeCAD/FreeCAD.git source = freecad-git::git+https://github.com/FreeCAD/FreeCAD.git
md5sums = SKIP md5sums = SKIP

View file

@ -1,11 +1,10 @@
# Maintainer: Grey Christoforo <first name at last name dot net> # Maintainer: Grey Christoforo <first name at last name dot net>
# Maintainer: Sebastiaan Lokhorst <sebastiaanlokhorst@gmail.com> # Maintainer: Sebastiaan Lokhorst <sebastiaanlokhorst@gmail.com>
_appname=freecad pkgname=freecad-git
pkgname="${_appname}-git"
pkgver=0.18.r3000.g9e4710d679 pkgver=0.18.r3000.g9e4710d679
pkgrel=1 pkgrel=1
epoch=2 epoch=0
pkgdesc='A general purpose 3D CAD modeler - git checkout' pkgdesc='A general purpose 3D CAD modeler - git checkout'
arch=('x86_64') arch=('x86_64')
url='https://www.freecadweb.org/' url='https://www.freecadweb.org/'
@ -18,7 +17,7 @@ makedepends=('boost' 'cmake' 'eigen' 'git' 'gcc-fortran'
'pyside2-tools' 'swig' 'qt5-tools') 'pyside2-tools' 'swig' 'qt5-tools')
optdepends=('pycollada: Create, edit and load COLLADA documents.') optdepends=('pycollada: Create, edit and load COLLADA documents.')
provides=('freecad') provides=('freecad')
conflicts=('freecad') conflicts=('freecad' 'freecad-appimage' 'freecad-appimage-git')
source=("${pkgname}::git+https://github.com/FreeCAD/FreeCAD.git") source=("${pkgname}::git+https://github.com/FreeCAD/FreeCAD.git")
md5sums=('SKIP') md5sums=('SKIP')
@ -28,6 +27,15 @@ pkgver() {
git describe --long --tags --exclude '*pre*' --exclude '*staging*' | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/_//' git describe --long --tags --exclude '*pre*' --exclude '*staging*' | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/_//'
} }
prepare() {
cd "${srcdir}/${pkgname}"
# fix a build error
curl -L "https://github.com/FreeCAD/FreeCAD/pull/2842/commits/095984fce44931a4c8e2ace269d45a62640fbfb4.patch" | patch -p1
# patch.txt
#dos2unix patch.txt
#patch --binary -p1 -i patch.txt
}
build() { build() {
cd "${srcdir}/${pkgname}" cd "${srcdir}/${pkgname}"