cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to Wine 5.21. This includes the following changes:

Browse Source 
- 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.
This commit is contained in:
Gerald Pfeifer 2020-11-12 13:31:01 +00:00
parent 849a43c2ec
commit 658e5248dd
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=554959
5 changed files with 22 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
emulators/wine-devel/Makefile
View File

@ -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

10
emulators/wine-devel/distinfo
View File

@ -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

12
emulators/wine-devel/files/extrapatch-dlls-ntdll-unix-file.c
View File

@ -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 )
+{

30
emulators/wine-devel/files/extrapatch-server-file.c
View File

@ -1,30 +0,0 @@
--- server/file.c.orig 2020-10-25 09:54:42.043906000 +0000
+++ server/file.c 2020-10-25 10:46:07.706926000 +0000
@@ -65,10 +65,27 @@
#ifndef XATTR_USER_PREFIX
#define XATTR_USER_PREFIX "user."
#endif
+
+#ifndef XATTR_USER_PREFIX_LEN
+#define XATTR_USER_PREFIX_LEN (sizeof(XATTR_USER_PREFIX) - 1)
+#endif
+
#ifndef XATTR_SIZE_MAX
#define XATTR_SIZE_MAX 65536
#endif
+#ifdef HAVE_SYS_EXTATTR_H
+static inline int xattr_valid_namespace( const char *name )
+{
+ if (strncmp( XATTR_USER_PREFIX, name, XATTR_USER_PREFIX_LEN ) != 0)
+ {
+ errno = EPERM;
+ return 0;
+ }
+ return 1;
+}
+#endif
+
/* We intentionally do not match the Samba 4 extended attribute for NT security descriptors (SDs):
* 1) Samba stores this information using an internal data structure (we use a flat NT SD).
* 2) Samba uses the attribute "security.NTACL". This attribute is within a namespace that only

15
emulators/wine-devel/pkg-plist
View File

@ -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