Update to 9.0rc2

Bunch of dependencies added and removed, too.

4 files changed, 43 insertions, 157 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f92a49facd4d..e00c03cc705e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,13 @@
-pkgbase = wine-stable
+pkgbase = wine-stable-next
 	pkgdesc = A compatibility layer for running Windows programs
-	pkgver = 8.0.2
+	pkgver = 9.0rc2
 	pkgrel = 1
-	url = http://www.winehq.com
+	url = https://www.winehq.org/
 	install = wine.install
 	arch = x86_64
 	license = LGPL
 	makedepends = alsa-lib
 	makedepends = lib32-alsa-lib
-	makedepends = fontforge
-	makedepends = giflib
-	makedepends = lib32-giflib
 	makedepends = gnutls
 	makedepends = lib32-gnutls
 	makedepends = gst-plugins-base-libs
@@ -25,23 +22,23 @@ pkgbase = wine-stable
 	makedepends = lib32-libxcomposite
 	makedepends = libxinerama
 	makedepends = lib32-libxinerama
-	makedepends = libxmu
-	makedepends = lib32-libxmu
 	makedepends = libxxf86vm
 	makedepends = lib32-libxxf86vm
 	makedepends = mesa
 	makedepends = lib32-mesa
 	makedepends = mingw-w64-gcc
-	makedepends = ncurses
-	makedepends = lib32-ncurses
 	makedepends = ocl-icd
 	makedepends = lib32-ocl-icd
 	makedepends = opencl-headers
+	makedepends = pcsclite
+	makedepends = lib32-pcsclite
 	makedepends = perl
 	makedepends = samba
 	makedepends = sane
 	makedepends = sdl2
 	makedepends = lib32-sdl2
+	makedepends = unixodbc
+	makedepends = lib32-unixodbc
 	makedepends = v4l-utils
 	makedepends = lib32-v4l-utils
 	makedepends = vulkan-headers
@@ -56,37 +53,36 @@ pkgbase = wine-stable
 	depends = lib32-gcc-libs
 	depends = gettext
 	depends = lib32-gettext
-	depends = glu
-	depends = lib32-glu
 	depends = libpcap
 	depends = lib32-libpcap
-	depends = libsm
-	depends = lib32-libsm
+	depends = libunwind
+	depends = lib32-libunwind
 	depends = libxcursor
 	depends = lib32-libxcursor
-	depends = libxdamage
-	depends = lib32-libxdamage
 	depends = libxi
 	depends = lib32-libxi
 	depends = libxrandr
 	depends = lib32-libxrandr
+	depends = wayland
+	depends = lib32-wayland
 	optdepends = alsa-lib
 	optdepends = lib32-alsa-lib
 	optdepends = alsa-plugins
 	optdepends = lib32-alsa-plugins
+	optdepends = cups
 	optdepends = dosbox
-	optdepends = giflib
-	optdepends = lib32-giflib
 	optdepends = gnutls
 	optdepends = lib32-gnutls
+	optdepends = gst-plugins-bad
+	optdepends = lib32-gst-plugins-bad
 	optdepends = gst-plugins-base
 	optdepends = lib32-gst-plugins-base
 	optdepends = gst-plugins-base-libs
 	optdepends = lib32-gst-plugins-base-libs
 	optdepends = gst-plugins-good
 	optdepends = lib32-gst-plugins-good
-	optdepends = libcups
-	optdepends = lib32-libcups
+	optdepends = gst-plugins-ugly
+	optdepends = lib32-gst-plugins-ugly
 	optdepends = libgphoto2
 	optdepends = lib32-libgphoto2
 	optdepends = libpulse
@@ -95,34 +91,34 @@ pkgbase = wine-stable
 	optdepends = lib32-libxcomposite
 	optdepends = libxinerama
 	optdepends = lib32-libxinerama
-	optdepends = ncurses
-	optdepends = lib32-ncurses
 	optdepends = ocl-icd
 	optdepends = lib32-ocl-icd
+	optdepends = pcsclite
+	optdepends = lib32-pcsclite
 	optdepends = samba
 	optdepends = sane
 	optdepends = sdl2
 	optdepends = lib32-sdl2
+	optdepends = unixodbc
+	optdepends = lib32-unixodbc
 	optdepends = v4l-utils
 	optdepends = lib32-v4l-utils
 	optdepends = vulkan-icd-loader
 	optdepends = lib32-vulkan-icd-loader
 	optdepends = wine-gecko
