Bug 289257 - emulators/wine-devel: Update to 10.14
Summary: emulators/wine-devel: Update to 10.14
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Some People
Assignee: Vladimir Druzenko
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2025-09-02 17:29 UTC by Thibault Payet
Modified: 2025-09-07 21:56 UTC (History)
2 users (show)

See Also:


Attachments
git-format patch (3.57 KB, patch)
2025-09-02 17:29 UTC, Thibault Payet
monwarez: maintainer-approval+
Details | Diff
git formated patch (4.96 KB, patch)
2025-09-02 23:58 UTC, Thibault Payet
monwarez: maintainer-approval+
Details | Diff
diff for making portclippy happy (3.53 KB, patch)
2025-09-07 13:05 UTC, Thibault Payet
monwarez: maintainer-approval+
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Thibault Payet 2025-09-02 17:29:04 UTC
Created attachment 263429 [details]
git-format patch
Comment 1 Vladimir Druzenko freebsd_committer freebsd_triage 2025-09-02 19:11:13 UTC
Build error with GCC14:

gcc14 -m64 -c -o dlls/ntdll/unix/signal_x86_64.o dlls/ntdll/unix/signal_x86_64.c -Idlls/ntdll -Iinclude -D__WINESRC__ \
  -DLTC_NO_PROTOTYPES -DLTC_SOURCE -D_NTSYSTEM_ -D_ACRTIMP= -DWINBASEAPI= -DWINE_UNIX_LIB -Wall \
  -pipe -fcf-protection=none -fvisibility=hidden -fno-stack-protector -fno-strict-aliasing \
  -Wdeclaration-after-statement -Wempty-body -Wignored-qualifiers -Winit-self -Wlogical-op \
  -Wno-packed-not-aligned -Wpointer-arith -Wshift-overflow=2 -Wstrict-prototypes -Wtype-limits \
  -Wunused-but-set-parameter -Wvla -Wwrite-strings -Wno-misleading-indentation -fPIC \
  -fasynchronous-unwind-tables -isystem /usr/local/include -O2 -pipe -march=core2  -fstack-protector-strong -Wl,-rpath=/usr/local/lib/gcc14 -isystem /usr/local/include -fno-strict-aliasing
dlls/ntdll/unix/signal_x86_64.c: In function 'check_invalid_gsbase':
dlls/ntdll/unix/signal_x86_64.c:2064:23: error: passing argument 1 of 'amd64_get_gsbase' from incompatible pointer type [-Wincompatible-pointer-types]
 2064 |     amd64_get_gsbase( &cur_gsbase );
      |                       ^~~~~~~~~~~
      |                       |
      |                       ULONG_PTR * {aka long unsigned int *}
