From owner-svn-ports-all@freebsd.org Thu Nov 12 13:31:03 2020 Return-Path: Delivered-To: svn-ports-all@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 3EEAC2EA3EB; Thu, 12 Nov 2020 13:31:03 +0000 (UTC) (envelope-from gerald@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CX2YM0lj9z3p8c; Thu, 12 Nov 2020 13:31:03 +0000 (UTC) (envelope-from gerald@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0C8E827494; Thu, 12 Nov 2020 13:31:03 +0000 (UTC) (envelope-from gerald@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0ACDV2nj022350; Thu, 12 Nov 2020 13:31:02 GMT (envelope-from gerald@FreeBSD.org) Received: (from gerald@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0ACDV2Pm022347; Thu, 12 Nov 2020 13:31:02 GMT (envelope-from gerald@FreeBSD.org) Message-Id: <202011121331.0ACDV2Pm022347@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gerald set sender to gerald@FreeBSD.org using -f From: Gerald Pfeifer Date: Thu, 12 Nov 2020 13:31:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r554959 - in head/emulators/wine-devel: . files X-SVN-Group: ports-head X-SVN-Commit-Author: gerald X-SVN-Commit-Paths: in head/emulators/wine-devel: . files X-SVN-Commit-Revision: 554959 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Nov 2020 13:31:03 -0000 Author: gerald Date: Thu Nov 12 13:31:01 2020 New Revision: 554959 URL: https://svnweb.freebsd.org/changeset/ports/554959 Log: Update to Wine 5.21. This includes the following changes: - GDI32 library converted to PE. - More fixes for windowless RichEdit. - A number of timezone updates. - Various bug fixes. files/extrapatch-server-file.c that I added to work around upstream breakage with the Wine Staging patchset is not necessary any longer, nor is half of files/extrapatch-dlls-ntdll-unix-file.c. Deleted: head/emulators/wine-devel/files/extrapatch-server-file.c Modified: head/emulators/wine-devel/Makefile head/emulators/wine-devel/distinfo head/emulators/wine-devel/files/extrapatch-dlls-ntdll-unix-file.c head/emulators/wine-devel/pkg-plist Modified: head/emulators/wine-devel/Makefile ============================================================================== --- head/emulators/wine-devel/Makefile Thu Nov 12 13:17:17 2020 (r554958) +++ head/emulators/wine-devel/Makefile Thu Nov 12 13:31:01 2020 (r554959) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= wine -DISTVERSION= 5.20 +DISTVERSION= 5.21 PORTEPOCH= 1 CATEGORIES= emulators MASTER_SITES= SF/${PORTNAME}/Source \ @@ -113,8 +113,7 @@ STAGING_EXTRACT_DEPENDS= bash:shells/bash \ git:devel/git \ autoconf>0:devel/autoconf STAGING_LIB_DEPENDS= libtxc_dxtn.so:graphics/s2tc -STAGING_EXTRA_PATCHES+= ${PATCHDIR}/extrapatch-dlls-ntdll-unix-file.c \ - ${PATCHDIR}/extrapatch-server-file.c +STAGING_EXTRA_PATCHES+= ${PATCHDIR}/extrapatch-dlls-ntdll-unix-file.c V4L_CONFIGURE_WITH= v4l2 V4L_BUILD_DEPENDS= ${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat Modified: head/emulators/wine-devel/distinfo ============================================================================== --- head/emulators/wine-devel/distinfo Thu Nov 12 13:17:17 2020 (r554958) +++ head/emulators/wine-devel/distinfo Thu Nov 12 13:31:01 2020 (r554959) @@ -1,5 +1,5 @@ -TIMESTAMP = 1603546548 -SHA256 (wine-5.20.tar.xz) = 8f5522f8cebebdbaa12f58e1ba671a11f66372e0aedf74fb932cf5a89390861c -SIZE (wine-5.20.tar.xz) = 24177960 -SHA256 (v5.20.tar.gz) = dce02a8dc45a766608ef46b87e33a0a1ac80502a82c3be1b75faaf2163a9cb55 -SIZE (v5.20.tar.gz) = 10378427 +TIMESTAMP = 1604738590 +SHA256 (wine-5.21.tar.xz) = 5a1a5c2549d11bce0d6640220ed6fd31042afcbcb366f475e0ccb4781d2d2840 +SIZE (wine-5.21.tar.xz) = 24178740 +SHA256 (v5.21.tar.gz) = 9dd1d5cf30e50ef750a48eb108ffa6c9c155adee0091367b684e84019fdac9c8 +SIZE (v5.21.tar.gz) = 10362610 Modified: head/emulators/wine-devel/files/extrapatch-dlls-ntdll-unix-file.c ============================================================================== --- head/emulators/wine-devel/files/extrapatch-dlls-ntdll-unix-file.c Thu Nov 12 13:17:17 2020 (r554958) +++ head/emulators/wine-devel/files/extrapatch-dlls-ntdll-unix-file.c Thu Nov 12 13:31:01 2020 (r554959) @@ -1,13 +1,9 @@ ---- dlls/ntdll/unix/file.c.orig 2020-10-24 12:22:03.186448000 +0000 -+++ dlls/ntdll/unix/file.c 2020-10-24 13:14:00.020964000 +0000 -@@ -390,6 +390,22 @@ - #define XATTR_USER_PREFIX "user." +--- dlls/ntdll/unix/file.c.orig 2020-11-07 09:33:27.083812000 +0000 ++++ dlls/ntdll/unix/file.c 2020-11-07 09:53:55.641522000 +0000 +@@ -394,6 +394,18 @@ + #define XATTR_USER_PREFIX_LEN (sizeof(XATTR_USER_PREFIX) - 1) #endif -+#ifndef XATTR_USER_PREFIX_LEN -+#define XATTR_USER_PREFIX_LEN (sizeof(XATTR_USER_PREFIX) - 1) -+#endif -+ +#ifdef HAVE_SYS_EXTATTR_H +static inline int xattr_valid_namespace( const char *name ) +{ Modified: head/emulators/wine-devel/pkg-plist ============================================================================== --- head/emulators/wine-devel/pkg-plist Thu Nov 12 13:17:17 2020 (r554958) +++ head/emulators/wine-devel/pkg-plist Thu Nov 12 13:31:01 2020 (r554959) @@ -158,6 +158,8 @@ include/wine/windows/bits2_5.h include/wine/windows/bits2_5.idl include/wine/windows/bits3_0.h include/wine/windows/bits3_0.idl +include/wine/windows/bits5_0.h +include/wine/windows/bits5_0.idl include/wine/windows/bitsmsg.h include/wine/windows/bluetoothapis.h include/wine/windows/bthsdpdef.h @@ -1389,6 +1391,7 @@ lib/wine/d3d10core.dll.so lib/wine/d3d11.dll.so %%VKD3D%%lib/wine/d3d12.dll.so lib/wine/d3d8.dll.so +lib/wine/d3d8thk.dll.so lib/wine/d3d9.dll.so lib/wine/d3dcompiler_33.dll.so lib/wine/d3dcompiler_34.dll.so @@ -1404,6 +1407,7 @@ lib/wine/d3dcompiler_43.dll.so lib/wine/d3dcompiler_46.dll.so lib/wine/d3dcompiler_47.dll.so lib/wine/d3dim.dll.so +lib/wine/d3dim700.dll.so lib/wine/d3drm.dll.so lib/wine/d3dx10_33.dll.so lib/wine/d3dx10_34.dll.so @@ -1856,6 +1860,7 @@ lib/wine/fakedlls/d3d10core.dll lib/wine/fakedlls/d3d11.dll %%VKD3D%%lib/wine/fakedlls/d3d12.dll lib/wine/fakedlls/d3d8.dll +lib/wine/fakedlls/d3d8thk.dll lib/wine/fakedlls/d3d9.dll lib/wine/fakedlls/d3dcompiler_33.dll lib/wine/fakedlls/d3dcompiler_34.dll @@ -1871,6 +1876,7 @@ lib/wine/fakedlls/d3dcompiler_43.dll lib/wine/fakedlls/d3dcompiler_46.dll lib/wine/fakedlls/d3dcompiler_47.dll lib/wine/fakedlls/d3dim.dll +lib/wine/fakedlls/d3dim700.dll lib/wine/fakedlls/d3drm.dll lib/wine/fakedlls/d3dx10_33.dll lib/wine/fakedlls/d3dx10_34.dll @@ -2210,7 +2216,7 @@ lib/wine/fakedlls/netio.sys lib/wine/fakedlls/netprofm.dll lib/wine/fakedlls/netsh.exe lib/wine/fakedlls/netstat.exe -%%STAGING%%lib/wine/fakedlls/netutils.dll +lib/wine/fakedlls/netutils.dll lib/wine/fakedlls/newdev.dll lib/wine/fakedlls/ngen.exe lib/wine/fakedlls/ninput.dll @@ -2343,7 +2349,7 @@ lib/wine/fakedlls/softpub.dll lib/wine/fakedlls/spoolss.dll lib/wine/fakedlls/spoolsv.exe lib/wine/fakedlls/srclient.dll -%%STAGING%%lib/wine/fakedlls/srvcli.dll +lib/wine/fakedlls/srvcli.dll lib/wine/fakedlls/sspicli.dll lib/wine/fakedlls/start.exe lib/wine/fakedlls/stdole2.tlb @@ -2575,6 +2581,7 @@ lib/wine/fwpuclnt.dll.so lib/wine/gameux.dll.so %%WINE32%%lib/wine/gdi.exe16.so lib/wine/gdi32.dll.so +lib/wine/gdi32.so lib/wine/gdiplus.dll.so %%X11%%lib/wine/glu32.dll.so lib/wine/gphoto2.ds.so @@ -2957,7 +2964,7 @@ lib/wine/netio.sys.so lib/wine/netprofm.dll.so lib/wine/netsh.exe.so lib/wine/netstat.exe.so -%%STAGING%%lib/wine/netutils.dll.so +lib/wine/netutils.dll.so lib/wine/newdev.dll.so lib/wine/ngen.exe.so lib/wine/ninput.dll.so @@ -3092,7 +3099,7 @@ lib/wine/softpub.dll.so lib/wine/spoolss.dll.so lib/wine/spoolsv.exe.so lib/wine/srclient.dll.so -%%STAGING%%lib/wine/srvcli.dll.so +lib/wine/srvcli.dll.so lib/wine/sspicli.dll.so lib/wine/start.exe.so lib/wine/stdole2.tlb.so