From owner-dev-commits-ports-main@freebsd.org Mon Sep 6 19:01:13 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 877C667998E; Mon, 6 Sep 2021 19:01:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4H3Hmn3T23z3LwQ; Mon, 6 Sep 2021 19:01:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 57437242AB; Mon, 6 Sep 2021 19:01:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 186J1DXw016995; Mon, 6 Sep 2021 19:01:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 186J1DQf016994; Mon, 6 Sep 2021 19:01:13 GMT (envelope-from git) Date: Mon, 6 Sep 2021 19:01:13 GMT Message-Id: <202109061901.186J1DQf016994@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gerald Pfeifer Subject: git: 210a5da8ef9c - main - emulators/wine-devel: Fix build on newer versions MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gerald X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 210a5da8ef9c632adaf5d33b3839e3806295fa89 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Sep 2021 19:01:13 -0000 The branch main has been updated by gerald: URL: https://cgit.FreeBSD.org/ports/commit/?id=210a5da8ef9c632adaf5d33b3839e3806295fa89 commit 210a5da8ef9c632adaf5d33b3839e3806295fa89 Author: Gerald Pfeifer AuthorDate: 2021-09-06 18:58:24 +0000 Commit: Gerald Pfeifer CommitDate: 2021-09-06 18:58:24 +0000 emulators/wine-devel: Fix build on newer versions Yet another recent breakage in dlls/nsiproxy.sys, this time only on newer versions of FreeBSD, yet another patch submitted upstream (and included locally temporarily). --- emulators/wine-devel/files/patch-dlls-nsiproxy.sys | 31 ++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/emulators/wine-devel/files/patch-dlls-nsiproxy.sys b/emulators/wine-devel/files/patch-dlls-nsiproxy.sys new file mode 100644 index 000000000000..73c77e1aee35 --- /dev/null +++ b/emulators/wine-devel/files/patch-dlls-nsiproxy.sys @@ -0,0 +1,31 @@ +Yet another recent breakage in dlls/nsiproxy.sys, yet another patch +submitted upstream. + +Plus I've adjusted my autobuilders to focus on newer versions of FreeBSD. + + +commit cd10f9b73cdae715e4a1ef32ade50c65a097ebf1 +Author: Gerald Pfeifer +Date: Mon Sep 6 17:54:53 2021 +0000 + + nsiproxy: Include sys/param.h from udp.c. + + udp.c features specific code to handle versions of FreeBSD past early + 12.0 snapshots. This is guarded by a check on __FreeBSD_version which + is defined in sys/param.h. Actually including that, like tcp.c already + does, activates that check and adjusted code and unbreaks the build. + +--- UTC +--- dlls/nsiproxy.sys/udp.c ++++ dlls/nsiproxy.sys/udp.c +@@ -22,6 +22,10 @@ + #include + #include + ++#ifdef HAVE_SYS_PARAM_H ++#include ++#endif ++ + #ifdef HAVE_SYS_TYPES_H + #include + #endif