Bug 267614 - misc/wmScoreBoard: fix build with -fcommon
Summary: misc/wmScoreBoard: fix build with -fcommon
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Only Me
Assignee: Fernando Apesteguía
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2022-11-07 09:25 UTC by Robert Clausecker
Modified: 2022-11-09 13:18 UTC (History)
1 user (show)

See Also:
fernape: merge-quarterly+

Attachments
misc/wmScoreBoard: fix build with -fcommon (2.17 KB, patch)
2022-11-07 09:25 UTC, Robert Clausecker 		fuz: maintainer-approval+
Details | Diff
View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Robert Clausecker freebsd_committer freebsd_triage 2022-11-07 09:25:17 UTC 
Created attachment 237917 [details]
misc/wmScoreBoard: fix build with -fcommon

Tested with Poudriere on armv7 arm64 FreeBSD 13.1.
Please MFH if possible.
Comment 1 Fernando Apesteguía freebsd_committer freebsd_triage 2022-11-07 18:54:18 UTC 
Hi Robert,

I see only these changes:

diff --git a/misc/wmScoreBoard/Makefile b/misc/wmScoreBoard/Makefile
index 75f66baf055c..96d32cd2d130 100644
--- a/misc/wmScoreBoard/Makefile
+++ b/misc/wmScoreBoard/Makefile
@@ -10,9 +10,6 @@ COMMENT=      Window Maker dockapp that display game scores from excite
 LICENSE=       GPLv2+
 LICENSE_FILE=  ${WRKSRC}/../COPYING
 
-BROKEN_FreeBSD_13=     ld: error: duplicate symbol: DisplayDepth
-BROKEN_FreeBSD_14=     ld: error: duplicate symbol: DisplayDepth
-
 RUN_DEPENDS=   wget:ftp/wget

So how is this fixed without any other patches or changing version of the software?
Comment 2 Fernando Apesteguía freebsd_committer freebsd_triage 2022-11-07 18:55:18 UTC 
(In reply to Fernando Apesteguía from comment #1)
sigh... scratch that. I see the patch now.
Comment 3 commit-hook freebsd_committer freebsd_triage 2022-11-09 13:17:44 UTC 
A commit in branch main references this bug:

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

commit 4d4c08ea1c9bbb758e51a59a25c617dc43a9c9d8
Author:     Fernando Apesteguía <fernape@FreeBSD.org>
AuthorDate: 2022-11-07 18:52:54 +0000
Commit:     Fernando Apesteguía <fernape@FreeBSD.org>
CommitDate: 2022-11-09 13:12:40 +0000

    misc/wmScoreBoard: fix build with -fcommon

    PR:             267614
    Reported by:    fuz@fuz.su (maintainer)
    MFH:            2022Q4 (build fix)

 misc/wmScoreBoard/Makefile                   |  3 ---
 misc/wmScoreBoard/files/patch-xutils.c (new) | 14 ++++++++++++++
 misc/wmScoreBoard/files/patch-xutils.h (new) | 19 +++++++++++++++++++
 3 files changed, 33 insertions(+), 3 deletions(-)
Comment 4 commit-hook freebsd_committer freebsd_triage 2022-11-09 13:17:45 UTC 
A commit in branch 2022Q4 references this bug:

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

commit d1772ec8bd491590e333facb4676895ab8fb1309
Author:     Fernando Apesteguía <fernape@FreeBSD.org>
AuthorDate: 2022-11-07 18:52:54 +0000
Commit:     Fernando Apesteguía <fernape@FreeBSD.org>
CommitDate: 2022-11-09 13:13:55 +0000

    misc/wmScoreBoard: fix build with -fcommon

    PR:             267614
    Reported by:    fuz@fuz.su (maintainer)
    MFH:            2022Q4 (build fix)

    (cherry picked from commit 4d4c08ea1c9bbb758e51a59a25c617dc43a9c9d8)

 misc/wmScoreBoard/Makefile                   |  3 ---
 misc/wmScoreBoard/files/patch-xutils.c (new) | 14 ++++++++++++++
 misc/wmScoreBoard/files/patch-xutils.h (new) | 19 +++++++++++++++++++
 3 files changed, 33 insertions(+), 3 deletions(-)
Comment 5 Fernando Apesteguía freebsd_committer freebsd_triage 2022-11-09 13:18:10 UTC 
Committed and merged to 2022Q4,

Thanks