diff options
| author |   Bernard Cafarelli <voyageur@gentoo.org> | 2020-02-03 00:28:08 +0100 |
|---|---|---|
| committer | Bernard Cafarelli <voyageur@gentoo.org> | 2020-02-03 00:28:52 +0100 |
| commit | cf12d7fd5d98f5209513bcc9b93388e98d785fd5 (patch) | |
| tree | b76687ba3af99485d8b6115e5957bd1f45adbfc8 | |
| parent | app-editors/okteta: 0.26.3 version bump (diff) | |
| download | gentoo-cf12d7fd5d98f5209513bcc9b93388e98d785fd5.tar.gz gentoo-cf12d7fd5d98f5209513bcc9b93388e98d785fd5.tar.bz2 gentoo-cf12d7fd5d98f5209513bcc9b93388e98d785fd5.zip | |
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 <voyageur@gentoo.org>
| -rw-r--r-- | x11-plugins/wmMatrix/files/wmMatrix-0.2-fno-common.patch | 37 | ||||
| -rw-r--r-- | 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 000000000000..1bb92d66a6c2 --- /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 e66928258312..5b686f451ee5 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! |