From nobody Wed Nov 09 13:11:40 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 4N6ljS4nWjz4V02G; Wed, 9 Nov 2022 13:11:40 +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 4N6ljS4CFBz447T; Wed, 9 Nov 2022 13:11:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667999500; 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=5keYiYjymtNguXMsWDuXVPVfqKiuKW7UeX9emf6RDtA=; b=GymVQ2LR5Babm0VhwhaqxY+MFNabDnTTFiZPnqrffvMgLdwjv4c837UPK6Z/RekbcjBXVw z6sDAt6t9Uj9CRyZySnYsnZ/JHtNJpueVRr6Sa+o/KPYIxVxEkaq8QuLfQ1eWwKiZLf45g qRwr9CxbwHP5B1bsTBqIdTQP+DUhWWPFfo6wSytZRnQb/ofdjfa2QI7tDrNgfv7bgqes8O lrNRp4EWobN1zDJTB6Cby/u5qSTmqVC2UxfjinNlNoaiQfaWrtaE0y1mDWNIJfb6+HlnY9 kpEwqZowMyqOO0mCdF7vs0UwwdrVtpT27zMwmRiPFWPEN7qJJvQGf1qevKow6w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667999500; 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=5keYiYjymtNguXMsWDuXVPVfqKiuKW7UeX9emf6RDtA=; b=Qsf5fUArYJ18C39xKsuHhyOoRNuZE3j/hxAdFI/1tn1e1CyK016al2w4BRd1MO83eBYPDC P1b47XP9BRF3POn9RyCYAgl+RWJVrIBRfmHinHcO9OncvDA73Aooqn6Vg1E/0O3t9qg633 g4g718CBvba7bJQXk2iVwONrdMGLDkvK+iB/GUd0LL8sckrp4L9qrCI9Pof0IZyCEDWH3v G0yZxdH590DYXgLr2jH9R6dM6dJxqp3xb31tXU80o59oJq5oy6ocTBYjUlaAX2FuSggQc5 32ZKDG7fDtmKHFT0Poiw6geYgBPbRYBy2eb6NJjJK7W4HzdJtwkU9eAeEgICxg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667999500; a=rsa-sha256; cv=none; b=rA1okmF0H4+S8OmM19JNCvLmtTkPVR0Ae4SdebLYg5V3ScRZR6HpXi9MwQ0eA0sMpaD60F MIc/7/5Y4j+TqZM6bUS48kTj2KerZ3a6BXdj7b1Q/3dtsAjYEh+ZejH2jKXKpnLHy3ndo+ pejT+ApzqwTzPZGm4/N3AsPR+9WsofwFipbFNNSz9aLoFh3HceMvtTtg+y3ReJumEFpGZ6 94xdD9nb78ac0WAIQ8+0lSzc19UXdXJNKxdHyPgAG2SgjUR79rJay9zr+MkI63GwovULN3 LOMa5DjdYAeezRfC7MQG7b8XD07g9JlnDnM6mh0Ig5PjNjLMZ4RS7K5QnGLlkg== 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 4N6ljS3G2CzNJl; Wed, 9 Nov 2022 13:11:40 +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 2A9DBenb041074; Wed, 9 Nov 2022 13:11:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2A9DBeXa041073; Wed, 9 Nov 2022 13:11:40 GMT (envelope-from git) Date: Wed, 9 Nov 2022 13:11:40 GMT Message-Id: <202211091311.2A9DBeXa041073@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: 4696df195a90 - main - games/wmqstat: fix build with -fno-common 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: 4696df195a908e0dc0dd5fbb6edbfc71c5ef2311 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=4696df195a908e0dc0dd5fbb6edbfc71c5ef2311 commit 4696df195a908e0dc0dd5fbb6edbfc71c5ef2311 Author: Robert Clausecker AuthorDate: 2022-11-07 18:56:57 +0000 Commit: Fernando Apesteguía CommitDate: 2022-11-09 13:07:44 +0000 games/wmqstat: fix build with -fno-common PR: 267612 Reported by: fuz@fuz.su (maintainer) MFH: 2022Q4 (build fix) --- games/wmqstat/Makefile | 9 +-------- games/wmqstat/files/patch-wmgeneral_list.h | 11 +++++++++++ games/wmqstat/files/patch-wmgeneral_wmgeneral.c | 10 ++++++++++ games/wmqstat/files/patch-wmgeneral_wmgeneral.h | 11 +++++++++++ 4 files changed, 33 insertions(+), 8 deletions(-) diff --git a/games/wmqstat/Makefile b/games/wmqstat/Makefile index e00f9b4ab464..6cc91b907198 100644 --- a/games/wmqstat/Makefile +++ b/games/wmqstat/Makefile @@ -1,6 +1,6 @@ PORTNAME= wmqstat PORTVERSION= 0.0.4 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games windowmaker MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/wmQStat%20${PORTVERSION} @@ -10,9 +10,6 @@ WWW= http://wmqstat.sourceforge.net/ LICENSE= GPLv2 -BROKEN_FreeBSD_13= ld: error: duplicate symbol: display -BROKEN_FreeBSD_14= ld: error: duplicate symbol: display - RUN_DEPENDS= qstat:games/qstat USES= xorg @@ -23,10 +20,6 @@ PORTDOCS= README OPTIONS_DEFINE= DOCS -# Unbreak the build against Clang -post-patch: - @${REINPLACE_CMD} -e 's, inline,,' ${WRKSRC}/wmgeneral/list.h - do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin @${MKDIR} ${STAGEDIR}${DOCSDIR} diff --git a/games/wmqstat/files/patch-wmgeneral_list.h b/games/wmqstat/files/patch-wmgeneral_list.h new file mode 100644 index 000000000000..19d90c2b6bf9 --- /dev/null +++ b/games/wmqstat/files/patch-wmgeneral_list.h @@ -0,0 +1,11 @@ +--- wmgeneral/list.h.orig 2003-04-09 19:48:21 UTC ++++ wmgeneral/list.h +@@ -30,7 +30,7 @@ Boston, MA 02111-1307, USA. */ + #define __LIST_H_ + + #if defined(__GNUC__) && !defined(__STRICT_ANSI__) +-# define INLINE inline ++# define INLINE + #else + # define INLINE + #endif diff --git a/games/wmqstat/files/patch-wmgeneral_wmgeneral.c b/games/wmqstat/files/patch-wmgeneral_wmgeneral.c new file mode 100644 index 000000000000..89b00f4b9c65 --- /dev/null +++ b/games/wmqstat/files/patch-wmgeneral_wmgeneral.c @@ -0,0 +1,10 @@ +--- wmgeneral/wmgeneral.c.orig 2022-11-07 08:44:56 UTC ++++ wmgeneral/wmgeneral.c +@@ -55,6 +55,7 @@ + /* X11 Variables */ + /*****************/ + ++Display *display; + Window Root; + int screen; + int x_fd; diff --git a/games/wmqstat/files/patch-wmgeneral_wmgeneral.h b/games/wmqstat/files/patch-wmgeneral_wmgeneral.h new file mode 100644 index 000000000000..561104770414 --- /dev/null +++ b/games/wmqstat/files/patch-wmgeneral_wmgeneral.h @@ -0,0 +1,11 @@ +--- wmgeneral/wmgeneral.h.orig 2003-04-09 19:48:21 UTC ++++ wmgeneral/wmgeneral.h +@@ -36,7 +36,7 @@ typedef struct { + /* Global variable */ + /*******************/ + +-Display *display; ++extern Display *display; + + /***********************/ + /* Function Prototypes */