[PR PATCH] Add wine-staging patchset as a (non-default) build option

[PR PATCH] Add wine-staging patchset as a (non-default) build option

[aeadio]

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

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

https://github.com/aeadio/void-packages wine-staging
https://github.com/void-linux/void-packages/pull/27791

Add wine-staging patchset as a (non-default) build option
Because staging is not release quality, this is introduced as a non-default build option. Because users expect a certain level of breakage and imperfection in Wine in general, I think it's still fine to introduce as an option, despite Void's policy against non-release software. Wine-staging is frequently required to make some applications/games work.

Open question of what to do if wine-staging lags a upstream wine release by a bit -- block package updates? But at least for the last several versions, wine-staging has tracked wine closely, lagging in their releases by no more than 1 day. 

Builds on x86_64 and i686. Tested on x86_64 with wine+wine-32bit multi. 

closes #27612

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

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

From 67f3f14c0548d7cc3254fc3b2317373e1034dfb5 Mon Sep 17 00:00:00 2001
From: Anthony Eadicicco <a@aead.io>
Date: Sat, 9 Jan 2021 14:53:24 -0500
Subject: [PATCH] Add wine-staging patchset as a (non-default) build option

closes #27612
---
 srcpkgs/wine/template | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index be0981ca546..8c9e96917bd 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,20 +1,24 @@
 # Template file for 'wine'
 pkgname=wine
 version=6.0rc6
-revision=1
-wrksrc=wine-${version/r/-r}
+revision=2
+create_wrksrc=yes
+build_wrksrc=wine-${version/r/-r}
 build_style=gnu-configure
 configure_args="--bindir=/usr/libexec/wine"
 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%r*}/wine-${version/r/-r}.tar.xz"
-checksum=e67a97f198c96b3a624b637902be39be68c6dc5540d5594513078cf89780e6c1
+distfiles="https://dl.winehq.org/wine/source/${version%r*}/wine-${version/r/-r}.tar.xz
+ $(vopt_if staging "https://github.com/wine-staging/wine-staging/archive/v${version/r/-r}.tar.gz")"
+checksum="e67a97f198c96b3a624b637902be39be68c6dc5540d5594513078cf89780e6c1
+ $(vopt_if staging "9ee8a6d9eefae3bca4a6550d5336edac96537e5da0c3669003d21f08b55cbd13")"
 
-build_options="mingw"
+build_options="mingw staging"
 build_options_default="mingw"
 desc_option_mingw="Use the MinGW cross compiler to build WinPE DLLs"
+desc_option_staging="Apply the wine-staging patchset"
 
 lib32mode=full
 archs="i686* x86_64*"
@@ -28,7 +32,8 @@ if [ "$XBPS_TARGET_MACHINE" = i686-musl ]; then
 fi
 
 hostmakedepends="pkg-config flex gettext
- $(vopt_if mingw "cross-${XBPS_TARGET_MACHINE%-musl}-w64-mingw32")"
+ $(vopt_if mingw "cross-${XBPS_TARGET_MACHINE%-musl}-w64-mingw32")
+ $(vopt_if staging 'autoconf')"
 makedepends="gettext-devel lcms2-devel zlib-devel ncurses-devel
  glu-devel libSM-devel libXext-devel libX11-devel libXpm-devel
  libXinerama-devel libXcomposite-devel libXmu-devel libXxf86vm-devel
@@ -57,6 +62,12 @@ if [ "$XBPS_LIBC" = "glibc" ]; then
 	hostmakedepends+=" prelink"
 fi
 
+if [ "${build_option_staging}" ]; then
+	do_patch() {
+	  "../wine-staging-${version/r/-r}/patches/patchinstall.sh" --all
+	}
+fi
+
 _wine_libexec="/usr/libexec/wine"
 nopie_files="${_wine_libexec}/wine${_wine_suffix}"
 

Re: Add wine-staging patchset as a (non-default) build option

[ericonr]

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/27791#issuecomment-757364867

Comment:
Please fix the commit to follow the commit style: `wine: ...`

Re: [PR PATCH] [Updated] Add wine-staging patchset as a (non-default) build option

[aeadio]

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

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

https://github.com/aeadio/void-packages wine-staging
https://github.com/void-linux/void-packages/pull/27791

