* Re: Adding x86_64 package to wine
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-17678@inbox.vuxu.org>
@ 2020-01-08 3:21 ` voidlinux-github
2020-01-22 14:09 ` voidlinux-github
` (22 subsequent siblings)
23 siblings, 0 replies; 24+ messages in thread
From: voidlinux-github @ 2020-01-08 3:21 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 338 bytes --]
New comment by bugcrazy on void-packages repository
https://github.com/void-linux/void-packages/pull/17678#issuecomment-571874130
Comment:
My x86_64 build log, no errors appear! This link [here](https://gist.githubusercontent.com/bugcrazy/73fb15bccf7ba3dc40145c3c0168a2b7/raw/b6089897f9c30475b321a8806d9b6e5d9454e755/Mylog_wine_x86_64)
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: Adding x86_64 package to wine
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-17678@inbox.vuxu.org>
2020-01-08 3:21 ` Adding x86_64 package to wine voidlinux-github
@ 2020-01-22 14:09 ` voidlinux-github
2020-01-23 7:47 ` voidlinux-github
` (21 subsequent siblings)
23 siblings, 0 replies; 24+ messages in thread
From: voidlinux-github @ 2020-01-22 14:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 204 bytes --]
New comment by Eluminae on void-packages repository
https://github.com/void-linux/void-packages/pull/17678#issuecomment-577198310
Comment:
How are we supposed to handle travis too long logs issues ? :)
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: Adding x86_64 package to wine
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-17678@inbox.vuxu.org>
2020-01-08 3:21 ` Adding x86_64 package to wine voidlinux-github
2020-01-22 14:09 ` voidlinux-github
@ 2020-01-23 7:47 ` voidlinux-github
2020-01-23 8:31 ` voidlinux-github
` (20 subsequent siblings)
23 siblings, 0 replies; 24+ messages in thread
From: voidlinux-github @ 2020-01-23 7:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 232 bytes --]
New comment by travankor on void-packages repository
https://github.com/void-linux/void-packages/pull/17678#issuecomment-577554977
Comment:
@bugcrazy See https://github.com/void-linux/void-packages/pull/540#issuecomment-417840507
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: Adding x86_64 package to wine
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-17678@inbox.vuxu.org>
` (2 preceding siblings ...)
2020-01-23 7:47 ` voidlinux-github
@ 2020-01-23 8:31 ` voidlinux-github
2020-01-23 8:38 ` voidlinux-github
` (19 subsequent siblings)
23 siblings, 0 replies; 24+ messages in thread
From: voidlinux-github @ 2020-01-23 8:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 173 bytes --]
New comment by Eluminae on void-packages repository
https://github.com/void-linux/void-packages/pull/17678#issuecomment-577578331
Comment:
so this will never be merged ?
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: Adding x86_64 package to wine
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-17678@inbox.vuxu.org>
` (3 preceding siblings ...)
2020-01-23 8:31 ` voidlinux-github
@ 2020-01-23 8:38 ` voidlinux-github
2020-01-23 17:56 ` voidlinux-github
` (18 subsequent siblings)
23 siblings, 0 replies; 24+ messages in thread
From: voidlinux-github @ 2020-01-23 8:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 198 bytes --]
New comment by travankor on void-packages repository
https://github.com/void-linux/void-packages/pull/17678#issuecomment-577580403
Comment:
I think a separate template called `wine64` might work.
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: Adding x86_64 package to wine
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-17678@inbox.vuxu.org>
` (4 preceding siblings ...)
2020-01-23 8:38 ` voidlinux-github
@ 2020-01-23 17:56 ` voidlinux-github
2020-01-23 18:01 ` voidlinux-github
` (17 subsequent siblings)
23 siblings, 0 replies; 24+ messages in thread
From: voidlinux-github @ 2020-01-23 17:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 299 bytes --]
New comment by bugcrazy on void-packages repository
https://github.com/void-linux/void-packages/pull/17678#issuecomment-577796302
Comment:
> How are we supposed to handle travis too long logs issues ? :)
This issue gets in the way, the travis should generate a file, thus facilitating the fixes!
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: Adding x86_64 package to wine
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-17678@inbox.vuxu.org>
` (5 preceding siblings ...)
2020-01-23 17:56 ` voidlinux-github
@ 2020-01-23 18:01 ` voidlinux-github
2020-01-23 18:04 ` voidlinux-github
` (16 subsequent siblings)
23 siblings, 0 replies; 24+ messages in thread
From: voidlinux-github @ 2020-01-23 18:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 374 bytes --]
New comment by bugcrazy on void-packages repository
https://github.com/void-linux/void-packages/pull/17678#issuecomment-577798111
Comment:
> @bugcrazy See [#540 (comment)](https://github.com/void-linux/void-packages/pull/540#issuecomment-417840507)
I know, the issue is in travis, it doesn't show what the conflict is, how to fix an issue, if we don't know what it is!
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: Adding x86_64 package to wine
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-17678@inbox.vuxu.org>
` (6 preceding siblings ...)
2020-01-23 18:01 ` voidlinux-github
@ 2020-01-23 18:04 ` voidlinux-github
2020-01-23 18:07 ` voidlinux-github
` (15 subsequent siblings)
23 siblings, 0 replies; 24+ messages in thread
From: voidlinux-github @ 2020-01-23 18:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 310 bytes --]
New comment by bugcrazy on void-packages repository
https://github.com/void-linux/void-packages/pull/17678#issuecomment-577799473
Comment:
It will be merged, when we know issue of travis, we can fix it!
> so this will never be merged ?
It will be merged, when we know issue of travis, we can fix it!
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: Adding x86_64 package to wine
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-17678@inbox.vuxu.org>
` (7 preceding siblings ...)
2020-01-23 18:04 ` voidlinux-github
@ 2020-01-23 18:07 ` voidlinux-github
2020-01-23 19:53 ` [PR PATCH] [Updated] " voidlinux-github
` (14 subsequent siblings)
23 siblings, 0 replies; 24+ messages in thread
From: voidlinux-github @ 2020-01-23 18:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 326 bytes --]
New comment by bugcrazy on void-packages repository
https://github.com/void-linux/void-packages/pull/17678#issuecomment-577800729
Comment:
> I think a separate template called `wine64` might work.
I think there must be something between the 32-bit libraries with x86_64, which generates the issue, but that's a hypothesis!
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: [PR PATCH] [Updated] Adding x86_64 package to wine
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-17678@inbox.vuxu.org>
` (8 preceding siblings ...)
2020-01-23 18:07 ` voidlinux-github
@ 2020-01-23 19:53 ` voidlinux-github
2020-01-24 0:48 ` voidlinux-github
` (13 subsequent siblings)
23 siblings, 0 replies; 24+ messages in thread
From: voidlinux-github @ 2020-01-23 19:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 435 bytes --]
There is an updated pull request by bugcrazy against master on the void-packages repository
https://github.com/bugcrazy/void-packages bugcrazy-patch-1
https://github.com/void-linux/void-packages/pull/17678
Adding x86_64 package to wine
Adding support for x86_64 to generate x84_64 and i686 packages to have a wine 64 package required by many
A patch file from https://github.com/void-linux/void-packages/pull/17678.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-bugcrazy-patch-1-17678.patch --]
[-- Type: text/x-diff, Size: 13387 bytes --]
From ca2b8cb54bcf49256e0b4e3c7e4c07eaf6552dd0 Mon Sep 17 00:00:00 2001
From: bugcrazy <39757967+bugcrazy@users.noreply.github.com>
Date: Sat, 21 Dec 2019 05:06:33 -0300
Subject: [PATCH 1/6] Update template
Adding support for x86_64 to generate x84_64 and i686 packages to have a wine 64 package required by many
---
srcpkgs/wine/template | 71 +++++++++++++++++++++++++++++++++++++------
1 file changed, 61 insertions(+), 10 deletions(-)
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index cca736f0764..9efc63aaa8c 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,9 +1,10 @@
# Template file for 'wine'
pkgname=wine
version=4.21
-revision=1
+revision=2
build_style=gnu-configure
-configure_args="--without-gstreamer"
+nocross=yes
+configure_args="--without-gstreamer --with-x"
short_desc="Run Microsoft Windows applications"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="LGPL-2.1-or-later"
@@ -13,8 +14,10 @@ checksum=324ce14a70059835f33d293f0740b1bf0366bc6b5514548bc083d89b44744ad0
nopie_files="/usr/bin/wine"
-lib32mode=full
-archs=i686
+archs="x86_64* i686*"
+if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
+ lib32mode=full
+fi
hostmakedepends="pkg-config flex prelink"
makedepends="gettext-devel lcms2-devel zlib-devel ncurses-devel
@@ -29,10 +32,53 @@ makedepends="gettext-devel lcms2-devel zlib-devel ncurses-devel
FAudio-devel"
depends="libXi libXinerama libXcomposite libXcursor libOSMesa
desktop-file-utils hicolor-icon-theme liberation-fonts-ttf
- gnutls"
+ gnutls freetype"
binfmts="/usr/bin/wine --magic MZ"
+if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
+ nopie_files+=" /usr/bin/winegcc /usr/bin/wine64 /usr/bin/widl /usr/bin/winebuild /usr/bin/winedump
+ /usr/bin/wrc /usr/bin/wineserver /usr/bin/wmc"
+ makedepends+=" gettext-devel-32bit lcms2-devel-32bit zlib-devel-32bit
+ ncurses-devel-32bit glu-devel-32bit libSM-devel-32bit libXext-devel-32bit
+ libX11-devel-32bit libXpm-devel-32bit libXinerama-devel-32bit
+ libXcomposite-devel-32bit libXmu-devel-32bit libXxf86vm-devel-32bit
+ libXcursor-devel-32bit libXrandr-devel-32bit libXdamage-devel-32bit
+ libXi-devel-32bit libldap-devel-32bit alsa-lib-devel-32bit libgphoto2-devel-32bit
+ libxml2-devel-32bit libxslt-devel-32bit freetype-devel-32bit
+ pulseaudio-devel-32bit mpg123-devel-32bit libgsm-devel-32bit libopenal-devel-32bit
+ giflib-devel-32bit libpng-devel-32bit fontconfig-devel-32bit gnutls-devel-32bit
+ dbus-devel-32bit sane-devel-32bit libpcap-devel-32bit
+ cups-devel-32bit ocl-icd-devel-32bit gcc-multilib vulkan-loader-32bit vkd3d-devel-32bit FAudio-devel-32bit"
+ depends+=" freetype-32bit libXi-32bit libXinerama-32bit
+ libXcomposite-32bit libXcursor-32bit
+ libOSMesa-32bit gnutls-32bit"
+ WINE="$XBPS_BUILDDIR/wine-$version"
+ WINE64="$WINE/../wine64/"
+ WINE32="$WINE/../wine32/"
+ pre_configure() {
+ mkdir -p "$WINE64" "$WINE32"
+ }
+ do_configure() {
+ cd "$WINE64"
+ "$WINE"/configure --libdir="/usr/lib" --enable-win64 ${configure_args}
+ cd "$WINE32"
+ "$WINE"/configure --libdir="/usr/lib32" --with-wine64="$WINE64" ${configure_args}
+ }
+ do_build() {
+ cd "$WINE64"
+ make ${makejobs}
+ cd "$WINE32"
+ make ${makejobs}
+ }
+ do_install() {
+ cd "$WINE32"
+ make install DESTDIR="${DESTDIR}"
+ cd "$WINE64"
+ make install DESTDIR="${DESTDIR}"
+ }
+fi
+
post_install() {
# Font aliasing settings for Win32 applications
install -d ${DESTDIR}/etc/fonts/conf.{avail,d}
@@ -41,12 +87,18 @@ post_install() {
}
libwine_package() {
- lib32mode=full
+ if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
+ lib32mode=full
+ fi
short_desc+=" - Runtime library"
replaces="libwine-unstable>=0"
pkg_install() {
- vmove "usr/lib/*.so.*"
- vmove usr/lib/wine
+ vmove "usr/lib/*.so*"
+ vmove "usr/lib/wine"
+ if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
+ vmove "usr/lib32/*.so*"
+ vmove "usr/lib32/wine"
+ fi
}
}
wine-devel_package() {
@@ -54,7 +106,6 @@ wine-devel_package() {
short_desc+=" - development files"
replaces="wine-unstable-devel>=0"
pkg_install() {
- vmove usr/include
- vmove "usr/lib/*.so"
+ vmove "usr/include"
}
}
From 31d72ac6c32ade51a1c87f8177b34b96e9dbfdf5 Mon Sep 17 00:00:00 2001
From: bugcrazy <39757967+bugcrazy@users.noreply.github.com>
Date: Sat, 21 Dec 2019 14:24:16 -0300
Subject: [PATCH 2/6] Wine x64
Wine style fixes
---
srcpkgs/wine/template | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 9efc63aaa8c..2cb8c6fb18f 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -54,27 +54,27 @@ if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
libXcomposite-32bit libXcursor-32bit
libOSMesa-32bit gnutls-32bit"
WINE="$XBPS_BUILDDIR/wine-$version"
- WINE64="$WINE/../wine64/"
- WINE32="$WINE/../wine32/"
+ WINE64="$_WINE/../wine64/"
+ WINE32="$_WINE/../wine32/"
pre_configure() {
- mkdir -p "$WINE64" "$WINE32"
+ mkdir -p "$_WINE64" "$_WINE32"
}
do_configure() {
- cd "$WINE64"
- "$WINE"/configure --libdir="/usr/lib" --enable-win64 ${configure_args}
- cd "$WINE32"
- "$WINE"/configure --libdir="/usr/lib32" --with-wine64="$WINE64" ${configure_args}
+ cd "$_WINE64"
+ "$_WINE"/configure --libdir="/usr/lib" --enable-win64 ${configure_args}
+ cd "$_WINE32"
+ "$_WINE"/configure --libdir="/usr/lib32" --with-wine64="$_WINE64" ${configure_args}
}
do_build() {
- cd "$WINE64"
+ cd "$_WINE64"
make ${makejobs}
- cd "$WINE32"
+ cd "$_WINE32"
make ${makejobs}
}
do_install() {
- cd "$WINE32"
+ cd "$_WINE32"
make install DESTDIR="${DESTDIR}"
- cd "$WINE64"
+ cd "$_WINE64"
make install DESTDIR="${DESTDIR}"
}
fi
From 83d0c935bbd8228f23c2b27fd22c62a38ec7d487 Mon Sep 17 00:00:00 2001
From: bugcrazy <39757967+bugcrazy@users.noreply.github.com>
Date: Sat, 21 Dec 2019 18:59:46 -0300
Subject: [PATCH 3/6] Wine x64: fixed styles
Fixing errors and styles
---
srcpkgs/wine/template | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 2cb8c6fb18f..48401b1c607 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -3,7 +3,6 @@ pkgname=wine
version=4.21
revision=2
build_style=gnu-configure
-nocross=yes
configure_args="--without-gstreamer --with-x"
short_desc="Run Microsoft Windows applications"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
@@ -52,10 +51,13 @@ if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
cups-devel-32bit ocl-icd-devel-32bit gcc-multilib vulkan-loader-32bit vkd3d-devel-32bit FAudio-devel-32bit"
depends+=" freetype-32bit libXi-32bit libXinerama-32bit
libXcomposite-32bit libXcursor-32bit
- libOSMesa-32bit gnutls-32bit"
- WINE="$XBPS_BUILDDIR/wine-$version"
- WINE64="$_WINE/../wine64/"
- WINE32="$_WINE/../wine32/"
+ libOSMesa-32bit gnutls-32bit libmpg123-32bit"
+ conflicts="wine-32bit"
+ provides="wine-32bit>=${version}_${revision}"
+
+ _WINE="$XBPS_BUILDDIR/wine-$version"
+ _WINE64="$_WINE/../wine64/"
+ _WINE32="$_WINE/../wine32/"
pre_configure() {
mkdir -p "$_WINE64" "$_WINE32"
}
From 5d631fb47ac9fd0fec38e3f4437a00f7e21be8ac Mon Sep 17 00:00:00 2001
From: bugcrazy <39757967+bugcrazy@users.noreply.github.com>
Date: Sun, 22 Dec 2019 01:24:54 -0300
Subject: [PATCH 4/6] Wine : fixed trailing whitespace and errors
Fixed trailing whitespace and errors
---
srcpkgs/wine/template | 43 +++++++++++++++++++++++--------------------
1 file changed, 23 insertions(+), 20 deletions(-)
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 48401b1c607..034c64c121b 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -3,6 +3,7 @@ pkgname=wine
version=4.21
revision=2
build_style=gnu-configure
+nocross=yes
configure_args="--without-gstreamer --with-x"
short_desc="Run Microsoft Windows applications"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
@@ -13,7 +14,7 @@ checksum=324ce14a70059835f33d293f0740b1bf0366bc6b5514548bc083d89b44744ad0
nopie_files="/usr/bin/wine"
-archs="x86_64* i686*"
+archs="i686 x86_64"
if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
lib32mode=full
fi
@@ -36,25 +37,27 @@ depends="libXi libXinerama libXcomposite libXcursor libOSMesa
binfmts="/usr/bin/wine --magic MZ"
if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
- nopie_files+=" /usr/bin/winegcc /usr/bin/wine64 /usr/bin/widl /usr/bin/winebuild /usr/bin/winedump
- /usr/bin/wrc /usr/bin/wineserver /usr/bin/wmc"
+ nopie_files+=" /usr/bin/winegcc /usr/bin/wine64 /usr/bin/widl
+ /usr/bin/winebuild /usr/bin/winedump /usr/bin/wrc /usr/bin/wineserver
+ /usr/bin/wmc"
makedepends+=" gettext-devel-32bit lcms2-devel-32bit zlib-devel-32bit
- ncurses-devel-32bit glu-devel-32bit libSM-devel-32bit libXext-devel-32bit
- libX11-devel-32bit libXpm-devel-32bit libXinerama-devel-32bit
- libXcomposite-devel-32bit libXmu-devel-32bit libXxf86vm-devel-32bit
- libXcursor-devel-32bit libXrandr-devel-32bit libXdamage-devel-32bit
- libXi-devel-32bit libldap-devel-32bit alsa-lib-devel-32bit libgphoto2-devel-32bit
- libxml2-devel-32bit libxslt-devel-32bit freetype-devel-32bit
- pulseaudio-devel-32bit mpg123-devel-32bit libgsm-devel-32bit libopenal-devel-32bit
- giflib-devel-32bit libpng-devel-32bit fontconfig-devel-32bit gnutls-devel-32bit
- dbus-devel-32bit sane-devel-32bit libpcap-devel-32bit
- cups-devel-32bit ocl-icd-devel-32bit gcc-multilib vulkan-loader-32bit vkd3d-devel-32bit FAudio-devel-32bit"
+ ncurses-devel-32bit glu-devel-32bit libSM-devel-32bit libXext-devel-32bit
+ libX11-devel-32bit libXpm-devel-32bit libXinerama-devel-32bit
+ libXcomposite-devel-32bit libXmu-devel-32bit libXxf86vm-devel-32bit
+ libXcursor-devel-32bit libXrandr-devel-32bit libXdamage-devel-32bit
+ libXi-devel-32bit libldap-devel-32bit alsa-lib-devel-32bit libgphoto2-devel-32bit
+ libxml2-devel-32bit libxslt-devel-32bit freetype-devel-32bit
+ pulseaudio-devel-32bit mpg123-devel-32bit libgsm-devel-32bit libopenal-devel-32bit
+ giflib-devel-32bit libpng-devel-32bit fontconfig-devel-32bit gnutls-devel-32bit
+ dbus-devel-32bit sane-devel-32bit libpcap-devel-32bit
+ cups-devel-32bit ocl-icd-devel-32bit gcc-multilib vulkan-loader-32bit vkd3d-devel-32bit
+ FAudio-devel-32bit"
depends+=" freetype-32bit libXi-32bit libXinerama-32bit
- libXcomposite-32bit libXcursor-32bit
- libOSMesa-32bit gnutls-32bit libmpg123-32bit"
- conflicts="wine-32bit"
+ libXcomposite-32bit libXcursor-32bit
+ libOSMesa-32bit gnutls-32bit libmpg123-32bit"
+ conflicts="wine-32bit"
provides="wine-32bit>=${version}_${revision}"
-
+
_WINE="$XBPS_BUILDDIR/wine-$version"
_WINE64="$_WINE/../wine64/"
_WINE32="$_WINE/../wine32/"
@@ -96,10 +99,10 @@ libwine_package() {
replaces="libwine-unstable>=0"
pkg_install() {
vmove "usr/lib/*.so*"
- vmove "usr/lib/wine"
+ vmove usr/lib/wine
if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
vmove "usr/lib32/*.so*"
- vmove "usr/lib32/wine"
+ vmove usr/lib32/wine
fi
}
}
@@ -108,6 +111,6 @@ wine-devel_package() {
short_desc+=" - development files"
replaces="wine-unstable-devel>=0"
pkg_install() {
- vmove "usr/include"
+ vmove usr/include
}
}
From 4c749c936e7e348aea72ce1b7f1321a8427e7b92 Mon Sep 17 00:00:00 2001
From: bugcrazy <39757967+bugcrazy@users.noreply.github.com>
Date: Sun, 22 Dec 2019 04:46:35 -0300
Subject: [PATCH 5/6] Wine: Fixing obvious issue
Place nocross= after checksum=
---
srcpkgs/wine/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 034c64c121b..f27bc6f3da4 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -3,7 +3,6 @@ pkgname=wine
version=4.21
revision=2
build_style=gnu-configure
-nocross=yes
configure_args="--without-gstreamer --with-x"
short_desc="Run Microsoft Windows applications"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
@@ -11,6 +10,7 @@ license="LGPL-2.1-or-later"
homepage="http://www.winehq.org/"
distfiles="https://dl.winehq.org/wine/source/${version%%.*}.x/wine-${version}.tar.xz"
checksum=324ce14a70059835f33d293f0740b1bf0366bc6b5514548bc083d89b44744ad0
+nocross=yes
nopie_files="/usr/bin/wine"
From 42784ca9792b8e9b24571691980a50bdea589b51 Mon Sep 17 00:00:00 2001
From: bugcrazy <39757967+bugcrazy@users.noreply.github.com>
Date: Thu, 23 Jan 2020 16:53:44 -0300
Subject: [PATCH 6/6] Version update
Wine version update
---
srcpkgs/wine/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index f27bc6f3da4..4bef2a972fc 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,6 +1,6 @@
# Template file for 'wine'
pkgname=wine
-version=4.21
+version=5.0
revision=2
build_style=gnu-configure
configure_args="--without-gstreamer --with-x"
@@ -8,8 +8,8 @@ short_desc="Run Microsoft Windows applications"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="LGPL-2.1-or-later"
homepage="http://www.winehq.org/"
-distfiles="https://dl.winehq.org/wine/source/${version%%.*}.x/wine-${version}.tar.xz"
-checksum=324ce14a70059835f33d293f0740b1bf0366bc6b5514548bc083d89b44744ad0
+distfiles="https://dl.winehq.org/wine/source/${version}/wine-${version}.tar.xz"
+checksum=181550ba69a80b00c631f80c28ff7642264613bbecdb0c0fc04d6534866713b4
nocross=yes
nopie_files="/usr/bin/wine"
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: [PR PATCH] [Updated] Adding x86_64 package to wine
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-17678@inbox.vuxu.org>
` (9 preceding siblings ...)
2020-01-23 19:53 ` [PR PATCH] [Updated] " voidlinux-github
@ 2020-01-24 0:48 ` voidlinux-github
2020-02-17 19:01 ` Oreo639
` (12 subsequent siblings)
23 siblings, 0 replies; 24+ messages in thread
From: voidlinux-github @ 2020-01-24 0:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 435 bytes --]
There is an updated pull request by bugcrazy against master on the void-packages repository
https://github.com/bugcrazy/void-packages bugcrazy-patch-1
https://github.com/void-linux/void-packages/pull/17678
Adding x86_64 package to wine
Adding support for x86_64 to generate x84_64 and i686 packages to have a wine 64 package required by many
A patch file from https://github.com/void-linux/void-packages/pull/17678.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-bugcrazy-patch-1-17678.patch --]
[-- Type: text/x-diff, Size: 13387 bytes --]
From ca2b8cb54bcf49256e0b4e3c7e4c07eaf6552dd0 Mon Sep 17 00:00:00 2001
From: bugcrazy <39757967+bugcrazy@users.noreply.github.com>
Date: Sat, 21 Dec 2019 05:06:33 -0300
Subject: [PATCH 1/6] Update template
Adding support for x86_64 to generate x84_64 and i686 packages to have a wine 64 package required by many
---
srcpkgs/wine/template | 71 +++++++++++++++++++++++++++++++++++++------
1 file changed, 61 insertions(+), 10 deletions(-)
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index cca736f0764..9efc63aaa8c 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,9 +1,10 @@
# Template file for 'wine'
pkgname=wine
version=4.21
-revision=1
+revision=2
build_style=gnu-configure
-configure_args="--without-gstreamer"
+nocross=yes
+configure_args="--without-gstreamer --with-x"
short_desc="Run Microsoft Windows applications"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="LGPL-2.1-or-later"
@@ -13,8 +14,10 @@ checksum=324ce14a70059835f33d293f0740b1bf0366bc6b5514548bc083d89b44744ad0
nopie_files="/usr/bin/wine"
-lib32mode=full
-archs=i686
+archs="x86_64* i686*"
+if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
+ lib32mode=full
+fi
hostmakedepends="pkg-config flex prelink"
makedepends="gettext-devel lcms2-devel zlib-devel ncurses-devel
@@ -29,10 +32,53 @@ makedepends="gettext-devel lcms2-devel zlib-devel ncurses-devel
FAudio-devel"
depends="libXi libXinerama libXcomposite libXcursor libOSMesa
desktop-file-utils hicolor-icon-theme liberation-fonts-ttf
- gnutls"
+ gnutls freetype"
binfmts="/usr/bin/wine --magic MZ"
+if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
+ nopie_files+=" /usr/bin/winegcc /usr/bin/wine64 /usr/bin/widl /usr/bin/winebuild /usr/bin/winedump
+ /usr/bin/wrc /usr/bin/wineserver /usr/bin/wmc"
+ makedepends+=" gettext-devel-32bit lcms2-devel-32bit zlib-devel-32bit
+ ncurses-devel-32bit glu-devel-32bit libSM-devel-32bit libXext-devel-32bit
+ libX11-devel-32bit libXpm-devel-32bit libXinerama-devel-32bit
+ libXcomposite-devel-32bit libXmu-devel-32bit libXxf86vm-devel-32bit
+ libXcursor-devel-32bit libXrandr-devel-32bit libXdamage-devel-32bit
+ libXi-devel-32bit libldap-devel-32bit alsa-lib-devel-32bit libgphoto2-devel-32bit
+ libxml2-devel-32bit libxslt-devel-32bit freetype-devel-32bit
+ pulseaudio-devel-32bit mpg123-devel-32bit libgsm-devel-32bit libopenal-devel-32bit
+ giflib-devel-32bit libpng-devel-32bit fontconfig-devel-32bit gnutls-devel-32bit
+ dbus-devel-32bit sane-devel-32bit libpcap-devel-32bit
+ cups-devel-32bit ocl-icd-devel-32bit gcc-multilib vulkan-loader-32bit vkd3d-devel-32bit FAudio-devel-32bit"
+ depends+=" freetype-32bit libXi-32bit libXinerama-32bit
+ libXcomposite-32bit libXcursor-32bit
+ libOSMesa-32bit gnutls-32bit"
+ WINE="$XBPS_BUILDDIR/wine-$version"
+ WINE64="$WINE/../wine64/"
+ WINE32="$WINE/../wine32/"
+ pre_configure() {
+ mkdir -p "$WINE64" "$WINE32"
+ }
+ do_configure() {
+ cd "$WINE64"
+ "$WINE"/configure --libdir="/usr/lib" --enable-win64 ${configure_args}
+ cd "$WINE32"
+ "$WINE"/configure --libdir="/usr/lib32" --with-wine64="$WINE64" ${configure_args}
+ }
+ do_build() {
+ cd "$WINE64"
+ make ${makejobs}
+ cd "$WINE32"
+ make ${makejobs}
+ }
+ do_install() {
+ cd "$WINE32"
+ make install DESTDIR="${DESTDIR}"
+ cd "$WINE64"
+ make install DESTDIR="${DESTDIR}"
+ }
+fi
+
post_install() {
# Font aliasing settings for Win32 applications
install -d ${DESTDIR}/etc/fonts/conf.{avail,d}
@@ -41,12 +87,18 @@ post_install() {
}
libwine_package() {
- lib32mode=full
+ if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
+ lib32mode=full
+ fi
short_desc+=" - Runtime library"
replaces="libwine-unstable>=0"
pkg_install() {
- vmove "usr/lib/*.so.*"
- vmove usr/lib/wine
+ vmove "usr/lib/*.so*"
+ vmove "usr/lib/wine"
+ if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
+ vmove "usr/lib32/*.so*"
+ vmove "usr/lib32/wine"
+ fi
}
}
wine-devel_package() {
@@ -54,7 +106,6 @@ wine-devel_package() {
short_desc+=" - development files"
replaces="wine-unstable-devel>=0"
pkg_install() {
- vmove usr/include
- vmove "usr/lib/*.so"
+ vmove "usr/include"
}
}
From 31d72ac6c32ade51a1c87f8177b34b96e9dbfdf5 Mon Sep 17 00:00:00 2001
From: bugcrazy <39757967+bugcrazy@users.noreply.github.com>
Date: Sat, 21 Dec 2019 14:24:16 -0300
Subject: [PATCH 2/6] Wine x64
Wine style fixes
---
srcpkgs/wine/template | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 9efc63aaa8c..2cb8c6fb18f 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -54,27 +54,27 @@ if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
libXcomposite-32bit libXcursor-32bit
libOSMesa-32bit gnutls-32bit"
WINE="$XBPS_BUILDDIR/wine-$version"
- WINE64="$WINE/../wine64/"
- WINE32="$WINE/../wine32/"
+ WINE64="$_WINE/../wine64/"
+ WINE32="$_WINE/../wine32/"
pre_configure() {
- mkdir -p "$WINE64" "$WINE32"
+ mkdir -p "$_WINE64" "$_WINE32"
}
do_configure() {
- cd "$WINE64"
- "$WINE"/configure --libdir="/usr/lib" --enable-win64 ${configure_args}
- cd "$WINE32"
- "$WINE"/configure --libdir="/usr/lib32" --with-wine64="$WINE64" ${configure_args}
+ cd "$_WINE64"
+ "$_WINE"/configure --libdir="/usr/lib" --enable-win64 ${configure_args}
+ cd "$_WINE32"
+ "$_WINE"/configure --libdir="/usr/lib32" --with-wine64="$_WINE64" ${configure_args}
}
do_build() {
- cd "$WINE64"
+ cd "$_WINE64"
make ${makejobs}
- cd "$WINE32"
+ cd "$_WINE32"
make ${makejobs}
}
do_install() {
- cd "$WINE32"
+ cd "$_WINE32"
make install DESTDIR="${DESTDIR}"
- cd "$WINE64"
+ cd "$_WINE64"
make install DESTDIR="${DESTDIR}"
}
fi
From 83d0c935bbd8228f23c2b27fd22c62a38ec7d487 Mon Sep 17 00:00:00 2001
From: bugcrazy <39757967+bugcrazy@users.noreply.github.com>
Date: Sat, 21 Dec 2019 18:59:46 -0300
Subject: [PATCH 3/6] Wine x64: fixed styles
Fixing errors and styles
---
srcpkgs/wine/template | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 2cb8c6fb18f..48401b1c607 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -3,7 +3,6 @@ pkgname=wine
version=4.21
revision=2
build_style=gnu-configure
-nocross=yes
configure_args="--without-gstreamer --with-x"
short_desc="Run Microsoft Windows applications"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
@@ -52,10 +51,13 @@ if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
cups-devel-32bit ocl-icd-devel-32bit gcc-multilib vulkan-loader-32bit vkd3d-devel-32bit FAudio-devel-32bit"
depends+=" freetype-32bit libXi-32bit libXinerama-32bit
libXcomposite-32bit libXcursor-32bit
- libOSMesa-32bit gnutls-32bit"
- WINE="$XBPS_BUILDDIR/wine-$version"
- WINE64="$_WINE/../wine64/"
- WINE32="$_WINE/../wine32/"
+ libOSMesa-32bit gnutls-32bit libmpg123-32bit"
+ conflicts="wine-32bit"
+ provides="wine-32bit>=${version}_${revision}"
+
+ _WINE="$XBPS_BUILDDIR/wine-$version"
+ _WINE64="$_WINE/../wine64/"
+ _WINE32="$_WINE/../wine32/"
pre_configure() {
mkdir -p "$_WINE64" "$_WINE32"
}
From 5d631fb47ac9fd0fec38e3f4437a00f7e21be8ac Mon Sep 17 00:00:00 2001
From: bugcrazy <39757967+bugcrazy@users.noreply.github.com>
Date: Sun, 22 Dec 2019 01:24:54 -0300
Subject: [PATCH 4/6] Wine : fixed trailing whitespace and errors
Fixed trailing whitespace and errors
---
srcpkgs/wine/template | 43 +++++++++++++++++++++++--------------------
1 file changed, 23 insertions(+), 20 deletions(-)
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 48401b1c607..034c64c121b 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -3,6 +3,7 @@ pkgname=wine
version=4.21
revision=2
build_style=gnu-configure
+nocross=yes
configure_args="--without-gstreamer --with-x"
short_desc="Run Microsoft Windows applications"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
@@ -13,7 +14,7 @@ checksum=324ce14a70059835f33d293f0740b1bf0366bc6b5514548bc083d89b44744ad0
nopie_files="/usr/bin/wine"
-archs="x86_64* i686*"
+archs="i686 x86_64"
if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
lib32mode=full
fi
@@ -36,25 +37,27 @@ depends="libXi libXinerama libXcomposite libXcursor libOSMesa
binfmts="/usr/bin/wine --magic MZ"
if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
- nopie_files+=" /usr/bin/winegcc /usr/bin/wine64 /usr/bin/widl /usr/bin/winebuild /usr/bin/winedump
- /usr/bin/wrc /usr/bin/wineserver /usr/bin/wmc"
+ nopie_files+=" /usr/bin/winegcc /usr/bin/wine64 /usr/bin/widl
+ /usr/bin/winebuild /usr/bin/winedump /usr/bin/wrc /usr/bin/wineserver
+ /usr/bin/wmc"
makedepends+=" gettext-devel-32bit lcms2-devel-32bit zlib-devel-32bit
- ncurses-devel-32bit glu-devel-32bit libSM-devel-32bit libXext-devel-32bit
- libX11-devel-32bit libXpm-devel-32bit libXinerama-devel-32bit
- libXcomposite-devel-32bit libXmu-devel-32bit libXxf86vm-devel-32bit
- libXcursor-devel-32bit libXrandr-devel-32bit libXdamage-devel-32bit
- libXi-devel-32bit libldap-devel-32bit alsa-lib-devel-32bit libgphoto2-devel-32bit
- libxml2-devel-32bit libxslt-devel-32bit freetype-devel-32bit
- pulseaudio-devel-32bit mpg123-devel-32bit libgsm-devel-32bit libopenal-devel-32bit
- giflib-devel-32bit libpng-devel-32bit fontconfig-devel-32bit gnutls-devel-32bit
- dbus-devel-32bit sane-devel-32bit libpcap-devel-32bit
- cups-devel-32bit ocl-icd-devel-32bit gcc-multilib vulkan-loader-32bit vkd3d-devel-32bit FAudio-devel-32bit"
+ ncurses-devel-32bit glu-devel-32bit libSM-devel-32bit libXext-devel-32bit
+ libX11-devel-32bit libXpm-devel-32bit libXinerama-devel-32bit
+ libXcomposite-devel-32bit libXmu-devel-32bit libXxf86vm-devel-32bit
+ libXcursor-devel-32bit libXrandr-devel-32bit libXdamage-devel-32bit
+ libXi-devel-32bit libldap-devel-32bit alsa-lib-devel-32bit libgphoto2-devel-32bit
+ libxml2-devel-32bit libxslt-devel-32bit freetype-devel-32bit
+ pulseaudio-devel-32bit mpg123-devel-32bit libgsm-devel-32bit libopenal-devel-32bit
+ giflib-devel-32bit libpng-devel-32bit fontconfig-devel-32bit gnutls-devel-32bit
+ dbus-devel-32bit sane-devel-32bit libpcap-devel-32bit
+ cups-devel-32bit ocl-icd-devel-32bit gcc-multilib vulkan-loader-32bit vkd3d-devel-32bit
+ FAudio-devel-32bit"
depends+=" freetype-32bit libXi-32bit libXinerama-32bit
- libXcomposite-32bit libXcursor-32bit
- libOSMesa-32bit gnutls-32bit libmpg123-32bit"
- conflicts="wine-32bit"
+ libXcomposite-32bit libXcursor-32bit
+ libOSMesa-32bit gnutls-32bit libmpg123-32bit"
+ conflicts="wine-32bit"
provides="wine-32bit>=${version}_${revision}"
-
+
_WINE="$XBPS_BUILDDIR/wine-$version"
_WINE64="$_WINE/../wine64/"
_WINE32="$_WINE/../wine32/"
@@ -96,10 +99,10 @@ libwine_package() {
replaces="libwine-unstable>=0"
pkg_install() {
vmove "usr/lib/*.so*"
- vmove "usr/lib/wine"
+ vmove usr/lib/wine
if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
vmove "usr/lib32/*.so*"
- vmove "usr/lib32/wine"
+ vmove usr/lib32/wine
fi
}
}
@@ -108,6 +111,6 @@ wine-devel_package() {
short_desc+=" - development files"
replaces="wine-unstable-devel>=0"
pkg_install() {
- vmove "usr/include"
+ vmove usr/include
}
}
From 4c749c936e7e348aea72ce1b7f1321a8427e7b92 Mon Sep 17 00:00:00 2001
From: bugcrazy <39757967+bugcrazy@users.noreply.github.com>
Date: Sun, 22 Dec 2019 04:46:35 -0300
Subject: [PATCH 5/6] Wine: Fixing obvious issue
Place nocross= after checksum=
---
srcpkgs/wine/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 034c64c121b..f27bc6f3da4 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -3,7 +3,6 @@ pkgname=wine
version=4.21
revision=2
build_style=gnu-configure
-nocross=yes
configure_args="--without-gstreamer --with-x"
short_desc="Run Microsoft Windows applications"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
@@ -11,6 +10,7 @@ license="LGPL-2.1-or-later"
homepage="http://www.winehq.org/"
distfiles="https://dl.winehq.org/wine/source/${version%%.*}.x/wine-${version}.tar.xz"
checksum=324ce14a70059835f33d293f0740b1bf0366bc6b5514548bc083d89b44744ad0
+nocross=yes
nopie_files="/usr/bin/wine"
From 42784ca9792b8e9b24571691980a50bdea589b51 Mon Sep 17 00:00:00 2001
From: bugcrazy <39757967+bugcrazy@users.noreply.github.com>
Date: Thu, 23 Jan 2020 16:53:44 -0300
Subject: [PATCH 6/6] Version update
Wine version update
---
srcpkgs/wine/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index f27bc6f3da4..4bef2a972fc 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,6 +1,6 @@
# Template file for 'wine'
pkgname=wine
-version=4.21
+version=5.0
revision=2
build_style=gnu-configure
configure_args="--without-gstreamer --with-x"
@@ -8,8 +8,8 @@ short_desc="Run Microsoft Windows applications"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="LGPL-2.1-or-later"
homepage="http://www.winehq.org/"
-distfiles="https://dl.winehq.org/wine/source/${version%%.*}.x/wine-${version}.tar.xz"
-checksum=324ce14a70059835f33d293f0740b1bf0366bc6b5514548bc083d89b44744ad0
+distfiles="https://dl.winehq.org/wine/source/${version}/wine-${version}.tar.xz"
+checksum=181550ba69a80b00c631f80c28ff7642264613bbecdb0c0fc04d6534866713b4
nocross=yes
nopie_files="/usr/bin/wine"
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: Adding x86_64 package to wine
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-17678@inbox.vuxu.org>
` (10 preceding siblings ...)
2020-01-24 0:48 ` voidlinux-github
@ 2020-02-17 19:01 ` Oreo639
2020-02-17 19:02 ` Oreo639
` (11 subsequent siblings)
23 siblings, 0 replies; 24+ messages in thread
From: Oreo639 @ 2020-02-17 19:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1275 bytes --]
New comment by Oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/17678#issuecomment-587122598
Comment:
The issue in travis is that the build log is too long. You can use [ci skip] in the commit message to skip travis building. It isn't the reason this pr likely won't get merged though.
As for why wine x86_64 likely won't get merged as was said before. xbps-src is supposed to let you build a package without any precompiled dependencies (it automatically builds them beforehand if they aren't in the repos). However it can't automatically cross compile 32-bit dependencies. If it tries to build a -32bit dependency in 64bit mode it will just make a 64bit package. You have to cross compile all the 32-bit dependencies beforehand. Thus it requires precompiled 32bit dependencies in the repos in order to work which is not optimal.
From Hoshpak:
>However void-packages is built on the premise that it is possible to bootstrap everything from sources without requiring any preexisting binary packages. So I should be able to always just clone this repository, not use any of the mirrors and build a whole system from the sources.
Also your commit log doesn't follow the commit style guide.
If I am mistaken please correct me.
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: Adding x86_64 package to wine
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-17678@inbox.vuxu.org>
` (11 preceding siblings ...)
2020-02-17 19:01 ` Oreo639
@ 2020-02-17 19:02 ` Oreo639
2020-02-17 19:05 ` Oreo639
` (10 subsequent siblings)
23 siblings, 0 replies; 24+ messages in thread
From: Oreo639 @ 2020-02-17 19:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1271 bytes --]
New comment by Oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/17678#issuecomment-587122598
Comment:
The log too long issue in travis can be worked around by using [ci skip] in the commit message to skip travis building. It isn't the reason this pr likely won't get merged though.
As for why wine x86_64 likely won't get merged as was said before. xbps-src is supposed to let you build a package without any precompiled dependencies (it automatically builds them beforehand if they aren't in the repos). However it can't automatically cross compile 32-bit dependencies. If it tries to build a -32bit dependency in 64bit mode it will just make a 64bit package. You have to cross compile all the 32-bit dependencies beforehand. Thus it requires precompiled 32bit dependencies in the repos in order to work which is not optimal.
From Hoshpak:
>However void-packages is built on the premise that it is possible to bootstrap everything from sources without requiring any preexisting binary packages. So I should be able to always just clone this repository, not use any of the mirrors and build a whole system from the sources.
Also your commit log doesn't follow the commit style guide.
If I am mistaken please correct me.
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: Adding x86_64 package to wine
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-17678@inbox.vuxu.org>
` (12 preceding siblings ...)
2020-02-17 19:02 ` Oreo639
@ 2020-02-17 19:05 ` Oreo639
2020-02-17 20:39 ` Oreo639
` (9 subsequent siblings)
23 siblings, 0 replies; 24+ messages in thread
From: Oreo639 @ 2020-02-17 19:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1279 bytes --]
New comment by Oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/17678#issuecomment-587122598
Comment:
The log too long issue in travis can be worked around by using [ci skip] in the commit message to skip travis building. It isn't the reason this pr likely won't get merged though.
As for why wine x86_64 likely won't get merged as was said before. xbps-src is supposed to let you build a package without any precompiled dependencies (it automatically builds them beforehand if they aren't in the repos). However it can't automatically cross compile 32-bit dependencies. If it tries to build a `-32bit` package in a 64bit environment it will just make a 64bit package. You have to cross compile all the 32-bit dependencies beforehand. Thus it requires precompiled 32bit dependencies in the repos in order to work which is not optimal.
From Hoshpak:
>However void-packages is built on the premise that it is possible to bootstrap everything from sources without requiring any preexisting binary packages. So I should be able to always just clone this repository, not use any of the mirrors and build a whole system from the sources.
Also your commit log doesn't follow the commit style guide.
If I am mistaken please correct me.
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: Adding x86_64 package to wine
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-17678@inbox.vuxu.org>
` (13 preceding siblings ...)
2020-02-17 19:05 ` Oreo639
@ 2020-02-17 20:39 ` Oreo639
2020-02-20 0:00 ` bugcrazy
` (8 subsequent siblings)
23 siblings, 0 replies; 24+ messages in thread
From: Oreo639 @ 2020-02-17 20:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1266 bytes --]
New comment by Oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/17678#issuecomment-587122598
Comment:
The log too long issue in travis can be worked around by using [ci skip] in the commit message to skip travis building. It isn't the reason this pr likely won't get merged though.
As for why wine x86_64 likely won't get merged as was said before. xbps-src is supposed to let you build a package without any precompiled dependencies (it automatically builds them beforehand if they aren't in the repos). However it can't automatically cross compile 32-bit dependencies. If it tries to build a `-32bit` package in a 64bit environment it will just make a 64bit package. You have to cross compile all the 32-bit dependencies beforehand. Thus it requires precompiled 32bit dependencies in order to work which is not optimal.
From Hoshpak:
>However void-packages is built on the premise that it is possible to bootstrap everything from sources without requiring any preexisting binary packages. So I should be able to always just clone this repository, not use any of the mirrors and build a whole system from the sources.
Also your commit log doesn't follow the commit style guide.
If I am mistaken please correct me.
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: Adding x86_64 package to wine
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-17678@inbox.vuxu.org>
` (14 preceding siblings ...)
2020-02-17 20:39 ` Oreo639
@ 2020-02-20 0:00 ` bugcrazy
2020-02-20 0:04 ` Duncaen
` (7 subsequent siblings)
23 siblings, 0 replies; 24+ messages in thread
From: bugcrazy @ 2020-02-20 0:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1415 bytes --]
New comment by bugcrazy on void-packages repository
https://github.com/void-linux/void-packages/pull/17678#issuecomment-588537971
Comment:
> The log too long issue in travis can be worked around by using [ci skip] in the commit message to skip travis building. It isn't the reason this pr likely won't get merged though.
>
> As for why wine x86_64 likely won't get merged as was said before. xbps-src is supposed to let you build a package without any precompiled dependencies (it automatically builds them beforehand if they aren't in the repos). However it can't automatically cross compile 32-bit dependencies. If it tries to build a `-32bit` package in a 64bit environment it will just make a 64bit package. You have to cross compile all the 32-bit dependencies beforehand. Thus it requires precompiled 32bit dependencies in order to work which is not optimal.
>
> From Hoshpak:
>
> > However void-packages is built on the premise that it is possible to bootstrap everything from sources without requiring any preexisting binary packages. So I should be able to always just clone this repository, not use any of the mirrors and build a whole system from the sources.
>
> Also your commit log doesn't follow the commit style guide.
>
> If I am mistaken please correct me.
Thanks for the tip! But the Steam package depends on 32-bit libraries, and Steam works on 64-bit with 32-bit libraries.
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: Adding x86_64 package to wine
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-17678@inbox.vuxu.org>
` (15 preceding siblings ...)
2020-02-20 0:00 ` bugcrazy
@ 2020-02-20 0:04 ` Duncaen
2020-02-20 0:04 ` Duncaen
` (6 subsequent siblings)
23 siblings, 0 replies; 24+ messages in thread
From: Duncaen @ 2020-02-20 0:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 340 bytes --]
New comment by Duncaen on void-packages repository
https://github.com/void-linux/void-packages/pull/17678#issuecomment-588538969
Comment:
> Thanks for the tip! But the Steam package depends on 32-bit libraries, and Steam works on 64-bit with 32-bit libraries.
We don't build steam and it doesn't depend on 32bit (for the same reason).
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: Adding x86_64 package to wine
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-17678@inbox.vuxu.org>
` (16 preceding siblings ...)
2020-02-20 0:04 ` Duncaen
@ 2020-02-20 0:04 ` Duncaen
2020-04-09 21:58 ` [PR PATCH] [Updated] " bugcrazy
` (5 subsequent siblings)
23 siblings, 0 replies; 24+ messages in thread
From: Duncaen @ 2020-02-20 0:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 349 bytes --]
New comment by Duncaen on void-packages repository
https://github.com/void-linux/void-packages/pull/17678#issuecomment-588538969
Comment:
> Thanks for the tip! But the Steam package depends on 32-bit libraries, and Steam works on 64-bit with 32-bit libraries.
We don't build steam and it doesn't depend on 32bit packages (for the same reason).
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: [PR PATCH] [Updated] Adding x86_64 package to wine
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-17678@inbox.vuxu.org>
` (17 preceding siblings ...)
2020-02-20 0:04 ` Duncaen
@ 2020-04-09 21:58 ` bugcrazy
2020-04-10 0:13 ` bugcrazy
` (4 subsequent siblings)
23 siblings, 0 replies; 24+ messages in thread
From: bugcrazy @ 2020-04-09 21:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 435 bytes --]
There is an updated pull request by bugcrazy against master on the void-packages repository
https://github.com/bugcrazy/void-packages bugcrazy-patch-1
https://github.com/void-linux/void-packages/pull/17678
Adding x86_64 package to wine
Adding support for x86_64 to generate x84_64 and i686 packages to have a wine 64 package required by many
A patch file from https://github.com/void-linux/void-packages/pull/17678.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-bugcrazy-patch-1-17678.patch --]
[-- Type: text/x-diff, Size: 16017 bytes --]
From ca2b8cb54bcf49256e0b4e3c7e4c07eaf6552dd0 Mon Sep 17 00:00:00 2001
From: bugcrazy <39757967+bugcrazy@users.noreply.github.com>
Date: Sat, 21 Dec 2019 05:06:33 -0300
Subject: [PATCH 1/9] Update template
Adding support for x86_64 to generate x84_64 and i686 packages to have a wine 64 package required by many
---
srcpkgs/wine/template | 71 +++++++++++++++++++++++++++++++++++++------
1 file changed, 61 insertions(+), 10 deletions(-)
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index cca736f0764..9efc63aaa8c 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,9 +1,10 @@
# Template file for 'wine'
pkgname=wine
version=4.21
-revision=1
+revision=2
build_style=gnu-configure
-configure_args="--without-gstreamer"
+nocross=yes
+configure_args="--without-gstreamer --with-x"
short_desc="Run Microsoft Windows applications"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="LGPL-2.1-or-later"
@@ -13,8 +14,10 @@ checksum=324ce14a70059835f33d293f0740b1bf0366bc6b5514548bc083d89b44744ad0
nopie_files="/usr/bin/wine"
-lib32mode=full
-archs=i686
+archs="x86_64* i686*"
+if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
+ lib32mode=full
+fi
hostmakedepends="pkg-config flex prelink"
makedepends="gettext-devel lcms2-devel zlib-devel ncurses-devel
@@ -29,10 +32,53 @@ makedepends="gettext-devel lcms2-devel zlib-devel ncurses-devel
FAudio-devel"
depends="libXi libXinerama libXcomposite libXcursor libOSMesa
desktop-file-utils hicolor-icon-theme liberation-fonts-ttf
- gnutls"
+ gnutls freetype"
binfmts="/usr/bin/wine --magic MZ"
+if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
+ nopie_files+=" /usr/bin/winegcc /usr/bin/wine64 /usr/bin/widl /usr/bin/winebuild /usr/bin/winedump
+ /usr/bin/wrc /usr/bin/wineserver /usr/bin/wmc"
+ makedepends+=" gettext-devel-32bit lcms2-devel-32bit zlib-devel-32bit
+ ncurses-devel-32bit glu-devel-32bit libSM-devel-32bit libXext-devel-32bit
+ libX11-devel-32bit libXpm-devel-32bit libXinerama-devel-32bit
+ libXcomposite-devel-32bit libXmu-devel-32bit libXxf86vm-devel-32bit
+ libXcursor-devel-32bit libXrandr-devel-32bit libXdamage-devel-32bit
+ libXi-devel-32bit libldap-devel-32bit alsa-lib-devel-32bit libgphoto2-devel-32bit
+ libxml2-devel-32bit libxslt-devel-32bit freetype-devel-32bit
+ pulseaudio-devel-32bit mpg123-devel-32bit libgsm-devel-32bit libopenal-devel-32bit
+ giflib-devel-32bit libpng-devel-32bit fontconfig-devel-32bit gnutls-devel-32bit
+ dbus-devel-32bit sane-devel-32bit libpcap-devel-32bit
+ cups-devel-32bit ocl-icd-devel-32bit gcc-multilib vulkan-loader-32bit vkd3d-devel-32bit FAudio-devel-32bit"
+ depends+=" freetype-32bit libXi-32bit libXinerama-32bit
+ libXcomposite-32bit libXcursor-32bit
+ libOSMesa-32bit gnutls-32bit"
+ WINE="$XBPS_BUILDDIR/wine-$version"
+ WINE64="$WINE/../wine64/"
+ WINE32="$WINE/../wine32/"
+ pre_configure() {
+ mkdir -p "$WINE64" "$WINE32"
+ }
+ do_configure() {
+ cd "$WINE64"
+ "$WINE"/configure --libdir="/usr/lib" --enable-win64 ${configure_args}
+ cd "$WINE32"
+ "$WINE"/configure --libdir="/usr/lib32" --with-wine64="$WINE64" ${configure_args}
+ }
+ do_build() {
+ cd "$WINE64"
+ make ${makejobs}
+ cd "$WINE32"
+ make ${makejobs}
+ }
+ do_install() {
+ cd "$WINE32"
+ make install DESTDIR="${DESTDIR}"
+ cd "$WINE64"
+ make install DESTDIR="${DESTDIR}"
+ }
+fi
+
post_install() {
# Font aliasing settings for Win32 applications
install -d ${DESTDIR}/etc/fonts/conf.{avail,d}
@@ -41,12 +87,18 @@ post_install() {
}
libwine_package() {
- lib32mode=full
+ if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
+ lib32mode=full
+ fi
short_desc+=" - Runtime library"
replaces="libwine-unstable>=0"
pkg_install() {
- vmove "usr/lib/*.so.*"
- vmove usr/lib/wine
+ vmove "usr/lib/*.so*"
+ vmove "usr/lib/wine"
+ if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
+ vmove "usr/lib32/*.so*"
+ vmove "usr/lib32/wine"
+ fi
}
}
wine-devel_package() {
@@ -54,7 +106,6 @@ wine-devel_package() {
short_desc+=" - development files"
replaces="wine-unstable-devel>=0"
pkg_install() {
- vmove usr/include
- vmove "usr/lib/*.so"
+ vmove "usr/include"
}
}
From 31d72ac6c32ade51a1c87f8177b34b96e9dbfdf5 Mon Sep 17 00:00:00 2001
From: bugcrazy <39757967+bugcrazy@users.noreply.github.com>
Date: Sat, 21 Dec 2019 14:24:16 -0300
Subject: [PATCH 2/9] Wine x64
Wine style fixes
---
srcpkgs/wine/template | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 9efc63aaa8c..2cb8c6fb18f 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -54,27 +54,27 @@ if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
libXcomposite-32bit libXcursor-32bit
libOSMesa-32bit gnutls-32bit"
WINE="$XBPS_BUILDDIR/wine-$version"
- WINE64="$WINE/../wine64/"
- WINE32="$WINE/../wine32/"
+ WINE64="$_WINE/../wine64/"
+ WINE32="$_WINE/../wine32/"
pre_configure() {
- mkdir -p "$WINE64" "$WINE32"
+ mkdir -p "$_WINE64" "$_WINE32"
}
do_configure() {
- cd "$WINE64"
- "$WINE"/configure --libdir="/usr/lib" --enable-win64 ${configure_args}
- cd "$WINE32"
- "$WINE"/configure --libdir="/usr/lib32" --with-wine64="$WINE64" ${configure_args}
+ cd "$_WINE64"
+ "$_WINE"/configure --libdir="/usr/lib" --enable-win64 ${configure_args}
+ cd "$_WINE32"
+ "$_WINE"/configure --libdir="/usr/lib32" --with-wine64="$_WINE64" ${configure_args}
}
do_build() {
- cd "$WINE64"
+ cd "$_WINE64"
make ${makejobs}
- cd "$WINE32"
+ cd "$_WINE32"
make ${makejobs}
}
do_install() {
- cd "$WINE32"
+ cd "$_WINE32"
make install DESTDIR="${DESTDIR}"
- cd "$WINE64"
+ cd "$_WINE64"
make install DESTDIR="${DESTDIR}"
}
fi
From 83d0c935bbd8228f23c2b27fd22c62a38ec7d487 Mon Sep 17 00:00:00 2001
From: bugcrazy <39757967+bugcrazy@users.noreply.github.com>
Date: Sat, 21 Dec 2019 18:59:46 -0300
Subject: [PATCH 3/9] Wine x64: fixed styles
Fixing errors and styles
---
srcpkgs/wine/template | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 2cb8c6fb18f..48401b1c607 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -3,7 +3,6 @@ pkgname=wine
version=4.21
revision=2
build_style=gnu-configure
-nocross=yes
configure_args="--without-gstreamer --with-x"
short_desc="Run Microsoft Windows applications"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
@@ -52,10 +51,13 @@ if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
cups-devel-32bit ocl-icd-devel-32bit gcc-multilib vulkan-loader-32bit vkd3d-devel-32bit FAudio-devel-32bit"
depends+=" freetype-32bit libXi-32bit libXinerama-32bit
libXcomposite-32bit libXcursor-32bit
- libOSMesa-32bit gnutls-32bit"
- WINE="$XBPS_BUILDDIR/wine-$version"
- WINE64="$_WINE/../wine64/"
- WINE32="$_WINE/../wine32/"
+ libOSMesa-32bit gnutls-32bit libmpg123-32bit"
+ conflicts="wine-32bit"
+ provides="wine-32bit>=${version}_${revision}"
+
+ _WINE="$XBPS_BUILDDIR/wine-$version"
+ _WINE64="$_WINE/../wine64/"
+ _WINE32="$_WINE/../wine32/"
pre_configure() {
mkdir -p "$_WINE64" "$_WINE32"
}
From 5d631fb47ac9fd0fec38e3f4437a00f7e21be8ac Mon Sep 17 00:00:00 2001
From: bugcrazy <39757967+bugcrazy@users.noreply.github.com>
Date: Sun, 22 Dec 2019 01:24:54 -0300
Subject: [PATCH 4/9] Wine : fixed trailing whitespace and errors
Fixed trailing whitespace and errors
---
srcpkgs/wine/template | 43 +++++++++++++++++++++++--------------------
1 file changed, 23 insertions(+), 20 deletions(-)
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 48401b1c607..034c64c121b 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -3,6 +3,7 @@ pkgname=wine
version=4.21
revision=2
build_style=gnu-configure
+nocross=yes
configure_args="--without-gstreamer --with-x"
short_desc="Run Microsoft Windows applications"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
@@ -13,7 +14,7 @@ checksum=324ce14a70059835f33d293f0740b1bf0366bc6b5514548bc083d89b44744ad0
nopie_files="/usr/bin/wine"
-archs="x86_64* i686*"
+archs="i686 x86_64"
if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
lib32mode=full
fi
@@ -36,25 +37,27 @@ depends="libXi libXinerama libXcomposite libXcursor libOSMesa
binfmts="/usr/bin/wine --magic MZ"
if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
- nopie_files+=" /usr/bin/winegcc /usr/bin/wine64 /usr/bin/widl /usr/bin/winebuild /usr/bin/winedump
- /usr/bin/wrc /usr/bin/wineserver /usr/bin/wmc"
+ nopie_files+=" /usr/bin/winegcc /usr/bin/wine64 /usr/bin/widl
+ /usr/bin/winebuild /usr/bin/winedump /usr/bin/wrc /usr/bin/wineserver
+ /usr/bin/wmc"
makedepends+=" gettext-devel-32bit lcms2-devel-32bit zlib-devel-32bit
- ncurses-devel-32bit glu-devel-32bit libSM-devel-32bit libXext-devel-32bit
- libX11-devel-32bit libXpm-devel-32bit libXinerama-devel-32bit
- libXcomposite-devel-32bit libXmu-devel-32bit libXxf86vm-devel-32bit
- libXcursor-devel-32bit libXrandr-devel-32bit libXdamage-devel-32bit
- libXi-devel-32bit libldap-devel-32bit alsa-lib-devel-32bit libgphoto2-devel-32bit
- libxml2-devel-32bit libxslt-devel-32bit freetype-devel-32bit
- pulseaudio-devel-32bit mpg123-devel-32bit libgsm-devel-32bit libopenal-devel-32bit
- giflib-devel-32bit libpng-devel-32bit fontconfig-devel-32bit gnutls-devel-32bit
- dbus-devel-32bit sane-devel-32bit libpcap-devel-32bit
- cups-devel-32bit ocl-icd-devel-32bit gcc-multilib vulkan-loader-32bit vkd3d-devel-32bit FAudio-devel-32bit"
+ ncurses-devel-32bit glu-devel-32bit libSM-devel-32bit libXext-devel-32bit
+ libX11-devel-32bit libXpm-devel-32bit libXinerama-devel-32bit
+ libXcomposite-devel-32bit libXmu-devel-32bit libXxf86vm-devel-32bit
+ libXcursor-devel-32bit libXrandr-devel-32bit libXdamage-devel-32bit
+ libXi-devel-32bit libldap-devel-32bit alsa-lib-devel-32bit libgphoto2-devel-32bit
+ libxml2-devel-32bit libxslt-devel-32bit freetype-devel-32bit
+ pulseaudio-devel-32bit mpg123-devel-32bit libgsm-devel-32bit libopenal-devel-32bit
+ giflib-devel-32bit libpng-devel-32bit fontconfig-devel-32bit gnutls-devel-32bit
+ dbus-devel-32bit sane-devel-32bit libpcap-devel-32bit
+ cups-devel-32bit ocl-icd-devel-32bit gcc-multilib vulkan-loader-32bit vkd3d-devel-32bit
+ FAudio-devel-32bit"
depends+=" freetype-32bit libXi-32bit libXinerama-32bit
- libXcomposite-32bit libXcursor-32bit
- libOSMesa-32bit gnutls-32bit libmpg123-32bit"
- conflicts="wine-32bit"
+ libXcomposite-32bit libXcursor-32bit
+ libOSMesa-32bit gnutls-32bit libmpg123-32bit"
+ conflicts="wine-32bit"
provides="wine-32bit>=${version}_${revision}"
-
+
_WINE="$XBPS_BUILDDIR/wine-$version"
_WINE64="$_WINE/../wine64/"
_WINE32="$_WINE/../wine32/"
@@ -96,10 +99,10 @@ libwine_package() {
replaces="libwine-unstable>=0"
pkg_install() {
vmove "usr/lib/*.so*"
- vmove "usr/lib/wine"
+ vmove usr/lib/wine
if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
vmove "usr/lib32/*.so*"
- vmove "usr/lib32/wine"
+ vmove usr/lib32/wine
fi
}
}
@@ -108,6 +111,6 @@ wine-devel_package() {
short_desc+=" - development files"
replaces="wine-unstable-devel>=0"
pkg_install() {
- vmove "usr/include"
+ vmove usr/include
}
}
From 4c749c936e7e348aea72ce1b7f1321a8427e7b92 Mon Sep 17 00:00:00 2001
From: bugcrazy <39757967+bugcrazy@users.noreply.github.com>
Date: Sun, 22 Dec 2019 04:46:35 -0300
Subject: [PATCH 5/9] Wine: Fixing obvious issue
Place nocross= after checksum=
---
srcpkgs/wine/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 034c64c121b..f27bc6f3da4 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -3,7 +3,6 @@ pkgname=wine
version=4.21
revision=2
build_style=gnu-configure
-nocross=yes
configure_args="--without-gstreamer --with-x"
short_desc="Run Microsoft Windows applications"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
@@ -11,6 +10,7 @@ license="LGPL-2.1-or-later"
homepage="http://www.winehq.org/"
distfiles="https://dl.winehq.org/wine/source/${version%%.*}.x/wine-${version}.tar.xz"
checksum=324ce14a70059835f33d293f0740b1bf0366bc6b5514548bc083d89b44744ad0
+nocross=yes
nopie_files="/usr/bin/wine"
From 42784ca9792b8e9b24571691980a50bdea589b51 Mon Sep 17 00:00:00 2001
From: bugcrazy <39757967+bugcrazy@users.noreply.github.com>
Date: Thu, 23 Jan 2020 16:53:44 -0300
Subject: [PATCH 6/9] Version update
Wine version update
---
srcpkgs/wine/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index f27bc6f3da4..4bef2a972fc 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,6 +1,6 @@
# Template file for 'wine'
pkgname=wine
-version=4.21
+version=5.0
revision=2
build_style=gnu-configure
configure_args="--without-gstreamer --with-x"
@@ -8,8 +8,8 @@ short_desc="Run Microsoft Windows applications"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="LGPL-2.1-or-later"
homepage="http://www.winehq.org/"
-distfiles="https://dl.winehq.org/wine/source/${version%%.*}.x/wine-${version}.tar.xz"
-checksum=324ce14a70059835f33d293f0740b1bf0366bc6b5514548bc083d89b44744ad0
+distfiles="https://dl.winehq.org/wine/source/${version}/wine-${version}.tar.xz"
+checksum=181550ba69a80b00c631f80c28ff7642264613bbecdb0c0fc04d6534866713b4
nocross=yes
nopie_files="/usr/bin/wine"
From a545cb91895e041be8ac07d28b628d31c8e74036 Mon Sep 17 00:00:00 2001
From: bugcrazy <39757967+bugcrazy@users.noreply.github.com>
Date: Mon, 24 Feb 2020 00:33:54 -0300
Subject: [PATCH 7/9] Test with [ci skip]
Test with [ci skip] for reading log errors
---
srcpkgs/wine/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 7c88aa54b57..e32259e96c1 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -3,6 +3,7 @@ pkgname=wine
version=5.0
revision=1
build_style=gnu-configure
+nocross=yes
configure_args="--without-gstreamer --with-x"
short_desc="Run Microsoft Windows applications"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
From 76e2fd5787ddb0c8d5a2086286af9541450df367 Mon Sep 17 00:00:00 2001
From: bugcrazy <39757967+bugcrazy@users.noreply.github.com>
Date: Mon, 24 Feb 2020 00:46:42 -0300
Subject: [PATCH 8/9] Second test with [ci skip]
Second test with [ci skip] for reading log errors.
---
srcpkgs/wine/template | 1 -
1 file changed, 1 deletion(-)
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index e32259e96c1..7c88aa54b57 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -3,7 +3,6 @@ pkgname=wine
version=5.0
revision=1
build_style=gnu-configure
-nocross=yes
configure_args="--without-gstreamer --with-x"
short_desc="Run Microsoft Windows applications"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
From 45578dfa29b074715b551b9a55c8437b87e0862d Mon Sep 17 00:00:00 2001
From: bugcrazy <39757967+bugcrazy@users.noreply.github.com>
Date: Thu, 9 Apr 2020 18:58:28 -0300
Subject: [PATCH 9/9] Wine update [ci skip]
---
srcpkgs/wine/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 7c88aa54b57..dd4f6c2e74d 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,15 +1,15 @@
# Template file for 'wine'
pkgname=wine
-version=5.0
+version=5.4
revision=1
build_style=gnu-configure
configure_args="--without-gstreamer --with-x"
short_desc="Run Microsoft Windows applications"
-maintainer="Andrea Brancaleoni <abc@pompel.me>"
+maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="http://www.winehq.org/"
-distfiles="https://dl.winehq.org/wine/source/${version}/wine-${version}.tar.xz"
-checksum=181550ba69a80b00c631f80c28ff7642264613bbecdb0c0fc04d6534866713b4
+distfiles="https://dl.winehq.org/wine/source/${version%%.*}.x/wine-${version}.tar.xz"
+checksum=4b3e2b0ffa5415f199540e6051c28c3976fce91ea5bfb2cf4a099c257317052c
nopie_files="/usr/bin/wine"
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: [PR PATCH] [Updated] Adding x86_64 package to wine
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-17678@inbox.vuxu.org>
` (18 preceding siblings ...)
2020-04-09 21:58 ` [PR PATCH] [Updated] " bugcrazy
@ 2020-04-10 0:13 ` bugcrazy
2020-04-10 1:40 ` bugcrazy
` (3 subsequent siblings)
23 siblings, 0 replies; 24+ messages in thread
From: bugcrazy @ 2020-04-10 0:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 435 bytes --]
There is an updated pull request by bugcrazy against master on the void-packages repository
https://github.com/bugcrazy/void-packages bugcrazy-patch-1
https://github.com/void-linux/void-packages/pull/17678
Adding x86_64 package to wine
Adding support for x86_64 to generate x84_64 and i686 packages to have a wine 64 package required by many
A patch file from https://github.com/void-linux/void-packages/pull/17678.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-bugcrazy-patch-1-17678.patch --]
[-- Type: text/x-diff, Size: 16017 bytes --]
From ca2b8cb54bcf49256e0b4e3c7e4c07eaf6552dd0 Mon Sep 17 00:00:00 2001
From: bugcrazy <39757967+bugcrazy@users.noreply.github.com>
Date: Sat, 21 Dec 2019 05:06:33 -0300
Subject: [PATCH 1/9] Update template
Adding support for x86_64 to generate x84_64 and i686 packages to have a wine 64 package required by many
---
srcpkgs/wine/template | 71 +++++++++++++++++++++++++++++++++++++------
1 file changed, 61 insertions(+), 10 deletions(-)
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index cca736f0764..9efc63aaa8c 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,9 +1,10 @@
# Template file for 'wine'
pkgname=wine
version=4.21
-revision=1
+revision=2
build_style=gnu-configure
-configure_args="--without-gstreamer"
+nocross=yes
+configure_args="--without-gstreamer --with-x"
short_desc="Run Microsoft Windows applications"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="LGPL-2.1-or-later"
@@ -13,8 +14,10 @@ checksum=324ce14a70059835f33d293f0740b1bf0366bc6b5514548bc083d89b44744ad0
nopie_files="/usr/bin/wine"
-lib32mode=full
-archs=i686
+archs="x86_64* i686*"
+if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
+ lib32mode=full
+fi
hostmakedepends="pkg-config flex prelink"
makedepends="gettext-devel lcms2-devel zlib-devel ncurses-devel
@@ -29,10 +32,53 @@ makedepends="gettext-devel lcms2-devel zlib-devel ncurses-devel
FAudio-devel"
depends="libXi libXinerama libXcomposite libXcursor libOSMesa
desktop-file-utils hicolor-icon-theme liberation-fonts-ttf
- gnutls"
+ gnutls freetype"
binfmts="/usr/bin/wine --magic MZ"
+if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
+ nopie_files+=" /usr/bin/winegcc /usr/bin/wine64 /usr/bin/widl /usr/bin/winebuild /usr/bin/winedump
+ /usr/bin/wrc /usr/bin/wineserver /usr/bin/wmc"
+ makedepends+=" gettext-devel-32bit lcms2-devel-32bit zlib-devel-32bit
+ ncurses-devel-32bit glu-devel-32bit libSM-devel-32bit libXext-devel-32bit
+ libX11-devel-32bit libXpm-devel-32bit libXinerama-devel-32bit
+ libXcomposite-devel-32bit libXmu-devel-32bit libXxf86vm-devel-32bit
+ libXcursor-devel-32bit libXrandr-devel-32bit libXdamage-devel-32bit
+ libXi-devel-32bit libldap-devel-32bit alsa-lib-devel-32bit libgphoto2-devel-32bit
+ libxml2-devel-32bit libxslt-devel-32bit freetype-devel-32bit
+ pulseaudio-devel-32bit mpg123-devel-32bit libgsm-devel-32bit libopenal-devel-32bit
+ giflib-devel-32bit libpng-devel-32bit fontconfig-devel-32bit gnutls-devel-32bit
+ dbus-devel-32bit sane-devel-32bit libpcap-devel-32bit
+ cups-devel-32bit ocl-icd-devel-32bit gcc-multilib vulkan-loader-32bit vkd3d-devel-32bit FAudio-devel-32bit"
+ depends+=" freetype-32bit libXi-32bit libXinerama-32bit
+ libXcomposite-32bit libXcursor-32bit
+ libOSMesa-32bit gnutls-32bit"
+ WINE="$XBPS_BUILDDIR/wine-$version"
+ WINE64="$WINE/../wine64/"
+ WINE32="$WINE/../wine32/"
+ pre_configure() {
+ mkdir -p "$WINE64" "$WINE32"
+ }
+ do_configure() {
+ cd "$WINE64"
+ "$WINE"/configure --libdir="/usr/lib" --enable-win64 ${configure_args}
+ cd "$WINE32"
+ "$WINE"/configure --libdir="/usr/lib32" --with-wine64="$WINE64" ${configure_args}
+ }
+ do_build() {
+ cd "$WINE64"
+ make ${makejobs}
+ cd "$WINE32"
+ make ${makejobs}
+ }
+ do_install() {
+ cd "$WINE32"
+ make install DESTDIR="${DESTDIR}"
+ cd "$WINE64"
+ make install DESTDIR="${DESTDIR}"
+ }
+fi
+
post_install() {
# Font aliasing settings for Win32 applications
install -d ${DESTDIR}/etc/fonts/conf.{avail,d}
@@ -41,12 +87,18 @@ post_install() {
}
libwine_package() {
- lib32mode=full
+ if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
+ lib32mode=full
+ fi
short_desc+=" - Runtime library"
replaces="libwine-unstable>=0"
pkg_install() {
- vmove "usr/lib/*.so.*"
- vmove usr/lib/wine
+ vmove "usr/lib/*.so*"
+ vmove "usr/lib/wine"
+ if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
+ vmove "usr/lib32/*.so*"
+ vmove "usr/lib32/wine"
+ fi
}
}
wine-devel_package() {
@@ -54,7 +106,6 @@ wine-devel_package() {
short_desc+=" - development files"
replaces="wine-unstable-devel>=0"
pkg_install() {
- vmove usr/include
- vmove "usr/lib/*.so"
+ vmove "usr/include"
}
}
From 31d72ac6c32ade51a1c87f8177b34b96e9dbfdf5 Mon Sep 17 00:00:00 2001
From: bugcrazy <39757967+bugcrazy@users.noreply.github.com>
Date: Sat, 21 Dec 2019 14:24:16 -0300
Subject: [PATCH 2/9] Wine x64
Wine style fixes
---
srcpkgs/wine/template | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 9efc63aaa8c..2cb8c6fb18f 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -54,27 +54,27 @@ if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
libXcomposite-32bit libXcursor-32bit
libOSMesa-32bit gnutls-32bit"
WINE="$XBPS_BUILDDIR/wine-$version"
- WINE64="$WINE/../wine64/"
- WINE32="$WINE/../wine32/"
+ WINE64="$_WINE/../wine64/"
+ WINE32="$_WINE/../wine32/"
pre_configure() {
- mkdir -p "$WINE64" "$WINE32"
+ mkdir -p "$_WINE64" "$_WINE32"
}
do_configure() {
- cd "$WINE64"
- "$WINE"/configure --libdir="/usr/lib" --enable-win64 ${configure_args}
- cd "$WINE32"
- "$WINE"/configure --libdir="/usr/lib32" --with-wine64="$WINE64" ${configure_args}
+ cd "$_WINE64"
+ "$_WINE"/configure --libdir="/usr/lib" --enable-win64 ${configure_args}
+ cd "$_WINE32"
+ "$_WINE"/configure --libdir="/usr/lib32" --with-wine64="$_WINE64" ${configure_args}
}
do_build() {
- cd "$WINE64"
+ cd "$_WINE64"
make ${makejobs}
- cd "$WINE32"
+ cd "$_WINE32"
make ${makejobs}
}
do_install() {
- cd "$WINE32"
+ cd "$_WINE32"
make install DESTDIR="${DESTDIR}"
- cd "$WINE64"
+ cd "$_WINE64"
make install DESTDIR="${DESTDIR}"
}
fi
From 83d0c935bbd8228f23c2b27fd22c62a38ec7d487 Mon Sep 17 00:00:00 2001
From: bugcrazy <39757967+bugcrazy@users.noreply.github.com>
Date: Sat, 21 Dec 2019 18:59:46 -0300
Subject: [PATCH 3/9] Wine x64: fixed styles
Fixing errors and styles
---
srcpkgs/wine/template | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 2cb8c6fb18f..48401b1c607 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -3,7 +3,6 @@ pkgname=wine
version=4.21
revision=2
build_style=gnu-configure
-nocross=yes
configure_args="--without-gstreamer --with-x"
short_desc="Run Microsoft Windows applications"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
@@ -52,10 +51,13 @@ if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
cups-devel-32bit ocl-icd-devel-32bit gcc-multilib vulkan-loader-32bit vkd3d-devel-32bit FAudio-devel-32bit"
depends+=" freetype-32bit libXi-32bit libXinerama-32bit
libXcomposite-32bit libXcursor-32bit
- libOSMesa-32bit gnutls-32bit"
- WINE="$XBPS_BUILDDIR/wine-$version"
- WINE64="$_WINE/../wine64/"
- WINE32="$_WINE/../wine32/"
+ libOSMesa-32bit gnutls-32bit libmpg123-32bit"
+ conflicts="wine-32bit"
+ provides="wine-32bit>=${version}_${revision}"
+
+ _WINE="$XBPS_BUILDDIR/wine-$version"
+ _WINE64="$_WINE/../wine64/"
+ _WINE32="$_WINE/../wine32/"
pre_configure() {
mkdir -p "$_WINE64" "$_WINE32"
}
From 5d631fb47ac9fd0fec38e3f4437a00f7e21be8ac Mon Sep 17 00:00:00 2001
From: bugcrazy <39757967+bugcrazy@users.noreply.github.com>
Date: Sun, 22 Dec 2019 01:24:54 -0300
Subject: [PATCH 4/9] Wine : fixed trailing whitespace and errors
Fixed trailing whitespace and errors
---
srcpkgs/wine/template | 43 +++++++++++++++++++++++--------------------
1 file changed, 23 insertions(+), 20 deletions(-)
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 48401b1c607..034c64c121b 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -3,6 +3,7 @@ pkgname=wine
version=4.21
revision=2
build_style=gnu-configure
+nocross=yes
configure_args="--without-gstreamer --with-x"
short_desc="Run Microsoft Windows applications"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
@@ -13,7 +14,7 @@ checksum=324ce14a70059835f33d293f0740b1bf0366bc6b5514548bc083d89b44744ad0
nopie_files="/usr/bin/wine"
-archs="x86_64* i686*"
+archs="i686 x86_64"
if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
lib32mode=full
fi
@@ -36,25 +37,27 @@ depends="libXi libXinerama libXcomposite libXcursor libOSMesa
binfmts="/usr/bin/wine --magic MZ"
if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
- nopie_files+=" /usr/bin/winegcc /usr/bin/wine64 /usr/bin/widl /usr/bin/winebuild /usr/bin/winedump
- /usr/bin/wrc /usr/bin/wineserver /usr/bin/wmc"
+ nopie_files+=" /usr/bin/winegcc /usr/bin/wine64 /usr/bin/widl
+ /usr/bin/winebuild /usr/bin/winedump /usr/bin/wrc /usr/bin/wineserver
+ /usr/bin/wmc"
makedepends+=" gettext-devel-32bit lcms2-devel-32bit zlib-devel-32bit
- ncurses-devel-32bit glu-devel-32bit libSM-devel-32bit libXext-devel-32bit
- libX11-devel-32bit libXpm-devel-32bit libXinerama-devel-32bit
- libXcomposite-devel-32bit libXmu-devel-32bit libXxf86vm-devel-32bit
- libXcursor-devel-32bit libXrandr-devel-32bit libXdamage-devel-32bit
- libXi-devel-32bit libldap-devel-32bit alsa-lib-devel-32bit libgphoto2-devel-32bit
- libxml2-devel-32bit libxslt-devel-32bit freetype-devel-32bit
- pulseaudio-devel-32bit mpg123-devel-32bit libgsm-devel-32bit libopenal-devel-32bit
- giflib-devel-32bit libpng-devel-32bit fontconfig-devel-32bit gnutls-devel-32bit
- dbus-devel-32bit sane-devel-32bit libpcap-devel-32bit
- cups-devel-32bit ocl-icd-devel-32bit gcc-multilib vulkan-loader-32bit vkd3d-devel-32bit FAudio-devel-32bit"
+ ncurses-devel-32bit glu-devel-32bit libSM-devel-32bit libXext-devel-32bit
+ libX11-devel-32bit libXpm-devel-32bit libXinerama-devel-32bit
+ libXcomposite-devel-32bit libXmu-devel-32bit libXxf86vm-devel-32bit
+ libXcursor-devel-32bit libXrandr-devel-32bit libXdamage-devel-32bit
+ libXi-devel-32bit libldap-devel-32bit alsa-lib-devel-32bit libgphoto2-devel-32bit
+ libxml2-devel-32bit libxslt-devel-32bit freetype-devel-32bit
+ pulseaudio-devel-32bit mpg123-devel-32bit libgsm-devel-32bit libopenal-devel-32bit
+ giflib-devel-32bit libpng-devel-32bit fontconfig-devel-32bit gnutls-devel-32bit
+ dbus-devel-32bit sane-devel-32bit libpcap-devel-32bit
+ cups-devel-32bit ocl-icd-devel-32bit gcc-multilib vulkan-loader-32bit vkd3d-devel-32bit
+ FAudio-devel-32bit"
depends+=" freetype-32bit libXi-32bit libXinerama-32bit
- libXcomposite-32bit libXcursor-32bit
- libOSMesa-32bit gnutls-32bit libmpg123-32bit"
- conflicts="wine-32bit"
+ libXcomposite-32bit libXcursor-32bit
+ libOSMesa-32bit gnutls-32bit libmpg123-32bit"
+ conflicts="wine-32bit"
provides="wine-32bit>=${version}_${revision}"
-
+
_WINE="$XBPS_BUILDDIR/wine-$version"
_WINE64="$_WINE/../wine64/"
_WINE32="$_WINE/../wine32/"
@@ -96,10 +99,10 @@ libwine_package() {
replaces="libwine-unstable>=0"
pkg_install() {
vmove "usr/lib/*.so*"
- vmove "usr/lib/wine"
+ vmove usr/lib/wine
if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
vmove "usr/lib32/*.so*"
- vmove "usr/lib32/wine"
+ vmove usr/lib32/wine
fi
}
}
@@ -108,6 +111,6 @@ wine-devel_package() {
short_desc+=" - development files"
replaces="wine-unstable-devel>=0"
pkg_install() {
- vmove "usr/include"
+ vmove usr/include
}
}
From 4c749c936e7e348aea72ce1b7f1321a8427e7b92 Mon Sep 17 00:00:00 2001
From: bugcrazy <39757967+bugcrazy@users.noreply.github.com>
Date: Sun, 22 Dec 2019 04:46:35 -0300
Subject: [PATCH 5/9] Wine: Fixing obvious issue
Place nocross= after checksum=
---
srcpkgs/wine/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 034c64c121b..f27bc6f3da4 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -3,7 +3,6 @@ pkgname=wine
version=4.21
revision=2
build_style=gnu-configure
-nocross=yes
configure_args="--without-gstreamer --with-x"
short_desc="Run Microsoft Windows applications"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
@@ -11,6 +10,7 @@ license="LGPL-2.1-or-later"
homepage="http://www.winehq.org/"
distfiles="https://dl.winehq.org/wine/source/${version%%.*}.x/wine-${version}.tar.xz"
checksum=324ce14a70059835f33d293f0740b1bf0366bc6b5514548bc083d89b44744ad0
+nocross=yes
nopie_files="/usr/bin/wine"
From 42784ca9792b8e9b24571691980a50bdea589b51 Mon Sep 17 00:00:00 2001
From: bugcrazy <39757967+bugcrazy@users.noreply.github.com>
Date: Thu, 23 Jan 2020 16:53:44 -0300
Subject: [PATCH 6/9] Version update
Wine version update
---
srcpkgs/wine/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index f27bc6f3da4..4bef2a972fc 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,6 +1,6 @@
# Template file for 'wine'
pkgname=wine
-version=4.21
+version=5.0
revision=2
build_style=gnu-configure
configure_args="--without-gstreamer --with-x"
@@ -8,8 +8,8 @@ short_desc="Run Microsoft Windows applications"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="LGPL-2.1-or-later"
homepage="http://www.winehq.org/"
-distfiles="https://dl.winehq.org/wine/source/${version%%.*}.x/wine-${version}.tar.xz"
-checksum=324ce14a70059835f33d293f0740b1bf0366bc6b5514548bc083d89b44744ad0
+distfiles="https://dl.winehq.org/wine/source/${version}/wine-${version}.tar.xz"
+checksum=181550ba69a80b00c631f80c28ff7642264613bbecdb0c0fc04d6534866713b4
nocross=yes
nopie_files="/usr/bin/wine"
From a545cb91895e041be8ac07d28b628d31c8e74036 Mon Sep 17 00:00:00 2001
From: bugcrazy <39757967+bugcrazy@users.noreply.github.com>
Date: Mon, 24 Feb 2020 00:33:54 -0300
Subject: [PATCH 7/9] Test with [ci skip]
Test with [ci skip] for reading log errors
---
srcpkgs/wine/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 7c88aa54b57..e32259e96c1 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -3,6 +3,7 @@ pkgname=wine
version=5.0
revision=1
build_style=gnu-configure
+nocross=yes
configure_args="--without-gstreamer --with-x"
short_desc="Run Microsoft Windows applications"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
From 76e2fd5787ddb0c8d5a2086286af9541450df367 Mon Sep 17 00:00:00 2001
From: bugcrazy <39757967+bugcrazy@users.noreply.github.com>
Date: Mon, 24 Feb 2020 00:46:42 -0300
Subject: [PATCH 8/9] Second test with [ci skip]
Second test with [ci skip] for reading log errors.
---
srcpkgs/wine/template | 1 -
1 file changed, 1 deletion(-)
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index e32259e96c1..7c88aa54b57 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -3,7 +3,6 @@ pkgname=wine
version=5.0
revision=1
build_style=gnu-configure
-nocross=yes
configure_args="--without-gstreamer --with-x"
short_desc="Run Microsoft Windows applications"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
From 45578dfa29b074715b551b9a55c8437b87e0862d Mon Sep 17 00:00:00 2001
From: bugcrazy <39757967+bugcrazy@users.noreply.github.com>
Date: Thu, 9 Apr 2020 18:58:28 -0300
Subject: [PATCH 9/9] Wine update [ci skip]
---
srcpkgs/wine/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 7c88aa54b57..dd4f6c2e74d 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,15 +1,15 @@
# Template file for 'wine'
pkgname=wine
-version=5.0
+version=5.4
revision=1
build_style=gnu-configure
configure_args="--without-gstreamer --with-x"
short_desc="Run Microsoft Windows applications"
-maintainer="Andrea Brancaleoni <abc@pompel.me>"
+maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="http://www.winehq.org/"
-distfiles="https://dl.winehq.org/wine/source/${version}/wine-${version}.tar.xz"
-checksum=181550ba69a80b00c631f80c28ff7642264613bbecdb0c0fc04d6534866713b4
+distfiles="https://dl.winehq.org/wine/source/${version%%.*}.x/wine-${version}.tar.xz"
+checksum=4b3e2b0ffa5415f199540e6051c28c3976fce91ea5bfb2cf4a099c257317052c
nopie_files="/usr/bin/wine"
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: [PR PATCH] [Updated] Adding x86_64 package to wine
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-17678@inbox.vuxu.org>
` (19 preceding siblings ...)
2020-04-10 0:13 ` bugcrazy
@ 2020-04-10 1:40 ` bugcrazy
2020-04-15 22:24 ` bugcrazy
` (2 subsequent siblings)
23 siblings, 0 replies; 24+ messages in thread
From: bugcrazy @ 2020-04-10 1:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 435 bytes --]
There is an updated pull request by bugcrazy against master on the void-packages repository
https://github.com/bugcrazy/void-packages bugcrazy-patch-1
https://github.com/void-linux/void-packages/pull/17678
Adding x86_64 package to wine
Adding support for x86_64 to generate x84_64 and i686 packages to have a wine 64 package required by many
A patch file from https://github.com/void-linux/void-packages/pull/17678.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-bugcrazy-patch-1-17678.patch --]
[-- Type: text/x-diff, Size: 16705 bytes --]
From ca2b8cb54bcf49256e0b4e3c7e4c07eaf6552dd0 Mon Sep 17 00:00:00 2001
From: bugcrazy <39757967+bugcrazy@users.noreply.github.com>
Date: Sat, 21 Dec 2019 05:06:33 -0300
Subject: [PATCH 01/10] Update template
Adding support for x86_64 to generate x84_64 and i686 packages to have a wine 64 package required by many
---
srcpkgs/wine/template | 71 +++++++++++++++++++++++++++++++++++++------
1 file changed, 61 insertions(+), 10 deletions(-)
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index cca736f0764..9efc63aaa8c 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,9 +1,10 @@
# Template file for 'wine'
pkgname=wine
version=4.21
-revision=1
+revision=2
build_style=gnu-configure
-configure_args="--without-gstreamer"
+nocross=yes
+configure_args="--without-gstreamer --with-x"
short_desc="Run Microsoft Windows applications"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="LGPL-2.1-or-later"
@@ -13,8 +14,10 @@ checksum=324ce14a70059835f33d293f0740b1bf0366bc6b5514548bc083d89b44744ad0
nopie_files="/usr/bin/wine"
-lib32mode=full
-archs=i686
+archs="x86_64* i686*"
+if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
+ lib32mode=full
+fi
hostmakedepends="pkg-config flex prelink"
makedepends="gettext-devel lcms2-devel zlib-devel ncurses-devel
@@ -29,10 +32,53 @@ makedepends="gettext-devel lcms2-devel zlib-devel ncurses-devel
FAudio-devel"
depends="libXi libXinerama libXcomposite libXcursor libOSMesa
desktop-file-utils hicolor-icon-theme liberation-fonts-ttf
- gnutls"
+ gnutls freetype"
binfmts="/usr/bin/wine --magic MZ"
+if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
+ nopie_files+=" /usr/bin/winegcc /usr/bin/wine64 /usr/bin/widl /usr/bin/winebuild /usr/bin/winedump
+ /usr/bin/wrc /usr/bin/wineserver /usr/bin/wmc"
+ makedepends+=" gettext-devel-32bit lcms2-devel-32bit zlib-devel-32bit
+ ncurses-devel-32bit glu-devel-32bit libSM-devel-32bit libXext-devel-32bit
+ libX11-devel-32bit libXpm-devel-32bit libXinerama-devel-32bit
+ libXcomposite-devel-32bit libXmu-devel-32bit libXxf86vm-devel-32bit
+ libXcursor-devel-32bit libXrandr-devel-32bit libXdamage-devel-32bit
+ libXi-devel-32bit libldap-devel-32bit alsa-lib-devel-32bit libgphoto2-devel-32bit
+ libxml2-devel-32bit libxslt-devel-32bit freetype-devel-32bit
+ pulseaudio-devel-32bit mpg123-devel-32bit libgsm-devel-32bit libopenal-devel-32bit
+ giflib-devel-32bit libpng-devel-32bit fontconfig-devel-32bit gnutls-devel-32bit
+ dbus-devel-32bit sane-devel-32bit libpcap-devel-32bit
+ cups-devel-32bit ocl-icd-devel-32bit gcc-multilib vulkan-loader-32bit vkd3d-devel-32bit FAudio-devel-32bit"
+ depends+=" freetype-32bit libXi-32bit libXinerama-32bit
+ libXcomposite-32bit libXcursor-32bit
+ libOSMesa-32bit gnutls-32bit"
+ WINE="$XBPS_BUILDDIR/wine-$version"
+ WINE64="$WINE/../wine64/"
+ WINE32="$WINE/../wine32/"
+ pre_configure() {
+ mkdir -p "$WINE64" "$WINE32"
+ }
+ do_configure() {
+ cd "$WINE64"
+ "$WINE"/configure --libdir="/usr/lib" --enable-win64 ${configure_args}
+ cd "$WINE32"
+ "$WINE"/configure --libdir="/usr/lib32" --with-wine64="$WINE64" ${configure_args}
+ }
+ do_build() {
+ cd "$WINE64"
+ make ${makejobs}
+ cd "$WINE32"
+ make ${makejobs}
+ }
+ do_install() {
+ cd "$WINE32"
+ make install DESTDIR="${DESTDIR}"
+ cd "$WINE64"
+ make install DESTDIR="${DESTDIR}"
+ }
+fi
+
post_install() {
# Font aliasing settings for Win32 applications
install -d ${DESTDIR}/etc/fonts/conf.{avail,d}
@@ -41,12 +87,18 @@ post_install() {
}
libwine_package() {
- lib32mode=full
+ if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
+ lib32mode=full
+ fi
short_desc+=" - Runtime library"
replaces="libwine-unstable>=0"
pkg_install() {
- vmove "usr/lib/*.so.*"
- vmove usr/lib/wine
+ vmove "usr/lib/*.so*"
+ vmove "usr/lib/wine"
+ if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
+ vmove "usr/lib32/*.so*"
+ vmove "usr/lib32/wine"
+ fi
}
}
wine-devel_package() {
@@ -54,7 +106,6 @@ wine-devel_package() {
short_desc+=" - development files"
replaces="wine-unstable-devel>=0"
pkg_install() {
- vmove usr/include
- vmove "usr/lib/*.so"
+ vmove "usr/include"
}
}
From 31d72ac6c32ade51a1c87f8177b34b96e9dbfdf5 Mon Sep 17 00:00:00 2001
From: bugcrazy <39757967+bugcrazy@users.noreply.github.com>
Date: Sat, 21 Dec 2019 14:24:16 -0300
Subject: [PATCH 02/10] Wine x64
Wine style fixes
---
srcpkgs/wine/template | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 9efc63aaa8c..2cb8c6fb18f 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -54,27 +54,27 @@ if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
libXcomposite-32bit libXcursor-32bit
libOSMesa-32bit gnutls-32bit"
WINE="$XBPS_BUILDDIR/wine-$version"
- WINE64="$WINE/../wine64/"
- WINE32="$WINE/../wine32/"
+ WINE64="$_WINE/../wine64/"
+ WINE32="$_WINE/../wine32/"
pre_configure() {
- mkdir -p "$WINE64" "$WINE32"
+ mkdir -p "$_WINE64" "$_WINE32"
}
do_configure() {
- cd "$WINE64"
- "$WINE"/configure --libdir="/usr/lib" --enable-win64 ${configure_args}
- cd "$WINE32"
- "$WINE"/configure --libdir="/usr/lib32" --with-wine64="$WINE64" ${configure_args}
+ cd "$_WINE64"
+ "$_WINE"/configure --libdir="/usr/lib" --enable-win64 ${configure_args}
+ cd "$_WINE32"
+ "$_WINE"/configure --libdir="/usr/lib32" --with-wine64="$_WINE64" ${configure_args}
}
do_build() {
- cd "$WINE64"
+ cd "$_WINE64"
make ${makejobs}
- cd "$WINE32"
+ cd "$_WINE32"
make ${makejobs}
}
do_install() {
- cd "$WINE32"
+ cd "$_WINE32"
make install DESTDIR="${DESTDIR}"
- cd "$WINE64"
+ cd "$_WINE64"
make install DESTDIR="${DESTDIR}"
}
fi
From 83d0c935bbd8228f23c2b27fd22c62a38ec7d487 Mon Sep 17 00:00:00 2001
From: bugcrazy <39757967+bugcrazy@users.noreply.github.com>
Date: Sat, 21 Dec 2019 18:59:46 -0300
Subject: [PATCH 03/10] Wine x64: fixed styles
Fixing errors and styles
---
srcpkgs/wine/template | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 2cb8c6fb18f..48401b1c607 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -3,7 +3,6 @@ pkgname=wine
version=4.21
revision=2
build_style=gnu-configure
-nocross=yes
configure_args="--without-gstreamer --with-x"
short_desc="Run Microsoft Windows applications"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
@@ -52,10 +51,13 @@ if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
cups-devel-32bit ocl-icd-devel-32bit gcc-multilib vulkan-loader-32bit vkd3d-devel-32bit FAudio-devel-32bit"
depends+=" freetype-32bit libXi-32bit libXinerama-32bit
libXcomposite-32bit libXcursor-32bit
- libOSMesa-32bit gnutls-32bit"
- WINE="$XBPS_BUILDDIR/wine-$version"
- WINE64="$_WINE/../wine64/"
- WINE32="$_WINE/../wine32/"
+ libOSMesa-32bit gnutls-32bit libmpg123-32bit"
+ conflicts="wine-32bit"
+ provides="wine-32bit>=${version}_${revision}"
+
+ _WINE="$XBPS_BUILDDIR/wine-$version"
+ _WINE64="$_WINE/../wine64/"
+ _WINE32="$_WINE/../wine32/"
pre_configure() {
mkdir -p "$_WINE64" "$_WINE32"
}
From 5d631fb47ac9fd0fec38e3f4437a00f7e21be8ac Mon Sep 17 00:00:00 2001
From: bugcrazy <39757967+bugcrazy@users.noreply.github.com>
Date: Sun, 22 Dec 2019 01:24:54 -0300
Subject: [PATCH 04/10] Wine : fixed trailing whitespace and errors
Fixed trailing whitespace and errors
---
srcpkgs/wine/template | 43 +++++++++++++++++++++++--------------------
1 file changed, 23 insertions(+), 20 deletions(-)
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 48401b1c607..034c64c121b 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -3,6 +3,7 @@ pkgname=wine
version=4.21
revision=2
build_style=gnu-configure
+nocross=yes
configure_args="--without-gstreamer --with-x"
short_desc="Run Microsoft Windows applications"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
@@ -13,7 +14,7 @@ checksum=324ce14a70059835f33d293f0740b1bf0366bc6b5514548bc083d89b44744ad0
nopie_files="/usr/bin/wine"
-archs="x86_64* i686*"
+archs="i686 x86_64"
if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
lib32mode=full
fi
@@ -36,25 +37,27 @@ depends="libXi libXinerama libXcomposite libXcursor libOSMesa
binfmts="/usr/bin/wine --magic MZ"
if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
- nopie_files+=" /usr/bin/winegcc /usr/bin/wine64 /usr/bin/widl /usr/bin/winebuild /usr/bin/winedump
- /usr/bin/wrc /usr/bin/wineserver /usr/bin/wmc"
+ nopie_files+=" /usr/bin/winegcc /usr/bin/wine64 /usr/bin/widl
+ /usr/bin/winebuild /usr/bin/winedump /usr/bin/wrc /usr/bin/wineserver
+ /usr/bin/wmc"
makedepends+=" gettext-devel-32bit lcms2-devel-32bit zlib-devel-32bit
- ncurses-devel-32bit glu-devel-32bit libSM-devel-32bit libXext-devel-32bit
- libX11-devel-32bit libXpm-devel-32bit libXinerama-devel-32bit
- libXcomposite-devel-32bit libXmu-devel-32bit libXxf86vm-devel-32bit
- libXcursor-devel-32bit libXrandr-devel-32bit libXdamage-devel-32bit
- libXi-devel-32bit libldap-devel-32bit alsa-lib-devel-32bit libgphoto2-devel-32bit
- libxml2-devel-32bit libxslt-devel-32bit freetype-devel-32bit
- pulseaudio-devel-32bit mpg123-devel-32bit libgsm-devel-32bit libopenal-devel-32bit
- giflib-devel-32bit libpng-devel-32bit fontconfig-devel-32bit gnutls-devel-32bit
- dbus-devel-32bit sane-devel-32bit libpcap-devel-32bit
- cups-devel-32bit ocl-icd-devel-32bit gcc-multilib vulkan-loader-32bit vkd3d-devel-32bit FAudio-devel-32bit"
+ ncurses-devel-32bit glu-devel-32bit libSM-devel-32bit libXext-devel-32bit
+ libX11-devel-32bit libXpm-devel-32bit libXinerama-devel-32bit
+ libXcomposite-devel-32bit libXmu-devel-32bit libXxf86vm-devel-32bit
+ libXcursor-devel-32bit libXrandr-devel-32bit libXdamage-devel-32bit
+ libXi-devel-32bit libldap-devel-32bit alsa-lib-devel-32bit libgphoto2-devel-32bit
+ libxml2-devel-32bit libxslt-devel-32bit freetype-devel-32bit
+ pulseaudio-devel-32bit mpg123-devel-32bit libgsm-devel-32bit libopenal-devel-32bit
+ giflib-devel-32bit libpng-devel-32bit fontconfig-devel-32bit gnutls-devel-32bit
+ dbus-devel-32bit sane-devel-32bit libpcap-devel-32bit
+ cups-devel-32bit ocl-icd-devel-32bit gcc-multilib vulkan-loader-32bit vkd3d-devel-32bit
+ FAudio-devel-32bit"
depends+=" freetype-32bit libXi-32bit libXinerama-32bit
- libXcomposite-32bit libXcursor-32bit
- libOSMesa-32bit gnutls-32bit libmpg123-32bit"
- conflicts="wine-32bit"
+ libXcomposite-32bit libXcursor-32bit
+ libOSMesa-32bit gnutls-32bit libmpg123-32bit"
+ conflicts="wine-32bit"
provides="wine-32bit>=${version}_${revision}"
-
+
_WINE="$XBPS_BUILDDIR/wine-$version"
_WINE64="$_WINE/../wine64/"
_WINE32="$_WINE/../wine32/"
@@ -96,10 +99,10 @@ libwine_package() {
replaces="libwine-unstable>=0"
pkg_install() {
vmove "usr/lib/*.so*"
- vmove "usr/lib/wine"
+ vmove usr/lib/wine
if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
vmove "usr/lib32/*.so*"
- vmove "usr/lib32/wine"
+ vmove usr/lib32/wine
fi
}
}
@@ -108,6 +111,6 @@ wine-devel_package() {
short_desc+=" - development files"
replaces="wine-unstable-devel>=0"
pkg_install() {
- vmove "usr/include"
+ vmove usr/include
}
}
From 4c749c936e7e348aea72ce1b7f1321a8427e7b92 Mon Sep 17 00:00:00 2001
From: bugcrazy <39757967+bugcrazy@users.noreply.github.com>
Date: Sun, 22 Dec 2019 04:46:35 -0300
Subject: [PATCH 05/10] Wine: Fixing obvious issue
Place nocross= after checksum=
---
srcpkgs/wine/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 034c64c121b..f27bc6f3da4 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -3,7 +3,6 @@ pkgname=wine
version=4.21
revision=2
build_style=gnu-configure
-nocross=yes
configure_args="--without-gstreamer --with-x"
short_desc="Run Microsoft Windows applications"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
@@ -11,6 +10,7 @@ license="LGPL-2.1-or-later"
homepage="http://www.winehq.org/"
distfiles="https://dl.winehq.org/wine/source/${version%%.*}.x/wine-${version}.tar.xz"
checksum=324ce14a70059835f33d293f0740b1bf0366bc6b5514548bc083d89b44744ad0
+nocross=yes
nopie_files="/usr/bin/wine"
From 42784ca9792b8e9b24571691980a50bdea589b51 Mon Sep 17 00:00:00 2001
From: bugcrazy <39757967+bugcrazy@users.noreply.github.com>
Date: Thu, 23 Jan 2020 16:53:44 -0300
Subject: [PATCH 06/10] Version update
Wine version update
---
srcpkgs/wine/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index f27bc6f3da4..4bef2a972fc 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,6 +1,6 @@
# Template file for 'wine'
pkgname=wine
-version=4.21
+version=5.0
revision=2
build_style=gnu-configure
configure_args="--without-gstreamer --with-x"
@@ -8,8 +8,8 @@ short_desc="Run Microsoft Windows applications"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="LGPL-2.1-or-later"
homepage="http://www.winehq.org/"
-distfiles="https://dl.winehq.org/wine/source/${version%%.*}.x/wine-${version}.tar.xz"
-checksum=324ce14a70059835f33d293f0740b1bf0366bc6b5514548bc083d89b44744ad0
+distfiles="https://dl.winehq.org/wine/source/${version}/wine-${version}.tar.xz"
+checksum=181550ba69a80b00c631f80c28ff7642264613bbecdb0c0fc04d6534866713b4
nocross=yes
nopie_files="/usr/bin/wine"
From a545cb91895e041be8ac07d28b628d31c8e74036 Mon Sep 17 00:00:00 2001
From: bugcrazy <39757967+bugcrazy@users.noreply.github.com>
Date: Mon, 24 Feb 2020 00:33:54 -0300
Subject: [PATCH 07/10] Test with [ci skip]
Test with [ci skip] for reading log errors
---
srcpkgs/wine/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 7c88aa54b57..e32259e96c1 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -3,6 +3,7 @@ pkgname=wine
version=5.0
revision=1
build_style=gnu-configure
+nocross=yes
configure_args="--without-gstreamer --with-x"
short_desc="Run Microsoft Windows applications"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
From 76e2fd5787ddb0c8d5a2086286af9541450df367 Mon Sep 17 00:00:00 2001
From: bugcrazy <39757967+bugcrazy@users.noreply.github.com>
Date: Mon, 24 Feb 2020 00:46:42 -0300
Subject: [PATCH 08/10] Second test with [ci skip]
Second test with [ci skip] for reading log errors.
---
srcpkgs/wine/template | 1 -
1 file changed, 1 deletion(-)
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index e32259e96c1..7c88aa54b57 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -3,7 +3,6 @@ pkgname=wine
version=5.0
revision=1
build_style=gnu-configure
-nocross=yes
configure_args="--without-gstreamer --with-x"
short_desc="Run Microsoft Windows applications"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
From 45578dfa29b074715b551b9a55c8437b87e0862d Mon Sep 17 00:00:00 2001
From: bugcrazy <39757967+bugcrazy@users.noreply.github.com>
Date: Thu, 9 Apr 2020 18:58:28 -0300
Subject: [PATCH 09/10] Wine update [ci skip]
---
srcpkgs/wine/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 7c88aa54b57..dd4f6c2e74d 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,15 +1,15 @@
# Template file for 'wine'
pkgname=wine
-version=5.0
+version=5.4
revision=1
build_style=gnu-configure
configure_args="--without-gstreamer --with-x"
short_desc="Run Microsoft Windows applications"
-maintainer="Andrea Brancaleoni <abc@pompel.me>"
+maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="http://www.winehq.org/"
-distfiles="https://dl.winehq.org/wine/source/${version}/wine-${version}.tar.xz"
-checksum=181550ba69a80b00c631f80c28ff7642264613bbecdb0c0fc04d6534866713b4
+distfiles="https://dl.winehq.org/wine/source/${version%%.*}.x/wine-${version}.tar.xz"
+checksum=4b3e2b0ffa5415f199540e6051c28c3976fce91ea5bfb2cf4a099c257317052c
nopie_files="/usr/bin/wine"
From 1e64c2dddc41c2ad857844a229014624808cae4c Mon Sep 17 00:00:00 2001
From: bugcrazy <39757967+bugcrazy@users.noreply.github.com>
Date: Thu, 9 Apr 2020 22:40:29 -0300
Subject: [PATCH 10/10] Test 3 with [ci skip]
---
srcpkgs/wine/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index dd4f6c2e74d..18504291d25 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -3,6 +3,7 @@ pkgname=wine
version=5.4
revision=1
build_style=gnu-configure
+nocross=yes
configure_args="--without-gstreamer --with-x"
short_desc="Run Microsoft Windows applications"
maintainer="Orphaned <orphan@voidlinux.org>"
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: [PR PATCH] [Updated] Adding x86_64 package to wine
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-17678@inbox.vuxu.org>
` (20 preceding siblings ...)
2020-04-10 1:40 ` bugcrazy
@ 2020-04-15 22:24 ` bugcrazy
2020-05-03 14:46 ` Hoshpak
2020-05-03 14:46 ` [PR PATCH] [Closed]: " Hoshpak
23 siblings, 0 replies; 24+ messages in thread
From: bugcrazy @ 2020-04-15 22:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 435 bytes --]
There is an updated pull request by bugcrazy against master on the void-packages repository
https://github.com/bugcrazy/void-packages bugcrazy-patch-1
https://github.com/void-linux/void-packages/pull/17678
Adding x86_64 package to wine
Adding support for x86_64 to generate x84_64 and i686 packages to have a wine 64 package required by many
A patch file from https://github.com/void-linux/void-packages/pull/17678.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-bugcrazy-patch-1-17678.patch --]
[-- Type: text/x-diff, Size: 17825 bytes --]
From ca2b8cb54bcf49256e0b4e3c7e4c07eaf6552dd0 Mon Sep 17 00:00:00 2001
From: bugcrazy <39757967+bugcrazy@users.noreply.github.com>
Date: Sat, 21 Dec 2019 05:06:33 -0300
Subject: [PATCH 01/11] Update template
Adding support for x86_64 to generate x84_64 and i686 packages to have a wine 64 package required by many
---
srcpkgs/wine/template | 71 +++++++++++++++++++++++++++++++++++++------
1 file changed, 61 insertions(+), 10 deletions(-)
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index cca736f0764..9efc63aaa8c 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,9 +1,10 @@
# Template file for 'wine'
pkgname=wine
version=4.21
-revision=1
+revision=2
build_style=gnu-configure
-configure_args="--without-gstreamer"
+nocross=yes
+configure_args="--without-gstreamer --with-x"
short_desc="Run Microsoft Windows applications"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="LGPL-2.1-or-later"
@@ -13,8 +14,10 @@ checksum=324ce14a70059835f33d293f0740b1bf0366bc6b5514548bc083d89b44744ad0
nopie_files="/usr/bin/wine"
-lib32mode=full
-archs=i686
+archs="x86_64* i686*"
+if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
+ lib32mode=full
+fi
hostmakedepends="pkg-config flex prelink"
makedepends="gettext-devel lcms2-devel zlib-devel ncurses-devel
@@ -29,10 +32,53 @@ makedepends="gettext-devel lcms2-devel zlib-devel ncurses-devel
FAudio-devel"
depends="libXi libXinerama libXcomposite libXcursor libOSMesa
desktop-file-utils hicolor-icon-theme liberation-fonts-ttf
- gnutls"
+ gnutls freetype"
binfmts="/usr/bin/wine --magic MZ"
+if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
+ nopie_files+=" /usr/bin/winegcc /usr/bin/wine64 /usr/bin/widl /usr/bin/winebuild /usr/bin/winedump
+ /usr/bin/wrc /usr/bin/wineserver /usr/bin/wmc"
+ makedepends+=" gettext-devel-32bit lcms2-devel-32bit zlib-devel-32bit
+ ncurses-devel-32bit glu-devel-32bit libSM-devel-32bit libXext-devel-32bit
+ libX11-devel-32bit libXpm-devel-32bit libXinerama-devel-32bit
+ libXcomposite-devel-32bit libXmu-devel-32bit libXxf86vm-devel-32bit
+ libXcursor-devel-32bit libXrandr-devel-32bit libXdamage-devel-32bit
+ libXi-devel-32bit libldap-devel-32bit alsa-lib-devel-32bit libgphoto2-devel-32bit
+ libxml2-devel-32bit libxslt-devel-32bit freetype-devel-32bit
+ pulseaudio-devel-32bit mpg123-devel-32bit libgsm-devel-32bit libopenal-devel-32bit
+ giflib-devel-32bit libpng-devel-32bit fontconfig-devel-32bit gnutls-devel-32bit
+ dbus-devel-32bit sane-devel-32bit libpcap-devel-32bit
+ cups-devel-32bit ocl-icd-devel-32bit gcc-multilib vulkan-loader-32bit vkd3d-devel-32bit FAudio-devel-32bit"
+ depends+=" freetype-32bit libXi-32bit libXinerama-32bit
+ libXcomposite-32bit libXcursor-32bit
+ libOSMesa-32bit gnutls-32bit"
+ WINE="$XBPS_BUILDDIR/wine-$version"
+ WINE64="$WINE/../wine64/"
+ WINE32="$WINE/../wine32/"
+ pre_configure() {
+ mkdir -p "$WINE64" "$WINE32"
+ }
+ do_configure() {
+ cd "$WINE64"
+ "$WINE"/configure --libdir="/usr/lib" --enable-win64 ${configure_args}
+ cd "$WINE32"
+ "$WINE"/configure --libdir="/usr/lib32" --with-wine64="$WINE64" ${configure_args}
+ }
+ do_build() {
+ cd "$WINE64"
+ make ${makejobs}
+ cd "$WINE32"
+ make ${makejobs}
+ }
+ do_install() {
+ cd "$WINE32"
+ make install DESTDIR="${DESTDIR}"
+ cd "$WINE64"
+ make install DESTDIR="${DESTDIR}"
+ }
+fi
+
post_install() {
# Font aliasing settings for Win32 applications
install -d ${DESTDIR}/etc/fonts/conf.{avail,d}
@@ -41,12 +87,18 @@ post_install() {
}
libwine_package() {
- lib32mode=full
+ if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
+ lib32mode=full
+ fi
short_desc+=" - Runtime library"
replaces="libwine-unstable>=0"
pkg_install() {
- vmove "usr/lib/*.so.*"
- vmove usr/lib/wine
+ vmove "usr/lib/*.so*"
+ vmove "usr/lib/wine"
+ if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
+ vmove "usr/lib32/*.so*"
+ vmove "usr/lib32/wine"
+ fi
}
}
wine-devel_package() {
@@ -54,7 +106,6 @@ wine-devel_package() {
short_desc+=" - development files"
replaces="wine-unstable-devel>=0"
pkg_install() {
- vmove usr/include
- vmove "usr/lib/*.so"
+ vmove "usr/include"
}
}
From 31d72ac6c32ade51a1c87f8177b34b96e9dbfdf5 Mon Sep 17 00:00:00 2001
From: bugcrazy <39757967+bugcrazy@users.noreply.github.com>
Date: Sat, 21 Dec 2019 14:24:16 -0300
Subject: [PATCH 02/11] Wine x64
Wine style fixes
---
srcpkgs/wine/template | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 9efc63aaa8c..2cb8c6fb18f 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -54,27 +54,27 @@ if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
libXcomposite-32bit libXcursor-32bit
libOSMesa-32bit gnutls-32bit"
WINE="$XBPS_BUILDDIR/wine-$version"
- WINE64="$WINE/../wine64/"
- WINE32="$WINE/../wine32/"
+ WINE64="$_WINE/../wine64/"
+ WINE32="$_WINE/../wine32/"
pre_configure() {
- mkdir -p "$WINE64" "$WINE32"
+ mkdir -p "$_WINE64" "$_WINE32"
}
do_configure() {
- cd "$WINE64"
- "$WINE"/configure --libdir="/usr/lib" --enable-win64 ${configure_args}
- cd "$WINE32"
- "$WINE"/configure --libdir="/usr/lib32" --with-wine64="$WINE64" ${configure_args}
+ cd "$_WINE64"
+ "$_WINE"/configure --libdir="/usr/lib" --enable-win64 ${configure_args}
+ cd "$_WINE32"
+ "$_WINE"/configure --libdir="/usr/lib32" --with-wine64="$_WINE64" ${configure_args}
}
do_build() {
- cd "$WINE64"
+ cd "$_WINE64"
make ${makejobs}
- cd "$WINE32"
+ cd "$_WINE32"
make ${makejobs}
}
do_install() {
- cd "$WINE32"
+ cd "$_WINE32"
make install DESTDIR="${DESTDIR}"
- cd "$WINE64"
+ cd "$_WINE64"
make install DESTDIR="${DESTDIR}"
}
fi
From 83d0c935bbd8228f23c2b27fd22c62a38ec7d487 Mon Sep 17 00:00:00 2001
From: bugcrazy <39757967+bugcrazy@users.noreply.github.com>
Date: Sat, 21 Dec 2019 18:59:46 -0300
Subject: [PATCH 03/11] Wine x64: fixed styles
Fixing errors and styles
---
srcpkgs/wine/template | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 2cb8c6fb18f..48401b1c607 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -3,7 +3,6 @@ pkgname=wine
version=4.21
revision=2
build_style=gnu-configure
-nocross=yes
configure_args="--without-gstreamer --with-x"
short_desc="Run Microsoft Windows applications"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
@@ -52,10 +51,13 @@ if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
cups-devel-32bit ocl-icd-devel-32bit gcc-multilib vulkan-loader-32bit vkd3d-devel-32bit FAudio-devel-32bit"
depends+=" freetype-32bit libXi-32bit libXinerama-32bit
libXcomposite-32bit libXcursor-32bit
- libOSMesa-32bit gnutls-32bit"
- WINE="$XBPS_BUILDDIR/wine-$version"
- WINE64="$_WINE/../wine64/"
- WINE32="$_WINE/../wine32/"
+ libOSMesa-32bit gnutls-32bit libmpg123-32bit"
+ conflicts="wine-32bit"
+ provides="wine-32bit>=${version}_${revision}"
+
+ _WINE="$XBPS_BUILDDIR/wine-$version"
+ _WINE64="$_WINE/../wine64/"
+ _WINE32="$_WINE/../wine32/"
pre_configure() {
mkdir -p "$_WINE64" "$_WINE32"
}
From 5d631fb47ac9fd0fec38e3f4437a00f7e21be8ac Mon Sep 17 00:00:00 2001
From: bugcrazy <39757967+bugcrazy@users.noreply.github.com>
Date: Sun, 22 Dec 2019 01:24:54 -0300
Subject: [PATCH 04/11] Wine : fixed trailing whitespace and errors
Fixed trailing whitespace and errors
---
srcpkgs/wine/template | 43 +++++++++++++++++++++++--------------------
1 file changed, 23 insertions(+), 20 deletions(-)
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 48401b1c607..034c64c121b 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -3,6 +3,7 @@ pkgname=wine
version=4.21
revision=2
build_style=gnu-configure
+nocross=yes
configure_args="--without-gstreamer --with-x"
short_desc="Run Microsoft Windows applications"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
@@ -13,7 +14,7 @@ checksum=324ce14a70059835f33d293f0740b1bf0366bc6b5514548bc083d89b44744ad0
nopie_files="/usr/bin/wine"
-archs="x86_64* i686*"
+archs="i686 x86_64"
if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
lib32mode=full
fi
@@ -36,25 +37,27 @@ depends="libXi libXinerama libXcomposite libXcursor libOSMesa
binfmts="/usr/bin/wine --magic MZ"
if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
- nopie_files+=" /usr/bin/winegcc /usr/bin/wine64 /usr/bin/widl /usr/bin/winebuild /usr/bin/winedump
- /usr/bin/wrc /usr/bin/wineserver /usr/bin/wmc"
+ nopie_files+=" /usr/bin/winegcc /usr/bin/wine64 /usr/bin/widl
+ /usr/bin/winebuild /usr/bin/winedump /usr/bin/wrc /usr/bin/wineserver
+ /usr/bin/wmc"
makedepends+=" gettext-devel-32bit lcms2-devel-32bit zlib-devel-32bit
- ncurses-devel-32bit glu-devel-32bit libSM-devel-32bit libXext-devel-32bit
- libX11-devel-32bit libXpm-devel-32bit libXinerama-devel-32bit
- libXcomposite-devel-32bit libXmu-devel-32bit libXxf86vm-devel-32bit
- libXcursor-devel-32bit libXrandr-devel-32bit libXdamage-devel-32bit
- libXi-devel-32bit libldap-devel-32bit alsa-lib-devel-32bit libgphoto2-devel-32bit
- libxml2-devel-32bit libxslt-devel-32bit freetype-devel-32bit
- pulseaudio-devel-32bit mpg123-devel-32bit libgsm-devel-32bit libopenal-devel-32bit
- giflib-devel-32bit libpng-devel-32bit fontconfig-devel-32bit gnutls-devel-32bit
- dbus-devel-32bit sane-devel-32bit libpcap-devel-32bit
- cups-devel-32bit ocl-icd-devel-32bit gcc-multilib vulkan-loader-32bit vkd3d-devel-32bit FAudio-devel-32bit"
+ ncurses-devel-32bit glu-devel-32bit libSM-devel-32bit libXext-devel-32bit
+ libX11-devel-32bit libXpm-devel-32bit libXinerama-devel-32bit
+ libXcomposite-devel-32bit libXmu-devel-32bit libXxf86vm-devel-32bit
+ libXcursor-devel-32bit libXrandr-devel-32bit libXdamage-devel-32bit
+ libXi-devel-32bit libldap-devel-32bit alsa-lib-devel-32bit libgphoto2-devel-32bit
+ libxml2-devel-32bit libxslt-devel-32bit freetype-devel-32bit
+ pulseaudio-devel-32bit mpg123-devel-32bit libgsm-devel-32bit libopenal-devel-32bit
+ giflib-devel-32bit libpng-devel-32bit fontconfig-devel-32bit gnutls-devel-32bit
+ dbus-devel-32bit sane-devel-32bit libpcap-devel-32bit
+ cups-devel-32bit ocl-icd-devel-32bit gcc-multilib vulkan-loader-32bit vkd3d-devel-32bit
+ FAudio-devel-32bit"
depends+=" freetype-32bit libXi-32bit libXinerama-32bit
- libXcomposite-32bit libXcursor-32bit
- libOSMesa-32bit gnutls-32bit libmpg123-32bit"
- conflicts="wine-32bit"
+ libXcomposite-32bit libXcursor-32bit
+ libOSMesa-32bit gnutls-32bit libmpg123-32bit"
+ conflicts="wine-32bit"
provides="wine-32bit>=${version}_${revision}"
-
+
_WINE="$XBPS_BUILDDIR/wine-$version"
_WINE64="$_WINE/../wine64/"
_WINE32="$_WINE/../wine32/"
@@ -96,10 +99,10 @@ libwine_package() {
replaces="libwine-unstable>=0"
pkg_install() {
vmove "usr/lib/*.so*"
- vmove "usr/lib/wine"
+ vmove usr/lib/wine
if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
vmove "usr/lib32/*.so*"
- vmove "usr/lib32/wine"
+ vmove usr/lib32/wine
fi
}
}
@@ -108,6 +111,6 @@ wine-devel_package() {
short_desc+=" - development files"
replaces="wine-unstable-devel>=0"
pkg_install() {
- vmove "usr/include"
+ vmove usr/include
}
}
From 4c749c936e7e348aea72ce1b7f1321a8427e7b92 Mon Sep 17 00:00:00 2001
From: bugcrazy <39757967+bugcrazy@users.noreply.github.com>
Date: Sun, 22 Dec 2019 04:46:35 -0300
Subject: [PATCH 05/11] Wine: Fixing obvious issue
Place nocross= after checksum=
---
srcpkgs/wine/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 034c64c121b..f27bc6f3da4 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -3,7 +3,6 @@ pkgname=wine
version=4.21
revision=2
build_style=gnu-configure
-nocross=yes
configure_args="--without-gstreamer --with-x"
short_desc="Run Microsoft Windows applications"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
@@ -11,6 +10,7 @@ license="LGPL-2.1-or-later"
homepage="http://www.winehq.org/"
distfiles="https://dl.winehq.org/wine/source/${version%%.*}.x/wine-${version}.tar.xz"
checksum=324ce14a70059835f33d293f0740b1bf0366bc6b5514548bc083d89b44744ad0
+nocross=yes
nopie_files="/usr/bin/wine"
From 42784ca9792b8e9b24571691980a50bdea589b51 Mon Sep 17 00:00:00 2001
From: bugcrazy <39757967+bugcrazy@users.noreply.github.com>
Date: Thu, 23 Jan 2020 16:53:44 -0300
Subject: [PATCH 06/11] Version update
Wine version update
---
srcpkgs/wine/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index f27bc6f3da4..4bef2a972fc 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,6 +1,6 @@
# Template file for 'wine'
pkgname=wine
-version=4.21
+version=5.0
revision=2
build_style=gnu-configure
configure_args="--without-gstreamer --with-x"
@@ -8,8 +8,8 @@ short_desc="Run Microsoft Windows applications"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="LGPL-2.1-or-later"
homepage="http://www.winehq.org/"
-distfiles="https://dl.winehq.org/wine/source/${version%%.*}.x/wine-${version}.tar.xz"
-checksum=324ce14a70059835f33d293f0740b1bf0366bc6b5514548bc083d89b44744ad0
+distfiles="https://dl.winehq.org/wine/source/${version}/wine-${version}.tar.xz"
+checksum=181550ba69a80b00c631f80c28ff7642264613bbecdb0c0fc04d6534866713b4
nocross=yes
nopie_files="/usr/bin/wine"
From a545cb91895e041be8ac07d28b628d31c8e74036 Mon Sep 17 00:00:00 2001
From: bugcrazy <39757967+bugcrazy@users.noreply.github.com>
Date: Mon, 24 Feb 2020 00:33:54 -0300
Subject: [PATCH 07/11] Test with [ci skip]
Test with [ci skip] for reading log errors
---
srcpkgs/wine/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 7c88aa54b57..e32259e96c1 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -3,6 +3,7 @@ pkgname=wine
version=5.0
revision=1
build_style=gnu-configure
+nocross=yes
configure_args="--without-gstreamer --with-x"
short_desc="Run Microsoft Windows applications"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
From 76e2fd5787ddb0c8d5a2086286af9541450df367 Mon Sep 17 00:00:00 2001
From: bugcrazy <39757967+bugcrazy@users.noreply.github.com>
Date: Mon, 24 Feb 2020 00:46:42 -0300
Subject: [PATCH 08/11] Second test with [ci skip]
Second test with [ci skip] for reading log errors.
---
srcpkgs/wine/template | 1 -
1 file changed, 1 deletion(-)
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index e32259e96c1..7c88aa54b57 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -3,7 +3,6 @@ pkgname=wine
version=5.0
revision=1
build_style=gnu-configure
-nocross=yes
configure_args="--without-gstreamer --with-x"
short_desc="Run Microsoft Windows applications"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
From 45578dfa29b074715b551b9a55c8437b87e0862d Mon Sep 17 00:00:00 2001
From: bugcrazy <39757967+bugcrazy@users.noreply.github.com>
Date: Thu, 9 Apr 2020 18:58:28 -0300
Subject: [PATCH 09/11] Wine update [ci skip]
---
srcpkgs/wine/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 7c88aa54b57..dd4f6c2e74d 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,15 +1,15 @@
# Template file for 'wine'
pkgname=wine
-version=5.0
+version=5.4
revision=1
build_style=gnu-configure
configure_args="--without-gstreamer --with-x"
short_desc="Run Microsoft Windows applications"
-maintainer="Andrea Brancaleoni <abc@pompel.me>"
+maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="http://www.winehq.org/"
-distfiles="https://dl.winehq.org/wine/source/${version}/wine-${version}.tar.xz"
-checksum=181550ba69a80b00c631f80c28ff7642264613bbecdb0c0fc04d6534866713b4
+distfiles="https://dl.winehq.org/wine/source/${version%%.*}.x/wine-${version}.tar.xz"
+checksum=4b3e2b0ffa5415f199540e6051c28c3976fce91ea5bfb2cf4a099c257317052c
nopie_files="/usr/bin/wine"
From 1e64c2dddc41c2ad857844a229014624808cae4c Mon Sep 17 00:00:00 2001
From: bugcrazy <39757967+bugcrazy@users.noreply.github.com>
Date: Thu, 9 Apr 2020 22:40:29 -0300
Subject: [PATCH 10/11] Test 3 with [ci skip]
---
srcpkgs/wine/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index dd4f6c2e74d..18504291d25 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -3,6 +3,7 @@ pkgname=wine
version=5.4
revision=1
build_style=gnu-configure
+nocross=yes
configure_args="--without-gstreamer --with-x"
short_desc="Run Microsoft Windows applications"
maintainer="Orphaned <orphan@voidlinux.org>"
From f935bf3dbbbaa49d996c9411b9c98f6e6f90234d Mon Sep 17 00:00:00 2001
From: bugcrazy <39757967+bugcrazy@users.noreply.github.com>
Date: Wed, 15 Apr 2020 19:24:11 -0300
Subject: [PATCH 11/11] Wine: update to 5.6
---
srcpkgs/wine/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 18504291d25..da123328f6a 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,16 +1,16 @@
# Template file for 'wine'
pkgname=wine
-version=5.4
+version=5.6
revision=1
build_style=gnu-configure
nocross=yes
configure_args="--without-gstreamer --with-x"
short_desc="Run Microsoft Windows applications"
-maintainer="Orphaned <orphan@voidlinux.org>"
+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-${version}.tar.xz"
-checksum=4b3e2b0ffa5415f199540e6051c28c3976fce91ea5bfb2cf4a099c257317052c
+checksum=50198a7e71d58fbdc521bbfde8b45bd9727b6cff5c8f101b586bc455d1bc00e6
nopie_files="/usr/bin/wine"
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: Adding x86_64 package to wine
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-17678@inbox.vuxu.org>
` (21 preceding siblings ...)
2020-04-15 22:24 ` bugcrazy
@ 2020-05-03 14:46 ` Hoshpak
2020-05-03 14:46 ` [PR PATCH] [Closed]: " Hoshpak
23 siblings, 0 replies; 24+ messages in thread
From: Hoshpak @ 2020-05-03 14:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 181 bytes --]
New comment by Hoshpak on void-packages repository
https://github.com/void-linux/void-packages/pull/17678#issuecomment-623121169
Comment:
d87090939234e8c4868aca2e4d855789d6011c76
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: [PR PATCH] [Closed]: Adding x86_64 package to wine
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-17678@inbox.vuxu.org>
` (22 preceding siblings ...)
2020-05-03 14:46 ` Hoshpak
@ 2020-05-03 14:46 ` Hoshpak
23 siblings, 0 replies; 24+ messages in thread
From: Hoshpak @ 2020-05-03 14:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 268 bytes --]
There's a closed pull request on the void-packages repository
Adding x86_64 package to wine
https://github.com/void-linux/void-packages/pull/17678
Description:
Adding support for x86_64 to generate x84_64 and i686 packages to have a wine 64 package required by many
^ permalink raw reply [flat|nested] 24+ messages in thread