Attachment 237914 Details for Bug 267612 – games/wmqstat: fix build with -fno-common

[patch] games/wmqstat: fix build with -fno-common

0001-games-wmqstat-fix-build-with-fno-common.patch (text/plain), 3.05 KB, created by Robert Clausecker on 2022-11-07 09:03:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Robert Clausecker

Created: 2022-11-07 09:03:58 UTC

Size: 3.05 KB

patch

obsolete

>From 62e6dba3be9693d83983d3eadaf10b449a08a0f9 Mon Sep 17 00:00:00 2001
>From: Robert Clausecker <fuz@fuz.su>
>Date: Mon, 7 Nov 2022 09:47:44 +0100
>Subject: [PATCH] games/wmqstat: fix build with -fno-common
>
>---
> 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(-)
> create mode 100644 games/wmqstat/files/patch-wmgeneral_list.h
> create mode 100644 games/wmqstat/files/patch-wmgeneral_wmgeneral.c
> create mode 100644 games/wmqstat/files/patch-wmgeneral_wmgeneral.h
>
>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 */
>-- 
>2.38.1
>

Flags:

fuz: maintainer-approval+

Actions: View | Diff

Attachments on bug 267612: 237914