From nobody Wed Nov 09 13:12:31 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 4N6lkS1ZFGz4V0MX; Wed, 9 Nov 2022 13:12:32 +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 4N6lkS15Jrz44Mq; Wed, 9 Nov 2022 13:12:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667999552; 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=43zNbTZxpib7qLRSZBWZqRdqCdMW4jIlftzxXsYu7qA=; b=A57hyXPrH/qx/GvozP6teFKkpHOyhd61Rxtd/X+jSbjPRH4t971VUlVadRuhRQsNnojKfq bHkLCaNOOSLpPAmRS9B1ybZoUgquNc1vTF2VXHNYFO0mpw6MBueXFMMqlXX2RdaSJRNUOG Gz0Hv+iFn8gLan0D0Jf5lT6MvgcoNTfbqr65p6jmnb7woHzd9IwRwtvnFHKujHEaq6nhBO 4BQHYMPc/tt4qGUw6wVAM5oKwjuyWghpqCKFHuclKbePfP/R1ECdZdnQ4RjVVxPMWxet8a pt9Tq0VZczz2C3RSdvz8loyN8IVbxj9fZ7o4Ih64r4TIorcn5nGTMIZ/COwkrg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667999552; 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=43zNbTZxpib7qLRSZBWZqRdqCdMW4jIlftzxXsYu7qA=; b=Gp+ZOt6G1I2nyTcADejwCckAblser/TOpAvQJoqsM2t/ESuxMUJP1wdPPVJs2I6AWgeyTv m9bHSqjw8QklZS0hfyxX68KoJQ3cYwRYb2tdTqYO2u/1EydR1PPJcw1mRl5r5Iyy3Mcso8 dja0S1AeJlbdN038t4MwiABdcVK2d/NWNTDDztGO/e7dSJjtmdDi/AS0OrkYrtiBJpp7Lg QZz9QFQT5zaKdQnmbSWgWurG0KniC7VpshJljANWSsJIF/X5exnWlyCVePB0m+8EeQvCOd s7Zy3C61rZNmiUYss7rn16Kr8ok+nJJP/0OL8iR2qtV1LgmqbItbEGfbl2/pog== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667999552; a=rsa-sha256; cv=none; b=um34TxWpP0dfrbozw/3ALQM8L4t3OTu5ErJefiGmkjMuPWLnnhDFiedyX9R1W0WzMCWAi2 v9RPzRRP1IVMPskE17n6sBurtZsPW5FWrV4vAOaH1ELGGWNFnu4BItRNd0a0rdLGrCU1lP CPRaE6cH1bWWUNPHtnQBwVJSINqTHTqcBle+O3oPSCew10ityQBX3GqLo+wWk+k9FcR2TH zU+V/L9lz20juhjQPhM0v1Xm9QTCaH/fPpygpjxb6RlggFXy1hInxDODJ2l+otc1IWZlOi TL2LWsr8NiJf8R2uxva8/8robPKKVoJi30oVC5UNupus06dKj//CCDZD73Mhww== 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 4N6lkR6xsdzN7Z; Wed, 9 Nov 2022 13:12:31 +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 2A9DCVMr044742; Wed, 9 Nov 2022 13:12:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2A9DCVLU044741; Wed, 9 Nov 2022 13:12:31 GMT (envelope-from git) Date: Wed, 9 Nov 2022 13:12:31 GMT Message-Id: <202211091312.2A9DCVLU044741@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: 9340ed121d3d - 2022Q4 - 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/2022Q4 X-Git-Reftype: branch X-Git-Commit: 9340ed121d3d80544436e7b096718c595484fac1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q4 has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=9340ed121d3d80544436e7b096718c595484fac1 commit 9340ed121d3d80544436e7b096718c595484fac1 Author: Robert Clausecker AuthorDate: 2022-11-07 18:56:57 +0000 Commit: Fernando Apesteguía CommitDate: 2022-11-09 13:08:46 +0000 games/wmqstat: fix build with -fno-common PR: 267612 Reported by: fuz@fuz.su (maintainer) MFH: 2022Q4 (build fix) (cherry picked from commit 4696df195a908e0dc0dd5fbb6edbfc71c5ef2311) --- 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 */