Add wine-staging patchset as a (non-default) build option
Because staging is not release quality, this is introduced as a non-default build option. Because users expect a certain level of breakage and imperfection in Wine in general, I think it's still fine to introduce as an option, despite Void's policy against non-release software. Wine-staging is frequently required to make some applications/games work.

Open question of what to do if wine-staging lags a upstream wine release by a bit -- block package updates? But at least for the last several versions, wine-staging has tracked wine closely, lagging in their releases by no more than 1 day. 

Builds on x86_64 and i686. Tested on x86_64 with wine+wine-32bit multi. 

closes #27612

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

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

From bf239e67e11a8c0ffc059e262e9fd33684af11da Mon Sep 17 00:00:00 2001
From: Anthony Eadicicco <a@aead.io>
Date: Sat, 9 Jan 2021 14:53:24 -0500
Subject: [PATCH] wine: Add wine-staging patchset as a (non-default) build
 option

closes #27612
---
 srcpkgs/wine/template | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index be0981ca546..8c9e96917bd 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,20 +1,24 @@
 # Template file for 'wine'
 pkgname=wine
 version=6.0rc6
-revision=1
-wrksrc=wine-${version/r/-r}
+revision=2
+create_wrksrc=yes
+build_wrksrc=wine-${version/r/-r}
 build_style=gnu-configure
 configure_args="--bindir=/usr/libexec/wine"
 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%r*}/wine-${version/r/-r}.tar.xz"
-checksum=e67a97f198c96b3a624b637902be39be68c6dc5540d5594513078cf89780e6c1
+distfiles="https://dl.winehq.org/wine/source/${version%r*}/wine-${version/r/-r}.tar.xz
+ $(vopt_if staging "https://github.com/wine-staging/wine-staging/archive/v${version/r/-r}.tar.gz")"
+checksum="e67a97f198c96b3a624b637902be39be68c6dc5540d5594513078cf89780e6c1
+ $(vopt_if staging "9ee8a6d9eefae3bca4a6550d5336edac96537e5da0c3669003d21f08b55cbd13")"
 
-build_options="mingw"
+build_options="mingw staging"
 build_options_default="mingw"
 desc_option_mingw="Use the MinGW cross compiler to build WinPE DLLs"
+desc_option_staging="Apply the wine-staging patchset"
 
 lib32mode=full
 archs="i686* x86_64*"
@@ -28,7 +32,8 @@ if [ "$XBPS_TARGET_MACHINE" = i686-musl ]; then
 fi
 
 hostmakedepends="pkg-config flex gettext
- $(vopt_if mingw "cross-${XBPS_TARGET_MACHINE%-musl}-w64-mingw32")"
+ $(vopt_if mingw "cross-${XBPS_TARGET_MACHINE%-musl}-w64-mingw32")
+ $(vopt_if staging 'autoconf')"
 makedepends="gettext-devel lcms2-devel zlib-devel ncurses-devel
  glu-devel libSM-devel libXext-devel libX11-devel libXpm-devel
  libXinerama-devel libXcomposite-devel libXmu-devel libXxf86vm-devel
@@ -57,6 +62,12 @@ if [ "$XBPS_LIBC" = "glibc" ]; then
 	hostmakedepends+=" prelink"
 fi
 
+if [ "${build_option_staging}" ]; then
+	do_patch() {
+	  "../wine-staging-${version/r/-r}/patches/patchinstall.sh" --all
+	}
+fi
+
 _wine_libexec="/usr/libexec/wine"
 nopie_files="${_wine_libexec}/wine${_wine_suffix}"
 

Re: [PR REVIEW] wine: Add wine-staging patchset as a (non-default) build option

[Chocimier]

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

New review comment by Chocimier on void-packages repository

https://github.com/void-linux/void-packages/pull/27791#discussion_r554478002

Comment:
Use post_patch instead, so any void patches would be used. Move `if` inside of function. Move function just before pre_build.

Re: [PR PATCH] [Updated] wine: Add wine-staging patchset as a (non-default) build option

[aeadio]

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

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

https://github.com/aeadio/void-packages wine-staging
https://github.com/void-linux/void-packages/pull/27791

wine: Add wine-staging patchset as a (non-default) build option
Because staging is not release quality, this is introduced as a non-default build option. Because users expect a certain level of breakage and imperfection in Wine in general, I think it's still fine to introduce as an option, despite Void's policy against non-release software. Wine-staging is frequently required to make some applications/games work.

