x11-wm/oroborus: fix build with gcc-10

Closes: https://bugs.gentoo.org/706722
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Jakov Smolic <jakov.smolic@sartura.hr>
Signed-off-by: David Seifert <soap@gentoo.org>
This commit is contained in:
Jakov Smolic
2020-11-26 11:32:33 +01:00
committed by David Seifert
parent a854857e47
commit a761d6f085
2 changed files with 36 additions and 2 deletions

View File

@@ -0,0 +1,33 @@
--- a/src/hints.c
+++ b/src/hints.c
@@ -43,7 +43,7 @@ Atom win_hints, win_state, win_client_list, win_layer, win_workspace,
win_workspace_count, win_desktop_button_proxy, win_supporting_wm_check,
gnome_panel_desktop_area;
Atom net_atoms[NET_ATOM_COUNT];
-Display *dpy;
+extern Display *dpy;
void
initHints (Display * d)
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -35,6 +35,8 @@
#include <stdio.h>
#endif
+int NumLockMask, CapsLockMask, ScrollLockMask;
+
void
parseKeyString (Display * dpy, MyKey * key, char *str)
{
--- a/src/keyboard.h
+++ b/src/keyboard.h
@@ -90,7 +90,7 @@ void grabKey (Display *, MyKey *, Window);
void ungrabKeys (Display *, Window);
void init_keyboard (Display * dpy);
-int NumLockMask, CapsLockMask, ScrollLockMask;
+extern int NumLockMask, CapsLockMask, ScrollLockMask;
#endif /* __KEYBOARD_H */

View File

@@ -1,4 +1,4 @@
# Copyright 1999-2018 Gentoo Foundation
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,7 +10,6 @@ SRC_URI="mirror://debian/pool/main/o/${PN}/${PN}_${PV}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ppc x86"
IUSE=""
RDEPEND="
x11-libs/libICE
@@ -21,4 +20,6 @@ RDEPEND="
DEPEND="${RDEPEND}
x11-base/xorg-proto"
PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
DOCS=( AUTHORS ChangeLog example.${PN}rc README TODO )