From 96abf40d7bc415cd8501a85084217ea7b8c5b6d9 Mon Sep 17 00:00:00 2001
From: Tony Mountifield <tony@mountifield.org>
Date: Tue, 9 Jan 2024 22:27:09 +0000
Subject: [PATCH] Update Mac Legacy from Qt 5.9.9 to 5.15.2

---
 .github/workflows/autobuild.yml |  2 +-
 Jamulus.pro                     |  6 +----
 mac/Info-make-legacy.plist      | 41 ---------------------------------
 3 files changed, 2 insertions(+), 47 deletions(-)
 delete mode 100644 mac/Info-make-legacy.plist

diff --git a/.github/workflows/autobuild.yml b/.github/workflows/autobuild.yml
index b098dc34c1..e8d88d2655 100644
--- a/.github/workflows/autobuild.yml
+++ b/.github/workflows/autobuild.yml
@@ -238,7 +238,7 @@ jobs:
           - config_name:            MacOS Legacy (artifacts+CodeQL)
             target_os:              macos
             building_on_os:         macos-12
-            base_command:           QT_VERSION=5.9.9 SIGN_IF_POSSIBLE=0 ARTIFACT_SUFFIX=_legacy ./.github/autobuild/mac.sh
+            base_command:           QT_VERSION=5.15.2 SIGN_IF_POSSIBLE=0 ARTIFACT_SUFFIX=_legacy ./.github/autobuild/mac.sh
             # Enable CodeQL on mac legacy as this version does not get signed
             run_codeql:             true
             # For Qt5 on Mac, we need to use an unsupported SDK version as macOS 12 doesn't
diff --git a/Jamulus.pro b/Jamulus.pro
index a6f00b48ea..8502cde225 100644
--- a/Jamulus.pro
+++ b/Jamulus.pro
@@ -190,11 +190,7 @@ win32 {
         MACOSX_BUNDLE_ICON.path = Contents/Resources
         QMAKE_BUNDLE_DATA += MACOSX_BUNDLE_ICON
     } else {
-        equals(QT_VERSION, "5.9.9") {
-            QMAKE_INFO_PLIST = mac/Info-make-legacy.plist
-        } else {
-            QMAKE_INFO_PLIST = mac/Info-make.plist
-        }
+        QMAKE_INFO_PLIST = mac/Info-make.plist
     }
 
     LIBS += -framework CoreFoundation \
diff --git a/mac/Info-make-legacy.plist b/mac/Info-make-legacy.plist
deleted file mode 100644
index ecdf2c55e9..0000000000
--- a/mac/Info-make-legacy.plist
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-    <dict>
-        <key>CFBundleName</key>
-        <string>@EXECUTABLE@</string>
-        <key>CFBundleDisplayName</key>
-        <string>@EXECUTABLE@</string>
-        <key>CFBundleIdentifier</key>
-        <string>@BUNDLEIDENTIFIER@</string>
-        <key>CFBundlePackageType</key>
-        <string>APPL</string>
-        <key>CFBundleVersion</key>
-        <string>@FULL_VERSION@</string>
-        <key>CFBundleShortVersionString</key>
-	    <string>@SHORT_VERSION@</string>
-        <key>CFBundleSupportedPlatforms</key>
-	    <array>
-		    <string>MacOSX</string>
-        </array>
-        <key>LSApplicationCategoryType</key>
-	    <string>public.app-category.music</string>
-        <key>LSMinimumSystemVersion</key>
-        <string>10.10</string>
-        <key>CFBundleExecutable</key>
-        <string>@EXECUTABLE@</string>
-        <key>CFBundleDevelopmentRegion</key>
-        <string>en</string>
-        <key>CFBundleIconFile</key>
-        <string>@ICON@</string>
-        <key>CFBundleGetInfoString</key>
-        <string>Jamulus - Created with QT</string>
-        <key>NSPrincipalClass</key>
-        <string>NSApplication</string>
-        <key>NSMicrophoneUsageDescription</key>
-        <string>Jamulus needs access to the microphone to record and stream your music to other musicians</string>
-        <!-- Opt out of Dark Mode as Qt 5.9 does not support it well, see https://bugreports.qt.io/browse/QTBUG-68891 -->
-        <key>NSRequiresAquaSystemAppearance</key>
-        <string>true</string>
-    </dict>
-</plist>