From 20dfd84edd1b45b78a284bf75ef711726a4e8415 Mon Sep 17 00:00:00 2001
From: Ron Yorston <rmy@pobox.com>
Date: Thu, 21 Feb 2019 11:29:12 +0000
Subject: win32: use manifest provided by MinGW-w64

The manifest included here wasn't effective in telling Windows
about version compatibility.  Use the default manifest provided
by MinGW-w64 instead.

On Fedora this requires installing the mingw32-windows-default-manifest
and/or mingw64-windows-default-manifest packages.
---
 Config.in                                |  8 --------
 README.md                                |  2 +-
 configs/mingw32_defconfig                |  1 -
 configs/mingw64_defconfig                |  1 -
 win32/resources/Kbuild.src               |  4 ----
 win32/resources/busybox-w32.manifest.src | 25 -------------------------
 win32/resources/resources.rc             |  4 ----
 7 files changed, 1 insertion(+), 44 deletions(-)
 delete mode 100644 win32/resources/busybox-w32.manifest.src

diff --git a/Config.in b/Config.in
index 9f8d4bf7c..cd0cab412 100644
--- a/Config.in
+++ b/Config.in
@@ -421,14 +421,6 @@ config FEATURE_VERSIONINFO
 	help
 	Include version information in the application.
 
-config FEATURE_MANIFEST
-	bool "Include manifest in binary (1.5 kb)"
-	default y
-	depends on FEATURE_RESOURCES
-	help
-	Include a manifest which declares privileges required by the
-	application.
-
 config FEATURE_ICON
 	bool "Include application icon in binary"
 	default y
diff --git a/README.md b/README.md
index 14737b8c0..b8b6fbad7 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@ Things may work for you, or may not.  Things may never work because of huge diff
 
 ### Building
 
-You need a MinGW compiler and a POSIX environment (so that `make menuconfig` works).  I cross-compile on Linux.  On Fedora or RHEL/CentOS+EPEL installing mingw32-gcc (32-bit build) or mingw64-gcc (64-bit build) will pull in everything needed.
+You need a MinGW compiler and a POSIX environment (so that `make menuconfig` works).  I cross-compile on Linux.  On Fedora or RHEL/CentOS+EPEL installing mingw32-gcc and mingw32-windows-default-manifest (32-bit build) or mingw64-gcc and mingw64-windows-default-manifest (64-bit build) will pull in everything needed.
 
 To start, run `make mingw32_defconfig` or `make mingw64_defconfig`.  You can then customize your build with `make menuconfig`.
 
diff --git a/configs/mingw32_defconfig b/configs/mingw32_defconfig
index cb74f8c20..907a5fa91 100644
--- a/configs/mingw32_defconfig
+++ b/configs/mingw32_defconfig
@@ -43,7 +43,6 @@ CONFIG_FEATURE_PRNG_SHELL=y
 # CONFIG_FEATURE_PRNG_ISAAC is not set
 CONFIG_FEATURE_RESOURCES=y
 CONFIG_FEATURE_VERSIONINFO=y
-CONFIG_FEATURE_MANIFEST=y
 CONFIG_FEATURE_ICON=y
 # CONFIG_FEATURE_ICON_ATERM is not set
 # CONFIG_FEATURE_ICON_STERM is not set
diff --git a/configs/mingw64_defconfig b/configs/mingw64_defconfig
index 2f85f2883..048c1da0f 100644
--- a/configs/mingw64_defconfig
+++ b/configs/mingw64_defconfig
@@ -43,7 +43,6 @@ CONFIG_FEATURE_PRNG_SHELL=y
 # CONFIG_FEATURE_PRNG_ISAAC is not set
 CONFIG_FEATURE_RESOURCES=y
 CONFIG_FEATURE_VERSIONINFO=y
-CONFIG_FEATURE_MANIFEST=y
 CONFIG_FEATURE_ICON=y
 # CONFIG_FEATURE_ICON_ATERM is not set
 # CONFIG_FEATURE_ICON_STERM is not set
diff --git a/win32/resources/Kbuild.src b/win32/resources/Kbuild.src
index 7cc010613..1900d1872 100644
--- a/win32/resources/Kbuild.src
+++ b/win32/resources/Kbuild.src
@@ -25,7 +25,3 @@ quiet_cmd_windres = WINDRES $@
 
 win32/resources/resources.o: win32/resources/resources.rc .config
 win32/resources/resources.o: win32/resources/aterm.ico win32/resources/sterm.ico
-win32/resources/resources.o: win32/resources/busybox-w32.manifest
-
-win32/resources/busybox-w32.manifest: win32/resources/busybox-w32.manifest.src .config
-	@sed -b "s/VERSION/$(BB_VER)/" $< >$@
diff --git a/win32/resources/busybox-w32.manifest.src b/win32/resources/busybox-w32.manifest.src
deleted file mode 100644
index c75dbdb96..000000000
--- a/win32/resources/busybox-w32.manifest.src
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-	<assemblyIdentity type="win32" name="busybox-w32" version="VERSION" />
-	<trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
-		<security>
-			<requestedPrivileges>
-				<requestedExecutionLevel level="asInvoker" uiAccess="false" />
-			</requestedPrivileges>
-		</security>
-	</trustInfo>
-	<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
-		<application>
-			<!-- Windows Vista -->
-			<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
-			<!-- Windows 7 -->
-			<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
-			<!-- Windows 8 -->
-			<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
-			<!-- Windows 8.1 -->
-			<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
-			<!-- Windows 10 -->
-			<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
-		</application>
-	</compatibility>
-</assembly>
diff --git a/win32/resources/resources.rc b/win32/resources/resources.rc
index f77a3bcc9..d8b9d6407 100644
--- a/win32/resources/resources.rc
+++ b/win32/resources/resources.rc
@@ -32,7 +32,3 @@ BEGIN
   END
 END
 #endif
-
-#if ENABLE_FEATURE_MANIFEST
-1 RT_MANIFEST "busybox-w32.manifest"
-#endif
-- 
cgit v1.2.3-55-g6feb