Bug 274905

Summary: emulators/wine-devel: Fix build on i386
Product: Ports & Packages Reporter: Alastair Hogge <agh>
Component: Individual Port(s)Assignee: Robert Clausecker <fuz>
Status: Closed FIXED    
Severity: Affects Only Me CC: agh, fuz, gerald
Priority: ---    
Version: Latest   
Hardware: Any   
OS: Any   
Attachments:
Description Flags
Fix pkg-plist to restore building on i386. none

Description Alastair Hogge 2023-11-04 11:45:47 UTC
Created attachment 246105 [details]
Fix pkg-plist to restore building on i386.

poudriere-testport for i386 fails on 12.4, 13.2, 14-rc4, and main, with a number of pkg-plist errors. Attached patch for pkg-plist restores the build.

poudriere-testport:
12.4-{amd64,i386} OK
13.2-{amd64,i386} OK
14.0-rc4-{amd64,i386} OK
main-{amd64,i386} OK

Thanks.
Comment 1 Robert Clausecker freebsd_committer freebsd_triage 2023-11-04 18:30:41 UTC
I'll commit this with a PORTREVISION bump as it seems to also change the plist on amd64.
Comment 2 Gerald Pfeifer freebsd_committer freebsd_triage 2023-11-05 11:02:19 UTC
I'm pretty sure the packaging list should not change on amd64, so 
not PORTREVISION bump should be necessary.

(What look like changes are for the sake of i386, even those marked
%%WINE64%%.)

In any case, thanks to both of you for helping with wine-devel!
Comment 3 Robert Clausecker freebsd_committer freebsd_triage 2023-11-05 17:09:51 UTC
(In reply to Gerald Pfeifer from comment #2)

The patch works both on i386 and amd64, so I suppose it might be correct.
Perhaps the submitter can weigh in?
Comment 4 Alastair Hogge 2023-11-06 00:36:10 UTC
OK, the changes in the patch can be grouped as follows:
1) Alphabetically sort the svcctl header and IDL to reduce diff conflicts in future.
2) Cover existing 64bit data correctly with %%WINE64%% so not to populate the Wine32 install with the wrong platform code. Nothing new is installed here.
3) Add the %%WINE32%% components to complete enabling the build on i386.

I concluded based on 2, that because nothing is added other than PLIST_SUB data to the pkg-plist, there is technically no change to the Port; nothing new; works the same. For 3, Wine on i386, I am sure was not building anywhere, so the a Wine-8.19 for i386 did not exist at all, and a PORTREVISION addition would be unnecessary as no prior existing Wine-8.19 for i386 exists.

I could be wrong tho.
Comment 5 Gerald Pfeifer freebsd_committer freebsd_triage 2023-11-06 08:12:12 UTC
(In reply to Alastair Hogge from comment #4)
> ...

Thanks, Alastair! Robert, this is what I meant when I indicated a
PORTREVISION bump shouldn't be necssary.
Comment 6 Robert Clausecker freebsd_committer freebsd_triage 2023-11-06 19:35:39 UTC
I understand.  Will commit without a PORTREVISION bump.
Comment 7 commit-hook freebsd_committer freebsd_triage 2023-11-07 00:24:15 UTC
A commit in branch main references this bug:

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

commit 1f3b9362b92cc5ad2af60dfbf6d7a9ebad1076fc
Author:     Alastair Hogge <agh@riseup.net>
AuthorDate: 2023-11-04 11:38:45 +0000
Commit:     Robert Clausecker <fuz@FreeBSD.org>
CommitDate: 2023-11-07 00:16:50 +0000

    emulators/wine-devel: Fix build on i386

    Fix pkg-plist to restore building on i386.
    Also sort the following in pkg-plist:
    include/wine/svcctl.h
    include/wine/svcctl.idl

    PR:             274905

 emulators/wine-devel/pkg-plist | 133 ++++++++++++++++++++++++++++++-----------
 1 file changed, 98 insertions(+), 35 deletions(-)
Comment 8 Robert Clausecker freebsd_committer freebsd_triage 2023-11-07 00:28:22 UTC
Thank you for your contribution.