Backport update to wine-gecko 2.47.4

3 files changed, 104 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d30d0cc50f3e..e32e2814a2b4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = wine-stable
 	pkgdesc = A compatibility layer for running Windows programs
 	pkgver = 8.0.1
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.winehq.com
 	install = wine.install
 	arch = x86_64
@@ -107,6 +107,7 @@ pkgbase = wine-stable
 	optdepends = lib32-v4l-utils
 	optdepends = vulkan-icd-loader
 	optdepends = lib32-vulkan-icd-loader
+	optdepends = wine-gecko
 	optdepends = wine-stable-mono
 	provides = wine=8.0.1
 	conflicts = wine
@@ -116,10 +117,12 @@ pkgbase = wine-stable
 	source = https://dl.winehq.org/wine/source/8.0/wine-8.0.1.tar.xz.sign
 	source = 30-win32-aliases.conf
 	source = wine-binfmt.conf
+	source = 0001-mshtml-Wine-Gecko-2.47.4-release.patch
 	validpgpkeys = DA23579A74D4AD9AF9D3F945CEFAC8EAAF17519D
 	b2sums = f1e04ddc7531704b4229d1bdb6e742ff20886dfff181b8b44e01e9921574e8c433553aaddb2453532902e89252244080d1cf9f904aa7d14d76709d830116e4b4
 	b2sums = SKIP
 	b2sums = 45db34fb35a679dc191b4119603eba37b8008326bd4f7d6bd422fbbb2a74b675bdbc9f0cc6995ed0c564cf088b7ecd9fbe2d06d42ff8a4464828f3c4f188075b
 	b2sums = e9de76a32493c601ab32bde28a2c8f8aded12978057159dd9bf35eefbf82f2389a4d5e30170218956101331cf3e7452ae82ad0db6aad623651b0cc2174a61588
+	b2sums = 6c2eb64e561222d368d3f428463223c08b1f11a2768b59fad9c7c5d6a920ed077b75c1aef3eb3b8b301f3591ac05e058b1b9af2292e6bd10f97be82d16b22444
 
 pkgname = wine-stable
