From 849164587cdcf1588755a01e6017ea61de301d77 Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Sat, 29 Jan 2022 10:14:51 +0100 Subject: [PATCH] wine: update to 7.1. --- srcpkgs/wine/patches/musl-limits.patch | 4 ++-- srcpkgs/wine/patches/musl-rpath.patch | 8 ++++---- srcpkgs/wine/patches/musl-uid-t.patch | 17 ++++++++--------- srcpkgs/wine/template | 8 ++++---- 4 files changed, 18 insertions(+), 19 deletions(-) diff --git a/srcpkgs/wine/patches/musl-limits.patch b/srcpkgs/wine/patches/musl-limits.patch index ec53bea46b7..6cbee48c76e 100644 --- a/srcpkgs/wine/patches/musl-limits.patch +++ b/srcpkgs/wine/patches/musl-limits.patch @@ -1,5 +1,5 @@ ---- a/wine-7.0/dlls/winebus.sys/bus_udev.c 2021-10-23 15:38:33.225064731 +0200 -+++ b/wine-7.0/dlls/winebus.sys/bus_udev.c 2021-10-23 15:39:06.662064765 +0200 +--- a/wine-7.1/dlls/winebus.sys/bus_udev.c 2021-10-23 15:38:33.225064731 +0200 ++++ b/wine-7.1/dlls/winebus.sys/bus_udev.c 2021-10-23 15:39:06.662064765 +0200 @@ -29,7 +29,8 @@ #include #include diff --git a/srcpkgs/wine/patches/musl-rpath.patch b/srcpkgs/wine/patches/musl-rpath.patch index 1f8b6f02907..15d9d1e03a8 100644 --- a/srcpkgs/wine/patches/musl-rpath.patch +++ b/srcpkgs/wine/patches/musl-rpath.patch @@ -1,7 +1,7 @@ diff --git a/configure b/configure index 774a95ce003..d408e77cc78 100755 ---- a/wine-7.0/configure -+++ b/wine-7.0/configure +--- a/wine-7.1/configure ++++ b/wine-7.1/configure @@ -11137,6 +11137,38 @@ fi LIBWINE_DEPENDS="wine.map" @@ -43,8 +43,8 @@ index 774a95ce003..d408e77cc78 100755 diff --git a/configure.ac b/configure.ac index 8c5066a3de6..01ede86df1e 100644 ---- a/wine-7.0/configure.ac -+++ b/wine-7.0/configure.ac +--- a/wine-7.1/configure.ac ++++ b/wine-7.1/configure.ac @@ -916,6 +916,9 @@ case $host_os in AC_SUBST(LIBWINE_SHAREDLIB,"libwine.so.$libwine_version") AC_SUBST(LIBWINE_DEPENDS,"wine.map") diff --git a/srcpkgs/wine/patches/musl-uid-t.patch b/srcpkgs/wine/patches/musl-uid-t.patch index 82a9e8aade3..13095efd784 100644 --- a/srcpkgs/wine/patches/musl-uid-t.patch +++ b/srcpkgs/wine/patches/musl-uid-t.patch @@ -1,11 +1,10 @@ ---- a/wine-7.0/server/security.h 2021-10-12 19:52:55.876645306 +0200 -+++ b/wine-7.0/server/security.h 2021-10-12 19:53:08.605490926 +0200 -@@ -21,6 +21,8 @@ - #ifndef __WINE_SERVER_SECURITY_H +--- a/wine-7.1/server/security.h 2022-01-29 08:23:43.759508270 +0100 ++++ b/wine-7.1/server/security.h 2022-01-29 08:24:07.976443565 +0100 +@@ -22,6 +22,7 @@ #define __WINE_SERVER_SECURITY_H -+#include -+ - extern const LUID SeIncreaseQuotaPrivilege; - extern const LUID SeSecurityPrivilege; - extern const LUID SeTakeOwnershipPrivilege; + #include ++#include + + extern const struct luid SeIncreaseQuotaPrivilege; + extern const struct luid SeSecurityPrivilege; diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template index 76057d020f6..6e620b56b07 100644 --- a/srcpkgs/wine/template +++ b/srcpkgs/wine/template @@ -1,6 +1,6 @@ # Template file for 'wine' pkgname=wine -version=7.0 +version=7.1 revision=1 _pkgver=${version/r/-r} create_wrksrc=yes @@ -11,10 +11,10 @@ short_desc="Run Microsoft Windows applications" maintainer="Helmut Pozimski " license="LGPL-2.1-or-later" homepage="http://www.winehq.org/" -distfiles="https://dl.winehq.org/wine/source/${version%r*}/wine-${_pkgver}.tar.xz +distfiles="https://dl.winehq.org/wine/source/${version%.*}.x/wine-${_pkgver}.tar.xz https://github.com/wine-staging/wine-staging/archive/v${_pkgver}.tar.gz" -checksum="5b43e27d5c085cb18f97394e46180310d5eef7c1d91c6895432a3889b2de086b - ff5eb5d3ca17953b75a0b1792313e2402338905a03d8d8e6d5fad186a0644740" +checksum="113c130eed2f3256c932ffbb7f482a0533ed3ac5c62c979622a2a6df7f9f636a + 7716daf2a24b61a37d356478639bc8e3a45833a9d9e4d8b7b506fa60f6ce76b2" build_options="mingw staging" build_options_default="mingw"