From 01d1845a80ae48d741deea695ddce95d940ab0d8 Mon Sep 17 00:00:00 2001
From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com>
Date: Sun, 23 Jan 2022 15:50:27 +0200
Subject: build, qt: Specify QMAKE_CXX explicitly

This change allows to drop the `update-alternatives` step if the
`g++-mingw-w64-x86-64` package has been installed.
---
 depends/packages/qt.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk
index 6b71a9abda..313b22218c 100644
--- a/depends/packages/qt.mk
+++ b/depends/packages/qt.mk
@@ -163,6 +163,7 @@ $(package)_config_opts_mingw32 += -no-dbus
 $(package)_config_opts_mingw32 += -no-freetype
 $(package)_config_opts_mingw32 += -xplatform win32-g++
 $(package)_config_opts_mingw32 += "QMAKE_CFLAGS = '$($(package)_cflags) $($(package)_cppflags)'"
+$(package)_config_opts_mingw32 += "QMAKE_CXX = '$($(package)_cxx)'"
 $(package)_config_opts_mingw32 += "QMAKE_CXXFLAGS = '$($(package)_cflags) $($(package)_cppflags)'"
 $(package)_config_opts_mingw32 += "QMAKE_LFLAGS = '$($(package)_ldflags)'"
 $(package)_config_opts_mingw32 += -device-option CROSS_COMPILE="$(host)-"
-- 
cgit v1.2.3


From 0bbae237a8e0122b97c5c71bc85bc845e26d5b47 Mon Sep 17 00:00:00 2001
From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com>
Date: Sun, 23 Jan 2022 15:51:16 +0200
Subject: ci: Drop no longer needed `update-alternatives`

---
 ci/test/05_before_script.sh | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/ci/test/05_before_script.sh b/ci/test/05_before_script.sh
index 1d67355d27..8f75fbd1fa 100755
--- a/ci/test/05_before_script.sh
+++ b/ci/test/05_before_script.sh
@@ -43,9 +43,6 @@ if [[ ${USE_MEMORY_SANITIZER} == "true" ]]; then
   CI_EXEC "contrib/install_db4.sh \$(pwd) --enable-umrw CC=clang CXX=clang++ CFLAGS='${MSAN_FLAGS}' CXXFLAGS='${MSAN_AND_LIBCXX_FLAGS}'"
 fi
 
-if [[ $HOST = *-mingw32 ]]; then
-  CI_EXEC update-alternatives --set "${HOST}-g++" \$\(which "${HOST}-g++-posix"\)
-fi
 if [ -z "$NO_DEPENDS" ]; then
   if [[ $DOCKER_NAME_TAG == *centos* ]]; then
     # CentOS has problems building the depends if the config shell is not explicitly set
-- 
cgit v1.2.3


From 9796dcacdc3841ab6e3359bd5ca67a5f634bf176 Mon Sep 17 00:00:00 2001
From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com>
Date: Sun, 23 Jan 2022 15:59:41 +0200
Subject: doc: Install only "-posix" MinGW compiler when possible

---
 doc/build-windows.md | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/doc/build-windows.md b/doc/build-windows.md
index 657865795c..e35d3bcbd0 100644
--- a/doc/build-windows.md
+++ b/doc/build-windows.md
@@ -48,8 +48,17 @@ Acquire the source in the usual way:
 ## Building for 64-bit Windows
 
 The first step is to install the mingw-w64 cross-compilation tool chain:
+  - on modern systems (Ubuntu 21.04 Hirsute Hippo or newer, Debian 11 Bullseye or newer):
 
-    sudo apt install g++-mingw-w64-x86-64
+```sh
+sudo apt install g++-mingw-w64-x86-64-posix
+```
+
+  - on older systems:
+
+```sh
+sudo apt install g++-mingw-w64-x86-64
+```
 
 Once the toolchain is installed the build steps are common:
 
-- 
cgit v1.2.3