[PR PATCH] wine: update to 9.0

[PR PATCH] wine: update to 9.0

[fvalasiad]

[-- Attachment #1: Type: text/plain, Size: 2485 bytes --]

There is a new pull request by fvalasiad against master on the void-packages repository

https://github.com/fvalasiad/void-packages wine
https://github.com/void-linux/void-packages/pull/48249

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/<release>.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.

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.

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.

I haven't taken any measures to enabling any of the two, just thought I'd bring them over to your attention and ask you what you wanna do about it.

Full notes: https://gitlab.winehq.org/wine/wine/-/releases/wine-9.0

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/48249.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-wine-48249.patch --]
[-- Type: text/x-diff, Size: 3827 bytes --]

From 37ab05dcc6e73f1a76df7bacea7109adffd04d09 Mon Sep 17 00:00:00 2001
From: Fotios Valasiadis <fvalasiad@gmail.com>
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/<release>.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.

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.

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.

I haven't taken any measures to enabling any of the two, just thought I'd bring them over to your attention and
ask you what you wanna do about it.

Full notes: https://gitlab.winehq.org/wine/wine/-/releases/wine-9.0

Signed-off-by: Fotios Valasiadis <fvalasiad@gmail.com>
---
 srcpkgs/wine/template | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 717260c94c4c4..035eef625dab2 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 <helmut@pozimski.eu>"
 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,11 @@ 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}
 # This testsuite might hang indefinitely
 make_check=extended
 
@@ -125,17 +125,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() {

Re: [PR PATCH] [Updated] wine: update to 9.0

[fvalasiad]

[-- Attachment #1: Type: text/plain, Size: 2475 bytes --]

There is an updated pull request by fvalasiad against master on the void-packages repository

https://github.com/fvalasiad/void-packages wine
https://github.com/void-linux/void-packages/pull/48249

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/<release>.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.

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.

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.

I haven't taken any measures to enabling any of the two, just thought I'd bring them over to your attention and ask you what you wanna do about it.

Full notes: https://gitlab.winehq.org/wine/wine/-/releases/wine-9.0

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/48249.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-wine-48249.patch --]
[-- Type: text/x-diff, Size: 3826 bytes --]

From 38b44c819fb245951b0db724598bdc82f1c9ab5a Mon Sep 17 00:00:00 2001
From: Fotios Valasiadis <fvalasiad@gmail.com>
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/<release>.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.

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.

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.

I haven't taken any measures to enabling any of the two,
just thought I'd bring them over to your attention and
ask you what you wanna do about it.

Full notes: https://gitlab.winehq.org/wine/wine/-/releases/wine-9.0

Signed-off-by: Fotios Valasiadis <fvalasiad@gmail.com>
---
 srcpkgs/wine/template | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 717260c94c4c4..035eef625dab2 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 <helmut@pozimski.eu>"
 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,11 @@ 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}
 # This testsuite might hang indefinitely
 make_check=extended
 
