Switch to git source to have proper version hashes

Also update to latest commit for 0.17

3 files changed, 13 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0f1c0c5a62ac..16ba3f3fff44 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = freecad
 	pkgdesc = A general purpose 3D CAD modeler
 	pkgver = 0.17
-	pkgrel = 6
+	pkgrel = 7
 	url = http://www.freecadweb.org/
 	arch = x86_64
 	license = LGPL
@@ -11,6 +11,7 @@ pkgbase = freecad
 	makedepends = swig
 	makedepends = xerces-c
 	makedepends = desktop-file-utils
+	makedepends = git
 	makedepends = cmake
 	makedepends = coin>=3.1.3-9
 	makedepends = python2-pyside2
@@ -39,15 +40,13 @@ pkgbase = freecad
 	optdepends = python2-pyqt5
 	optdepends = graphviz
 	optdepends = openscad
-	source = freecad-0.17.tar.gz::https://github.com/FreeCAD/FreeCAD/archive/0.17.tar.gz
-	source = freecad-84d6128-rollup.patch::https://github.com/FreeCAD/FreeCAD/compare/0.17...84d6128.patch
+	source = git+https://github.com/FreeCAD/FreeCAD.git#commit=9948ee4
 	source = freecad.desktop
 	source = freecad.xml
 	source = gcc8.patch
 	source = smesh-pthread.patch
 	source = qt5.11.patch
-	sha256sums = ae017393476b6dc7f1192bcaf91ceedc2f9b791f2495307ce7c45efadb5266fb
-	sha256sums = c4a4e084da448c78644e8acc1f3158cf2cb82ee4936b5b79e282497fd62d566e
+	sha256sums = SKIP
 	sha256sums = 617968d7bbd1da71bdedaed1b66c5d6eaf24e0fb34678b93f5d925d370c66296
 	sha256sums = 248918de7d3c2145b5cc4fbbc9e224d22f4a6ca7ead2680e8c3a32e91772482a
 	sha256sums = 618bb85c4f3a4eb0e329d1fc30391b777c9b0cffe97aa1e96d45f58b18424311
diff --git a/.gitignore b/.gitignore
index a6097aa29bec..8083a134d097 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,2 @@
-freecad-*.tar.gz
-*rollup.patch
+FreeCAD/
 *.pkg.*
diff --git a/PKGBUILD b/PKGBUILD
index 70db9585f3ba..bfa2e06cc89e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,8 +9,8 @@
 
 pkgname=freecad
 pkgver=0.17
-_rollup=84d6128
-pkgrel=6
+_commit=9948ee4
+pkgrel=7
 pkgdesc='A general purpose 3D CAD modeler'
 arch=('x86_64')
 url='http://www.freecadweb.org/'
@@ -18,15 +18,13 @@ license=('LGPL')
 depends=('boost-libs' 'curl' 'opencascade>=7.2' 'xerces-c' 'libspnav' 'glu' 'netcdf'
          'shared-mime-info' 'hicolor-icon-theme' 'jsoncpp' 'qt5-base' 'qt5-declarative' 'qt5-svg' 'qt5-tools'
          'med' 'python2-pivy' 'python2-pyside2' 'python2-matplotlib' 'pyside2-tools')
-makedepends=('boost' 'eigen' 'gcc-fortran' 'swig' 'xerces-c' 'desktop-file-utils'
+makedepends=('boost' 'eigen' 'gcc-fortran' 'swig' 'xerces-c' 'desktop-file-utils' 'git'
              'cmake' 'coin>=3.1.3-9' 'python2-pyside2' 'pyside2' 'shiboken2')
 optdepends=('python2-matplotlib' 'python2-pyqt5' 'graphviz' 'openscad')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/FreeCAD/FreeCAD/archive/$pkgver.tar.gz"
-        "$pkgname-$_rollup-rollup.patch::https://github.com/FreeCAD/FreeCAD/compare/$pkgver...$_rollup.patch"
+source=("git+https://github.com/FreeCAD/FreeCAD.git#commit=$_commit"
         "${pkgname}.desktop" "${pkgname}.xml"
         'gcc8.patch' 'smesh-pthread.patch' 'qt5.11.patch')
-sha256sums=('ae017393476b6dc7f1192bcaf91ceedc2f9b791f2495307ce7c45efadb5266fb'
-            'c4a4e084da448c78644e8acc1f3158cf2cb82ee4936b5b79e282497fd62d566e'
+sha256sums=('SKIP'
             '617968d7bbd1da71bdedaed1b66c5d6eaf24e0fb34678b93f5d925d370c66296'
             '248918de7d3c2145b5cc4fbbc9e224d22f4a6ca7ead2680e8c3a32e91772482a'
             '618bb85c4f3a4eb0e329d1fc30391b777c9b0cffe97aa1e96d45f58b18424311'
@@ -34,16 +32,15 @@ sha256sums=('ae017393476b6dc7f1192bcaf91ceedc2f9b791f2495307ce7c45efadb5266fb'
             'a639c9d51f8443e4d2270fe60d5ac3ac62c7c64c532620108514840f8e8704bc')
 
 prepare() {
-    cd "${srcdir}/FreeCAD-${pkgver}"
+    cd "${srcdir}/FreeCAD"
 
-    patch -Np1 -i ../$pkgname-$_rollup-rollup.patch
     patch -Np1 -i ../gcc8.patch
     patch -Np1 -i ../smesh-pthread.patch
     patch -Np1 -i ../qt5.11.patch
 }
 
 build() {
-    cd "${srcdir}/FreeCAD-${pkgver}"
+    cd "${srcdir}/FreeCAD"
     cmake \
         -DCMAKE_BUILD_TYPE=Release \
         -DCMAKE_INSTALL_PREFIX="/usr/lib/freecad" \
@@ -60,7 +57,7 @@ build() {
 }
 
 package() {
-    cd "${srcdir}/FreeCAD-${pkgver}"
+    cd "${srcdir}/FreeCAD"
 
     make DESTDIR="${pkgdir}" install