From c7719bb5a1003a521ffc396f5818f0175ae2398a Mon Sep 17 00:00:00 2001
From: Matt McCormick <matt.mccormick@kitware.com>
Date: Mon, 15 Apr 2024 20:58:12 -0400
Subject: [PATCH 1/2] ENH: Bump version to 5.4rc4

ITK_GIT_TAG updated to tentative hash for v5.4rc04 tag.
---
 CMakeLists.txt | 4 ++--
 itkVersion.py  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ff876ae1..4c49a903 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -94,8 +94,8 @@ if(ITKPythonPackage_SUPERBUILD)
 
   set(ITK_REPOSITORY "https://github.com/InsightSoftwareConsortium/ITK.git")
 
-  # master branch, 2024-04-12
-  set(ITK_GIT_TAG "81be125a547ba2fa2343ae36cce8812bd711c5b4")
+  # master branch, 2024-04-15
+  set(ITK_GIT_TAG "2082a9364a204cd93b9db082ee651aae096016c7")
 
   #-----------------------------------------------------------------------------
   # A separate project is used to download ITK, so that it can reused
diff --git a/itkVersion.py b/itkVersion.py
index bc9a77c5..d9ab5591 100644
--- a/itkVersion.py
+++ b/itkVersion.py
@@ -1,4 +1,4 @@
-VERSION = '5.4rc3'
+VERSION = '5.4rc4'
 
 def get_versions():
     """Returns versions for the ITK Python package.

From c236b97c1cd58e0782710d117ea6b2c18a24f26f Mon Sep 17 00:00:00 2001
From: Matt McCormick <matt.mccormick@kitware.com>
Date: Tue, 16 Apr 2024 10:06:23 -0400
Subject: [PATCH 2/2] BUG: Only delocate the platform wheels

The `itk` meta wheel does not have native binaries, its file name is
`itk-*`. All the platform wheels are `itk_*`.

To address:

Traceback (most recent call last):
  File "/Users/svc-dashboard/D/P/ITKPythonPackage/scripts/../venvs/3.10/bin/delocate-wheel", line 8, in <module>
    sys.exit(main())
  File "/Users/svc-dashboard/D/P/ITKPythonPackage/venvs/3.10/lib/python3.10/site-packages/delocate/cmd/delocate_wheel.py", line 110, in main
    copied = delocate_wheel(
  File "/Users/svc-dashboard/D/P/ITKPythonPackage/venvs/3.10/lib/python3.10/site-packages/delocate/delocating.py", line 1004, in delocate_wheel
    out_wheel_fixed = _check_and_update_wheel_name(
  File "/Users/svc-dashboard/D/P/ITKPythonPackage/venvs/3.10/lib/python3.10/site-packages/delocate/delocating.py", line 831, in _check_and_update_wheel_name
    new_name, problematic_files = _calculate_minimum_wheel_name(
  File "/Users/svc-dashboard/D/P/ITKPythonPackage/venvs/3.10/lib/python3.10/site-packages/delocate/delocating.py", line 798, in _calculate_minimum_wheel_name
    raise DelocationError(
delocate.libsana.DelocationError: Failed to find any binary with the required architecture: 'x86_64'
---
 scripts/macpython-build-wheels.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/macpython-build-wheels.sh b/scripts/macpython-build-wheels.sh
index 025034ba..2985aa87 100755
--- a/scripts/macpython-build-wheels.sh
+++ b/scripts/macpython-build-wheels.sh
@@ -221,7 +221,7 @@ for VENV in "${VENVS[@]}"; do
 done
 
 if [[ $(arch) != "arm64" ]]; then
-  for wheel in dist/*.whl; do
+  for wheel in dist/itk_*.whl; do
     echo "Delocating $wheel"
     ${DELOCATE_LISTDEPS} $wheel # lists library dependencies
     ${DELOCATE_WHEEL} $wheel # copies library dependencies into wheel