Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 31 Jul 2024 08:13:32 GMT
From:      Gerald Pfeifer <gerald@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: c54ecc25f108 - main - emulators/wine-devel: Update to Wine 9.13
Message-ID:  <202407310813.46V8DW2e042448@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by gerald:

URL: https://cgit.FreeBSD.org/ports/commit/?id=c54ecc25f108da5e574e944938c19b078b0a11c7

commit c54ecc25f108da5e574e944938c19b078b0a11c7
Author:     Gerald Pfeifer <gerald@FreeBSD.org>
AuthorDate: 2024-07-30 06:44:13 +0000
Commit:     Gerald Pfeifer <gerald@FreeBSD.org>
CommitDate: 2024-07-31 08:10:39 +0000

    emulators/wine-devel: Update to Wine 9.13
    
    This includes the following changes:
     - Support for loading ODBC Windows drivers
       (though we haven't enabled ODBC at this point).
     - More user32 data structures in shared memory.
     - More rewriting of the CMD.EXE engine.
     - Various bug fixes.
    
    On the way remove files/clang/stdarg.h, a copy of clang's stdarg.h which
    we have been using while the devel/llvm* ports did not install it (and
    some others). This changed for devel/llvm17 with commit b21e6b4de1
    seven weeks ago.
---
 emulators/wine-devel/Makefile             |  5 ++---
 emulators/wine-devel/distinfo             |  6 +++---
 emulators/wine-devel/files/clang/stdarg.h | 35 -------------------------------
 emulators/wine-devel/pkg-plist            |  3 +++
 4 files changed, 8 insertions(+), 41 deletions(-)

diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile
index 314d778fd415..d9360095156d 100644
--- a/emulators/wine-devel/Makefile
+++ b/emulators/wine-devel/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	wine
-DISTVERSION=	9.12
-PORTREVISION=	1
+DISTVERSION=	9.13
 PORTEPOCH=	1
 CATEGORIES=	emulators
 MASTER_SITES=	https://dl.winehq.org/wine/source/9.x/
@@ -39,7 +38,7 @@ CONFIGURE_ARGS+=--verbose \
 		--without-gssapi \
 		--without-inotify \
 		--without-krb5 \
-		--with-mingw CROSSCC="clang" CROSSCFLAGS="-isystem ${FILESDIR}/clang" \
+		--with-mingw CROSSCC="clang" \
 		--without-netapi \
 		--without-odbc \
 		--without-opencl \
diff --git a/emulators/wine-devel/distinfo b/emulators/wine-devel/distinfo
index 6170d498574c..4827ff8ccbf8 100644
--- a/emulators/wine-devel/distinfo
+++ b/emulators/wine-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1720014238
-SHA256 (wine-9.12.tar.xz) = 09145ae720b2f9f18187970ba0640bbf3ced5ae8dc78af1d7d57f5077ec26af6
-SIZE (wine-9.12.tar.xz) = 30339552
+TIMESTAMP = 1722291307
+SHA256 (wine-9.13.tar.xz) = d79651d0fe38defe84cbd9e345f001c02ffc125979e29ebf203d6d487abf7348
+SIZE (wine-9.13.tar.xz) = 30542188
diff --git a/emulators/wine-devel/files/clang/stdarg.h b/emulators/wine-devel/files/clang/stdarg.h
deleted file mode 100644
index 0bc39408c1e5..000000000000
--- a/emulators/wine-devel/files/clang/stdarg.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*===---- stdarg.h - Variable argument handling ----------------------------===
- *
- * Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
- * See https://llvm.org/LICENSE.txt for license information.
- * SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
- *
- *===-----------------------------------------------------------------------===
- */
-
-#ifndef __STDARG_H
-#define __STDARG_H
-
-#ifndef _VA_LIST
-typedef __builtin_va_list va_list;
-#define _VA_LIST
-#endif
-#define va_start(ap, param) __builtin_va_start(ap, param)
-#define va_end(ap)          __builtin_va_end(ap)
-#define va_arg(ap, type)    __builtin_va_arg(ap, type)
-
-/* GCC always defines __va_copy, but does not define va_copy unless in c99 mode
- * or -ansi is not specified, since it was not part of C90.
- */
-#define __va_copy(d,s) __builtin_va_copy(d,s)
-
-#if __STDC_VERSION__ >= 199901L || __cplusplus >= 201103L || !defined(__STRICT_ANSI__)
-#define va_copy(dest, src)  __builtin_va_copy(dest, src)
-#endif
-
-#ifndef __GNUC_VA_LIST
-#define __GNUC_VA_LIST 1
-typedef __builtin_va_list __gnuc_va_list;
-#endif
-
-#endif /* __STDARG_H */
diff --git a/emulators/wine-devel/pkg-plist b/emulators/wine-devel/pkg-plist
index 61943ba0741c..2496a574766e 100644
--- a/emulators/wine-devel/pkg-plist
+++ b/emulators/wine-devel/pkg-plist
@@ -1090,6 +1090,8 @@ include/wine/windows/windows.applicationmodel.core.h
 include/wine/windows/windows.applicationmodel.core.idl
 include/wine/windows/windows.applicationmodel.h
 include/wine/windows/windows.applicationmodel.idl
+include/wine/windows/windows.data.json.h
+include/wine/windows/windows.data.json.idl
 include/wine/windows/windows.devices.bluetooth.h
 include/wine/windows/windows.devices.bluetooth.idl
 include/wine/windows/windows.devices.enumeration.h
@@ -2493,6 +2495,7 @@ lib/wine/%%WINEARCH%%-windows/windows.security.credentials.ui.userconsentverifie
 lib/wine/%%WINEARCH%%-windows/windows.storage.applicationdata.dll
 lib/wine/%%WINEARCH%%-windows/windows.system.profile.systemmanufacturers.dll
 lib/wine/%%WINEARCH%%-windows/windows.ui.dll
+lib/wine/%%WINEARCH%%-windows/windows.web.dll
 lib/wine/%%WINEARCH%%-windows/windowscodecs.dll
 lib/wine/%%WINEARCH%%-windows/windowscodecsext.dll
 %%ALSA%%lib/wine/%%WINEARCH%%-windows/winealsa.drv



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202407310813.46V8DW2e042448>