From nobody Wed Nov 09 13:16:50 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 4N6lqR1RYxz4V0sT; Wed, 9 Nov 2022 13:16:51 +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 4N6lqR0vj2z44sb; Wed, 9 Nov 2022 13:16:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667999811; 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=aV5ICAUj7nXqZaRiXcibbkJ6mMgyJe6dheEiBjlB9TY=; b=qXQmDeF0gs7BSdxTqcVYepJDy7j3ftydRsbi5IMpuwKLXoyrUXeWxyhN0BHzE8H18YUKZH 4nKs+B+p8mEv/cGxaA89kGd9cf+Ky3Kp2gyaZ4W/onfayc1JdfYIoxbLfCaemblCJ6Ep4q LF58jdqcedbSTE7twqtwTTIo7iT9K3lOTR4buFekTx7OcOYvRdFV3vvLJRI01z2gXR72kY xLF5NYe6ZaT9dvG7dqyfnPabM96anf8NN+QpXyNAZ+lu4dwnS26n5oLy9Xpp8dpFyoQI86 WkZrREa2bU1nBB+u27jPAo/k14nyvwtNZr3tVEWsQEtQQGnDJuRm8q/5h6J3GA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667999811; 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=aV5ICAUj7nXqZaRiXcibbkJ6mMgyJe6dheEiBjlB9TY=; b=EvWgRk3KgFfzHt4KId8JAUY18TMUn2an0mN4uH+T1y4aKZWZX4FXHHhAvO1bOHrx7rvHLz 7XiETBCpIWkzCOgr68xtUOZVzRkJKMItAXHoDKgHae+Ero1JxVeuQrscyzA8sMOtpL+voj 3Dfa3Y3ui4UiIoNdekZO0Cs4myyOj8Tkzv+DyA6ysVMoG7polSZWbNR6PBHE8FGD9yJo7g 3iaAwABawqatks9EDP+MfsTR0hIKE1900pABZC491+T30jlbe1bFSmoJK74J1onwJ1JBTD 7SlVx0HAICfjSDI4JswvHlAxfv7RBmWOEont8gaa4f2XSR/tnyNozfsQk5UhXg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667999811; a=rsa-sha256; cv=none; b=btKDEVYYxOGTLtzMm7rleLA24syaVQBM6ZP6EQlSuWG6i7iPsB65CbjaHBD97njBVtcPRd A4iUxZcWaKWV+8vV6gQgy5vU94W2Qog446CbDCNBE5WWA7hGMuoXeSHygif0Z4mJbjcsWN 3KOc1OPIj3CwxUY/gOACW/HAykGU5BwfLfLwbYL2KZ5J4UTEUvnU2nc5swDuxAK9oHdKI4 /t6XBvHd49lCWQgK151xvuQXyn+BOrFLYdRMXJwT82yPK6Djy5ABD4HIcfLyAjSvQWuEzZ +/0vIdMo0HXFs3h9oKLXNihIgous5kihZBsTxn3tSfocwXxDu5oYhF6XkhJJTg== 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 4N6lqQ735czN7c; Wed, 9 Nov 2022 13:16:50 +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 2A9DGoUE045597; Wed, 9 Nov 2022 13:16:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2A9DGomx045596; Wed, 9 Nov 2022 13:16:50 GMT (envelope-from git) Date: Wed, 9 Nov 2022 13:16:50 GMT Message-Id: <202211091316.2A9DGomx045596@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Fernando=20Apestegu=C3=ADa?= Subject: git: 4d4c08ea1c9b - main - 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/main X-Git-Reftype: branch X-Git-Commit: 4d4c08ea1c9bbb758e51a59a25c617dc43a9c9d8 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=4d4c08ea1c9bbb758e51a59a25c617dc43a9c9d8 commit 4d4c08ea1c9bbb758e51a59a25c617dc43a9c9d8 Author: Fernando Apesteguía AuthorDate: 2022-11-07 18:52:54 +0000 Commit: Fernando Apesteguía 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 | 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