From 3f6fb85be89862603ce07791b20271e49d0793d0 Mon Sep 17 00:00:00 2001 From: Dean M Greer <38226388+Gcenx@users.noreply.github.com> Date: Mon, 21 Oct 2024 20:57:03 -0400 Subject: [PATCH] wine-devel,wine-staging: Update to 9.20 --- emulators/wine-devel/Portfile | 18 +++++++++++------- .../wine-devel/files/1001-devel-msync.diff | 4 ++-- .../wine-devel/files/1001-staging-msync.diff | 4 ++-- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/emulators/wine-devel/Portfile b/emulators/wine-devel/Portfile index 16f9111add91b..45a15e0aca2cf 100644 --- a/emulators/wine-devel/Portfile +++ b/emulators/wine-devel/Portfile @@ -7,7 +7,7 @@ PortGroup muniversal 1.1 # Keep the wine-stable, wine-devel and wine-crossover portfiles as similar as possible. -github.setup wine-mirror wine 9.19 wine- +github.setup wine-mirror wine 9.20 wine- github.tarball_from archive name wine-devel conflicts wine-stable wine-staging wine-crossover @@ -37,9 +37,9 @@ long_description \ checksums \ ${distname}${extract.suffix} \ - rmd160 e84b8c7e9ebabf844fc1d999afb114a842b699e8 \ - sha256 82d8aa49abb25be5c9772047ff30a956960662d0e72174aff95c98c360611ff6 \ - size 50036168 + rmd160 a4524cd0f2c05b360be9c0ef17d2cb86c10921ec \ + sha256 ae5d1ef7fe71903bc1ff65e5b02e44b401225399eed8d6a0efa8a792bf79ad70 \ + size 51667148 depends_build \ port:bison \ @@ -144,9 +144,9 @@ subport wine-staging { checksums-append \ ${wine_staging_distfile} \ - rmd160 e2239ab25231a6b12f8231876827f38a9cb05ffe \ - sha256 8743e7a75d79618394d41fe23ea8cb6c8ebc3caf28c34a518c239b8a9333d287 \ - size 9460757 + rmd160 fa1258bc308dcae98314a4104ef9f2f05dca47f7 \ + sha256 e88fe8e23f7160489538636a2d795772415004d48cdcc85d29dd9e59b2fe575d \ + size 9518651 depends_patch-append port:autoconf @@ -212,6 +212,10 @@ configure.ldflags-delete -L${compiler.library_path} configure.optflags -g -O2 configure.env-append "CROSSCFLAGS=${configure.optflags}" +# Needed due to commit +# https://gitlab.winehq.org/wine/wine/-/commit/b21813fa135995449b7a4ba19b561d6faf087ee8 +configure.cflags-append -Wno-error=incompatible-function-pointer-types + # Were only installing wine not the development files destroot.target install-lib diff --git a/emulators/wine-devel/files/1001-devel-msync.diff b/emulators/wine-devel/files/1001-devel-msync.diff index 14a57571c70ee..3fa8748780ac7 100644 --- a/emulators/wine-devel/files/1001-devel-msync.diff +++ b/emulators/wine-devel/files/1001-devel-msync.diff @@ -2162,8 +2162,8 @@ index 74bf0f0c839..fd84ee0d1a9 100644 /* ### protocol_version begin ### */ --#define SERVER_PROTOCOL_VERSION 842 -+#define SERVER_PROTOCOL_VERSION 846 +-#define SERVER_PROTOCOL_VERSION 843 ++#define SERVER_PROTOCOL_VERSION 847 /* ### protocol_version end ### */ diff --git a/emulators/wine-devel/files/1001-staging-msync.diff b/emulators/wine-devel/files/1001-staging-msync.diff index 71715dadd860c..182ed0c769453 100644 --- a/emulators/wine-devel/files/1001-staging-msync.diff +++ b/emulators/wine-devel/files/1001-staging-msync.diff @@ -2224,8 +2224,8 @@ index 44f18710766..e6610d3cab5 100644 /* ### protocol_version begin ### */ --#define SERVER_PROTOCOL_VERSION 843 -+#define SERVER_PROTOCOL_VERSION 847 +-#define SERVER_PROTOCOL_VERSION 844 ++#define SERVER_PROTOCOL_VERSION 848 /* ### protocol_version end ### */