From e83531aa220c5343f5c3e909a79d5fb9a5d881e0 Mon Sep 17 00:00:00 2001
From: Scott Worley <scottworley@scottworley.com>
Date: Mon, 31 May 2021 08:17:08 -0700
Subject: [PATCH] wine: gecko 2.47.1 -> 2.47.2

Wine uses gecko 2.47.2 since wine commit
70567d9f2d32fa3f052609051e9913344f24c42a, which
is wine versions 6.0 up through current (6.9)

Add a test verifying that the "Can't find Gecko" error message does
not appear.  A positive test of HTML rendering would be better (eg:
would be robust against changes in the error message string), but this
test is easy to set up & much better than nothing.
---
 nixos/tests/wine.nix                 | 5 ++++-
 pkgs/misc/emulators/wine/sources.nix | 8 ++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/nixos/tests/wine.nix b/nixos/tests/wine.nix
index 566b9baa67b..30d417ce9fa 100644
--- a/nixos/tests/wine.nix
+++ b/nixos/tests/wine.nix
@@ -25,9 +25,12 @@ let
         machine.wait_for_unit("multi-user.target")
         ${concatMapStrings (exe: ''
           greeting = machine.succeed(
-              'wine ${exe}'
+              "bash -c 'wine ${exe} 2> >(tee wine-stderr >&2)'"
           )
           assert 'Hello, world!' in greeting
+          machine.fail(
+              "fgrep 'Could not find Wine Gecko. HTML rendering will be disabled.' wine-stderr"
+          )
         '') exes}
       '';
     };
diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix
index 6103472a7cc..abaa16d2d13 100644
--- a/pkgs/misc/emulators/wine/sources.nix
+++ b/pkgs/misc/emulators/wine/sources.nix
@@ -19,14 +19,14 @@ in rec {
 
     ## see http://wiki.winehq.org/Gecko
     gecko32 = fetchurl rec {
-      version = "2.47.1";
+      version = "2.47.2";
       url = "https://dl.winehq.org/wine/wine-gecko/${version}/wine-gecko-${version}-x86.msi";
-      sha256 = "0ld03pjm65xkpgqkvfsmk6h9krjsqbgxw4b8rvl2fj20j8l0w2zh";
+      sha256 = "07d6nrk2g0614kvwdjym1wq21d2bwy3pscwikk80qhnd6rrww875";
     };
     gecko64 = fetchurl rec {
-      version = "2.47.1";
+      version = "2.47.2";
       url = "https://dl.winehq.org/wine/wine-gecko/${version}/wine-gecko-${version}-x86_64.msi";
-      sha256 = "0jj7azmpy07319238g52a8m4nkdwj9g010i355ykxnl8m5wjwcb9";
+      sha256 = "0iffhvdawc499nbn4k99k33cr7g8sdfcvq8k3z1g6gw24h87d5h5";
     };
 
     ## see http://wiki.winehq.org/Mono