Update manifest XML for the GTK DLL

diff --git a/gtk/gtk-win32.rc.body.in b/gtk/gtk-win32.rc.body.in
index fc2dfd2ed31ed518cc8238bd5b5602cc4a343f02..785159f31836483cb9b3eb6c825e9b255fcf3646 100644 (file)
--- 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/libgtk.manifest.in b/gtk/libgtk.manifest.in
new file mode 100644 (file)
index 0000000..4aa45ce
--- /dev/null
+++ b/gtk/libgtk.manifest.in
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+  <assemblyIdentity
+      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="*"
+          publicKeyToken="6595b64144ccf1df"
+          language="*"
+      />
+    </dependentAssembly>
+  </dependency>
+</assembly>

diff --git a/gtk/libgtk4.manifest.in b/gtk/libgtk4.manifest.in
deleted file mode 100644 (file)
index 6e1677e..0000000
--- a/gtk/libgtk4.manifest.in
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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"
-      type="win32"
-  />
-  <dependency>
-    <dependentAssembly>
-      <assemblyIdentity
-          type="win32"
-          name="Microsoft.Windows.Common-Controls"
-          version="6.0.0.0"
-          processorArchitecture="@EXE_MANIFEST_ARCHITECTURE@"
-          publicKeyToken="6595b64144ccf1df"
-          language="*"
-      />
-    </dependentAssembly>
-  </dependency>
-</assembly>

diff --git a/gtk/meson.build b/gtk/meson.build
index cd199ffadf34f950dfed969df7f991d9632c63c2..a230f2d1d94179e14ed38313c0de5387ff63c8de 100644 (file)
--- 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,
   )