From c4696855ba69df263511f8f54e729725ec8ac50b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Sat, 27 Apr 2024 11:59:47 +0200
Subject: [PATCH 1/3] Remove invalid characters form the end of the LCENSE.rtf
 file

---
 packaging/wix/LICENSE.rtf | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packaging/wix/LICENSE.rtf b/packaging/wix/LICENSE.rtf
index 0b2442786e6..b78cb94e76a 100644
--- a/packaging/wix/LICENSE.rtf
+++ b/packaging/wix/LICENSE.rtf
@@ -2073,4 +2073,3 @@ Moreover, you may apply this exception to a modified version of the Library, pro
 Furthermore, you are not required to apply this additional permission to a modified version of the Library.\par
 \par
 }
- 

From 93ca3532c0972c14124d90d9a776864aa5b3716f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Sat, 27 Apr 2024 12:46:42 +0200
Subject: [PATCH 2/3] Write Mixxx version to LICENSE.rtf using CMake

---
 .pre-commit-config.yaml                       | 2 +-
 CMakeLists.txt                                | 4 +++-
 packaging/wix/{LICENSE.rtf => LICENSE.rtf.in} | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)
 rename packaging/wix/{LICENSE.rtf => LICENSE.rtf.in} (98%)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 24911fdef94..852bc3a8b72 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -64,7 +64,7 @@ repos:
             "\\W(?:m_p*(?=[A-Z])|m_(?=\\w)|pp*(?=[A-Z])|k(?=[A-Z])|s_(?=\\w))",
             --write-changes,
           ]
-        exclude: ^(packaging/wix/LICENSE.rtf|src/dialog/dlgabout\.cpp|.*\.(?:pot?|(?<!d\.)ts|wxl|svg))$
+        exclude: ^(packaging/wix/LICENSE.rtf.in|src/dialog/dlgabout\.cpp|.*\.(?:pot?|(?<!d\.)ts|wxl|svg))$
   - repo: https://github.com/pre-commit/mirrors-eslint
     rev: v8.48.0
     hooks:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2f4639c3d77..04e4a644537 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3493,7 +3493,7 @@ set(CPACK_DEBIAN_UPLOAD_PPA_SCRIPT "${CMAKE_CURRENT_SOURCE_DIR}/packaging/CPackD
 set(CPACK_DEBIAN_INSTALL_SCRIPT "${CMAKE_CURRENT_SOURCE_DIR}/packaging/CPackDebInstall.cmake")
 
 set(CPACK_WIX_UPGRADE_GUID "921DC99C-4DCF-478D-B950-50685CB9E6BE")
-set(CPACK_WIX_LICENSE_RTF "${CMAKE_CURRENT_SOURCE_DIR}/packaging/wix/LICENSE.rtf")
+set(CPACK_WIX_LICENSE_RTF "${CMAKE_CURRENT_BINARY_DIR}/packaging/wix/LICENSE.rtf")
 set(CPACK_WIX_PRODUCT_ICON "${CMAKE_SOURCE_DIR}/res/images/icons/ic_mixxx.ico")
 set(CPACK_WIX_PROPERTY_ARPHELPLINK "${CPACK_PACKAGE_HOMEPAGE_URL}")
 set(CPACK_WIX_UI_BANNER "${CMAKE_CURRENT_SOURCE_DIR}/packaging/wix/images/banner.bmp")
@@ -3504,6 +3504,8 @@ set(CPACK_PROJECT_CONFIG_FILE "${CMAKE_SOURCE_DIR}/packaging/CPackConfig.cmake"
 if(WIN32)
     # override not working default NSIS
     set(CPACK_GENERATOR WIX)
+    # uses CMAKE_PROJECT_VERSION
+    configure_file(packaging/wix/LICENSE.rtf.in packaging/wix/LICENSE.rtf @ONLY)
 endif()
 
 include(CPack)
diff --git a/packaging/wix/LICENSE.rtf b/packaging/wix/LICENSE.rtf.in
similarity index 98%
rename from packaging/wix/LICENSE.rtf
rename to packaging/wix/LICENSE.rtf.in
index b78cb94e76a..80ed87dc5da 100644
--- a/packaging/wix/LICENSE.rtf
+++ b/packaging/wix/LICENSE.rtf.in
@@ -1,7 +1,7 @@
 {\rtf1\ansi\ansicpg1252\deff0\nouicompat{\fonttbl{\f0\fnil\fcharset0 Courier New;}}
 {\colortbl ;\red0\green0\blue255;}
 {\*\generator Riched20 10.0.14393}\viewkind4\uc1
-\pard\qj\ul\b\f0\fs22\lang1036 Mixxx version 2.4, Digital DJ'ing software.\ulnone\b0\fs24\par
+\pard\qj\ul\b\f0\fs22\lang1036 Mixxx @CMAKE_PROJECT_VERSION@, Digital DJ'ing software.\ulnone\b0\fs24\par
 \fs22 Copyright (C) 2001-2023 Mixxx Development Team\par
 \par
 Promotional tracks are copyright their respective owners and\par

From 87f15356c611b408064c2b3c5e575d3bc1cbe889 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Sat, 27 Apr 2024 12:21:10 +0200
Subject: [PATCH 3/3] Use CPACK_PACKAGE_NAME = "Mixxx", to fix Windows Menu
 folder and WIX dialogs.

---
 CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 04e4a644537..376b9a9042a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3440,6 +3440,7 @@ file(RELATIVE_PATH MIXXX_INSTALL_DOCDIR_RELATIVE_TO_DATADIR "${CMAKE_INSTALL_PRE
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/src/config.h.in" "${CMAKE_CURRENT_BINARY_DIR}/src/config.h" @ONLY)
 
 # Packaging
+set(CPACK_PACKAGE_NAME "Mixxx")
 set(CPACK_PACKAGE_VENDOR "Mixxx Project")
 set(CPACK_PACKAGE_CONTACT "RJ Skerry-Ryan <rryan@mixxx.org>")
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Digital DJ Application")