mykola/freebsd-ports
1
0
Fork 0
forked from Lainports/freebsd-ports
Code Pull requests Activity

Update to Wine 6.0 RC2, which brings bug fixes only since we're in code

Browse source 
freeze.

Wine Staging now uses the same version designation as Wine itself after
a report of mine, so revert special casing STAGING_DISTFILES; similarly
my two patches files/extrapatch-dlls-ntdll-unix-file.c and
files/extrapatch-staging-server-fd.c are now upstream, so remove them.
This commit is contained in:
Gerald Pfeifer 2020-12-14 09:28:07 +00:00
parent bb5e10b791
commit 3bc39e8a76
4 changed files with 7 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
emulators/wine-devel/Makefile
View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= wine
DISTVERSION= 6.0-rc1
DISTVERSION= 6.0-rc2
PORTEPOCH= 1
CATEGORIES= emulators
MASTER_SITES= SF/${PORTNAME}/Source \
@ -107,14 +107,12 @@ SDL_USES= sdl
SDL_USE= SDL=sdl2
STAGING_MASTER_SITES= https://github.com/wine-staging/wine-staging/archive/:staging
STAGING_DIST= v${DISTVERSION:S/-//}.tar.gz
STAGING_DIST= v${DISTVERSION}.tar.gz
STAGING_DISTFILES= ${STAGING_DIST}:staging
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-staging-server-fd.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 = 1607184256
SHA256 (wine-6.0-rc1.tar.xz) = 78ddc948f946c662779bd5943d91812740480021bc951cbcadeb102c38b53bc8
SIZE (wine-6.0-rc1.tar.xz) = 24194552
SHA256 (v6.0rc1.tar.gz) = 8de3866030ccd2e8387a3079dd543406c739850ab0fcc16e3bf66b55d2d230c6
SIZE (v6.0rc1.tar.gz) = 10331511
TIMESTAMP = 1607854914
SHA256 (wine-6.0-rc2.tar.xz) = f20887cbe62cc42539b21f5823d64fdc310018b1533ebf042da81927f3920d76
SIZE (wine-6.0-rc2.tar.xz) = 24190236
SHA256 (v6.0-rc2.tar.gz) = 35b3790a7d8260cfc3e19c09b7868b46187c059b8c35d758934579e6344e710f
SIZE (v6.0-rc2.tar.gz) = 9815463

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

@ -1,21 +0,0 @@
--- 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
+#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
+
static int xattr_fremove( int filedes, const char *name )
{
#if defined(XATTR_ADDITIONAL_OPTIONS)

15
emulators/wine-devel/files/extrapatch-staging-server-fd.c
View file

@ -1,15 +0,0 @@
https://bugs.winehq.org/show_bug.cgi?id=50255
--- server/fd.c.orig 2020-12-05 16:14:40.336431000 +0000
+++ server/fd.c 2020-12-05 16:14:42.435171000 +0000
@@ -1982,8 +1982,10 @@
}
else rw_mode = O_RDONLY;
+#if defined(O_SYMLINK)
if ((options & FILE_OPEN_REPARSE_POINT) && !(flags & O_CREAT))
flags |= O_SYMLINK;
+#endif
if ((fd->unix_fd = open( name, rw_mode | (flags & ~O_TRUNC), *mode )) == -1)
{