From b96b4b60b4ae563c5d2669e60388d5cf2ffd35e7 Mon Sep 17 00:00:00 2001
From: Jon Beniston <jon@beniston.com>
Date: Sat, 9 Nov 2024 22:32:18 +0000
Subject: [PATCH 1/4] Workaround for "hdiutil: create failed - Resource busy"

---
 .github/workflows/mac.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml
index 9f9114931..22adba5d4 100644
--- a/.github/workflows/mac.yml
+++ b/.github/workflows/mac.yml
@@ -37,6 +37,10 @@ jobs:
           host: 'mac'
           arch: 'clang_64'
           modules: 'qtcharts qtscxml qt5compat qtlocation qtmultimedia qtpositioning qtserialport qtspeech qtwebsockets qtwebengine qtshadertools qtwebchannel'
+      - name: "Workaround for hdiutil: create failed - Resource busy - https://github.com/actions/runner-images/issues/7522"
+        run: |
+          echo killing...; sudo pkill -9 XProtect >/dev/null || true;
+          echo waiting...; while pgrep XProtect; do sleep 3; done;
       - name: Configure SDRangel
         run: |
           mkdir build && cd build

From 1ca63912b6d25338cf0b3d7112b84aa20856ec4f Mon Sep 17 00:00:00 2001
From: Jon Beniston <jon@beniston.com>
Date: Sun, 10 Nov 2024 10:04:51 +0000
Subject: [PATCH 2/4] Try macos-12

---
 .github/workflows/mac.yml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml
index 22adba5d4..1d6749920 100644
--- a/.github/workflows/mac.yml
+++ b/.github/workflows/mac.yml
@@ -9,7 +9,7 @@ on:
 
 jobs:
   build_mac_x64:
-    runs-on: macos-13
+    runs-on: macos-12
     steps:
       - uses: actions/checkout@v4
         with:
@@ -37,10 +37,6 @@ jobs:
           host: 'mac'
           arch: 'clang_64'
           modules: 'qtcharts qtscxml qt5compat qtlocation qtmultimedia qtpositioning qtserialport qtspeech qtwebsockets qtwebengine qtshadertools qtwebchannel'
-      - name: "Workaround for hdiutil: create failed - Resource busy - https://github.com/actions/runner-images/issues/7522"
-        run: |
-          echo killing...; sudo pkill -9 XProtect >/dev/null || true;
-          echo waiting...; while pgrep XProtect; do sleep 3; done;
       - name: Configure SDRangel
         run: |
           mkdir build && cd build

From 43077fc549dd756b404677f41c56ecc609e9b673 Mon Sep 17 00:00:00 2001
From: Jon Beniston <jon@beniston.com>
Date: Sun, 10 Nov 2024 10:13:03 +0000
Subject: [PATCH 3/4] Add mac into dmg filename

---
 cmake/cpack/CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cmake/cpack/CMakeLists.txt b/cmake/cpack/CMakeLists.txt
index 3ce284247..932caec17 100644
--- a/cmake/cpack/CMakeLists.txt
+++ b/cmake/cpack/CMakeLists.txt
@@ -36,7 +36,7 @@ if(APPLE AND BUNDLE AND BUILD_GUI)
   set(CPACK_BUNDLE_ICON "${CMAKE_SOURCE_DIR}/cmake/cpack/sdrangel_icon.icns")
   set(CPACK_BUNDLE_PLIST "${CMAKE_BINARY_DIR}/Info.plist")
   set(CPACK_PACKAGE_ICON "${CMAKE_SOURCE_DIR}/cmake/cpack/sdrangel_icon.icns")
-  set(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${CPACK_PACKAGE_VERSION}_${CPACK_MACOS_PACKAGE_ARCHITECTURE}_${CMAKE_SYSTEM_PROCESSOR}" CACHE INTERNAL "")
+  set(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${CPACK_PACKAGE_VERSION}_mac-${CPACK_MACOS_PACKAGE_ARCHITECTURE}_${CMAKE_SYSTEM_PROCESSOR}" CACHE INTERNAL "")
   set(CPACK_PRE_BUILD_SCRIPTS "${PROJECT_BINARY_DIR}/deploy_mac.cmake")
 
   # copy SoapySDR Modules
@@ -175,7 +175,7 @@ elseif(WIN32 OR MINGW)
       COMMAND ${CMAKE_COMMAND} -E copy_if_different "${fftw3f_dll}" "${SDRANGEL_BINARY_BIN_DIR}/"
     )
   endforeach(fftw3f_dll)
-  
+
   file(GLOB LIBUSB_DLLS "${LIBUSB_DLL_DIR}/*${CMAKE_SHARED_LIBRARY_SUFFIX}")
   foreach(libusb_dll ${LIBUSB_DLLS})
     get_filename_component(libusb_dll_name "${libusb_dll}"  NAME)

From 82843888624b65b3eb82bc5dae2c230017981d46 Mon Sep 17 00:00:00 2001
From: Jon Beniston <jon@beniston.com>
Date: Sun, 10 Nov 2024 14:09:47 +0000
Subject: [PATCH 4/4] nasm and subversion already installed in brew - and
 upgrade fails.

---
 .github/workflows/mac.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml
index 1d6749920..598bde0b2 100644
--- a/.github/workflows/mac.yml
+++ b/.github/workflows/mac.yml
@@ -15,10 +15,6 @@ jobs:
         with:
           submodules: true
           fetch-depth: 0
-      - name: Update brew
-        run: brew update
-      - name: Install brew packages
-        run: brew install nasm subversion
       - name: Install SDRplay API
         run: |
             wget https://www.sdrplay.com/software/SDRplayAPI-macos-installer-universal-3.15.0.pkg