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 7062F138350 for ; Thu, 27 Feb 2020 10:44:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6D6DFE09D1; Thu, 27 Feb 2020 10:44:36 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 41E76E09D1 for ; Thu, 27 Feb 2020 10:44:36 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 EA8A234F416 for ; Thu, 27 Feb 2020 10:44:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 25143158 for ; Thu, 27 Feb 2020 10:44:31 +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: <1582800243.a2f3c2b38d2d8d85e5f2c0a5d781bab0a2046415.voyageur@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-plugins/wmmoonclock/, x11-plugins/wmmoonclock/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-plugins/wmmoonclock/files/wmmoonclock-1.29-gcc-10.patch x11-plugins/wmmoonclock/wmmoonclock-1.29.ebuild X-VCS-Directories: x11-plugins/wmmoonclock/files/ x11-plugins/wmmoonclock/ X-VCS-Committer: voyageur X-VCS-Committer-Name: Bernard Cafarelli X-VCS-Revision: a2f3c2b38d2d8d85e5f2c0a5d781bab0a2046415 X-VCS-Branch: master Date: Thu, 27 Feb 2020 10:44:31 +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: 51ff490c-4506-472b-8af4-da7e7f0289b8 X-Archives-Hash: 4aa4de0be9d1ac1709c5e77f638bf14e commit: a2f3c2b38d2d8d85e5f2c0a5d781bab0a2046415 Author: Bernard Cafarelli gentoo org> AuthorDate: Thu Feb 27 10:43:50 2020 +0000 Commit: Bernard Cafarelli gentoo org> CommitDate: Thu Feb 27 10:44:03 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2f3c2b3 x11-plugins/wmmoonclock: fix build with -fno-common Closes: https://bugs.gentoo.org/707152 Package-Manager: Portage-2.3.89, Repoman-2.3.20 Signed-off-by: Bernard Cafarelli gentoo.org> .../files/wmmoonclock-1.29-gcc-10.patch | 37 ++++++++++++++++++++++ x11-plugins/wmmoonclock/wmmoonclock-1.29.ebuild | 4 ++- 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/x11-plugins/wmmoonclock/files/wmmoonclock-1.29-gcc-10.patch b/x11-plugins/wmmoonclock/files/wmmoonclock-1.29-gcc-10.patch new file mode 100644 index 00000000000..9554254e623 --- /dev/null +++ b/x11-plugins/wmmoonclock/files/wmmoonclock-1.29-gcc-10.patch @@ -0,0 +1,37 @@ +diff -Naur wmmoonclock-1.29.orig/src/xutils.c wmmoonclock-1.29/src/xutils.c +--- wmmoonclock-1.29.orig/src/xutils.c 2017-08-15 00:32:44.000000000 +0200 ++++ wmmoonclock-1.29/src/xutils.c 2020-02-27 11:42:33.266076617 +0100 +@@ -52,6 +52,13 @@ + XpmIcon wmgen; + Pixmap pixmask; + ++Display *display; ++Window Root; ++Window iconwin, win; ++int screen; ++int DisplayDepth; ++ ++ + + + +diff -Naur wmmoonclock-1.29.orig/src/xutils.h wmmoonclock-1.29/src/xutils.h +--- wmmoonclock-1.29.orig/src/xutils.h 2017-08-15 00:31:51.000000000 +0200 ++++ wmmoonclock-1.29/src/xutils.h 2020-02-27 11:41:58.180058348 +0100 +@@ -20,11 +20,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; + + + diff --git a/x11-plugins/wmmoonclock/wmmoonclock-1.29.ebuild b/x11-plugins/wmmoonclock/wmmoonclock-1.29.ebuild index 0345f7cf9a5..9530051db95 100644 --- a/x11-plugins/wmmoonclock/wmmoonclock-1.29.ebuild +++ b/x11-plugins/wmmoonclock/wmmoonclock-1.29.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -17,3 +17,5 @@ RDEPEND="x11-libs/libX11 x11-libs/libXpm" DEPEND="${RDEPEND} x11-base/xorg-proto" + +PATCHES=( "${FILESDIR}"/${P}-gcc-10.patch )