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 " 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 " @@ -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 " @@ -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 " @@ -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 " 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 " 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 " 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 " +maintainer="Orphaned " 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 " 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 " +maintainer="Helmut Pozimski " 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"