Merge remote-tracking branch 'next/master'

1 files changed, 73 insertions, 65 deletions

diff --git a/.SRCINFO b/.SRCINFO
index cf4e670ef141..6073d0e3b557 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,157 +1,165 @@
-pkgbase = wine-stable
+pkgbase = wine-stable-next
 	pkgdesc = A compatibility layer for running Windows programs
-	pkgver = 6.0.2
-	pkgrel = 2
+	pkgver = 7.0rc6
+	pkgrel = 1
 	url = http://www.winehq.com
 	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 = gsm
+	makedepends = lib32-gsm
 	makedepends = gst-plugins-base-libs
+	makedepends = lib32-gst-plugins-base-libs
 	makedepends = libcups
-	makedepends = libgl
+	makedepends = lib32-libcups
 	makedepends = libgphoto2
+	makedepends = lib32-libgphoto2
+	makedepends = libjpeg-turbo
+	makedepends = lib32-libjpeg-turbo
 	makedepends = libldap
+	makedepends = lib32-libldap
 	makedepends = libpng
+	makedepends = lib32-libpng
 	makedepends = libpulse
+	makedepends = lib32-libpulse
 	makedepends = libxcomposite
+	makedepends = lib32-libxcomposite
 	makedepends = libxinerama
+	makedepends = lib32-libxinerama
 	makedepends = libxmu
+	makedepends = lib32-libxmu
 	makedepends = libxslt
+	makedepends = lib32-libxslt
 	makedepends = libxxf86vm
+	makedepends = lib32-libxxf86vm
 	makedepends = mesa
+	makedepends = lib32-mesa
 	makedepends = mingw-w64-gcc
 	makedepends = mpg123
+	makedepends = lib32-mpg123
 	makedepends = ncurses
+	makedepends = lib32-ncurses
 	makedepends = ocl-icd
+	makedepends = lib32-ocl-icd
 	makedepends = openal
+	makedepends = lib32-openal
 	makedepends = opencl-headers
 	makedepends = perl
 	makedepends = samba
 	makedepends = sane
 	makedepends = sdl2
+	makedepends = lib32-sdl2
 	makedepends = v4l-utils
+	makedepends = lib32-v4l-utils
 	makedepends = vkd3d
+	makedepends = lib32-vkd3d
 	makedepends = vulkan-headers
 	makedepends = vulkan-icd-loader
-	makedepends = lib32-alsa-lib
-	makedepends = lib32-giflib
-	makedepends = lib32-gnutls
-	makedepends = lib32-gst-plugins-base-libs
-	makedepends = lib32-libcups
-	makedepends = lib32-libgl
-	makedepends = lib32-libldap
-	makedepends = lib32-libpng
-	makedepends = lib32-libpulse
-	makedepends = lib32-libxcomposite
-	makedepends = lib32-libxinerama
-	makedepends = lib32-libxmu
-	makedepends = lib32-libxslt
-	makedepends = lib32-libxxf86vm
-	makedepends = lib32-mesa
-	makedepends = lib32-mpg123
-	makedepends = lib32-ncurses
-	makedepends = lib32-ocl-icd
-	makedepends = lib32-openal
-	makedepends = lib32-sdl2
-	makedepends = lib32-v4l-utils
-	makedepends = lib32-vkd3d
 	makedepends = lib32-vulkan-icd-loader
 	depends = desktop-file-utils
 	depends = faudio
-	depends = fontconfig
-	depends = freetype2
-	depends = glu
-	depends = lcms2
-	depends = libpcap
-	depends = libsm
-	depends = libxcursor
-	depends = libxdamage
-	depends = libxi
-	depends = libxml2
-	depends = libxrandr
 	depends = lib32-faudio
+	depends = fontconfig
 	depends = lib32-fontconfig
+	depends = freetype2
 	depends = lib32-freetype2
+	depends = gcc-libs
 	depends = lib32-gcc-libs
+	depends = gettext
 	depends = lib32-gettext
+	depends = glu
 	depends = lib32-glu
+	depends = lcms2
 	depends = lib32-lcms2
+	depends = libpcap
 	depends = lib32-libpcap
+	depends = libsm
 	depends = lib32-libsm
+	depends = libxcursor
 	depends = lib32-libxcursor
+	depends = libxdamage
 	depends = lib32-libxdamage
+	depends = libxi
 	depends = lib32-libxi
+	depends = libxml2
 	depends = lib32-libxml2
+	depends = libxrandr
 	depends = lib32-libxrandr
 	optdepends = alsa-lib
+	optdepends = lib32-alsa-lib
 	optdepends = alsa-plugins
