[PR PATCH] wine: update to 9.18

[PR PATCH] wine: update to 9.18

[fvalasiad]

[-- Attachment #1: Type: text/plain, Size: 314 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/52312

wine: update to 9.18
@Hoshpak

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

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

From 194abf259bd978f0210c96ef3a31df12c30c4c13 Mon Sep 17 00:00:00 2001
From: Fotios Valasiadis <fvalasiad@gmail.com>
Date: Sun, 22 Sep 2024 22:15:01 +0300
Subject: [PATCH] wine: update to 9.18

---
 srcpkgs/wine/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 69798940164bd1..627c135505660a 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,6 +1,6 @@
 # Template file for 'wine'
 pkgname=wine
-version=9.17
+version=9.18
 revision=1
 _pkgver=${version/r/-r}
 create_wrksrc=yes
@@ -13,8 +13,8 @@ license="LGPL-2.1-or-later"
 homepage="http://www.winehq.org/"
 distfiles="https://dl.winehq.org/wine/source/${version%.*}.x/wine-${_pkgver}.tar.xz
  https://github.com/wine-staging/wine-staging/archive/v${_pkgver}.tar.gz"
-checksum="3edb7eb6f31bb5c3f7378dd5623da9d95f7d4d6d7c8378afd89c8e3a30aa080c
- 8b75c8fe4802eb00084b7b7c274a9941f06b28ed6496efa612476b9760852392"
+checksum="6526f5211c085453bcb642946eb2ce8d1d42a8a4a68168bf2a0d73f32612dd1c
+ afe8c6f3fe2824f5175f76ab1604de671a6adcae11768f118d7e5045c65b5666"
 
 # NOTE: wine depends on specific versions of wine-mono and wine-gecko,
 # check for updates to these packages when updating wine

Re: wine: update to 9.18

[fvalasiad]

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

New comment by fvalasiad on void-packages repository

https://github.com/void-linux/void-packages/pull/52312#issuecomment-2366950594

Comment:
Clean void-i686 install and I can build wine just fine, HMMMM

Re: wine: update to 9.18

[fvalasiad]

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

New comment by fvalasiad on void-packages repository

https://github.com/void-linux/void-packages/pull/52312#issuecomment-2366962347

Comment:
Unfortunately, I am too damn busy this time of the year, so I won't be able to tackle this until I find spare time.

If anyone wants to pick up where I left off, I'd suggest you look at https://gitlab.winehq.org/wine/wine/-/releases/wine-9.18 

There have been some patches to configure.ac and aclocal.m4 regarding the C preprocessor, in particular one patch replaces a define check using the C preprocessor with a standard build-to-test procedure.

Given that I am able to build just fine on a void-i686 install, we can assume its an environment issue.

Best of luck,
F.

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

[fvalasiad]

[-- Attachment #1: Type: text/plain, Size: 319 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/52312

wine: update to 9.18
@Hoshpak

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

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

From c318c2f2c621978b9bdb6d377b880d7143e55720 Mon Sep 17 00:00:00 2001
From: Fotios Valasiadis <fvalasiad@gmail.com>
Date: Sun, 22 Sep 2024 22:15:01 +0300
Subject: [PATCH] wine: update to 9.18

---
 srcpkgs/wine/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 69798940164bd1..359843fd88b3cc 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,6 +1,6 @@
 # Template file for 'wine'
 pkgname=wine
-version=9.17
+version=9.18
 revision=1
 _pkgver=${version/r/-r}
 create_wrksrc=yes
@@ -13,8 +13,8 @@ license="LGPL-2.1-or-later"
 homepage="http://www.winehq.org/"
 distfiles="https://dl.winehq.org/wine/source/${version%.*}.x/wine-${_pkgver}.tar.xz
  https://github.com/wine-staging/wine-staging/archive/v${_pkgver}.tar.gz"
-checksum="3edb7eb6f31bb5c3f7378dd5623da9d95f7d4d6d7c8378afd89c8e3a30aa080c
- 8b75c8fe4802eb00084b7b7c274a9941f06b28ed6496efa612476b9760852392"
+checksum="6526f5211c085453bcb642946eb2ce8d1d42a8a4a68168bf2a0d73f32612dd1c
+ afe8c6f3fe2824f5175f76ab1604de671a6adcae11768f118d7e5045c65b5666"
 
 # NOTE: wine depends on specific versions of wine-mono and wine-gecko,
 # check for updates to these packages when updating wine
@@ -73,6 +73,7 @@ if [ "$XBPS_TARGET_WORDSIZE" != 32 ]; then
 else
 	_wineserver_suffix="32"
 	CFLAGS=" -D_LARGE_FILE_SOURCE=1 -D_FILE_OFFSET_BITS=64"
+	CPPFLAGS=" -D_LARGE_FILE_SOURCE=1 -D_FILE_OFFSET_BITS=64"
 fi
 
 if [ "$XBPS_LIBC" = "glibc" ]; then

Re: wine: update to 9.18

[fvalasiad]

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

New comment by fvalasiad on void-packages repository

https://github.com/void-linux/void-packages/pull/52312#issuecomment-2375470778

Comment:
@Hoshpak After a couple of hours of hairpulling, turned out to be the notorious Y2038 problem.

If I had to make an educated guess, this is the patch that broke it: https://gitlab.winehq.org/wine/wine/-/commit/4f7412005f685e4dcd309078bf2fea199e0ea47e

Is this an upstream fault? Nope, the template was setting `_FILE_OFFSET_BITS=64` in `CFLAGS` but not `CPPFLAGS` resulting to the C preprocessor test in the configured script to fail.

Why did it work before? Because as you can see in the patch wine was handling setting it on its own for WoW64 builds, which affected void's i686 build. As soon as they removed that functionality, chaos ensued. 

Why did it work in a clean void-i686 install but not within the chroot that xbps-src was setting up leading to this confusion? Because i686-pc-linux-gnu-cpp isn't installed as a target in the chroot. Outside the chroot `gcc -E <file` was used which was respecting CFLAGS while in the chroot `cpp` was used which wasn't.

Let me know if there are any problems.
Peace!
F.

Re: wine: update to 9.18

[fvalasiad]

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

New comment by fvalasiad on void-packages repository

https://github.com/void-linux/void-packages/pull/52312#issuecomment-2375470778

Comment:
@Hoshpak After a couple of hours of hairpulling, turned out to be the notorious Y2038 problem.

If I had to make an educated guess, this is the patch that broke it: https://gitlab.winehq.org/wine/wine/-/commit/4f7412005f685e4dcd309078bf2fea199e0ea47e

Is this an upstream fault? Nope, the template was setting `_FILE_OFFSET_BITS=64` in `CFLAGS` but not `CPPFLAGS` resulting to the C preprocessor test in the configured script to fail.

Why did it work before? Because as you can see in the patch wine was handling setting it on its own for WoW64 builds, which affected void's i686 build. As soon as they removed that functionality, chaos ensued. 

Why did it work in a clean `void-i686` install but not within the chroot that `xbps-src` was setting up leading to this confusion? Because `i686-pc-linux-gnu-cpp` isn't installed as a target in the chroot. Outside the chroot `gcc -E <file` was used which was respecting `CFLAGS` while in the chroot `cpp` was used which wasn't.

Let me know if there are any problems.
Peace!
F.

Re: wine: update to 9.18

[fvalasiad]

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

New comment by fvalasiad on void-packages repository

https://github.com/void-linux/void-packages/pull/52312#issuecomment-2375470778

Comment:
@Hoshpak After a couple of hours of hairpulling, turned out to be the notorious Y2038 problem.

If I had to make an educated guess, this is the patch that broke it: https://gitlab.winehq.org/wine/wine/-/commit/4f7412005f685e4dcd309078bf2fea199e0ea47e

Is this an upstream fault? Nope, the template was setting `_FILE_OFFSET_BITS=64` in `CFLAGS` but not `CPPFLAGS` resulting to the C preprocessor test in the configured script to fail.

Why did it work before? Because as you can see in the patch wine was handling setting it on its own for WoW64 builds, which affected void's i686 build. As soon as they removed that functionality, chaos ensued. 

Why did it work in a clean `void-i686` install but not within the chroot that `xbps-src` was setting up leading to this confusion? Because `i686-pc-linux-gnu-cpp` isn't installed as a target in the chroot. Outside the chroot `gcc -E <file` was used as the preprocessor which was reusing `CFLAGS` also for the preprocessor compiler step, while in the chroot `cpp` was used which wasn't and needed CPPFLAGS to be set explicitly.

Let me know if there are any problems.
Peace!
F.

Re: wine: update to 9.18

[fvalasiad]

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

New comment by fvalasiad on void-packages repository

https://github.com/void-linux/void-packages/pull/52312#issuecomment-2375470778

Comment:
@Hoshpak After a couple of hours of hairpulling, turned out to be the notorious Y2038 problem.

If I had to make an educated guess, this is the patch that broke it: https://gitlab.winehq.org/wine/wine/-/commit/4f7412005f685e4dcd309078bf2fea199e0ea47e

Is this an upstream fault? Nope, the template was setting `_FILE_OFFSET_BITS=64` in `CFLAGS` but not `CPPFLAGS` resulting to the C preprocessor test in the configured script to fail.

Why did it work before? Because as you can see in the patch wine was handling setting it on its own for WoW64 builds, which affected void's i686 build. As soon as they removed that functionality, chaos ensued. 

Why did it work in a clean `void-i686` install but not within the chroot that `xbps-src` was setting up leading to this confusion? Because `i686-pc-linux-gnu-cpp` isn't installed as a target in the chroot. Outside the chroot `gcc -E <file` was used as the preprocessor which was reusing `CFLAGS` also for the preprocessor compiler step, while in the chroot `cpp` was used which wasn't and needed `CPPFLAGS` to be set explicitly.

Let me know if there are any problems.
Peace!
F.

Re: wine: update to 9.18

[Hoshpak]

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

New comment by Hoshpak on void-packages repository

https://github.com/void-linux/void-packages/pull/52312#issuecomment-2377531890

Comment:
@fvalasiad thanks for all the effort you put into this!

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

[Hoshpak]

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

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

wine: update to 9.18
https://github.com/void-linux/void-packages/pull/52312

Description:
@Hoshpak

Re: wine: update to 9.18

[fvalasiad]

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

New comment by fvalasiad on void-packages repository

https://github.com/void-linux/void-packages/pull/52312#issuecomment-2377617390

Comment:
:)