From ee7bfc4a45061ce00b5ee2e1195b3aa90848867c Mon Sep 17 00:00:00 2001
From: fwcd <fwcd@fwcd.dev>
Date: Sat, 27 Jan 2024 17:47:09 +0100
Subject: [PATCH 1/3] macOS packaging: Capitalize name of bundle (Mixxx.app)

---
 CMakeLists.txt                | 3 ++-
 packaging/macos/Info.plist.in | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 78359118499..60369a74958 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1676,7 +1676,7 @@ set(MIXXX_INSTALL_DOCDIR "./doc")
 set(MIXXX_INSTALL_LICENSEDIR "./doc")
 if (APPLE AND MACOS_BUNDLE)
   set(MIXXX_INSTALL_BINDIR "${CMAKE_INSTALL_BINDIR}")
-  set(MACOS_BUNDLE_NAME mixxx)
+  set(MACOS_BUNDLE_NAME Mixxx)
   set(MIXXX_INSTALL_PREFIX "${MACOS_BUNDLE_NAME}.app")
   set(MIXXX_INSTALL_DATADIR "${MIXXX_INSTALL_PREFIX}/Contents/Resources")
   set(MIXXX_INSTALL_DOCDIR "${MIXXX_INSTALL_DATADIR}")
@@ -1765,6 +1765,7 @@ if (APPLE)
 
     set_target_properties(mixxx PROPERTIES
         MACOSX_BUNDLE true
+        OUTPUT_NAME "${MACOS_BUNDLE_NAME}"
         MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/packaging/macos/Info.plist.in"
     )
   endif()
diff --git a/packaging/macos/Info.plist.in b/packaging/macos/Info.plist.in
index c1599fdca8f..e4025c89d8f 100644
--- a/packaging/macos/Info.plist.in
+++ b/packaging/macos/Info.plist.in
@@ -3,7 +3,7 @@
 <plist version="1.0">
   <dict>
     <key>CFBundleExecutable</key>
-    <string>mixxx</string>
+    <string>@MACOS_BUNDLE_NAME@</string>
 
     <key>CFBundleIconFile</key>
     <string>application.icns</string>

From 933233e17b68d8676e64d185f19d81865c0b589e Mon Sep 17 00:00:00 2001
From: fwcd <fwcd@fwcd.dev>
Date: Sat, 27 Jan 2024 17:54:13 +0100
Subject: [PATCH 2/3] macOS packaging: Define bundle identifier in CMakeLists

---
 CMakeLists.txt                | 1 +
 packaging/macos/Info.plist.in | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 60369a74958..231e32074ca 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1677,6 +1677,7 @@ set(MIXXX_INSTALL_LICENSEDIR "./doc")
 if (APPLE AND MACOS_BUNDLE)
   set(MIXXX_INSTALL_BINDIR "${CMAKE_INSTALL_BINDIR}")
   set(MACOS_BUNDLE_NAME Mixxx)
+  set(MACOS_BUNDLE_IDENTIFIER org.mixxx.mixxx)
   set(MIXXX_INSTALL_PREFIX "${MACOS_BUNDLE_NAME}.app")
   set(MIXXX_INSTALL_DATADIR "${MIXXX_INSTALL_PREFIX}/Contents/Resources")
   set(MIXXX_INSTALL_DOCDIR "${MIXXX_INSTALL_DATADIR}")
diff --git a/packaging/macos/Info.plist.in b/packaging/macos/Info.plist.in
index e4025c89d8f..2b3daf8148c 100644
--- a/packaging/macos/Info.plist.in
+++ b/packaging/macos/Info.plist.in
@@ -12,7 +12,7 @@
     <string>APPL</string>
 
     <key>CFBundleIdentifier</key>
-    <string>org.mixxx.mixxx</string>
+    <string>@MACOS_BUNDLE_IDENTIFIER@</string>
 
     <key>CFBundleName</key>
     <string>Mixxx</string>

From a81f552258de42ff931f02c5f9ef079f6aae9416 Mon Sep 17 00:00:00 2001
From: fwcd <fwcd@fwcd.dev>
Date: Sat, 27 Jan 2024 18:16:28 +0100
Subject: [PATCH 3/3] macOS packaging: Set bundle and display name uniformly

Since we now capitalize everywhere, we can simplify this
---
 packaging/macos/Info.plist.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packaging/macos/Info.plist.in b/packaging/macos/Info.plist.in
index 2b3daf8148c..c5a79fee389 100644
--- a/packaging/macos/Info.plist.in
+++ b/packaging/macos/Info.plist.in
@@ -15,10 +15,10 @@
     <string>@MACOS_BUNDLE_IDENTIFIER@</string>
 
     <key>CFBundleName</key>
-    <string>Mixxx</string>
+    <string>@MACOS_BUNDLE_NAME@</string>
 
     <key>CFBundleDisplayName</key>
-    <string>Mixxx</string>
+    <string>@MACOS_BUNDLE_NAME@</string>
 
     <key>CFBundleVersion</key>
     <string>@MACOS_BUNDLE_VERSION@</string>