Bug 1632693 - Upgrade wine to 5.0. r=rstewart
authorMike Hommey <mh+mozilla@glandium.org>
Sat, 25 Apr 2020 21:02:23 +0000
changeset 526089 59f59e806221dfe16fd3df6a4ba4bb78705c4131
parent 526088 c04304e53312694216e694e091e73a176b2f5286
child 526090 90bd5342c58f92923a4e26ddd3b00c37810ace97
push id37350
push usernbeleuzu@mozilla.com
push dateSun, 26 Apr 2020 09:43:12 +0000
treeherdermozilla-central@21659f178a12 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersrstewart
bugs1632693
milestone77.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1632693 - Upgrade wine to 5.0. r=rstewart It requires a newer version of bison to build, which we get by using a more recent version of Debian for the toolchain build (Debian 9 being the version we use for the builds that depend on wine, so it will work there). Differential Revision: https://phabricator.services.mozilla.com/D72254
taskcluster/ci/docker-image/kind.yml
taskcluster/ci/fetch/toolchains.yml
taskcluster/ci/toolchain/misc.yml
taskcluster/scripts/misc/build-wine.sh
--- a/taskcluster/ci/docker-image/kind.yml
+++ b/taskcluster/ci/docker-image/kind.yml
@@ -67,16 +67,20 @@ jobs:
             - deb7-sqlite3
             - deb7-xz-utils
     toolchain-build:
         symbol: I(toolchain)
         parent: debian7-base
         packages:
             - deb7-cmake
             - deb7-ninja
+    deb9-toolchain-build:
+        symbol: I(deb9-toolchain)
+        parent: debian9-base
+        definition: toolchain-build
     deb10-toolchain-build:
         symbol: I(deb10-toolchain)
         parent: debian10-base
         definition: toolchain-build
         packages:
             - deb10-cmake
     custom-v8:
         symbol: I(custom-v8)
--- a/taskcluster/ci/fetch/toolchains.yml
+++ b/taskcluster/ci/fetch/toolchains.yml
@@ -264,23 +264,23 @@ nsis-3.01-win:
 upx-3.95-win:
     description: upx 3.95 for windows
     fetch:
         type: static-url
         url: https://hg.mozilla.org/mozilla-build/raw-file/3b8c537ca3c879551956ad47ca9f089583f647c5/upx-3.95-win64.zip
         sha256: 5c076f87ba64d82f11513f4af0ceb07246a3540aa3c72ca3ffc2d53971fa56e3
         size: 462820
 
-wine-3.0.3:
-    description: wine-3.0.3.tar.xz
+wine-5.0:
+    description: wine-5.0.tar.xz
     fetch:
         type: static-url
-        url: http://dl.winehq.org/wine/source/3.0/wine-3.0.3.tar.xz
-        sha256: eb645999ea6f6455a5275bf267e19a32497c8f5aac818ea40afe7c8c396a4da1
-        size: 19735412
+        url: https://dl.winehq.org/wine/source/5.0/wine-5.0.tar.xz
+        sha256: 181550ba69a80b00c631f80c28ff7642264613bbecdb0c0fc04d6534866713b4
+        size: 22469428
         gpg-signature:
             sig-url: "{url}.sign"
             key-path: build/unix/build-gcc/DA23579A74D4AD9AF9D3F945CEFAC8EAAF17519D.key
 
 cbindgen-0.14.1:
     description: cbindgen source code
     fetch:
         type: git
--- a/taskcluster/ci/toolchain/misc.yml
+++ b/taskcluster/ci/toolchain/misc.yml
@@ -239,23 +239,24 @@ linux64-liblowercase:
             - linux64-rust-1.41
 
 linux64-wine:
     description: "Wine build for Windows Cross Compile"
     treeherder:
         symbol: TL(wine)
         tier: 1
     worker:
+        docker-image: {in-tree: deb9-toolchain-build}
         max-run-time: 10800
     run:
         script: build-wine.sh
         toolchain-artifact: public/build/wine.tar.xz
     fetches:
         fetch:
-            - wine-3.0.3
+            - wine-5.0
 
 win32-pdbstr:
     description: "pdbstr for 32-bits Windows"
     treeherder:
         symbol: TW32(pdbstr)
     worker-type: b-win2012
     worker:
         artifacts:
--- a/taskcluster/scripts/misc/build-wine.sh
+++ b/taskcluster/scripts/misc/build-wine.sh
@@ -4,21 +4,21 @@ set -x -e -v
 WORKSPACE=$HOME/workspace
 INSTALL_DIR=$WORKSPACE/wine
 
 mkdir -p $INSTALL_DIR
 mkdir -p $WORKSPACE/build/wine
 mkdir -p $WORKSPACE/build/wine64
 
 cd $WORKSPACE/build/wine64
-$MOZ_FETCHES_DIR/wine-3.0.3/configure --enable-win64 --without-x --without-freetype --prefix=$INSTALL_DIR/
+$MOZ_FETCHES_DIR/wine-5.0/configure --enable-win64 --without-x --without-freetype --prefix=$INSTALL_DIR/
 make -j$(nproc)
 
 cd $WORKSPACE/build/wine
-$MOZ_FETCHES_DIR/wine-3.0.3/configure --with-wine64=../wine64 --without-x --without-freetype --prefix=$INSTALL_DIR/
+$MOZ_FETCHES_DIR/wine-5.0/configure --with-wine64=../wine64 --without-x --without-freetype --prefix=$INSTALL_DIR/
 make -j$(nproc)
 make install
 
 cd $WORKSPACE/build/wine64
 make install
 
 # --------------