Open question of what to do if wine-staging lags a upstream wine release by a bit -- block package updates? But at least for the last several versions, wine-staging has tracked wine closely, lagging in their releases by no more than 1 day. 

Builds on x86_64 and i686. Tested on x86_64 with wine+wine-32bit multi. 

closes #27612

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

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

From 250e8393ac2436d5a0d57b1b90ccd90474871503 Mon Sep 17 00:00:00 2001
From: Anthony Eadicicco <a@aead.io>
Date: Sat, 9 Jan 2021 14:53:24 -0500
Subject: [PATCH] wine: Add wine-staging patchset as a (non-default) build
 option

closes #27612
---
 srcpkgs/wine/template | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index be0981ca546..588cbb8c80c 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,20 +1,24 @@
 # Template file for 'wine'
 pkgname=wine
 version=6.0rc6
-revision=1
-wrksrc=wine-${version/r/-r}
+revision=2
+create_wrksrc=yes
+build_wrksrc=wine-${version/r/-r}
 build_style=gnu-configure
 configure_args="--bindir=/usr/libexec/wine"
 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%r*}/wine-${version/r/-r}.tar.xz"
-checksum=e67a97f198c96b3a624b637902be39be68c6dc5540d5594513078cf89780e6c1
+distfiles="https://dl.winehq.org/wine/source/${version%r*}/wine-${version/r/-r}.tar.xz
+ $(vopt_if staging "https://github.com/wine-staging/wine-staging/archive/v${version/r/-r}.tar.gz")"
+checksum="e67a97f198c96b3a624b637902be39be68c6dc5540d5594513078cf89780e6c1
+ $(vopt_if staging "9ee8a6d9eefae3bca4a6550d5336edac96537e5da0c3669003d21f08b55cbd13")"
 
-build_options="mingw"
+build_options="mingw staging"
 build_options_default="mingw"
 desc_option_mingw="Use the MinGW cross compiler to build WinPE DLLs"
+desc_option_staging="Apply the wine-staging patchset"
 
 lib32mode=full
 archs="i686* x86_64*"
@@ -28,7 +32,8 @@ if [ "$XBPS_TARGET_MACHINE" = i686-musl ]; then
 fi
 
 hostmakedepends="pkg-config flex gettext
- $(vopt_if mingw "cross-${XBPS_TARGET_MACHINE%-musl}-w64-mingw32")"
+ $(vopt_if mingw "cross-${XBPS_TARGET_MACHINE%-musl}-w64-mingw32")
+ $(vopt_if staging 'autoconf')"
 makedepends="gettext-devel lcms2-devel zlib-devel ncurses-devel
  glu-devel libSM-devel libXext-devel libX11-devel libXpm-devel
  libXinerama-devel libXcomposite-devel libXmu-devel libXxf86vm-devel
@@ -64,6 +69,12 @@ if [ "${_nopie}" = yes ]; then
 	nopie_files+=" ${_wine_libexec}/wineserver${_wineserver_suffix}"
 fi
 
+post_patch() {
+  if [ "${build_option_staging}" ]; then
+    "../wine-staging-${version/r/-r}/patches/patchinstall.sh" --all
+  fi
+}
+
 pre_build() {
 	if [ "${_nopie}" = yes ]; then
 		make ${makejobs} LDFLAGS="$LDFLAGS -no-pie" \

Re: [PR PATCH] [Updated] wine: Add wine-staging patchset as a (non-default) build option

[aeadio]

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

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

https://github.com/aeadio/void-packages wine-staging
https://github.com/void-linux/void-packages/pull/27791

wine: Add wine-staging patchset as a (non-default) build option
Because staging is not release quality, this is introduced as a non-default build option. Because users expect a certain level of breakage and imperfection in Wine in general, I think it's still fine to introduce as an option, despite Void's policy against non-release software. Wine-staging is frequently required to make some applications/games work.

Open question of what to do if wine-staging lags a upstream wine release by a bit -- block package updates? But at least for the last several versions, wine-staging has tracked wine closely, lagging in their releases by no more than 1 day. 

Builds on x86_64 and i686. Tested on x86_64 with wine+wine-32bit multi. 

closes #27612

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

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

From 785b66ce1cef5d65bd01829dde95c323657d02f6 Mon Sep 17 00:00:00 2001
From: Anthony Eadicicco <a@aead.io>
Date: Sat, 9 Jan 2021 14:53:24 -0500
Subject: [PATCH] wine: Add wine-staging patchset as a (non-default) build
 option

closes #27612
---
 srcpkgs/wine/template | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index be0981ca546..3fe2784f0a8 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,20 +1,24 @@
 # Template file for 'wine'
 pkgname=wine
 version=6.0rc6
-revision=1
-wrksrc=wine-${version/r/-r}
+revision=2
+create_wrksrc=yes
+build_wrksrc=wine-${version/r/-r}
 build_style=gnu-configure
 configure_args="--bindir=/usr/libexec/wine"
 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%r*}/wine-${version/r/-r}.tar.xz"
