include some critical bugfixes

2 files changed, 15 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8d730793f7b9..e61c92992ec3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = python-antspy
 	pkgdesc = Advanced Normalization Tools (ANTs) in Python
 	pkgver = 0.1.5
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/ANTsX/ANTsPy
 	arch = any
 	license = apache
@@ -11,8 +11,8 @@ pkgbase = python-antspy
 	depends = python-webcolors
 	depends = insight-toolkit
 	optdepends = python-plotly: surface rendering
-	source = https://github.com/ANTsX/ANTsPy/archive/v0.1.5.tar.gz
-	sha512sums = 0d6a9bc0d33c8969ce95beca08a771fda5bdf73837c78840ec405c89787656e2cb40174706b9981eb31f02c9fae9db818c58acbbfa3c2f903dc6b7b33befa3ed
+	source = ANTsPy-0.1.5::git+https://github.com/ANTsX/ANTsPy.git
+	sha512sums = SKIP
 
 pkgname = python-antspy
 
diff --git a/PKGBUILD b/PKGBUILD
index f824d5efc368..5c7150b46d1e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 _pkgname=antspy
 pkgname=python-$_pkgname
 pkgver=0.1.5
-pkgrel=1
+pkgrel=2
 pkgdesc="Advanced Normalization Tools (ANTs) in Python"
 arch=('any')
 url="https://github.com/ANTsX/ANTsPy"
@@ -10,21 +10,23 @@ license=('apache')
 depends=('python' 'python-numpy' 'python-webcolors' 'insight-toolkit')
 optdepends=('python-plotly: surface rendering')
 makedepends=('python-setuptools')
-source=("https://github.com/ANTsX/ANTsPy/archive/v${pkgver}.tar.gz")
-sha512sums=('0d6a9bc0d33c8969ce95beca08a771fda5bdf73837c78840ec405c89787656e2cb40174706b9981eb31f02c9fae9db818c58acbbfa3c2f903dc6b7b33befa3ed')
+source=("ANTsPy-$pkgver::git+https://github.com/ANTsX/ANTsPy.git")
+sha512sums=('SKIP')
+# source=("https://github.com/ANTsX/ANTsPy/archive/v${pkgver}.tar.gz")
+# sha512sums=('0d6a9bc0d33c8969ce95beca08a771fda5bdf73837c78840ec405c89787656e2cb40174706b9981eb31f02c9fae9db818c58acbbfa3c2f903dc6b7b33befa3ed')
+
+# This commit includes some fixes that allow to compile against ITKv5
+_release_commit=7a8796b5204fccb6158e79453cd781811c063b3d
 
 package() {
 	cd "$srcdir/ANTsPy-$pkgver"
 
-	export ITK_DIR="/usr"
+	git checkout $_release_commit
 
-	# Solve troubles with object instantiations 
-	sed -i 's,typename TransformType::Pointer transformPointer,auto transformPointer,' \
-		"${srcdir}/ANTsPy-0.1.5/ants/lib/LOCAL_antsTransform.h" \
-		"${srcdir}/ANTsPy-0.1.5/ants/lib/LOCAL_readTransform.cxx"
+	# Include a bugfix in the version of ANTs used, otherwise it will not compile
+	sed -i '521s,1d5d805c8a2f29f71050488caa7314aae1ef1520,45c37d92c9855325ba9ba1fd5ee131d547d8efb6,' scripts/configure_ANTsPy.sh
 
-	# Solve dumb bug
-	sed -i '521s,void,LabelParameterMapType,' "ants/lib/antscore/antsAtroposSegmentationImageFilter.h"
+	export ITK_DIR="/usr"
 
 	python setup.py install --optimize=1 --root="${pkgdir}"
 }