Date: Wed, 9 Nov 2022 13:12:31 GMT From: =?utf-8?Q?Fernando=20Apestegu=C3=ADa?= <fernape@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: 9340ed121d3d - 2022Q4 - games/wmqstat: fix build with -fno-common Message-ID: <202211091312.2A9DCVLU044741@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2022Q4 has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=9340ed121d3d80544436e7b096718c595484fac1 commit 9340ed121d3d80544436e7b096718c595484fac1 Author: Robert Clausecker <fuz@fuz.su> AuthorDate: 2022-11-07 18:56:57 +0000 Commit: Fernando Apesteguía <fernape@FreeBSD.org> 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 */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202211091312.2A9DCVLU044741>