From cd15fac3b5b02379b7fc7beb0122b9a1e68e8313 Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Sat, 12 Mar 2022 09:34:10 +0100 Subject: [PATCH] wine: update to 7.4. --- srcpkgs/wine/patches/musl-limits.patch | 4 ++-- srcpkgs/wine/patches/musl-rpath.patch | 8 ++++---- srcpkgs/wine/patches/musl-uid-t.patch | 4 ++-- srcpkgs/wine/template | 10 +++++----- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/srcpkgs/wine/patches/musl-limits.patch b/srcpkgs/wine/patches/musl-limits.patch index a791710f0c7..b13cbe9ea48 100644 --- a/srcpkgs/wine/patches/musl-limits.patch +++ b/srcpkgs/wine/patches/musl-limits.patch @@ -1,5 +1,5 @@ ---- a/wine-7.3/dlls/winebus.sys/bus_udev.c 2021-10-23 15:38:33.225064731 +0200 -+++ b/wine-7.3/dlls/winebus.sys/bus_udev.c 2021-10-23 15:39:06.662064765 +0200 +--- a/wine-7.4/dlls/winebus.sys/bus_udev.c 2021-10-23 15:38:33.225064731 +0200 ++++ b/wine-7.4/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 8607cbe9929..82f45cc1d17 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.3/configure -+++ b/wine-7.3/configure +--- a/wine-7.4/configure ++++ b/wine-7.4/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.3/configure.ac -+++ b/wine-7.3/configure.ac +--- a/wine-7.4/configure.ac ++++ b/wine-7.4/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 9ee5a79e163..2fe1c18c553 100644 --- a/srcpkgs/wine/patches/musl-uid-t.patch +++ b/srcpkgs/wine/patches/musl-uid-t.patch @@ -1,5 +1,5 @@ ---- a/wine-7.3/server/security.h 2022-01-29 08:23:43.759508270 +0100 -+++ b/wine-7.3/server/security.h 2022-01-29 08:24:07.976443565 +0100 +--- a/wine-7.4/server/security.h 2022-01-29 08:23:43.759508270 +0100 ++++ b/wine-7.4/server/security.h 2022-01-29 08:24:07.976443565 +0100 @@ -22,6 +22,7 @@ #define __WINE_SERVER_SECURITY_H diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template index f82741c2741..8dfb8df9f6b 100644 --- a/srcpkgs/wine/template +++ b/srcpkgs/wine/template @@ -1,6 +1,6 @@ # Template file for 'wine' pkgname=wine -version=7.3 +version=7.4 revision=1 _pkgver=${version/r/-r} create_wrksrc=yes @@ -13,8 +13,8 @@ license="LGPL-2.1-or-later" homepage="http://www.winehq.org/" distfiles="https://dl.winehq.org/wine/source/${version%.*}.x/wine-${_pkgver}.tar.xz https://github.com/wine-staging/wine-staging/archive/v${_pkgver}.tar.gz" -checksum="71fdffed747bd176ba414ebc49027df75aa2d45580a0338a7a36d974cd147a96 - 6175e8929e4594dcf23ef28f556cde87b122dbf2e2476006660d920cc121cc98" +checksum="728e866d6e49ce92a2a0c514333e9ff08bdbf6c86f5ef4e6180143b8d2b7d416 + c1688af87737f47337a8f7e24d501d99582a691a2a08ba8e71b9911abbfd8554" build_options="mingw staging xshm" build_options_default="mingw xshm" @@ -43,8 +43,8 @@ makedepends="gettext-devel ncurses-devel glu-devel libSM-devel libldap-devel alsa-lib-devel libgphoto2-devel glib-devel freetype-devel pulseaudio-devel libopenal-devel giflib-devel v4l-utils-devel fontconfig-devel gnutls-devel dbus-devel sane-devel - libpcap-devel cups-devel ocl-icd-devel vulkan-loader vkd3d-devel - gst-plugins-base1-devel SDL2-devel" + libpcap-devel cups-devel ocl-icd-devel vulkan-loader gst-plugins-base1-devel + SDL2-devel" depends="libXi libXinerama libXcomposite libXcursor libOSMesa desktop-file-utils hicolor-icon-theme liberation-fonts-ttf gnutls SDL2 wine-common>=${version}_${revision} libwine>=${version}_${revision}"