sysutils/wmflame: fix the port's build against -fno-common

Ensure that there is only one variable definition per each object, as
the C (and C++) standards mandated for years and compilers started to
enforce as of recently (Clang 11, GCC 10).

While we are at it, at missing `xext' component to the USE_XORG list.

PR:	267600
This commit is contained in:
Robert Clausecker 2022-11-07 04:18:52 +00:00 committed by Alexey Dokuchaev
parent 8e57739426
commit eb0fbcfdfa
3 changed files with 28 additions and 4 deletions

View File

@ -11,11 +11,8 @@ WWW= http://web.novalis.org/
LICENSE= GPLv2
BROKEN_FreeBSD_13= ld: error: duplicate symbol: Root
BROKEN_FreeBSD_14= ld: error: duplicate symbol: Root
USES= gmake xorg
USE_XORG= x11 xpm
USE_XORG= x11 xext xpm
PLIST_FILES= bin/wmflame

View File

@ -0,0 +1,12 @@
--- ../wmgeneral/wmgeneral.c.orig 1999-07-12 03:30:14 UTC
+++ ../wmgeneral/wmgeneral.c
@@ -57,6 +57,9 @@
/* X11 Variables */
/*****************/
+Display *display;
+Window Root, iconwin, win;
+XpmIcon wmgen;
int screen;
int x_fd;
int d_depth;

View File

@ -0,0 +1,15 @@
--- ../wmgeneral/wmgeneral.h.orig 1999-06-17 06:48:13 UTC
+++ ../wmgeneral/wmgeneral.h
@@ -36,9 +36,9 @@ typedef struct {
/* Global variable */
/*******************/
-Display *display;
-Window Root, iconwin, win;
-XpmIcon wmgen;
+extern Display *display;
+extern Window Root, iconwin, win;
+extern XpmIcon wmgen;
/***********************/
/* Function Prototypes */