+	optdepends = lib32-alsa-plugins
 	optdepends = dosbox
 	optdepends = giflib
+	optdepends = lib32-giflib
 	optdepends = gnutls
+	optdepends = lib32-gnutls
 	optdepends = gsm
+	optdepends = lib32-gsm
 	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 = libgphoto2
+	optdepends = lib32-libgphoto2
 	optdepends = libjpeg-turbo
+	optdepends = lib32-libjpeg-turbo
 	optdepends = libldap
+	optdepends = lib32-libldap
 	optdepends = libpng
+	optdepends = lib32-libpng
 	optdepends = libpulse
+	optdepends = lib32-libpulse
 	optdepends = libxcomposite
+	optdepends = lib32-libxcomposite
 	optdepends = libxinerama
+	optdepends = lib32-libxinerama
 	optdepends = libxslt
+	optdepends = lib32-libxslt
 	optdepends = mpg123
+	optdepends = lib32-mpg123
 	optdepends = ncurses
+	optdepends = lib32-ncurses
 	optdepends = ocl-icd
+	optdepends = lib32-ocl-icd
 	optdepends = openal
+	optdepends = lib32-openal
 	optdepends = samba
 	optdepends = sane
 	optdepends = sdl2
-	optdepends = v4l-utils
-	optdepends = vkd3d
-	optdepends = vulkan-icd-loader
-	optdepends = lib32-alsa-lib
-	optdepends = lib32-alsa-plugins
-	optdepends = lib32-giflib
-	optdepends = lib32-gnutls
-	optdepends = lib32-gst-plugins-base
-	optdepends = lib32-gst-plugins-base-libs
-	optdepends = lib32-gst-plugins-good
-	optdepends = lib32-libcups
-	optdepends = lib32-libjpeg-turbo
-	optdepends = lib32-libldap
-	optdepends = lib32-libpng
-	optdepends = lib32-libpulse
-	optdepends = lib32-libxcomposite
-	optdepends = lib32-libxinerama
-	optdepends = lib32-libxslt
-	optdepends = lib32-mpg123
-	optdepends = lib32-ncurses
-	optdepends = lib32-ocl-icd
-	optdepends = lib32-openal
 	optdepends = lib32-sdl2
+	optdepends = v4l-utils
 	optdepends = lib32-v4l-utils
+	optdepends = vkd3d
 	optdepends = lib32-vkd3d
+	optdepends = vulkan-icd-loader
 	optdepends = lib32-vulkan-icd-loader
-	provides = wine=6.0.2
+	optdepends = wine-mono
+	provides = wine=7.0rc6
+	provides = wine-stable=7.0rc6
 	conflicts = wine
+	conflicts = wine-stable
 	options = staticlibs
-	source = https://dl.winehq.org/wine/source/6.0/wine-6.0.2.tar.xz
-	source = https://dl.winehq.org/wine/source/6.0/wine-6.0.2.tar.xz.sign
+	source = https://dl.winehq.org/wine/source/7.0/wine-7.0-rc6.tar.xz
+	source = https://dl.winehq.org/wine/source/7.0/wine-7.0-rc6.tar.xz.sign
 	source = 30-win32-aliases.conf
 	source = wine-binfmt.conf
-	source = 0001-ldap-rename-ldap_connect-to-oldap_connect.patch
 	validpgpkeys = DA23579A74D4AD9AF9D3F945CEFAC8EAAF17519D
-	b2sums = 176614736055892b7203313edc52e2926807c93b0bb97d59f65fbf284fd9cb138e4555fb7cd5a6c7c867367fdc50c89f12d7360ca0db947a7f04594f35f14775
+	b2sums = ba7a1a58f6cc53f35c522f3c37959a88a7db8b73a6bbb9b9f40436a63758bd5d17ed964cb2ed69857a7a90f2a89c89cc1ce58aa771a02bb8be1c05ac37f25fcc
 	b2sums = SKIP
 	b2sums = 45db34fb35a679dc191b4119603eba37b8008326bd4f7d6bd422fbbb2a74b675bdbc9f0cc6995ed0c564cf088b7ecd9fbe2d06d42ff8a4464828f3c4f188075b
 	b2sums = e9de76a32493c601ab32bde28a2c8f8aded12978057159dd9bf35eefbf82f2389a4d5e30170218956101331cf3e7452ae82ad0db6aad623651b0cc2174a61588
 	b2sums = b3ca0a31ee21f765a526729560a77a62f9e6a10a8a280d7cc6b5f8950542e99116ad26fcceeeb193bc0db92b85ab7d40da3777875f56b9370309993df1dc9a3e
 
-pkgname = wine-stable
+pkgname = wine-stable-next