From nobody Mon Nov 07 04:20:18 2022 X-Original-To: dev-commits-ports-main@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 4N5J1H1k6Cz4gqGR; Mon, 7 Nov 2022 04:20:19 +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 4N5J1H0p9Tz4KrB; Mon, 7 Nov 2022 04:20:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667794819; 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=XMKzgKhN23RY3/Q7xcEdNT7H6BrULTpHMwysrLJjYuU=; b=TEJx/N22v/5FSgPgQBjPGzZ5Do0O64EOybll44h9SOtf9jiJVYS07O3enN+uml5MXRdMSE 8iJyIlCkL0xWdTAtdWHSFj4GAh8zZNxlYi3swUuXgW9SPycKw38cuYVJa6y+ui1wmZElXU q41woVg6B09vd9/cW1Kjdk3n7vdatbsuYXmA23gIsrd44vAQ+BJUfqzPNmcJVsAw8Ha41y SKlkChWI3udbls3nJOueCJZwU0c+beJvMv64xxS67CYz1m6w9kujYTxULXSfpfPQnD1O+L 9vBjn7G4i0Viqk/e3d47MAXTQyacvBsRcMlDVouh3otR6u9mOg8w25UIPFid8Q== 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 4N5J1G6zLbzn8L; Mon, 7 Nov 2022 04:20:18 +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 2A74KImK093174; Mon, 7 Nov 2022 04:20:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2A74KITL093173; Mon, 7 Nov 2022 04:20:18 GMT (envelope-from git) Date: Mon, 7 Nov 2022 04:20:18 GMT Message-Id: <202211070420.2A74KITL093173@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: eb0fbcfdfa6e - main - sysutils/wmflame: fix the port's build against -fno-common List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: eb0fbcfdfa6ec1203d95bc81ddeb1151698e79e8 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667794819; 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=XMKzgKhN23RY3/Q7xcEdNT7H6BrULTpHMwysrLJjYuU=; b=ZjhbJFxmr8PFEHAR/jAssUYDmRA9XIPYpfDnrbH3kuz2J+eiIlOQIwMXdbagMGDBS5AjQw FyyQNDTaTOXDvQe35R6KyrPFYg3cjYPcgXHOMqItDDXWi4TPjD7V/90fvV9RPXTQbWIrG6 2t5npA2/X2DViVDmeB49JAwzHl3HkD9JozXUHqnysuzDlwXvJm8CLFgukpz32kfb2jJgRa 8wffaDYNCqHKSHj0ZwFGujLk55C5iy9RHzdAyUMs1nNtok89QFe4AZrDEqN8xYSZPAJ+Rl o+YvPcdD0DwNe/1SWEMUFwhe1GJ+M4oz+r8eQljMDl+9/mFkRNDqobAFfy6OOg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667794819; a=rsa-sha256; cv=none; b=xPl+GXDMo80SGYk4ne51E4aZ/DS83D+lVAMXn8YXSy0mra3ZEaXITzO/DRU+R182/Tlpf5 qt2FSNu7G5cSaR0rU1e6CkGrvINkWro8yKxwwRzajBKKoil2hHifuSVKsLHmhXVjfScxYR Da4tbGykjKPNr9xGvhrDSVcrXBqYRX2Ps2ieTJECPiQtLmQBjbM4NgejaCc7Dis8hGRjD+ QEncyp3AKay/agdsu3hV8Pr8FUeryOBy29euEq76OCg2fqniOpNg4XkCXcl+I+z17Ay9G2 1K57HITacjf0yVVy4sJkLGRSJVFXu8dJFAc2wZiWpo0hR/6UnPPv92iEOvTiVw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=eb0fbcfdfa6ec1203d95bc81ddeb1151698e79e8 commit eb0fbcfdfa6ec1203d95bc81ddeb1151698e79e8 Author: Robert Clausecker AuthorDate: 2022-11-07 04:18:52 +0000 Commit: Alexey Dokuchaev CommitDate: 2022-11-07 04:18:52 +0000 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 --- sysutils/wmflame/Makefile | 5 +---- sysutils/wmflame/files/patch-wmgeneral_wmgeneral.c | 12 ++++++++++++ sysutils/wmflame/files/patch-wmgeneral_wmgeneral.h | 15 +++++++++++++++ 3 files changed, 28 insertions(+), 4 deletions(-) diff --git a/sysutils/wmflame/Makefile b/sysutils/wmflame/Makefile index 5c0e2c8b39b0..da6b44c53692 100644 --- a/sysutils/wmflame/Makefile +++ b/sysutils/wmflame/Makefile @@ -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 diff --git a/sysutils/wmflame/files/patch-wmgeneral_wmgeneral.c b/sysutils/wmflame/files/patch-wmgeneral_wmgeneral.c new file mode 100644 index 000000000000..e3fafba3a215 --- /dev/null +++ b/sysutils/wmflame/files/patch-wmgeneral_wmgeneral.c @@ -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; diff --git a/sysutils/wmflame/files/patch-wmgeneral_wmgeneral.h b/sysutils/wmflame/files/patch-wmgeneral_wmgeneral.h new file mode 100644 index 000000000000..87c392721b23 --- /dev/null +++ b/sysutils/wmflame/files/patch-wmgeneral_wmgeneral.h @@ -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 */