commit: 66edbfc31b168de0d42a813e0c810d558b437a2c Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org> AuthorDate: Wed Jan 29 17:57:29 2020 +0000 Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org> CommitDate: Wed Jan 29 18:26:59 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66edbfc3
x11-plugins/wmCalClock: fix build with -fno-common Closes: https://bugs.gentoo.org/706686 Package-Manager: Portage-2.3.86, Repoman-2.3.20 Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org> .../wmCalClock/files/wmCalClock-1.25-gcc-10.patch | 35 ++++++++++++++++++++++ x11-plugins/wmCalClock/wmCalClock-1.25-r3.ebuild | 7 +++-- 2 files changed, 40 insertions(+), 2 deletions(-) diff --git a/x11-plugins/wmCalClock/files/wmCalClock-1.25-gcc-10.patch b/x11-plugins/wmCalClock/files/wmCalClock-1.25-gcc-10.patch new file mode 100644 index 00000000000..c6a737e6b44 --- /dev/null +++ b/x11-plugins/wmCalClock/files/wmCalClock-1.25-gcc-10.patch @@ -0,0 +1,35 @@ +diff -Naur wmCalClock-1.25.orig/Src/xutils.c wmCalClock-1.25/Src/xutils.c +--- a/xutils.c 1999-03-27 07:46:38.000000000 +0100 ++++ b/xutils.c 2020-01-29 18:55:05.062360592 +0100 +@@ -52,6 +52,11 @@ + GC NormalGC; + XpmIcon wmgen; + Pixmap pixmask; ++Display *display; ++Window Root; ++Window iconwin, win; ++int screen; ++int DisplayDepth; + + + /* +diff -Naur wmCalClock-1.25.orig/Src/xutils.h wmCalClock-1.25/Src/xutils.h +--- a/xutils.h 1999-03-27 07:46:38.000000000 +0100 ++++ b/xutils.h 2020-01-29 18:54:54.360359886 +0100 +@@ -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; + + + diff --git a/x11-plugins/wmCalClock/wmCalClock-1.25-r3.ebuild b/x11-plugins/wmCalClock/wmCalClock-1.25-r3.ebuild index 3ace8130324..c7508ab5e8e 100644 --- a/x11-plugins/wmCalClock/wmCalClock-1.25-r3.ebuild +++ b/x11-plugins/wmCalClock/wmCalClock-1.25-r3.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 @@ -24,7 +24,10 @@ S="${WORKDIR}/${P}/Src" DOCS=( ../{BUGS,CHANGES,HINTS,README,TODO} ) -PATCHES=( "${FILESDIR}"/${P}-makefile.patch ) +PATCHES=( + "${FILESDIR}"/${P}-makefile.patch + "${FILESDIR}"/${P}-gcc-10.patch + ) src_compile() { emake CC="$(tc-getCC)" LIBDIR="-L/usr/$(get_libdir)/"
