summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorGrey Christoforo2019-12-27 19:27:04 +0000
committerGrey Christoforo2019-12-27 19:27:04 +0000
commit3ea5de2c5ae7d256075506d9e75eb1cffcd1c28a (patch)
treec81e59edb9f3267064068648e8f8f6452ce8df60
parentaa24b5fbf03429948d79f51c31a4914bdf20fc1f (diff)
downloadaur-3ea5de2c5ae7d256075506d9e75eb1cffcd1c28a.tar.gz
fix the build
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD16
2 files changed, 18 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 85d31104f54..5d63983aa6d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
pkgbase = freecad-git
pkgdesc = A general purpose 3D CAD modeler - git checkout
- pkgver = 0.18.r2685.gf55cf3ef10
+ pkgver = 0.18.r3000.g9e4710d679
pkgrel = 1
- epoch = 2
+ epoch = 0
url = https://www.freecadweb.org/
arch = x86_64
license = LGPL
@@ -27,15 +27,19 @@ pkgbase = freecad-git
depends = shiboken2
depends = xerces-c
depends = pyside2
+ depends = pyside2-tools
depends = python-matplotlib
depends = python-netcdf4
depends = python-pivy
depends = qt5-svg
depends = qt5-webkit
depends = qt5-webengine
+ depends = qt5-base
optdepends = pycollada: Create, edit and load COLLADA documents.
provides = freecad
conflicts = freecad
+ conflicts = freecad-appimage
+ conflicts = freecad-appimage-git
source = freecad-git::git+https://github.com/FreeCAD/FreeCAD.git
md5sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 2b13abca515..69c78fb097e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,11 +1,10 @@
# Maintainer: Grey Christoforo <first name at last name dot net>
# Maintainer: Sebastiaan Lokhorst <sebastiaanlokhorst@gmail.com>
-_appname=freecad
-pkgname="${_appname}-git"
+pkgname=freecad-git
pkgver=0.18.r3000.g9e4710d679
pkgrel=1
-epoch=2
+epoch=0
pkgdesc='A general purpose 3D CAD modeler - git checkout'
arch=('x86_64')
url='https://www.freecadweb.org/'
@@ -18,7 +17,7 @@ makedepends=('boost' 'cmake' 'eigen' 'git' 'gcc-fortran'
'pyside2-tools' 'swig' 'qt5-tools')
optdepends=('pycollada: Create, edit and load COLLADA documents.')
provides=('freecad')
-conflicts=('freecad')
+conflicts=('freecad' 'freecad-appimage' 'freecad-appimage-git')
source=("${pkgname}::git+https://github.com/FreeCAD/FreeCAD.git")
md5sums=('SKIP')
@@ -28,6 +27,15 @@ pkgver() {
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() {
cd "${srcdir}/${pkgname}"