From owner-dev-commits-ports-main@freebsd.org Fri Aug 27 06:24:45 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 157D1658C22; Fri, 27 Aug 2021 06:24:45 +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 4GwqSY04FKz3MQ1; Fri, 27 Aug 2021 06:24:45 +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 D08151E7A7; Fri, 27 Aug 2021 06:24:44 +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 17R6OiCr052970; Fri, 27 Aug 2021 06:24:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 17R6Oie6052969; Fri, 27 Aug 2021 06:24:44 GMT (envelope-from git) Date: Fri, 27 Aug 2021 06:24:44 GMT Message-Id: <202108270624.17R6Oie6052969@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: 3353a8922aea - main - emulators/wine-devel: Fix the build in dlls/nsiproxy.sys 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: 3353a8922aea80f5b78b3526b5ba45483ae29017 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: Fri, 27 Aug 2021 06:24:45 -0000 The branch main has been updated by gerald: URL: https://cgit.FreeBSD.org/ports/commit/?id=3353a8922aea80f5b78b3526b5ba45483ae29017 commit 3353a8922aea80f5b78b3526b5ba45483ae29017 Author: Gerald Pfeifer AuthorDate: 2021-08-27 06:24:25 +0000 Commit: Gerald Pfeifer CommitDate: 2021-08-27 06:24:25 +0000 emulators/wine-devel: Fix the build in dlls/nsiproxy.sys In what looks like a change between FreeBSD 11 and FreeBSD 12 and later we now need to explicitly include sys/queue.h to avoid In file included from dlls/nsiproxy.sys/tcp.c:42: /usr/include/netinet/tcp_var.h:516:2: error: expected specifier-qualifier-list before 'TAILQ_ENTRY' 516 | TAILQ_ENTRY(tcptw) tw_2msl; I submitted this upstream already where it got accepted, so this patch files/patch-dlls-nsiproxy.sys is only a temporary stop gap. --- emulators/wine-devel/files/patch-dlls-nsiproxy.sys | 37 ++++++++++++++++++++++ 1 file changed, 37 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..c73499fa7810 --- /dev/null +++ b/emulators/wine-devel/files/patch-dlls-nsiproxy.sys @@ -0,0 +1,37 @@ +This patch of mine has been accepted upstream already. + +commit a1cc71207cd22d7d884f44d135d975d981fa21e6 +Author: Gerald Pfeifer +Date: Tue Aug 24 14:53:47 2021 +0200 + + nsiproxy: Include sys/queue.h from tcp.c. + + In what looks like a change between FreeBSD 11 and later versions + (FreeBSD 12 and 13), we now need to explicitly include sys/queue.h + to avoid + + In file included from dlls/nsiproxy.sys/tcp.c:42: + /usr/include/netinet/tcp_var.h:516:2: error: + expected specifier-qualifier-list before 'TAILQ_ENTRY' + 516 | TAILQ_ENTRY(tcptw) tw_2msl; + + Signed-off-by: Gerald Pfeifer + Signed-off-by: Huw Davies + Signed-off-by: Alexandre Julliard + +--- UTC +diff --git dlls/nsiproxy.sys/tcp.c dlls/nsiproxy.sys/tcp.c +index 8567330be99..603aefadfe9 100644 +--- dlls/nsiproxy.sys/tcp.c ++++ dlls/nsiproxy.sys/tcp.c +@@ -58,6 +58,10 @@ + #include + #endif + ++#ifdef HAVE_SYS_QUEUE_H ++#include ++#endif ++ + #ifdef HAVE_NETINET_TCP_VAR_H + #include + #endif