-	optdepends = wine-stable-mono
-	provides = wine=8.0.2
+	optdepends = wine-mono
+	provides = wine=9.0rc2
 	conflicts = wine
 	options = staticlibs
 	options = !lto
-	source = https://dl.winehq.org/wine/source/8.0/wine-8.0.2.tar.xz
-	source = https://dl.winehq.org/wine/source/8.0/wine-8.0.2.tar.xz.sign
+	source = https://dl.winehq.org/wine/source/9.0/wine-9.0-rc2.tar.xz
+	source = https://dl.winehq.org/wine/source/9.0/wine-9.0-rc2.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 = dcffaba6c90c4e02a7bc591a81e11aced06c006370c4c316c8a367b2f5814926063482959fabfe9d674ee1b5a560e59087e9b711e28360ced3aee2bbd6bb8fdb
+	b2sums = 2eddc96df30a8239b4b3314b7127eb3a11f953826506f12b8f5dc2acfe45f8a4fc3de7a4af4ada5c14c60783771ba865eb35189dcdb09eeb7e52438dd34fe668
 	b2sums = SKIP
 	b2sums = 45db34fb35a679dc191b4119603eba37b8008326bd4f7d6bd422fbbb2a74b675bdbc9f0cc6995ed0c564cf088b7ecd9fbe2d06d42ff8a4464828f3c4f188075b
 	b2sums = e9de76a32493c601ab32bde28a2c8f8aded12978057159dd9bf35eefbf82f2389a4d5e30170218956101331cf3e7452ae82ad0db6aad623651b0cc2174a61588
-	b2sums = 0cf4946fa93a0af447419b984c725fc8a4e1f1d0c5ffdb579a6a1bebb5b35c8d4c8a00b85b2e1754fc6f38f904bba992be8ed6ad9837ecbda42b974238af21db
 
-pkgname = wine-stable
+pkgname = wine-stable-next
diff --git a/0001-mshtml-Wine-Gecko-2.47.4-release.patch b/0001-mshtml-Wine-Gecko-2.47.4-release.patch
deleted file mode 100644
index 0dd2355d1fec..000000000000
--- a/0001-mshtml-Wine-Gecko-2.47.4-release.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From 10d6e719ff498ca4b22824782790b13cde13c022 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.41.0
-
diff --git a/PKGBUILD b/PKGBUILD
index 2fbe18d10877..1bf4a0853dc4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,24 +4,22 @@
 # for example), your WINEPREFIX may break and experience unusual bugs.
 # Try to make a clean WINEPREFIX, such as by doing “rm -rf ~/.wine”
 
-pkgname=wine-stable
-_pkgver=8.0.2
+pkgname=wine-stable-next
+_pkgver=9.0-rc2
 pkgver=${_pkgver/-/}  # Useful for wine-stable-next
 pkgrel=1
 
-source=(https://dl.winehq.org/wine/source/8.0/wine-$_pkgver.tar.xz{,.sign}
+source=(https://dl.winehq.org/wine/source/9.0/wine-$_pkgver.tar.xz{,.sign}
         30-win32-aliases.conf
-        wine-binfmt.conf
-        0001-mshtml-Wine-Gecko-2.47.4-release.patch)
-b2sums=('dcffaba6c90c4e02a7bc591a81e11aced06c006370c4c316c8a367b2f5814926063482959fabfe9d674ee1b5a560e59087e9b711e28360ced3aee2bbd6bb8fdb'
+        wine-binfmt.conf)
+b2sums=('2eddc96df30a8239b4b3314b7127eb3a11f953826506f12b8f5dc2acfe45f8a4fc3de7a4af4ada5c14c60783771ba865eb35189dcdb09eeb7e52438dd34fe668'
         'SKIP'
         '45db34fb35a679dc191b4119603eba37b8008326bd4f7d6bd422fbbb2a74b675bdbc9f0cc6995ed0c564cf088b7ecd9fbe2d06d42ff8a4464828f3c4f188075b'
-        'e9de76a32493c601ab32bde28a2c8f8aded12978057159dd9bf35eefbf82f2389a4d5e30170218956101331cf3e7452ae82ad0db6aad623651b0cc2174a61588'
-        '0cf4946fa93a0af447419b984c725fc8a4e1f1d0c5ffdb579a6a1bebb5b35c8d4c8a00b85b2e1754fc6f38f904bba992be8ed6ad9837ecbda42b974238af21db')
+        'e9de76a32493c601ab32bde28a2c8f8aded12978057159dd9bf35eefbf82f2389a4d5e30170218956101331cf3e7452ae82ad0db6aad623651b0cc2174a61588')
 validpgpkeys=(DA23579A74D4AD9AF9D3F945CEFAC8EAAF17519D)
 
 pkgdesc="A compatibility layer for running Windows programs"