Comment 2 Vladimir Druzenko freebsd_committer freebsd_triage 2025-09-02 19:29:37 UTC
1. Testing patch files/patch-dlls_ntdll_unix_signal__x86__64.c:
--- dlls/ntdll/unix/signal_x86_64.c.orig        2025-08-29 19:56:01 UTC
+++ dlls/ntdll/unix/signal_x86_64.c
@@ -2061,7 +2061,7 @@ static inline BOOL check_invalid_gsbase( ucontext_t *u
     else
         arch_prctl( ARCH_GET_GS, &cur_gsbase );
 #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-    amd64_get_gsbase( &cur_gsbase );
+    amd64_get_gsbase( (void **)&cur_gsbase );
 #elif defined(__NetBSD__)
     sysarch( X86_64_GET_GSBASE, &cur_gsbase );
 #endif

2.
====> Checking for pkg-plist issues (check-plist)
===> Parsing plist
===> Checking for items in STAGEDIR missing from pkg-plist
Error: Orphaned: lib/wine/%%WINEARCH%%-windows/winbio.dll
===> Checking for items in pkg-plist which are not in STAGEDIR
===> Error: Plist issues found.
*** Error code 1

Testing patch for pkg-plist:
 %%WINE32%%lib/wine/%%WINEARCH%%-windows/winaspi.dll16
+lib/wine/%%WINEARCH%%-windows/winbio.dll
 %%WINE32%%lib/wine/%%WINEARCH%%-windows/windebug.dll16
Comment 3 Thibault Payet 2025-09-02 20:06:58 UTC
(In reply to Vladimir Druzenko from comment #1)
On my poudriere it build with gcc13 and it is a warning only.
Is that on CURRENT or a specific port configuration ?

For the fix, no doing a reinterpret cast is not the good way to solve this.
And given where the code is, I wonder if it is actually used for the old wow64 path.
I will need to further investigate.

For the plist stuff, I may have missed it, thanks.
Comment 4 Thibault Payet 2025-09-02 20:23:01 UTC
(In reply to Thibault Payet from comment #3)
Yep this was a fix done for the new wow64 mode, see https://bugs.winehq.org/show_bug.cgi?id=58141
Comment 5 Vladimir Druzenko freebsd_committer freebsd_triage 2025-09-02 20:35:04 UTC
(In reply to Thibault Payet from comment #3)
> Is that on CURRENT or a specific port configuration ?
This is a test of not stopping process in bug#281091.

> For the fix, no doing a reinterpret cast is not the good way to solve this.
If I had to choose between cast to "(void **)" and "-Wno-incompatible-pointer-types", I'm for cast.
Comment 6 Thibault Payet 2025-09-02 23:51:44 UTC
(In reply to Vladimir Druzenko from comment #5)
I guess I will do that, the underlying code seems to either use rdgsbase() or use sysarch with AMD64_GET_GSBASE.
Comment 7 Thibault Payet 2025-09-02 23:58:08 UTC
Created attachment 263434 [details]
git formated patch

Added the missing file in plist, and fixup gcc warning.
Comment 8 Vladimir Druzenko freebsd_committer freebsd_triage 2025-09-03 01:15:58 UTC
(In reply to Thibault Payet from comment #7)
Incorrect alphabetical order in plist.
Comment 9 commit-hook freebsd_committer freebsd_triage 2025-09-03 01:16:17 UTC
A commit in branch main references this bug:

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

commit ffaf09b17e050c558fac4072ce81bbc77af9a140
Author:     Thibault Payet <monwarez@mailoo.org>
AuthorDate: 2025-09-03 01:12:49 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2025-09-03 01:12:49 +0000

    emulators/wine-devel: Update 10.13 => 10.14

    Changelog:
    - Bundled vkd3d upgraded to version 1.17.
    - Support for ping on IPv6.
    - Various bug fixes.
    https://gitlab.winehq.org/wine/wine/-/releases/wine-10.14

    PR:     289257

 emulators/wine-devel/Makefile                                 |  2 +-
 emulators/wine-devel/distinfo                                 |  6 +++---
 .../files/patch-dlls_ntdll_unix_signal__x86__64.c (new)       | 11 +++++++++++
 emulators/wine-devel/pkg-plist                                |  8 ++++++++
 4 files changed, 23 insertions(+), 4 deletions(-)
Comment 10 Vladimir Druzenko freebsd_committer freebsd_triage 2025-09-03 01:17:37 UTC
What do you think about fix warnings from portclippy in separate commit?

# PORTNAME block
PORTNAME
DISTVERSION
PORTEPOCH
CATEGORIES
MASTER_SITES
PKGNAMESUFFIX

# Maintainer block
MAINTAINER
COMMENT
WWW

# License block
LICENSE
LICENSE_COMB
LICENSE_FILE

# BROKEN/IGNORE/DEPRECATED messages
ONLY_FOR_ARCHS

# Dependencies
BUILD_DEPENDS

# USES block
USES
+CPE_VENDOR
USE_GCC
+USE_LDCONFIG
USE_SDL
-CPE_VENDOR

-CONFLICTS_INSTALL
# USES=shebangfix related variables
+SHEBANG_FILES

# Configure block
GNU_CONFIGURE
CONFIGURE_ARGS
CONFIGURE_ENV

-USE_LDCONFIG
# CFLAGS/CXXFLAGS/LDFLAGS block
+PIE_UNSAFE

-SHEBANG_FILES
# Conflicts
+CONFLICTS_INSTALL

# Standard bsd.port.mk variables
BINARY_ALIAS
SUB_FILES

-PIE_UNSAFE

# Packaging list block
PORTDATA

# Options definitions
OPTIONS_DEFINE
OPTIONS_DEFAULT
OPTIONS_RADIO
OPTIONS_RADIO_AUDIO
OPTIONS_SUB

# Options descriptions
DOSBOX_DESC
GECKO_DESC
MONO_DESC
WAYLAND_DESC

# Options helpers
-ALSA_CONFIGURE_WITH
-ALSA_USES
-ALSA_USE
ALSA_LIB_DEPENDS
ALSA_RUN_DEPENDS
-CUPS_CONFIGURE_WITH
+ALSA_USES
+ALSA_USE
+ALSA_CONFIGURE_WITH
CUPS_LIB_DEPENDS
+CUPS_CONFIGURE_WITH
DOSBOX_RUN_DEPENDS
GECKO_RUN_DEPENDS
-GNUTLS_CONFIGURE_WITH
GNUTLS_LIB_DEPENDS
+GNUTLS_CONFIGURE_WITH
MONO_RUN_DEPENDS
-OSS_CONFIGURE_WITH
OSS_USES
OSS_USE
-V4L_CONFIGURE_WITH
+OSS_CONFIGURE_WITH
V4L_BUILD_DEPENDS
V4L_LIB_DEPENDS
-WAYLAND_CONFIGURE_WITH
+V4L_CONFIGURE_WITH
WAYLAND_BUILD_DEPENDS
WAYLAND_LIB_DEPENDS
-X11_CONFIGURE_WITH
+WAYLAND_CONFIGURE_WITH
+X11_LIB_DEPENDS
X11_USES
X11_USE
-X11_LIB_DEPENDS
+X11_CONFIGURE_WITH
Comment 11 Thibault Payet 2025-09-07 13:05:55 UTC
Created attachment 263573 [details]
diff for making portclippy happy

This should fix portclippy issues
Comment 12 commit-hook freebsd_committer freebsd_triage 2025-09-07 14:28:50 UTC
A commit in branch main references this bug:

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

commit e86886e38b29b810b204e881651b0d77326177fe
Author:     Thibault Payet <monwarez@mailoo.org>
AuthorDate: 2025-09-07 14:25:53 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2025-09-07 14:25:53 +0000

    emulators/wine-devel: Sort and align Makefile - no functional changes

    Fix warnings from portclippy, sort options and etc.

    PR:     289257

 emulators/wine-devel/Makefile | 61 +++++++++++++++++++++----------------------
 1 file changed, 30 insertions(+), 31 deletions(-)
Comment 13 Vladimir Druzenko freebsd_committer freebsd_triage 2025-09-07 14:31:00 UTC
Thanks.

I've added a few minor improvements.
Comment 14 Gerald Pfeifer freebsd_committer freebsd_triage 2025-09-07 21:56:34 UTC
I've had the new local patch in my tree for a while and pushed it
upstream now since it's hitting others:

   https://gitlab.winehq.org/wine/wine/-/merge_requests/8919