From 59f3c444779b4dbddea00dd4dddb5668b29df369 Mon Sep 17 00:00:00 2001 From: Fotios Valasiadis Date: Wed, 17 Jan 2024 19:04:00 +0200 Subject: [PATCH] wine: update to 9.0 Changes in this commit besides upgrade to 9.0: 1. The link to the source code temporarily changed since for release 9.0 they did not follow the 9.x/.tar.gz convention and instead released it directly under 9.0/. I expect them to move back to 9.x though sooner or later when 9.1 is to be released. We can change it back at that time. 2. libwine, previously marked deprecated was removed, I as a result also remove the respective package. 3. Additional notes include the new WoW64 functionality which no longer requires a separate wine 32bit install to run 32bit windows software, it's all to be managed by the 64bit installation, really cool, but still somewhat experimental with some drawbacks, not anything extremely annoying though, can be enabled with a command line flag. Since musl does not have multilib, enabling it just for it for now, but keeping glibc the same since it's still experimental. Also it's now possible to run x86 windows apps on ARM AARCH64! Once again you need to supply a command line flag to enable it. Bright future since it now means aarch64 void linux can ship wine to arm installs too. Full notes: https://gitlab.winehq.org/wine/wine/-/releases/wine-9.0 Signed-off-by: Fotios Valasiadis --- srcpkgs/libwine | 1 - srcpkgs/wine/template | 28 ++++++++++++---------------- 2 files changed, 12 insertions(+), 17 deletions(-) delete mode 120000 srcpkgs/libwine diff --git a/srcpkgs/libwine b/srcpkgs/libwine deleted file mode 120000 index bd42d64fa10a4..0000000000000 --- a/srcpkgs/libwine +++ /dev/null @@ -1 +0,0 @@ -wine \ No newline at end of file diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template index 717260c94c4c4..15769a8351dfa 100644 --- a/srcpkgs/wine/template +++ b/srcpkgs/wine/template @@ -1,6 +1,6 @@ # Template file for 'wine' pkgname=wine -version=8.21 +version=9.0 revision=1 _pkgver=${version/r/-r} create_wrksrc=yes @@ -11,10 +11,10 @@ short_desc="Run Microsoft Windows applications" maintainer="Helmut Pozimski " license="LGPL-2.1-or-later" homepage="http://www.winehq.org/" -distfiles="https://dl.winehq.org/wine/source/${version%.*}.x/wine-${_pkgver}.tar.xz +distfiles="https://dl.winehq.org/wine/source/${_pkgver}/wine-${_pkgver}.tar.xz https://github.com/wine-staging/wine-staging/archive/v${_pkgver}.tar.gz" -checksum="02d6493f348168268669b62d4795df5b335be9ae06229c68f388a093d0d6b61d - 735d3072caa0ba0b528b837bd20e38b5d5f6008b055fff5295d37ea7cae66ce6" +checksum="7cfd090a5395f5b76d95bb5defac8a312c8de4c070c1163b8b58da38330ca6ee + e3b4af34214a5c962056fc1b360d1f6fc0d33d97cd3ee6d3f9d8758c2cb7f58c" # NOTE: wine depends on specific versions of wine-mono and wine-gecko, # check for updates to these packages when updating wine @@ -52,11 +52,12 @@ makedepends="gettext-devel ncurses-devel glu-devel libSM-devel SDL2-devel" depends="libXi libXinerama libXcomposite libXcursor libOSMesa desktop-file-utils hicolor-icon-theme liberation-fonts-ttf - gnutls SDL2 wine-common>=${version}_${revision} libwine>=${version}_${revision}" + gnutls SDL2 wine-common>=${version}_${revision}" lib32depends="libXi-32bit>=0 libXinerama-32bit>=0 libXcomposite-32bit>=0 libXcursor-32bit>=0 libOSMesa-32bit>=0 desktop-file-utils>=0 hicolor-icon-theme>=0 liberation-fonts-ttf>=0 gnutls-32bit>=0 SDL2-32bit>=0 - wine-common>=${version}_${revision} libwine-32bit>=${version}_${revision}" + wine-common>=${version}_${revision}" +replaces="libwine>=0" # This testsuite might hang indefinitely make_check=extended @@ -73,6 +74,11 @@ if [ "$XBPS_LIBC" = "glibc" ]; then hostmakedepends+=" prelink" fi +if [ "XBPS_TARGET_LIBC" = "musl" ]; then + configure_args+=" --enable-archs=i386,x86_64" + makedepends+=" cross-i686-w64-mingw32" +fi + _wine_libexec="/usr/libexec/wine" nopie_files="${_wine_libexec}/wine${_wine_suffix}" @@ -125,17 +131,7 @@ post_install() { done } -libwine_package() { - lib32mode=full - short_desc+=" - Runtime library" - replaces="libwine-unstable>=0" - pkg_install() { - vmove usr/lib/wine - } -} - wine-devel_package() { - depends="libwine-${version}_${revision}" short_desc+=" - development files" replaces="wine-unstable-devel>=0" pkg_install() {