[Wine] Update from custom fork (7.0-rc3) to upstream Wine 11.2

W/Wine/build_tarballs.jl

@@ -13,10 +13,9 @@ platform_spec = [a for a in ARGS if !startswith(a, "-")]
 is_meta = any(a->startswith(a, "--meta-json"), ARGS)
 requested_platforms = map(p->parse(Platform, p; validate_strict=true), platform_spec)
 
-version = v"7.0-rc3"
+version = v"11.2"
 sources = Any[
-    GitSource("https://github.com/JuliaComputing/wine-staging.git", "10ff6d27133070cff6369c48d7ee4c56ee8da7aa"),
-    DirectorySource("./bundled")
+    GitSource("https://github.com/wine-mirror/wine.git", "8a6562df03e730ae3cc75d544862701ed8de52f1"),
 ]
 
 # The products that we will ensure are always built
@@ -71,8 +70,7 @@ if !is_meta
         platform32 = platform_map[platform64]
 
         wine64_build_script = raw"""
-        cd $WORKSPACE/srcdir/wine-staging
-        atomic_patch -p1 $WORKSPACE/srcdir/patches/hwcap2.patch
+        cd $WORKSPACE/srcdir/wine
 
         # First, build wine64, making the actual build directory itself the thing we will install.
         mkdir $WORKSPACE/destdir/wine64
@@ -82,7 +80,7 @@ if !is_meta
         # build environment, everything goes through ok and doesn't
         # trigger wine's cross compile detection (which would require
         # a more complicated bootstrap process).
-        $WORKSPACE/srcdir/wine-staging/configure --prefix=${prefix} --build=${target} --host=${target} --without-x --without-freetype --enable-win64
+        $WORKSPACE/srcdir/wine/configure --prefix=${prefix} --build=${target} --host=${target} --without-x --without-freetype --enable-win64
         make -j${nproc}
         """
 
@@ -95,18 +93,17 @@ if !is_meta
 
         # Next, build wine32, without wine64, then use those tools to build wine32 WITH wine64
         wine32_script = raw"""
-        cd $WORKSPACE/srcdir/wine-staging
-        atomic_patch -p1 $WORKSPACE/srcdir/patches/hwcap2.patch
+        cd $WORKSPACE/srcdir/wine
 
         # Next, build wine32, linking against the previously included wine64 stuff:
         mkdir $WORKSPACE/srcdir/wine32_only
         cd $WORKSPACE/srcdir/wine32_only
-        $WORKSPACE/srcdir/wine-staging/configure --host=${target} --without-x --without-freetype
+        $WORKSPACE/srcdir/wine/configure --host=${target} --without-x --without-freetype
         make -j${nproc}
 
         mkdir $prefix/wine32
         cd $prefix/wine32
-        $WORKSPACE/srcdir/wine-staging/configure --prefix=${prefix}/wine32 --host=${target} --without-x --without-freetype --with-wine64=$WORKSPACE/srcdir/wine64 --with-wine-tools=$WORKSPACE/srcdir/wine32_only
+        $WORKSPACE/srcdir/wine/configure --prefix=${prefix}/wine32 --host=${target} --without-x --without-freetype --with-wine64=$WORKSPACE/srcdir/wine64 --with-wine-tools=$WORKSPACE/srcdir/wine32_only
         make -j${nproc}
         make -j${nproc} install
         """
@@ -125,9 +122,7 @@ end
 
 # Finally, install both:
 script = raw"""
-cd $WORKSPACE/srcdir/wine-staging
-atomic_patch -p1 $WORKSPACE/srcdir/patches/hwcap2.patch
-atomic_patch -p1 $WORKSPACE/srcdir/patches/darwin.patch
+cd $WORKSPACE/srcdir/wine
 
 if [[ "${target}" == *darwin* ]]; then
     # On macOS, we currently do not support 32-bit wine. It is unclear whether
@@ -149,12 +144,12 @@ if [[ "${target}" == *darwin* ]]; then
 	ln -s $(which x86_64-linux-musl-as) aliases/as
     export OLD_PATH=$PATH
     export PATH=$PWD/aliases:$PATH
-    ${WORKSPACE}/srcdir/wine-staging/configure --build=x86_64-linux-musl --host=x86_64-linux-musl CC=x86_64-linux-musl-gcc LD=x86_64-linux-musl-ld AS=x86_64-linux-musl-as --enable-win64 --without-x --without-freetype
+    ${WORKSPACE}/srcdir/wine/configure --build=x86_64-linux-musl --host=x86_64-linux-musl CC=x86_64-linux-musl-gcc LD=x86_64-linux-musl-ld AS=x86_64-linux-musl-as --enable-win64 --without-x --without-freetype
     make -j${nproc} CC=x86_64-linux-musl-gcc LD=x86_64-linux-musl-ld AS=x86_64-linux-musl-as
     export PATH=$OLD_PATH
 
     # Ok, now we can actually do the proper build of wine.
-    cd $WORKSPACE/srcdir/wine-staging
+    cd $WORKSPACE/srcdir/wine
     ./configure --build=${MACHTYPE} --prefix=${prefix} --host=${target} --without-x --without-freetype --with-wine-tools=$WORKSPACE/wine_tools --enable-win64
     make -j${nproc}
 else
@@ -163,8 +158,8 @@ else
 fi
 
 make -j${nproc} install
-install_license $WORKSPACE/srcdir/wine-staging/LICENSE
-install_license $WORKSPACE/srcdir/wine-staging/COPYING.LIB
+install_license $WORKSPACE/srcdir/wine/LICENSE
+install_license $WORKSPACE/srcdir/wine/COPYING.LIB
 """
 
 final_products = Product[