@@ -125,17 +125,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() {

Re: wine: update to 9.0

[fvalasiad]

[-- Attachment #1: Type: text/plain, Size: 153 bytes --]

New comment by fvalasiad on void-packages repository

https://github.com/void-linux/void-packages/pull/48249#issuecomment-1896024886

Comment:
@Hoshpak 

Re: [PR REVIEW] wine: update to 9.0

[Hoshpak]

[-- Attachment #1: Type: text/plain, Size: 157 bytes --]

New review comment by Hoshpak on void-packages repository

https://github.com/void-linux/void-packages/pull/48249#discussion_r1456127942

Comment:
here also

Re: [PR REVIEW] wine: update to 9.0

[Hoshpak]

[-- Attachment #1: Type: text/plain, Size: 191 bytes --]

New review comment by Hoshpak on void-packages repository

https://github.com/void-linux/void-packages/pull/48249#discussion_r1456127667

Comment:
The closing quotation mark is missing here.

Re: [PR PATCH] [Updated] wine: update to 9.0

[fvalasiad]

[-- Attachment #1: Type: text/plain, Size: 2475 bytes --]

There is an updated pull request by fvalasiad against master on the void-packages repository

https://github.com/fvalasiad/void-packages wine
https://github.com/void-linux/void-packages/pull/48249

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/<release>.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.

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.

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.

I haven't taken any measures to enabling any of the two, just thought I'd bring them over to your attention and ask you what you wanna do about it.

Full notes: https://gitlab.winehq.org/wine/wine/-/releases/wine-9.0

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/48249.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-wine-48249.patch --]
[-- Type: text/x-diff, Size: 3828 bytes --]

From 3093a07924a5110196f2bc793d5bcd7101b1622a Mon Sep 17 00:00:00 2001
From: Fotios Valasiadis <fvalasiad@gmail.com>
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/<release>.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.

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.

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.

I haven't taken any measures to enabling any of the two,
just thought I'd bring them over to your attention and
ask you what you wanna do about it.

Full notes: https://gitlab.winehq.org/wine/wine/-/releases/wine-9.0

Signed-off-by: Fotios Valasiadis <fvalasiad@gmail.com>
---
 srcpkgs/wine/template | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 717260c94c4c4..fe663dd89d657 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 <helmut@pozimski.eu>"
 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,11 @@ 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}"
 # This testsuite might hang indefinitely
 make_check=extended
 
@@ -125,17 +125,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() {

Re: [PR REVIEW] wine: update to 9.0

[fvalasiad]

[-- Attachment #1: Type: text/plain, Size: 154 bytes --]

New review comment by fvalasiad on void-packages repository

https://github.com/void-linux/void-packages/pull/48249#discussion_r1456149809

Comment:
done

Re: wine: update to 9.0

[fvalasiad]

[-- Attachment #1: Type: text/plain, Size: 335 bytes --]

New comment by fvalasiad on void-packages repository

https://github.com/void-linux/void-packages/pull/48249#issuecomment-1896276629

Comment:
@Hoshpak any idea about the conflicts mentioned with libwine? Is it because of the fact that srcpkgs/libwine is still there? Should I remove it in this PR as well or leave it for another one?

Re: wine: update to 9.0

[Hoshpak]

[-- Attachment #1: Type: text/plain, Size: 621 bytes --]

New comment by Hoshpak on void-packages repository

https://github.com/void-linux/void-packages/pull/48249#issuecomment-1896280991

Comment:
The new WoW64 mode looks interesting however it seems like activating it would compromise too much on compatibility and performance so I would prefer to keep building the old way for now and activate the new mode only after it has been improved in a future version or if we wanted to drop i686 and multilib support.

Building for aarch64 would certainly be useful for some people however I don't own any aarch64 hardware right now so I couldn't test the resulting build myself.

Re: wine: update to 9.0

[fvalasiad]

[-- Attachment #1: Type: text/plain, Size: 1050 bytes --]

New comment by fvalasiad on void-packages repository

https://github.com/void-linux/void-packages/pull/48249#issuecomment-1896293268

Comment:
> The new WoW64 mode looks interesting however it seems like activating it would compromise too much on compatibility and performance so I would prefer to keep building the old way for now and activate the new mode only after it has been improved in a future version or if we wanted to drop i686 and multilib support.
> 
> Building for aarch64 would certainly be useful for some people however I don't own any aarch64 hardware right now so I couldn't test the resulting build myself.

I have a couple of SBCs and PIs around, want me to run a quick void install on em and try out wine with some basic x86 windows programs?

I am not that familiar with configuring the template for other architectures though, I will need some time to figure out how to make a package. Otherwise I cross compile wine normally and simply move the bundle to my pi and test run it there, then we invest in the arm package.

Re: wine: update to 9.0

[AlexKurisu]

[-- Attachment #1: Type: text/plain, Size: 261 bytes --]

New comment by AlexKurisu on void-packages repository

https://github.com/void-linux/void-packages/pull/48249#issuecomment-1898456220

Comment:
Maybe enable the new WoW64 on musl? It won't make anything worse there since musl doesn't support multilib at all…

Re: wine: update to 9.0

[fvalasiad]

[-- Attachment #1: Type: text/plain, Size: 518 bytes --]

New comment by fvalasiad on void-packages repository

https://github.com/void-linux/void-packages/pull/48249#issuecomment-1898604630

Comment:
@AlexKurisu Hmmm indeed there is no performance penalty to pay between using the old WoW64 with 32bit binaries and using the new one with only 64bit binaries. So wine on musl so far was not able to run windows 32bit apps at all? This means that the musl experience is also improved, god I love the new wine release!

I upvote, it's a good idea, what do you think @Hoshpak.

Re: wine: update to 9.0

[fvalasiad]

[-- Attachment #1: Type: text/plain, Size: 517 bytes --]

New comment by fvalasiad on void-packages repository

https://github.com/void-linux/void-packages/pull/48249#issuecomment-1898604630

Comment:
@AlexKurisu Hmmm indeed there is no performance penalty to pay/bugs potentially introduced in the mixed 64bit 32bit version since there was no 32bit version! So wine on musl so far was not able to run windows 32bit apps at all? This means that the musl experience is also improved, god I love the new wine release!

I upvote, it's a good idea, what do you think @Hoshpak.

Re: wine: update to 9.0

[AlexKurisu]

[-- Attachment #1: Type: text/plain, Size: 216 bytes --]

New comment by AlexKurisu on void-packages repository

https://github.com/void-linux/void-packages/pull/48249#issuecomment-1898641225

Comment:
Just to note: Alpine builds wine with new WoW64 since it's introduction

Re: wine: update to 9.0

[Hoshpak]

[-- Attachment #1: Type: text/plain, Size: 989 bytes --]

New comment by Hoshpak on void-packages repository

https://github.com/void-linux/void-packages/pull/48249#issuecomment-1898873936

Comment:
@fvalasiad Regarding the libwine package: Please also remove the symlink. The package should probably also declare a "replaces=libwine>=0" to ensure that it is removed during the installation of the new wine version. I think that should solve the failing check.

Getting a package to cross-compile that isn't intended to be (I'm not sure if that's actually the case for wine) can be quite challenging so I would suggest that we give it a try and do if it's a quick wine but regard it as optional and postpone it if it's not to not delay the update unnecessarily. I would have some time on the weekend to try to adapt the template to cross-compile.

Regarding the enabling the new WoW64 for musl only for now, I think that that's a great idea. musl indeed never had support for 32 bit binaries so it would be a great benefit for musl users.

Re: wine: update to 9.0

[Hoshpak]

[-- Attachment #1: Type: text/plain, Size: 989 bytes --]

New comment by Hoshpak on void-packages repository

https://github.com/void-linux/void-packages/pull/48249#issuecomment-1898873936

Comment:
@fvalasiad Regarding the libwine package: Please also remove the symlink. The package should probably also declare a replaces="libwine>=0" to ensure that it is removed during the installation of the new wine version. I think that should solve the failing check.

Getting a package to cross-compile that isn't intended to be (I'm not sure if that's actually the case for wine) can be quite challenging so I would suggest that we give it a try and do if it's a quick wine but regard it as optional and postpone it if it's not to not delay the update unnecessarily. I would have some time on the weekend to try to adapt the template to cross-compile.

Regarding the enabling the new WoW64 for musl only for now, I think that that's a great idea. musl indeed never had support for 32 bit binaries so it would be a great benefit for musl users.

Re: wine: update to 9.0

[Hoshpak]

[-- Attachment #1: Type: text/plain, Size: 991 bytes --]

New comment by Hoshpak on void-packages repository

https://github.com/void-linux/void-packages/pull/48249#issuecomment-1898873936

Comment:
@fvalasiad Regarding the libwine package: Please also remove the symlink. The package should probably also declare a `replaces="libwine>=0"` to ensure that it is removed during the installation of the new wine version. I think that should solve the failing check.

Getting a package to cross-compile that isn't intended to be (I'm not sure if that's actually the case for wine) can be quite challenging so I would suggest that we give it a try and do if it's a quick wine but regard it as optional and postpone it if it's not to not delay the update unnecessarily. I would have some time on the weekend to try to adapt the template to cross-compile.

Regarding the enabling the new WoW64 for musl only for now, I think that that's a great idea. musl indeed never had support for 32 bit binaries so it would be a great benefit for musl users.

Re: [PR PATCH] [Updated] wine: update to 9.0

[fvalasiad]

[-- Attachment #1: Type: text/plain, Size: 2475 bytes --]

There is an updated pull request by fvalasiad against master on the void-packages repository

https://github.com/fvalasiad/void-packages wine
https://github.com/void-linux/void-packages/pull/48249

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/<release>.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.

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.

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.

I haven't taken any measures to enabling any of the two, just thought I'd bring them over to your attention and ask you what you wanna do about it.

Full notes: https://gitlab.winehq.org/wine/wine/-/releases/wine-9.0

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/48249.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-wine-48249.patch --]
[-- Type: text/x-diff, Size: 4110 bytes --]

From cd1b1169172e051b021ba27f9613a6b863163d12 Mon Sep 17 00:00:00 2001
From: Fotios Valasiadis <fvalasiad@gmail.com>
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/<release>.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.

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.

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.

I haven't taken any measures to enabling any of the two,
just thought I'd bring them over to your attention and
ask you what you wanna do about it.

Full notes: https://gitlab.winehq.org/wine/wine/-/releases/wine-9.0

Signed-off-by: Fotios Valasiadis <fvalasiad@gmail.com>
---
 srcpkgs/libwine       |  1 -
 srcpkgs/wine/template | 23 +++++++----------------
 2 files changed, 7 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..5a780d0cf49ee 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 <helmut@pozimski.eu>"
 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
 
@@ -125,17 +126,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() {

Re: wine: update to 9.0

[fvalasiad]

[-- Attachment #1: Type: text/plain, Size: 493 bytes --]

New comment by fvalasiad on void-packages repository

https://github.com/void-linux/void-packages/pull/48249#issuecomment-1898926671

Comment:
@Hoshpak 'Ight let's make this patch merged for now and we shall focus on the other two on a separate PR.

wine for now requires an external emulator for the whole x86 to arm thing, so it'd require extra dependencies for the arm version.

I will also soon figure out how to build musl with new WoW64 and test it with a win32 app, then open a PR.

Re: wine: update to 9.0

[fvalasiad]

[-- Attachment #1: Type: text/plain, Size: 191 bytes --]

New comment by fvalasiad on void-packages repository

https://github.com/void-linux/void-packages/pull/48249#issuecomment-1898968523

Comment:
@Hoshpak all checks passed! Feel free to merge!

Re: [PR PATCH] [Updated] wine: update to 9.0

[fvalasiad]

[-- Attachment #1: Type: text/plain, Size: 2475 bytes --]

There is an updated pull request by fvalasiad against master on the void-packages repository

https://github.com/fvalasiad/void-packages wine
https://github.com/void-linux/void-packages/pull/48249

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/<release>.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.

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.

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.

I haven't taken any measures to enabling any of the two, just thought I'd bring them over to your attention and ask you what you wanna do about it.

Full notes: https://gitlab.winehq.org/wine/wine/-/releases/wine-9.0

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/48249.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-wine-48249.patch --]
[-- Type: text/x-diff, Size: 4413 bytes --]

From 59f3c444779b4dbddea00dd4dddb5668b29df369 Mon Sep 17 00:00:00 2001
From: Fotios Valasiadis <fvalasiad@gmail.com>
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/<release>.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 <fvalasiad@gmail.com>
---
 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 <helmut@pozimski.eu>"
 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() {

Re: wine: update to 9.0

[fvalasiad]

[-- Attachment #1: Type: text/plain, Size: 364 bytes --]

New comment by fvalasiad on void-packages repository

https://github.com/void-linux/void-packages/pull/48249#issuecomment-1901307670

Comment:
@Hoshpak since you did not merge yet and I finished my experiment with new WoW64 on a musl VM, verifying it works, I included the change in the PR.

Uncertain though if XBPS_LIBC is the correct check to be making here.

Re: [PR PATCH] [Merged]: wine: update to 9.0

[Hoshpak]

[-- Attachment #1: Type: text/plain, Size: 2318 bytes --]

There's a merged pull request on the void-packages repository

wine: update to 9.0
https://github.com/void-linux/void-packages/pull/48249

Description:
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/<release>.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.

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.

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.

I haven't taken any measures to enabling any of the two, just thought I'd bring them over to your attention and ask you what you wanna do about it.

Full notes: https://gitlab.winehq.org/wine/wine/-/releases/wine-9.0

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->