diff --git a/0001-mshtml-Wine-Gecko-2.47.4-release.patch b/0001-mshtml-Wine-Gecko-2.47.4-release.patch
new file mode 100644
index 000000000000..a352b5cf5378
--- /dev/null
+++ b/0001-mshtml-Wine-Gecko-2.47.4-release.patch
@@ -0,0 +1,94 @@
+From c3aa25a89b831b34e742be796e9c6fb17aeb45ba Mon Sep 17 00:00:00 2001
+From: Jacek Caban <jacek@codeweavers.com>
+Date: Mon, 3 Apr 2023 16:55:12 +0200
+Subject: [PATCH] mshtml: Wine Gecko 2.47.4 release.
+
+---
+ dlls/appwiz.cpl/addons.c | 6 +++---
+ dlls/mshtml/nsiface.idl  | 7 ++++++-
+ tools/gitlab/test.yml    | 2 +-
+ 3 files changed, 10 insertions(+), 5 deletions(-)
+
+diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c
+index c63106de95b..ed7b5f0797e 100644
+--- a/dlls/appwiz.cpl/addons.c
++++ b/dlls/appwiz.cpl/addons.c
+@@ -46,13 +46,13 @@
+ 
+ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl);
+ 
+-#define GECKO_VERSION "2.47.3"
++#define GECKO_VERSION "2.47.4"
+ #ifdef __i386__
+ #define GECKO_ARCH "x86"
+-#define GECKO_SHA "e5b9b06d3ce355646a8d2e72e044e37e1e0c8d18464eb1985adcd187a7f48e01"
++#define GECKO_SHA "26cecc47706b091908f7f814bddb074c61beb8063318e9efc5a7f789857793d6"
+ #elif defined(__x86_64__)
+ #define GECKO_ARCH "x86_64"
+-#define GECKO_SHA "a53ee954392b6d1fe3d68545f6e4e2a97afbc8dc8b03a8b443349545ce139675"
++#define GECKO_SHA "e590b7d988a32d6aa4cf1d8aa3aa3d33766fdd4cf4c89c2dcc2095ecb28d066f"
+ #else
+ #define GECKO_ARCH ""
+ #define GECKO_SHA "???"
+diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl
+index 1e97f1fc63b..8ad5e871e21 100644
+--- a/dlls/mshtml/nsiface.idl
++++ b/dlls/mshtml/nsiface.idl
+@@ -25,7 +25,7 @@
+ 
+ #pragma makedep header
+ 
+-cpp_quote("#define GECKO_VERSION \"2.47.3\"")
++cpp_quote("#define GECKO_VERSION \"2.47.4\"")
+ cpp_quote("#define GECKO_VERSION_STRING \"Wine Gecko \" GECKO_VERSION")
+ 
+ import "wtypes.idl";
+@@ -114,6 +114,7 @@ interface nsIDOMHTMLSelectElement;
+ interface nsIFile;
+ interface nsIDocShell;
+ interface mozIDOMWindowProxy;
++interface nsIDOMMediaQueryListListener;
+ 
+ interface IMoniker;
+ 
+@@ -919,6 +920,7 @@ interface nsIDOMMediaQueryList : nsISupports
+ {
+     nsresult GetMedia(nsAString *aMedia);
+     nsresult GetMatches(bool *_retval);
++    nsresult SetListener(nsIDOMMediaQueryListListener *listener);
+ }
+ 
+ [
+@@ -1445,6 +1447,8 @@ interface nsIDOMHTMLDocument : nsIDOMDocument
+     nsresult GetSelection(nsISelection **_retval);
+     nsresult CaptureEvents();
+     nsresult ReleaseEvents();
++    nsresult GetIECompatMode(uint32_t *aIECompatMode);
++    nsresult SetIECompatMode(uint32_t aIECompatMode);
+ }
+ 
+ [
+@@ -1777,6 +1781,7 @@ interface nsIDOMHTMLInputElement : nsISupports
+     nsresult MozGetFileNameArray(uint32_t *aLength, PRUnichar ***aFileNames);
+     nsresult MozSetFileNameArray(const PRUnichar **aFileNames, uint32_t aLength);
+     nsresult MozIsTextField(bool aExcludePassword, bool *_retval);
++    nsresult GetComplete(bool *aComplete);
+ }
+ 
+ [
+diff --git a/tools/gitlab/test.yml b/tools/gitlab/test.yml
+index da34390bc1f..848559ae8c2 100644
+--- a/tools/gitlab/test.yml
++++ b/tools/gitlab/test.yml
+@@ -6,7 +6,7 @@
+   interruptible: true
+   variables:
+     GIT_STRATEGY: none
+-    GECKO_VER: 2.47.3
++    GECKO_VER: 2.47.4
+     MONO_VER: 7.4.0
+   cache:
+     - key: wine-gecko-$GECKO_VER
+-- 
+2.40.1
+
diff --git a/PKGBUILD b/PKGBUILD
index d10ad3e24d63..6d8a17126dc6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,15 +7,17 @@
 pkgname=wine-stable
 _pkgver=8.0.1
 pkgver=${_pkgver/-/}  # Useful for wine-stable-next
-pkgrel=1
+pkgrel=2
 
 source=(https://dl.winehq.org/wine/source/8.0/wine-$_pkgver.tar.xz{,.sign}
         30-win32-aliases.conf
-        wine-binfmt.conf)
+        wine-binfmt.conf
+        0001-mshtml-Wine-Gecko-2.47.4-release.patch)
 b2sums=('f1e04ddc7531704b4229d1bdb6e742ff20886dfff181b8b44e01e9921574e8c433553aaddb2453532902e89252244080d1cf9f904aa7d14d76709d830116e4b4'
         'SKIP'
         '45db34fb35a679dc191b4119603eba37b8008326bd4f7d6bd422fbbb2a74b675bdbc9f0cc6995ed0c564cf088b7ecd9fbe2d06d42ff8a4464828f3c4f188075b'
-        'e9de76a32493c601ab32bde28a2c8f8aded12978057159dd9bf35eefbf82f2389a4d5e30170218956101331cf3e7452ae82ad0db6aad623651b0cc2174a61588')
+        'e9de76a32493c601ab32bde28a2c8f8aded12978057159dd9bf35eefbf82f2389a4d5e30170218956101331cf3e7452ae82ad0db6aad623651b0cc2174a61588'
+        '6c2eb64e561222d368d3f428463223c08b1f11a2768b59fad9c7c5d6a920ed077b75c1aef3eb3b8b301f3591ac05e058b1b9af2292e6bd10f97be82d16b22444')
 validpgpkeys=(DA23579A74D4AD9AF9D3F945CEFAC8EAAF17519D)
 
 pkgdesc="A compatibility layer for running Windows programs"
@@ -88,6 +90,7 @@ optdepends=(
   sdl2                   lib32-sdl2
   v4l-utils              lib32-v4l-utils
   vulkan-icd-loader      lib32-vulkan-icd-loader
+  wine-gecko
   wine-stable-mono
 )