summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorGrey Christoforo2019-12-31 13:48:34 +0000
committerGrey Christoforo2019-12-31 13:48:34 +0000
commit234acf35eb90a2d2a633c25c4e5762a289a10e5f (patch)
tree2b9f00a91463c68b06016d685d088df4acc37a66
parent3ea5de2c5ae7d256075506d9e75eb1cffcd1c28a (diff)
downloadaur-234acf35eb90a2d2a633c25c4e5762a289a10e5f.tar.gz
remove merged build fix patch
-rw-r--r--.SRCINFO4
-rw-r--r--.gitignore16
-rw-r--r--PKGBUILD17
3 files changed, 14 insertions, 23 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 5d63983aa6d..31022c217bf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = freecad-git
pkgdesc = A general purpose 3D CAD modeler - git checkout
- pkgver = 0.18.r3000.g9e4710d679
+ pkgver = 0.18.r3026.gdcc2790834
pkgrel = 1
epoch = 0
url = https://www.freecadweb.org/
@@ -40,7 +40,7 @@ pkgbase = freecad-git
conflicts = freecad
conflicts = freecad-appimage
conflicts = freecad-appimage-git
- source = freecad-git::git+https://github.com/FreeCAD/FreeCAD.git
+ source = git+https://github.com/FreeCAD/FreeCAD.git
md5sums = SKIP
pkgname = freecad-git
diff --git a/.gitignore b/.gitignore
index e7f545baa55..101b10fbef8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,5 @@
-*
-!.gitignore
-!PKGBUILD
-!.SRCINFO
-!*.install
-!ChangeLog
-!*.diff
-!*.patch
-<<<<<<< HEAD
-!*.desktop
-!*.xml
+src/
+pkg/
+FreeCAD/
+*.tar.xz
+*.tar.gz
diff --git a/PKGBUILD b/PKGBUILD
index 69c78fb097e..3daa42e16a0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
# Maintainer: Sebastiaan Lokhorst <sebastiaanlokhorst@gmail.com>
pkgname=freecad-git
-pkgver=0.18.r3000.g9e4710d679
+pkgver=0.18.r3026.gdcc2790834
pkgrel=1
epoch=0
pkgdesc='A general purpose 3D CAD modeler - git checkout'
@@ -18,26 +18,23 @@ makedepends=('boost' 'cmake' 'eigen' 'git' 'gcc-fortran'
optdepends=('pycollada: Create, edit and load COLLADA documents.')
provides=('freecad')
conflicts=('freecad' 'freecad-appimage' 'freecad-appimage-git')
-source=("${pkgname}::git+https://github.com/FreeCAD/FreeCAD.git")
+source=("git+https://github.com/FreeCAD/FreeCAD.git")
md5sums=('SKIP')
pkgver() {
- cd "${srcdir}/${pkgname}"
+ cd "${srcdir}/FreeCAD"
# upstream recyles the "pre" and "staging" tags so they do not produces stable commit counts
git describe --long --tags --exclude '*pre*' --exclude '*staging*' | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/_//'
}
prepare() {
- cd "${srcdir}/${pkgname}"
+ cd "${srcdir}/FreeCAD"
# 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
+ #curl -L "https://github.com/FreeCAD/FreeCAD/pull/2842/commits/095984fce44931a4c8e2ace269d45a62640fbfb4.patch" | patch -p1
}
build() {
- cd "${srcdir}/${pkgname}"
+ cd "${srcdir}/FreeCAD"
# we need to manually set all PYSIDE_* paths as autodetection is broken:
# https://github.com/FreeCAD/FreeCAD/pull/2020
@@ -63,7 +60,7 @@ build() {
}
package() {
- cd "${srcdir}/${pkgname}"
+ cd "${srcdir}/FreeCAD"
make DESTDIR="${pkgdir}" install