From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DE2EC138350 for ; Sun, 2 Feb 2020 23:29:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 15694E0841; Sun, 2 Feb 2020 23:29:02 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EEC28E0841 for ; Sun, 2 Feb 2020 23:29:01 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E804634E421 for ; Sun, 2 Feb 2020 23:29:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 22CADAD for ; Sun, 2 Feb 2020 23:28:59 +0000 (UTC) From: "Bernard Cafarelli" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Bernard Cafarelli" Message-ID: <1580686132.cf12d7fd5d98f5209513bcc9b93388e98d785fd5.voyageur@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-plugins/wmMatrix/, x11-plugins/wmMatrix/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-plugins/wmMatrix/files/wmMatrix-0.2-fno-common.patch x11-plugins/wmMatrix/wmMatrix-0.2-r2.ebuild X-VCS-Directories: x11-plugins/wmMatrix/ x11-plugins/wmMatrix/files/ X-VCS-Committer: voyageur X-VCS-Committer-Name: Bernard Cafarelli X-VCS-Revision: cf12d7fd5d98f5209513bcc9b93388e98d785fd5 X-VCS-Branch: master Date: Sun, 2 Feb 2020 23:28:59 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: bbfc70f5-40e1-4916-9c14-c14e7e30e49d X-Archives-Hash: b70e460caef18612addca85575f33770 commit: cf12d7fd5d98f5209513bcc9b93388e98d785fd5 Author: Bernard Cafarelli gentoo org> AuthorDate: Sun Feb 2 23:28:08 2020 +0000 Commit: Bernard Cafarelli gentoo org> CommitDate: Sun Feb 2 23:28:52 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf12d7fd x11-plugins/wmMatrix: fix build with -fno-common Thanks jer for patch Closes: https://bugs.gentoo.org/707970 Package-Manager: Portage-2.3.87, Repoman-2.3.20 Signed-off-by: Bernard Cafarelli gentoo.org> .../wmMatrix/files/wmMatrix-0.2-fno-common.patch | 37 ++++++++++++++++++++++ x11-plugins/wmMatrix/wmMatrix-0.2-r2.ebuild | 7 ++-- 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/x11-plugins/wmMatrix/files/wmMatrix-0.2-fno-common.patch b/x11-plugins/wmMatrix/files/wmMatrix-0.2-fno-common.patch new file mode 100644 index 00000000000..1bb92d66a6c --- /dev/null +++ b/x11-plugins/wmMatrix/files/wmMatrix-0.2-fno-common.patch @@ -0,0 +1,37 @@ +--- a/xutils.h ++++ b/xutils.h +@@ -18,11 +18,11 @@ + /* + * Global variable + */ +-Display *display; +-Window Root; +-Window iconwin, win; +-int screen; +-int DisplayDepth; ++extern Display *display; ++extern Window Root; ++extern Window iconwin, win; ++extern int screen; ++extern int DisplayDepth; + + + +--- a/xutils.c ++++ b/xutils.c +@@ -42,6 +42,15 @@ + #include "xutils.h" + + ++/* ++ * Global variable ++ */ ++Display *display; ++Window Root; ++Window iconwin, win; ++int screen; ++int DisplayDepth; ++ + + /* + * X11 Variables diff --git a/x11-plugins/wmMatrix/wmMatrix-0.2-r2.ebuild b/x11-plugins/wmMatrix/wmMatrix-0.2-r2.ebuild index e6692825831..5b686f451ee 100644 --- a/x11-plugins/wmMatrix/wmMatrix-0.2-r2.ebuild +++ b/x11-plugins/wmMatrix/wmMatrix-0.2-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -22,7 +22,10 @@ LICENSE="GPL-2" KEYWORDS="amd64 ppc ppc64 ~sparc x86" IUSE="" -PATCHES=( "${FILESDIR}"/${P}-makefile.patch ) +PATCHES=( + "${FILESDIR}"/${P}-makefile.patch + "${FILESDIR}"/${P}-fno-common.patch + ) src_compile() { # this version is distributed with compiled binaries!