From b90f2e8e0b55e1ec8baf17f59fcf0359e9625f6a Mon Sep 17 00:00:00 2001
From: Fuzzbawls <fuzzbawls@gmail.com>
Date: Fri, 9 Aug 2024 01:07:44 -0700
Subject: [PATCH 1/3] [Build] Remove unused macOS framework libraries.

---
 build-aux/m4/bitcoin_qt.m4 | 3 +--
 src/qt/notificator.cpp     | 5 -----
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/build-aux/m4/bitcoin_qt.m4 b/build-aux/m4/bitcoin_qt.m4
index 8302530799e1d..7b452e7b5d184 100644
--- a/build-aux/m4/bitcoin_qt.m4
+++ b/build-aux/m4/bitcoin_qt.m4
@@ -133,7 +133,6 @@ AC_DEFUN([BITCOIN_QT_CONFIGURE],[
       _BITCOIN_QT_CHECK_STATIC_PLUGINS([Q_IMPORT_PLUGIN(QXcbIntegrationPlugin)],[-lqxcb -lxcb-static])
       AC_DEFINE([QT_QPA_PLATFORM_XCB], [1], [Define this symbol if the Qt platform is XCB])
     elif test "x$TARGET_OS" = xdarwin; then
-      AX_CHECK_LINK_FLAG([-framework IOKit], [QT_LIBS="$QT_LIBS -framework IOKit"], [AC_MSG_ERROR([could not link iokit framework])])
       _BITCOIN_QT_CHECK_STATIC_PLUGINS([Q_IMPORT_PLUGIN(QCocoaIntegrationPlugin)],[-lqcocoa])
       AC_DEFINE([QT_QPA_PLATFORM_COCOA], [1], [Define this symbol if the Qt platform is Cocoa])
     fi
@@ -204,7 +203,7 @@ AC_DEFUN([BITCOIN_QT_CONFIGURE],[
     *darwin*)
      BITCOIN_QT_CHECK([
        MOC_DEFS="${MOC_DEFS} -DQ_OS_MAC"
-       base_frameworks="-framework Foundation -framework ApplicationServices -framework AppKit"
+       base_frameworks="-framework Foundation -framework AppKit"
        AX_CHECK_LINK_FLAG([$base_frameworks], [QT_LIBS="$QT_LIBS $base_frameworks"], [AC_MSG_ERROR([could not find base frameworks])])
      ])
     ;;
diff --git a/src/qt/notificator.cpp b/src/qt/notificator.cpp
index 360c8ccbb5813..867fd86e3f4d2 100644
--- a/src/qt/notificator.cpp
+++ b/src/qt/notificator.cpp
@@ -18,13 +18,8 @@
 #include <QtDBus>
 #include <stdint.h>
 #endif
-// Include ApplicationServices.h after QtDbus to avoid redefinition of check().
-// This affects at least OSX 10.6. See /usr/include/AssertMacros.h for details.
-// Note: This could also be worked around using:
-// #define __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES 0
 #ifdef Q_OS_MAC
 #include "macnotificationhandler.h"
-#include <ApplicationServices/ApplicationServices.h>
 #endif
 
 

From 81505c98e61d9a2bdc6e77b14a03de885cccf9e2 Mon Sep 17 00:00:00 2001
From: Fuzzbawls <fuzzbawls@gmail.com>
Date: Fri, 9 Aug 2024 01:11:58 -0700
Subject: [PATCH 2/3] [GA] Pin XCode version for macos-14 runners

---
 .github/workflows/build-and-test.yml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 0dfdca451fe43..4c10ff7e7d9b9 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -146,6 +146,12 @@ jobs:
           key: ${{ runner.os }}-cmake-${{ matrix.config.name }}-ccache
           restore-keys: ${{ runner.os }}-cmake-${{ matrix.config.name }}-ccache
 
+      - name: Set Xcode Version
+        if: matrix.config.os == 'macos-14'
+        uses: maxim-lobanov/setup-xcode@v1
+        with:
+          xcode-version: '15.0.1'
+
       - name: Configure CMake Wallet
         run: |
           CC=${{ matrix.config.cc }}
@@ -266,6 +272,12 @@ jobs:
           key: ${{ runner.os }}-${{ matrix.config.id }}-native-ccache
           restore-keys: ${{ runner.os }}-${{ matrix.config.id }}-native-ccache
 
+      - name: Set Xcode Version
+        if: matrix.config.os == 'macos-14'
+        uses: maxim-lobanov/setup-xcode@v1
+        with:
+          xcode-version: '15.0.1'
+
       - name: Configure Native Wallet
         run: |
           PATH=$(echo $PATH | tr ':' "\n" | sed '/\/opt\/python/d' | tr "\n" ":" | sed "s|::|:|g")

From b944d78a8afddb64a18b1cd650bf15a9ea761e57 Mon Sep 17 00:00:00 2001
From: Fuzzbawls <fuzzbawls@gmail.com>
Date: Fri, 9 Aug 2024 01:59:44 -0700
Subject: [PATCH 3/3] [GA] Update apt cache prior to package installation

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

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 4c10ff7e7d9b9..3da31fa356b1f 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -133,6 +133,7 @@ jobs:
       - name: Setup Environment
         run: |
           if [[ ${{ matrix.config.os }} = ubuntu* ]]; then
+            sudo apt-get update
             sudo apt-get install --no-install-recommends --no-upgrade -qq "$APT_BASE" ${{ matrix.config.packages }}
           fi
           if [[ ${{ matrix.config.os }} = macos* ]]; then
@@ -258,6 +259,7 @@ jobs:
       - name: Setup Environment
         run: |
           if [[ ${{ matrix.config.os }} = ubuntu* ]]; then
+            sudo apt-get update
             sudo apt-get install --no-install-recommends --no-upgrade -qq "$APT_BASE" ${{ matrix.config.packages }}
           fi
           if [[ ${{ matrix.config.os }} = macos* ]]; then
@@ -406,6 +408,7 @@ jobs:
       - name: Setup Environment
         run: |
           if [[ ${{ matrix.config.os }} = ubuntu* ]]; then
+            sudo apt-get update
             sudo apt-get install --no-install-recommends --no-upgrade -qq ${{ matrix.config.packages }}
           fi
           if [[ ${{ matrix.config.os }} = macos* ]]; then
@@ -787,6 +790,7 @@ jobs:
         run: |
           if [[ ${{ matrix.config.packages }} != None ]]; then
             if [[ ${{ matrix.config.os }} = ubuntu* ]]; then
+              sudo apt-get update
               sudo apt-get install --no-install-recommends --no-upgrade -qq ${{ matrix.config.packages }}
             fi
             if [[ ${{ matrix.config.os }} = macos* ]]; then