-checksum=e67a97f198c96b3a624b637902be39be68c6dc5540d5594513078cf89780e6c1
+distfiles="https://dl.winehq.org/wine/source/${version%r*}/wine-${version/r/-r}.tar.xz
+ $(vopt_if staging "https://github.com/wine-staging/wine-staging/archive/v${version/r/-r}.tar.gz")"
+checksum="e67a97f198c96b3a624b637902be39be68c6dc5540d5594513078cf89780e6c1
+ $(vopt_if staging "9ee8a6d9eefae3bca4a6550d5336edac96537e5da0c3669003d21f08b55cbd13")"
 
-build_options="mingw"
+build_options="mingw staging"
 build_options_default="mingw"
 desc_option_mingw="Use the MinGW cross compiler to build WinPE DLLs"
+desc_option_staging="Apply the wine-staging patchset"
 
 lib32mode=full
 archs="i686* x86_64*"
@@ -28,7 +32,8 @@ if [ "$XBPS_TARGET_MACHINE" = i686-musl ]; then
 fi
 
 hostmakedepends="pkg-config flex gettext
- $(vopt_if mingw "cross-${XBPS_TARGET_MACHINE%-musl}-w64-mingw32")"
+ $(vopt_if mingw "cross-${XBPS_TARGET_MACHINE%-musl}-w64-mingw32")
+ $(vopt_if staging 'autoconf')"
 makedepends="gettext-devel lcms2-devel zlib-devel ncurses-devel
  glu-devel libSM-devel libXext-devel libX11-devel libXpm-devel
  libXinerama-devel libXcomposite-devel libXmu-devel libXxf86vm-devel
@@ -64,6 +69,12 @@ if [ "${_nopie}" = yes ]; then
 	nopie_files+=" ${_wine_libexec}/wineserver${_wineserver_suffix}"
 fi
 
+post_patch() {
+	if [ "${build_option_staging}" ]; then
+		"../wine-staging-${version/r/-r}/patches/patchinstall.sh" --all
+	fi
+}
+
 pre_build() {
 	if [ "${_nopie}" = yes ]; then
 		make ${makejobs} LDFLAGS="$LDFLAGS -no-pie" \

Re: wine: Add wine-staging patchset as a (non-default) build option

[Hoshpak]

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

New comment by Hoshpak on void-packages repository

https://github.com/void-linux/void-packages/pull/27791#issuecomment-758820834

Comment:
I don't like having `vopt_if` in distfiles and checksum. It is somewhat
clunky and I doubt that `xgensum` would work properly with that.
Another option would be to put an if block after the variable
declaration and append to the variables if necessary.

What workflow do you have in mind for wine and the staging build
option? In the current form, updating the wine package without also
updating the staging tarball would lead to a build option until someone
also updates staging. If the staging tarballs are released in a timely
manner after the wine release, perhaps putting the staging tarball
directly in distfiles would also be an option. The builder would then
extract both tarballs but only apply the staging patches when the build
option is set. I at least wouldn't mind waiting a day after a release
to update the wine package. 

Re: [PR PATCH] [Updated] wine: Add wine-staging patchset as a (non-default) build option

[aeadio]

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

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

https://github.com/aeadio/void-packages wine-staging
https://github.com/void-linux/void-packages/pull/27791

wine: Add wine-staging patchset as a (non-default) build option
Because staging is not release quality, this is introduced as a non-default build option. Because users expect a certain level of breakage and imperfection in Wine in general, I think it's still fine to introduce as an option, despite Void's policy against non-release software. Wine-staging is frequently required to make some applications/games work.

Open question of what to do if wine-staging lags a upstream wine release by a bit -- block package updates? But at least for the last several versions, wine-staging has tracked wine closely, lagging in their releases by no more than 1 day. 

Builds on x86_64 and i686. Tested on x86_64 with wine+wine-32bit multi. 

closes #27612

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

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

From 887b6a35000421b37e91cbd55291e49d32a68589 Mon Sep 17 00:00:00 2001
From: Anthony Eadicicco <a@aead.io>
Date: Sat, 9 Jan 2021 14:53:24 -0500
Subject: [PATCH] wine: Add wine-staging patchset as a (non-default) build
 option

closes #27612
---
 srcpkgs/wine/template | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index be0981ca546..3fe2784f0a8 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,20 +1,24 @@
 # Template file for 'wine'
 pkgname=wine
 version=6.0rc6
-revision=1
-wrksrc=wine-${version/r/-r}
+revision=2
+create_wrksrc=yes
+build_wrksrc=wine-${version/r/-r}
 build_style=gnu-configure
 configure_args="--bindir=/usr/libexec/wine"
 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%r*}/wine-${version/r/-r}.tar.xz"
