From nobody Wed Nov 09 13:17:36 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4N6lrK1c0hz4V13Z; Wed, 9 Nov 2022 13:17:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4N6lrK16jbz455t; Wed, 9 Nov 2022 13:17:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667999857; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ANKapUPvmHJVba81Tr7apUOH41Et7SRIYE3Y+A94bzk=; b=pm8ANAfQIWkksb56cxWZno0y71hrYyofev1qmnZyegUeX9iC6uKIZV8JbZyca441CtOwR+ Y/XdPinOUctO9rRTLeC7brT1aiqaV3D6Nff6deDtK67R8IH4+aNnwolBuEm3lMPtAyw7yv gblOo4F5FGzNHpP1np3IPtCvewKd8nUgD5olboFPECloHOQ0dhyFuKVgdLsecUptRtVkjb y0xRblKMC7fBP66t24wDdVrxUPFVj/urk21oMW5P9/AHQzo2mkrBh4Zhyo42ScrOcAQZ3H 6tOY4Ov5AFM+6qLMzCoHl7/QUUcpPy3hpoY8ksqA1SE95KIeVlvEHuqpJhp3rw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667999857; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ANKapUPvmHJVba81Tr7apUOH41Et7SRIYE3Y+A94bzk=; b=dJGDeJ95UbyXXoIYwSf6K1gGEB30MBUwVlFSGxzOq7HYVSDsn7YpDK6BD9ESFrbDhUCOjv tpm8fRbTqvBlB+Wpc1zCIAXIP2utiDp5wFBvKbaVvgJYdQ0Ch+iplfRi6TikpQ4SJ/GmRl Jq1GxnkiRZFDLF9Pin/+Sshu/l3H6zccJPO7wlxdEVGwg2sAlmkZQaVUjkwNkJlgP73Ihk 8pqJZ5789chfEMpVr3A21w8MQc35aXVKCCpFi9XTa5vc2zyvk8PjXxpoDLhlrMo7oeyCqh IX6Kzt2YX6D2Y9iKseWYx+WDz/rdsMXJQaqm/Scu/cUylz32sKqWRS/AcOfveQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667999857; a=rsa-sha256; cv=none; b=V9mTvLptdHVcB3W+FWuELqyEo6s5A0+9ZJthDBa/YrXvNL9wQvOOBUtEIHlqxQnsq2pmn7 JFKmAg5KRM5TLVB5RNqv8h0uARIAQ9PlRG88VAgXJGmVQK+3fXIi1PFoa6dNPdTrxN1eka rp2UOAuuZn/PkkVyZmSGdlmOYU6NX5DI6muC7oUJ7pZQN+BADeUVSfb2yu9IBHMjv1Iz8+ yNQSqpgZNLAtVBBwrNUNpuNiCwrm24BMIdn8Zl4H4nQYba6t2mX+ROHtu/eGofhwbD1nTl slSxZkb+Ban71mjKUaFv//lCmU36pBHfb8N9w2DaawE1ELEakxZCb749TJJ1vg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4N6lrK0CKfzN7d; Wed, 9 Nov 2022 13:17:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2A9DHaPG045894; Wed, 9 Nov 2022 13:17:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2A9DHaAd045893; Wed, 9 Nov 2022 13:17:36 GMT (envelope-from git) Date: Wed, 9 Nov 2022 13:17:36 GMT Message-Id: <202211091317.2A9DHaAd045893@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: =?utf-8?Q?Fernando=20Apestegu=C3=ADa?= Subject: git: d1772ec8bd49 - 2022Q4 - misc/wmScoreBoard: fix build with -fcommon List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fernape X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q4 X-Git-Reftype: branch X-Git-Commit: d1772ec8bd491590e333facb4676895ab8fb1309 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q4 has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=d1772ec8bd491590e333facb4676895ab8fb1309 commit d1772ec8bd491590e333facb4676895ab8fb1309 Author: Fernando Apesteguía AuthorDate: 2022-11-07 18:52:54 +0000 Commit: Fernando Apesteguía 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 | 14 ++++++++++++++ misc/wmScoreBoard/files/patch-xutils.h | 19 +++++++++++++++++++ 3 files changed, 33 insertions(+), 3 deletions(-) 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 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/src diff --git a/misc/wmScoreBoard/files/patch-xutils.c b/misc/wmScoreBoard/files/patch-xutils.c new file mode 100644 index 000000000000..4ca56fce3463 --- /dev/null +++ b/misc/wmScoreBoard/files/patch-xutils.c @@ -0,0 +1,14 @@ +--- xutils.c.orig 2022-11-07 09:20:08 UTC ++++ xutils.c +@@ -39,6 +39,11 @@ + * X11 Variables + */ + ++Display *display; ++Window Root; ++Window iconwin, win; ++int screen; ++int DisplayDepth; + int x_fd; + XSizeHints mysizehints; + XWMHints mywmhints; diff --git a/misc/wmScoreBoard/files/patch-xutils.h b/misc/wmScoreBoard/files/patch-xutils.h new file mode 100644 index 000000000000..ba01407b041c --- /dev/null +++ b/misc/wmScoreBoard/files/patch-xutils.h @@ -0,0 +1,19 @@ +--- xutils.h.orig 2022-11-07 09:20:05 UTC ++++ xutils.h +@@ -15,11 +15,11 @@ typedef struct { + * Global variables + */ + +-Display *display; +-Window Root; +-Window iconwin, win; +-int screen; +-int DisplayDepth; ++extern Display *display; ++extern Window Root; ++extern Window iconwin, win; ++extern int screen; ++extern int DisplayDepth; + + /* + * Function Prototypes