From cf1e9b4c20e426253ec943d8fe47b2bc1e00801e Mon Sep 17 00:00:00 2001
From: Christoph Reiter <reiter.christoph@gmail.com>
Date: Mon, 23 Sep 2024 06:45:12 +0200
Subject: [PATCH 1/3] Remove the MINGW32 shortcut

We are phasing out 32-bit support, so let's not install a shortcut for it by default.
Users can still access it via the mingw32.exe directly if needed.
---
 qt-ifw/packages/com.msys2.root/meta/installscript.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/qt-ifw/packages/com.msys2.root/meta/installscript.js b/qt-ifw/packages/com.msys2.root/meta/installscript.js
index 8d71076..2bd8eed 100644
--- a/qt-ifw/packages/com.msys2.root/meta/installscript.js
+++ b/qt-ifw/packages/com.msys2.root/meta/installscript.js
@@ -34,7 +34,6 @@ function createShortcuts()
         return;
     }
 
-    component.addOperation("CreateShortcut", "@TargetDir@/mingw32.exe", "@StartMenuDir@/MSYS2 MINGW32.lnk", "iconPath=@TargetDir@/mingw32.exe");
     component.addOperation("CreateShortcut", "@TargetDir@/mingw64.exe", "@StartMenuDir@/MSYS2 MINGW64.lnk", "iconPath=@TargetDir@/mingw64.exe");
     component.addOperation("CreateShortcut", "@TargetDir@/ucrt64.exe", "@StartMenuDir@/MSYS2 UCRT64.lnk", "iconPath=@TargetDir@/ucrt64.exe");
     component.addOperation("CreateShortcut", "@TargetDir@/clang64.exe", "@StartMenuDir@/MSYS2 CLANG64.lnk", "iconPath=@TargetDir@/clang64.exe");

From 58f6dc63ea465c64bc6c7ea6bb775e73f4778367 Mon Sep 17 00:00:00 2001
From: Christoph Reiter <reiter.christoph@gmail.com>
Date: Fri, 6 Dec 2024 14:58:44 +0100
Subject: [PATCH 2/3] CI: use "persist-credentials: false" for actions/checkout

See https://woodruffw.github.io/zizmor/audits/#artipacked
---
 .github/workflows/build.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 1d2ca9c..b7ec54b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -15,6 +15,8 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
+        with:
+          persist-credentials: false
 
       - name: setup-msys2
         uses: msys2/setup-msys2@v2
@@ -72,6 +74,8 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
+        with:
+          persist-credentials: false
 
       - uses: actions/download-artifact@v4
         with:
@@ -108,6 +112,8 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
+        with:
+          persist-credentials: false
 
       - uses: actions/download-artifact@v4
         with:
@@ -141,6 +147,8 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
+        with:
+          persist-credentials: false
 
       - uses: actions/download-artifact@v4
         with:

From 3cf8b7eabe619b4fc6e28493c9fb3d11bac13ba3 Mon Sep 17 00:00:00 2001
From: Christoph Reiter <reiter.christoph@gmail.com>
Date: Sat, 7 Dec 2024 22:04:51 +0100
Subject: [PATCH 3/3] Use WizardStyle=Modern instead of Aero

The later seems to be the default for some reason but does not
support dark mode (or breaks when dark mode is enabled).
Use the "Modern" style instead, and also set a smaller default
width while at it.

Note that the style is a QWizard concept and not QTIFW specific.

The only related upstream issue I found was
https://bugreports.qt.io/browse/QTBUG-123853

Fixes #84
---
 qt-ifw/config/config.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/qt-ifw/config/config.xml b/qt-ifw/config/config.xml
index fdafe5e..9f3726e 100644
--- a/qt-ifw/config/config.xml
+++ b/qt-ifw/config/config.xml
@@ -11,6 +11,8 @@
     <InstallerApplicationIcon>msys2</InstallerApplicationIcon>
     <InstallerWindowIcon>msys2.ico</InstallerWindowIcon>
     <InstallActionColumnVisible>false</InstallActionColumnVisible>
+    <WizardStyle>Modern</WizardStyle>
+    <WizardDefaultWidth>40em</WizardDefaultWidth>
     <MaintenanceToolName>uninstall</MaintenanceToolName>
     <SupportsModify>false</SupportsModify>
     <RepositorySettingsPageVisible>false</RepositorySettingsPageVisible>