-url="http://www.winehq.com"
+url="https://www.winehq.org/"
 arch=(x86_64)
 options=(staticlibs !lto)
 license=(LGPL)
@@ -33,19 +31,16 @@ depends=(
   freetype2              lib32-freetype2
   gcc-libs               lib32-gcc-libs
   gettext                lib32-gettext
-  glu                    lib32-glu
   libpcap                lib32-libpcap
-  libsm                  lib32-libsm
+  libunwind              lib32-libunwind
   libxcursor             lib32-libxcursor
-  libxdamage             lib32-libxdamage
   libxi                  lib32-libxi
   libxrandr              lib32-libxrandr
+  wayland                lib32-wayland
 )
 
 makedepends=(
   alsa-lib               lib32-alsa-lib
-  fontforge
-  giflib                 lib32-giflib
   gnutls                 lib32-gnutls
   gst-plugins-base-libs  lib32-gst-plugins-base-libs
   libcups                lib32-libcups
@@ -53,17 +48,17 @@ makedepends=(
   libpulse               lib32-libpulse
   libxcomposite          lib32-libxcomposite
   libxinerama            lib32-libxinerama
-  libxmu                 lib32-libxmu
   libxxf86vm             lib32-libxxf86vm
   mesa                   lib32-mesa
   mingw-w64-gcc
-  ncurses                lib32-ncurses
   ocl-icd                lib32-ocl-icd
   opencl-headers
+  pcsclite               lib32-pcsclite
   perl
   samba
   sane
   sdl2                   lib32-sdl2
+  unixodbc               lib32-unixodbc
   v4l-utils              lib32-v4l-utils
   vulkan-headers
   vulkan-icd-loader      lib32-vulkan-icd-loader
@@ -72,26 +67,28 @@ makedepends=(
 optdepends=(
   alsa-lib               lib32-alsa-lib
   alsa-plugins           lib32-alsa-plugins
+  cups
   dosbox
-  giflib                 lib32-giflib
   gnutls                 lib32-gnutls
+  gst-plugins-bad        lib32-gst-plugins-bad
   gst-plugins-base       lib32-gst-plugins-base
   gst-plugins-base-libs  lib32-gst-plugins-base-libs
   gst-plugins-good       lib32-gst-plugins-good
-  libcups                lib32-libcups
+  gst-plugins-ugly       lib32-gst-plugins-ugly
   libgphoto2             lib32-libgphoto2
   libpulse               lib32-libpulse
   libxcomposite          lib32-libxcomposite
   libxinerama            lib32-libxinerama
-  ncurses                lib32-ncurses
   ocl-icd                lib32-ocl-icd
+  pcsclite               lib32-pcsclite
   samba
   sane
   sdl2                   lib32-sdl2
+  unixodbc               lib32-unixodbc
   v4l-utils              lib32-v4l-utils
   vulkan-icd-loader      lib32-vulkan-icd-loader
   wine-gecko
-  wine-stable-mono
+  wine-mono
 )
 
 provides=(wine=$pkgver)
@@ -109,8 +106,6 @@ prepare() {
     fi
   done
 
-  sed 's|OpenCL/opencl.h|CL/opencl.h|g' -i wine/configure*
-
   # Get rid of old build dirs
   rm -rf wine-{32,64}-build
   mkdir wine-{32,64}-build
diff --git a/wine.install b/wine.install
index 8837584bd477..674a1e072abb 100644
--- a/wine.install
+++ b/wine.install
@@ -5,14 +5,3 @@ To enable binfmt support, run:
 # systemctl restart systemd-binfmt
 EOF
 }
-
-post_upgrade() {
-  # Check the version upgraded from is less than 4.0.3-1
-  if [ $(vercmp 4.0.3-1 "$2") -eq 1 ]; then
-    cat <<EOF
-binfmt support has been made optional, to enable it, run:
-# ln -s /usr/share/wine/binfmt/wine.conf /etc/binfmt.d/wine.conf
-# systemctl restart systemd-binfmt
-EOF
-  fi
-}