-checksum=e67a97f198c96b3a624b637902be39be68c6dc5540d5594513078cf89780e6c1
+distfiles="https://dl.winehq.org/wine/source/${version%r*}/wine-${version/r/-r}.tar.xz
+ $(vopt_if staging "https://github.com/wine-staging/wine-staging/archive/v${version/r/-r}.tar.gz")"
+checksum="e67a97f198c96b3a624b637902be39be68c6dc5540d5594513078cf89780e6c1
+ $(vopt_if staging "9ee8a6d9eefae3bca4a6550d5336edac96537e5da0c3669003d21f08b55cbd13")"
 
-build_options="mingw"
+build_options="mingw staging"
 build_options_default="mingw"
 desc_option_mingw="Use the MinGW cross compiler to build WinPE DLLs"
+desc_option_staging="Apply the wine-staging patchset"
 
 lib32mode=full
 archs="i686* x86_64*"
@@ -28,7 +32,8 @@ if [ "$XBPS_TARGET_MACHINE" = i686-musl ]; then
 fi
 
 hostmakedepends="pkg-config flex gettext
- $(vopt_if mingw "cross-${XBPS_TARGET_MACHINE%-musl}-w64-mingw32")"
+ $(vopt_if mingw "cross-${XBPS_TARGET_MACHINE%-musl}-w64-mingw32")
+ $(vopt_if staging 'autoconf')"
 makedepends="gettext-devel lcms2-devel zlib-devel ncurses-devel
  glu-devel libSM-devel libXext-devel libX11-devel libXpm-devel
  libXinerama-devel libXcomposite-devel libXmu-devel libXxf86vm-devel
@@ -64,6 +69,12 @@ if [ "${_nopie}" = yes ]; then
 	nopie_files+=" ${_wine_libexec}/wineserver${_wineserver_suffix}"
 fi
 
+post_patch() {
+	if [ "${build_option_staging}" ]; then
+		"../wine-staging-${version/r/-r}/patches/patchinstall.sh" --all
+	fi
+}
+
 pre_build() {
 	if [ "${_nopie}" = yes ]; then
 		make ${makejobs} LDFLAGS="$LDFLAGS -no-pie" \

Re: wine: Add wine-staging patchset as a (non-default) build option

[aeadio]

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

New comment by aeadio on void-packages repository

https://github.com/void-linux/void-packages/pull/27791#issuecomment-758969021

Comment:
> I don't like having `vopt_if` in distfiles and checksum

I was split on this and I agree. I opted to just include it in distfiles directly. The download isn't too large. 

While I was there, I also hoisted out the `${version/r/-r}` snippet, since it's now used several times. 

> I at least wouldn't mind waiting a day after a release to update the wine package.

It consistently tracks, and has only missed the 1 day window once in the past year. I think it's fine to pause it the extra day when needed. It's frequently released same-day. 

Does CI test non-default build options? 

Re: [PR PATCH] [Updated] wine: Add wine-staging patchset as a (non-default) build option

[aeadio]

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

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

https://github.com/aeadio/void-packages wine-staging
https://github.com/void-linux/void-packages/pull/27791

wine: Add wine-staging patchset as a (non-default) build option
Because staging is not release quality, this is introduced as a non-default build option. Because users expect a certain level of breakage and imperfection in Wine in general, I think it's still fine to introduce as an option, despite Void's policy against non-release software. Wine-staging is frequently required to make some applications/games work.

Open question of what to do if wine-staging lags a upstream wine release by a bit -- block package updates? But at least for the last several versions, wine-staging has tracked wine closely, lagging in their releases by no more than 1 day. 

Builds on x86_64 and i686. Tested on x86_64 with wine+wine-32bit multi. 

closes #27612

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

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

From 6f27a1e283e09dc940914ae9e89d3a24ef0265fe Mon Sep 17 00:00:00 2001
From: Anthony Eadicicco <a@aead.io>
Date: Sat, 9 Jan 2021 14:53:24 -0500
Subject: [PATCH] wine: Add wine-staging patchset as a (non-default) build
 option

closes #27612
---
 srcpkgs/wine/template | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index be0981ca546..36e99f6fafb 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,20 +1,25 @@
 # Template file for 'wine'
 pkgname=wine
 version=6.0rc6
-revision=1
-wrksrc=wine-${version/r/-r}
+revision=2
+_pkgver=${version/r/-r}
+create_wrksrc=yes
+build_wrksrc=wine-${_pkgver}
 build_style=gnu-configure
 configure_args="--bindir=/usr/libexec/wine"
 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%r*}/wine-${version/r/-r}.tar.xz"
