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
This commit is contained in:
Mike Hommey 2020-04-25 21:02:23 +00:00
Родитель c4534f1f07
Коммит 340788143e
4 изменённых файлов: 13 добавлений и 8 удалений

Просмотреть файл

@ -72,6 +72,10 @@ jobs:
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

Просмотреть файл

@ -269,13 +269,13 @@ upx-3.95-win:
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

Просмотреть файл

@ -244,13 +244,14 @@ linux64-wine:
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"

Просмотреть файл

@ -9,11 +9,11 @@ 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