commit: a761d6f08552139aa32011fba0c0daf9fc995e30 Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr> AuthorDate: Thu Nov 26 10:32:33 2020 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Thu Nov 26 10:32:33 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a761d6f0
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 <AT> sartura.hr> Signed-off-by: David Seifert <soap <AT> gentoo.org> .../files/oroborus-2.0.20-fno-common.patch | 33 ++++++++++++++++++++++ x11-wm/oroborus/oroborus-2.0.20-r1.ebuild | 5 ++-- 2 files changed, 36 insertions(+), 2 deletions(-) diff --git a/x11-wm/oroborus/files/oroborus-2.0.20-fno-common.patch b/x11-wm/oroborus/files/oroborus-2.0.20-fno-common.patch new file mode 100644 index 00000000000..e7a1e215715 --- /dev/null +++ b/x11-wm/oroborus/files/oroborus-2.0.20-fno-common.patch @@ -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 */ + diff --git a/x11-wm/oroborus/oroborus-2.0.20-r1.ebuild b/x11-wm/oroborus/oroborus-2.0.20-r1.ebuild index 071ee8295d3..1c0dec3cece 100644 --- a/x11-wm/oroborus/oroborus-2.0.20-r1.ebuild +++ b/x11-wm/oroborus/oroborus-2.0.20-r1.ebuild @@ -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 )
