[lilac] updated to 4.11.20210226-3

3 files changed, 33 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6c252c163e96..e413d3a95977 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 pkgbase = 3dslicer
 	pkgdesc = A multi-platform, free and open source software package for visualization and medical image computing
 	pkgver = 4.11.20210226
-	pkgrel = 1
-	url = https://www.slicer.org/
+	pkgrel = 3
+	url = https://www.slicer.org
 	arch = x86_64
 	license = BSD
 	makedepends = clang
@@ -29,10 +29,11 @@ pkgbase = 3dslicer
 	depends = teem
 	options = !emptydirs
 	options = !strip
-	source = 3dslicer-4.11.20210226::git+https://github.com/Slicer/Slicer.git#tag=v4.11.20210226
+	source = 3dslicer::git+https://github.com/Slicer/Slicer.git#tag=v4.11.20210226
 	source = 3dslicer.svg::https://github.com/Slicer/Slicer/raw/v4.11/Resources/3DSlicerLogo-app-icon.svg
+	source = itk_limits.patch
 	sha512sums = SKIP
 	sha512sums = c23104efcbec3d49b5c26ad5514ed74316423db4aa9e6c7894f02f7ddbe509b577de358dfdd2f7c492963f312b7c146f03d5e41a89ab1298811894dc18746225
+	sha512sums = e0c19c5fc2580366b91b16f20e6b8914dbb003a5ce2741fd5b2d2f5520724266c037b1edac33dc00a344a96c627743c5670f861065e28d81a4b207ab8082cc2e
 
 pkgname = 3dslicer
-
diff --git a/PKGBUILD b/PKGBUILD
index d4528f45ecb9..9e7a8b293ffa 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,10 +2,10 @@
 
 pkgname=3dslicer
 pkgver=4.11.20210226
-pkgrel=1
-pkgdesc="A multi-platform, free and open source software package for visualization and medical image computing"
+pkgrel=3
+pkgdesc='A multi-platform, free and open source software package for visualization and medical image computing'
 arch=('x86_64')
-url="https://www.slicer.org/"
+url='https://www.slicer.org'
 license=('BSD')
 depends=(
   bzip2
@@ -34,17 +34,21 @@ makedepends=(
   subversion
 )
 options=(!emptydirs !strip)
-source=("${pkgname}-${pkgver}::git+https://github.com/Slicer/Slicer.git#tag=v${pkgver}"
-        "${pkgname}.svg::https://github.com/Slicer/Slicer/raw/v4.11/Resources/3DSlicerLogo-app-icon.svg")
+source=("${pkgname}::git+https://github.com/Slicer/Slicer.git#tag=v${pkgver}"
+        "${pkgname}.svg::https://github.com/Slicer/Slicer/raw/v4.11/Resources/3DSlicerLogo-app-icon.svg"
+        "itk_limits.patch"
+)
 sha512sums=('SKIP'
-            'c23104efcbec3d49b5c26ad5514ed74316423db4aa9e6c7894f02f7ddbe509b577de358dfdd2f7c492963f312b7c146f03d5e41a89ab1298811894dc18746225')
+            'c23104efcbec3d49b5c26ad5514ed74316423db4aa9e6c7894f02f7ddbe509b577de358dfdd2f7c492963f312b7c146f03d5e41a89ab1298811894dc18746225'
+            'e0c19c5fc2580366b91b16f20e6b8914dbb003a5ce2741fd5b2d2f5520724266c037b1edac33dc00a344a96c627743c5670f861065e28d81a4b207ab8082cc2e')
 
 prepare() {
   # find sqlite with cmake's FindSQLite3
-  sed -i 's/find_package(${proj} REQUIRED)/find_package(SQLite3 REQUIRED)/' "${srcdir}/${pkgname}-${pkgver}/SuperBuild/External_sqlite.cmake"
+  sed -i 's/find_package(${proj} REQUIRED)/find_package(SQLite3 REQUIRED)/' "${srcdir}/${pkgname}/SuperBuild/External_sqlite.cmake"
   # fix building with system teem
-  sed -i '/ExternalProject_Add_Empty/d' "${srcdir}/${pkgname}-${pkgver}/SuperBuild/External_teem.cmake"
-
+  sed -i '/ExternalProject_Add_Empty/d' "${srcdir}/${pkgname}/SuperBuild/External_teem.cmake"
+  # quick fix clang:12/gcc:11 <limits> header regression
+  git -C "${srcdir}/${pkgname}" apply -v "${srcdir}/itk_limits.patch"
   echo "Creating desktop file"
   gendesk -f -n --pkgname ${pkgname} \
     --pkgdesc "${pkgdesc}" \
@@ -54,11 +58,11 @@ prepare() {
 }
 
 build() {
-  cmake -B build -S "${srcdir}/${pkgname}-${pkgver}" \
-    -DBUILD_TESTING=OFF \
-    -DCMAKE_BUILD_TYPE=Release \
+  cmake -B build -S "${srcdir}/${pkgname}" \
     -DCMAKE_C_COMPILER=clang \
     -DCMAKE_CXX_COMPILER=clang++ \
+    -DBUILD_TESTING=OFF \
+    -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DSlicer_BUILD_DOCUMENTATION=OFF \
     -DSlicer_BUILD_I18N_SUPPORT=ON \
diff --git a/itk_limits.patch b/itk_limits.patch
new file mode 100644
index 000000000000..beaa88722c1c
--- /dev/null
+++ b/itk_limits.patch
@@ -0,0 +1,12 @@
+diff --git a/SuperBuild/External_ITK.cmake b/SuperBuild/External_ITK.cmake
+index 222d3a1b0..708748bee 100644
+--- a/SuperBuild/External_ITK.cmake
++++ b/SuperBuild/External_ITK.cmake
+@@ -168,6 +168,7 @@ if(NOT DEFINED ITK_DIR AND NOT Slicer_USE_SYSTEM_${proj})
+     INSTALL_COMMAND ""
+     DEPENDS
+       ${${proj}_DEPENDENCIES}
++    PATCH_COMMAND bash -c "grep -lR 'std::numeric_limits'|xargs sed -i '1 i\#include <limits>'"
+     )
+ 
+   ExternalProject_GenerateProjectDescription_Step(${proj})