-checksum=e67a97f198c96b3a624b637902be39be68c6dc5540d5594513078cf89780e6c1
+distfiles="https://dl.winehq.org/wine/source/${version%r*}/wine-${_pkgver}.tar.xz
+ https://github.com/wine-staging/wine-staging/archive/v${_pkgver}.tar.gz"
+checksum="e67a97f198c96b3a624b637902be39be68c6dc5540d5594513078cf89780e6c1
+ 9ee8a6d9eefae3bca4a6550d5336edac96537e5da0c3669003d21f08b55cbd13"
 
-build_options="mingw"
+build_options="mingw staging"
 build_options_default="mingw"
 desc_option_mingw="Use the MinGW cross compiler to build WinPE DLLs"
+desc_option_staging="Apply the wine-staging patchset"
 
 lib32mode=full
 archs="i686* x86_64*"
@@ -28,7 +33,8 @@ if [ "$XBPS_TARGET_MACHINE" = i686-musl ]; then
 fi
 
 hostmakedepends="pkg-config flex gettext
- $(vopt_if mingw "cross-${XBPS_TARGET_MACHINE%-musl}-w64-mingw32")"
+ $(vopt_if mingw "cross-${XBPS_TARGET_MACHINE%-musl}-w64-mingw32")
+ $(vopt_if staging 'autoconf')"
 makedepends="gettext-devel lcms2-devel zlib-devel ncurses-devel
  glu-devel libSM-devel libXext-devel libX11-devel libXpm-devel
  libXinerama-devel libXcomposite-devel libXmu-devel libXxf86vm-devel
@@ -64,6 +70,12 @@ if [ "${_nopie}" = yes ]; then
 	nopie_files+=" ${_wine_libexec}/wineserver${_wineserver_suffix}"
 fi
 
+post_patch() {
+	if [ "${build_option_staging}" ]; then
+		"../wine-staging-${_pkgver}/patches/patchinstall.sh" --all
+	fi
+}
+
 pre_build() {
 	if [ "${_nopie}" = yes ]; then
 		make ${makejobs} LDFLAGS="$LDFLAGS -no-pie" \

Re: wine: Add wine-staging patchset as a (non-default) build option

[ericonr]

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/27791#issuecomment-758996031

Comment:
> Does CI test non-default build options?

No

Re: [PR PATCH] [Merged]: wine: Add wine-staging patchset as a (non-default) build option

[Hoshpak]

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

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

wine: Add wine-staging patchset as a (non-default) build option
https://github.com/void-linux/void-packages/pull/27791

Description:
Because staging is not release quality, this is introduced as a non-default build option. Because users expect a certain level of breakage and imperfection in Wine in general, I think it's still fine to introduce as an option, despite Void's policy against non-release software. Wine-staging is frequently required to make some applications/games work.

Open question of what to do if wine-staging lags a upstream wine release by a bit -- block package updates? But at least for the last several versions, wine-staging has tracked wine closely, lagging in their releases by no more than 1 day. 

Builds on x86_64 and i686. Tested on x86_64 with wine+wine-32bit multi. 

closes #27612