From owner-dev-commits-ports-main@freebsd.org Thu Jul 22 17:05:46 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 BADBC6619A7; Thu, 22 Jul 2021 17:05:46 +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 4GVzNp4z6pz4TNJ; Thu, 22 Jul 2021 17:05:46 +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 92E4A159E1; Thu, 22 Jul 2021 17:05:46 +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 16MH5klQ077899; Thu, 22 Jul 2021 17:05:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16MH5kQV077898; Thu, 22 Jul 2021 17:05:46 GMT (envelope-from git) Date: Thu, 22 Jul 2021 17:05:46 GMT Message-Id: <202107221705.16MH5kQV077898@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: 21a122d5c9e6 - main - emulators/wine-devel: Update to Wine 6.13 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: 21a122d5c9e6dcd9df1c91bb3b2d41515cae6a0a 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: Thu, 22 Jul 2021 17:05:46 -0000 The branch main has been updated by gerald: URL: https://cgit.FreeBSD.org/ports/commit/?id=21a122d5c9e6dcd9df1c91bb3b2d41515cae6a0a commit 21a122d5c9e6dcd9df1c91bb3b2d41515cae6a0a Author: Gerald Pfeifer AuthorDate: 2021-07-22 17:02:21 +0000 Commit: Gerald Pfeifer CommitDate: 2021-07-22 17:03:00 +0000 emulators/wine-devel: Update to Wine 6.13 This includes the following changes: - Proper scrollbar theming. - More work towards WinSock PE conversion. - Preparation work for the GDI syscall interface. - Some progress on the IPHLPAPI PE conversion. - Various bug fixes. My patch from files/patch-nsiproxy.sys has been included upstream, alas new breakage has been introduced in dlls/nsiproxy.sys, so "refresh" that with another patch. The STAGING option now patches again; no longer mark it as broken. --- emulators/wine-devel/Makefile | 3 +-- emulators/wine-devel/distinfo | 10 +++++----- emulators/wine-devel/files/patch-nsiproxy.sys | 28 +++++++++++++-------------- 3 files changed, 20 insertions(+), 21 deletions(-) diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile index 21837f23aeb5..0af6a06f0343 100644 --- a/emulators/wine-devel/Makefile +++ b/emulators/wine-devel/Makefile @@ -1,7 +1,7 @@ # Created by: Gerald Pfeifer PORTNAME= wine -DISTVERSION= 6.12 +DISTVERSION= 6.13 PORTEPOCH= 1 CATEGORIES= emulators MASTER_SITES= SF/${PORTNAME}/Source \ @@ -100,7 +100,6 @@ SDL_CONFIGURE_WITH= sdl SDL_USES= sdl SDL_USE= SDL=sdl2 -STAGING_BROKEN= fails to patch STAGING_MASTER_SITES= https://github.com/wine-staging/wine-staging/archive/:staging STAGING_DIST= v${DISTVERSION}.tar.gz STAGING_DISTFILES= ${STAGING_DIST}:staging diff --git a/emulators/wine-devel/distinfo b/emulators/wine-devel/distinfo index 1ff7572cb8d4..2f1f61cc6eb4 100644 --- a/emulators/wine-devel/distinfo +++ b/emulators/wine-devel/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1625401429 -SHA256 (wine-6.12.tar.xz) = fb92be300edf8039623f138383cb3908c95b2d4b9a490e2a0823b24c56b7cea8 -SIZE (wine-6.12.tar.xz) = 24666960 -SHA256 (v6.12.tar.gz) = 2a1db3a4ffaed01a523f1409da0dcedb8059c33d9b6835efd97b0fb3c8b657c7 -SIZE (v6.12.tar.gz) = 9658338 +TIMESTAMP = 1626945429 +SHA256 (wine-6.13.tar.xz) = e03a21a011d45d2ae9f222040fb7690b97156376e7431f861f20073eaf24f28a +SIZE (wine-6.13.tar.xz) = 24704408 +SHA256 (v6.13.tar.gz) = 884e698cc07ba11f7189145508941a6400384d53005e148655f321070ee1e8c4 +SIZE (v6.13.tar.gz) = 9658122 diff --git a/emulators/wine-devel/files/patch-nsiproxy.sys b/emulators/wine-devel/files/patch-nsiproxy.sys index fa837bc5d5e5..6d21bb33bf37 100644 --- a/emulators/wine-devel/files/patch-nsiproxy.sys +++ b/emulators/wine-devel/files/patch-nsiproxy.sys @@ -1,22 +1,22 @@ -This patch of mine has been included upstream in the meantime. +Submitted this upstream and should be in the next release. -commit 1fc3d75a17b025bcdb818714db47a37c309ea186 +commit a89016726656776c42643a021c09ce139b0c196e Author: Gerald Pfeifer -Date: Sat Jul 3 06:55:06 2021 +0000 +Date: Thu Jul 22 09:51:02 2021 +0000 - nsiproxy: Include netinet/in.h before if_ether.h + nsiproxy: Include sys/socket.h -index 647fd650cd3..7a0e7ec6f6c 100644 ---- dlls/nsiproxy.sys/ndis.c -+++ dlls/nsiproxy.sys/ndis.c -@@ -38,6 +38,10 @@ - #include - #endif +index ab1b6294bea..93fdefa24cc 100644 +--- dlls/nsiproxy.sys/ip.c ++++ dlls/nsiproxy.sys/ip.c +@@ -21,6 +21,10 @@ + #include "config.h" + #include -+#ifdef HAVE_NETINET_IN_H -+#include ++#ifdef HAVE_SYS_SOCKET_H ++#include +#endif + - #ifdef HAVE_NETINET_IF_ETHER_H - #include + #ifdef HAVE_NETINET_IN_H + #include #endif