From 156e25b6aa1a3f5440f937f7603766c0447fc1c8 Mon Sep 17 00:00:00 2001
From: Luca Bacci <luca.bacci982@gmail.com>
Date: Tue, 30 May 2023 19:33:19 +0200
Subject: [PATCH] Update manifest XML for the GTK DLL

---
 gtk/gtk-win32.rc.body.in                        | 2 +-
 gtk/{libgtk4.manifest.in => libgtk.manifest.in} | 9 +++++----
 gtk/meson.build                                 | 8 +++++---
 3 files changed, 11 insertions(+), 8 deletions(-)
 rename gtk/{libgtk4.manifest.in => libgtk.manifest.in} (68%)

diff --git a/gtk/gtk-win32.rc.body.in b/gtk/gtk-win32.rc.body.in
index fc2dfd2ed3..785159f318 100644
--- a/gtk/gtk-win32.rc.body.in
+++ b/gtk/gtk-win32.rc.body.in
@@ -32,4 +32,4 @@ VS_VERSION_INFO VERSIONINFO
     END
   END
 
-ISOLATIONAWARE_MANIFEST_RESOURCE_ID RT_MANIFEST libgtk4.manifest
\ No newline at end of file
+ISOLATIONAWARE_MANIFEST_RESOURCE_ID RT_MANIFEST libgtk.manifest
diff --git a/gtk/libgtk4.manifest.in b/gtk/libgtk.manifest.in
similarity index 68%
rename from gtk/libgtk4.manifest.in
rename to gtk/libgtk.manifest.in
index 6e1677eb1f..4aa45ceef3 100644
--- a/gtk/libgtk4.manifest.in
+++ b/gtk/libgtk.manifest.in
@@ -1,18 +1,19 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
   <assemblyIdentity
-      version="1.0.0.0"
-      processorArchitecture="@EXE_MANIFEST_ARCHITECTURE@"
-      name="libgtk3"
+      version="@GTK_MANIFEST_VERSION@"
+      processorArchitecture="*"
+      name="org.gnome.GTK"
       type="win32"
   />
+  <description>GTK is a multi-platform GUI toolkit based on GObject</description>
   <dependency>
     <dependentAssembly>
       <assemblyIdentity
           type="win32"
           name="Microsoft.Windows.Common-Controls"
           version="6.0.0.0"
-          processorArchitecture="@EXE_MANIFEST_ARCHITECTURE@"
+          processorArchitecture="*"
           publicKeyToken="6595b64144ccf1df"
           language="*"
       />
diff --git a/gtk/meson.build b/gtk/meson.build
index cd199ffadf..a230f2d1d9 100644
--- a/gtk/meson.build
+++ b/gtk/meson.build
@@ -1014,7 +1014,9 @@ gtkversion_cdata.set('GTK_VERSION', gtk_version)
 gtkversion_cdata.set('GTK_API_VERSION', gtk_api_version)
 
 if host_machine.system() == 'windows'
-  gtkversion_cdata.set('EXE_MANIFEST_ARCHITECTURE', '*')
+  v = gtk_binary_version.split('.')
+  gtk_manifest_version = '.'.join(v.get(0, '0'), v.get(1, '0'), v.get(2, '0'), v.get(3, '0'))
+  gtkversion_cdata.set('GTK_MANIFEST_VERSION', gtk_manifest_version)
 endif
 
 gtkversion = configure_file(input: 'gtkversion.h.in',
@@ -1097,8 +1099,8 @@ if win32_enabled
     configuration: gtkversion_cdata,
   )
 
-  win32_manifest = configure_file(input: 'libgtk4.manifest.in',
-    output: 'libgtk4.manifest',
+  win32_manifest = configure_file(input: 'libgtk.manifest.in',
+    output: 'libgtk.manifest',
     configuration: gtkversion_cdata,
   )
 
-- 
2.30.2