fixing patch for upstream change

3 files changed, 18 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a1d7667740f5..b72dc6295f16 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = ants-git
 	pkgdesc = Advanced Normalization Tools (ANTs) computes high-dimensional \ mappings to capture the statistics of brain structure and function
-	pkgver = v2.3.5.r38.ga7eca60d
-	pkgrel = 2
+	pkgver = v2.3.5.r64.g221dad77
+	pkgrel = 1
 	url = http://www.picsl.upenn.edu/ANTS/
 	arch = i686
 	arch = x86_64
@@ -15,8 +15,8 @@ pkgbase = ants-git
 	provides = ants
 	conflicts = ants
 	source = ants-git::git+https://github.com/stnava/ANTs.git
-	source = 0001-fix-for-GDCM-build-isssue-with-superbuilding-on-Arch.patch
+	source = 0001-fix-for-GDCM-build.patch
 	sha256sums = SKIP
-	sha256sums = f28f9a2edf0e14e7ecdba68fccf78a2226538c268529b16bc66b9a484490b9b0
+	sha256sums = f20685afed8f3fdc005b7c6924cee39350f0eac1e6010cfe9fee78a517d7e684
 
 pkgname = ants-git
diff --git a/0001-fix-for-GDCM-build-isssue-with-superbuilding-on-Arch.patch b/0001-fix-for-GDCM-build.patch
index 706a358e2e32..c06bf2299103 100644
--- a/0001-fix-for-GDCM-build-isssue-with-superbuilding-on-Arch.patch
+++ b/0001-fix-for-GDCM-build.patch
@@ -1,20 +1,21 @@
-From 67b29178b5e87752ffc6d55805ba40e9beba1226 Mon Sep 17 00:00:00 2001
+From cb5ff0856fffcb11797b0584941415b051d3914b Mon Sep 17 00:00:00 2001
 From: Liam Timms <timms5000@gmail.com>
-Date: Thu, 15 Jul 2021 19:56:34 -0400
-Subject: [PATCH] fix for GDCM build isssue with superbuilding on Arch
+Date: Thu, 7 Oct 2021 20:40:25 -0400
+Subject: [PATCH] fix for GDCM build
 
 ---
- SuperBuild/External_ITKv5.cmake | 5 +++++
- 1 file changed, 5 insertions(+)
+ SuperBuild/External_ITKv5.cmake | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
 
 diff --git a/SuperBuild/External_ITKv5.cmake b/SuperBuild/External_ITKv5.cmake
-index 31cc34e4..a7d046fd 100644
+index ae5db29c..d89f39e8 100644
 --- a/SuperBuild/External_ITKv5.cmake
 +++ b/SuperBuild/External_ITKv5.cmake
-@@ -119,6 +119,11 @@ if(NOT DEFINED ${extProjName}_DIR AND NOT ${USE_SYSTEM_${extProjName}})
+@@ -119,7 +119,11 @@ if(NOT DEFINED ${extProjName}_DIR AND NOT ${USE_SYSTEM_${extProjName}})
        -DITK_FUTURE_LEGACY_REMOVE:BOOL=ON
        -DITKV3_COMPATIBILITY:BOOL=OFF
        -DITK_BUILD_DEFAULT_MODULES:BOOL=ON
+-      -DITK_USE_SYSTEM_PNG=${ITK_USE_SYSTEM_PNG}
 +      -DITK_USE_SYSTEM_JPEG:BOOL=ON
 +      -DITK_USE_SYSTEM_PNG:BOOL=ON
 +      -DITK_USE_SYSTEM_ZLIB:BOOL=ON
@@ -24,5 +25,5 @@ index 31cc34e4..a7d046fd 100644
  #      -DITK_MODULE_IO:BOOL=ON
  #      -DITK_MODULE_Filtering:BOOL=ON
 -- 
-2.32.0
+2.33.0
 
diff --git a/PKGBUILD b/PKGBUILD
index 1bf5ec03fd95..da03ee1b1ac2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,8 +3,8 @@
 
 _pkgname='ants'
 pkgname="${_pkgname}-git"
-pkgver=v2.3.5.r38.ga7eca60d
-pkgrel=2
+pkgver=v2.3.5.r64.g221dad77
+pkgrel=1
 pkgdesc='Advanced Normalization Tools (ANTs) computes high-dimensional \
 mappings to capture the statistics of brain structure and function'
 arch=('i686' 'x86_64')
@@ -16,9 +16,9 @@ optdepends=()
 provides=("${_pkgname}")
 conflicts=("${_pkgname}")
 source=("${pkgname}"'::git+https://github.com/stnava/ANTs.git'
-        '0001-fix-for-GDCM-build-isssue-with-superbuilding-on-Arch.patch')
+        '0001-fix-for-GDCM-build.patch')
 sha256sums=('SKIP'
-            'f28f9a2edf0e14e7ecdba68fccf78a2226538c268529b16bc66b9a484490b9b0')
+            'f20685afed8f3fdc005b7c6924cee39350f0eac1e6010cfe9fee78a517d7e684')
 
 pkgver() {
   cd "${srcdir}/${pkgname}"
@@ -27,7 +27,7 @@ pkgver() {
 
 prepare() {
   cd "${srcdir}/${pkgname}"
-  patch -Np1 -i "${srcdir}"/0001-fix-for-GDCM-build-isssue-with-superbuilding-on-Arch.patch
+  patch -Np1 -i "${srcdir}"/0001-fix-for-GDCM-build.patch
   mkdir -p antsBuild
 }