commit: 914552b9e04847f6b4c5224953cf0c11b919ae1c Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> AuthorDate: Fri Jan 31 22:30:43 2020 +0000 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> CommitDate: Fri Jan 31 22:31:29 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=914552b9
x11-wm/aewm: Fix CFLAGS=-fno-common Package-Manager: Portage-2.3.86, Repoman-2.3.20 Closes: https://bugs.gentoo.org/707680 Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org> x11-wm/aewm/aewm-1.3.12-r1.ebuild | 3 ++- x11-wm/aewm/files/aewm-1.3.12-fno-common.patch | 25 +++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/x11-wm/aewm/aewm-1.3.12-r1.ebuild b/x11-wm/aewm/aewm-1.3.12-r1.ebuild index c0d52983ed8..3efbc6c7a7e 100644 --- a/x11-wm/aewm/aewm-1.3.12-r1.ebuild +++ b/x11-wm/aewm/aewm-1.3.12-r1.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=7 @@ -26,6 +26,7 @@ DEPEND=" " PATCHES=( "${FILESDIR}"/${P}-r1-gentoo.patch + "${FILESDIR}"/${P}-fno-common.patch ) src_compile() { diff --git a/x11-wm/aewm/files/aewm-1.3.12-fno-common.patch b/x11-wm/aewm/files/aewm-1.3.12-fno-common.patch new file mode 100644 index 00000000000..e885161ce88 --- /dev/null +++ b/x11-wm/aewm/files/aewm-1.3.12-fno-common.patch @@ -0,0 +1,25 @@ +--- aedesk.c ++++ b/aedesk.c +@@ -11,10 +11,6 @@ + + #define UMOD(x, y) ((((long)(x) % (long)(y)) + (y)) % (y)) + +-Display *dpy; +-Window root; +-Atom net_cur_desk, net_num_desks; +- + static unsigned long parse_desk(char *spec); + + int main(int argc, char **argv) +--- aepanel.c ++++ b/aepanel.c +@@ -36,9 +36,6 @@ + void sig_handler(int); + void set_strut(Window, strut_t *); + +-Atom net_wm_strut; +-Atom net_wm_strut_partial; +-Atom net_wm_wintype; + Atom net_wm_wintype_dock; + + #define NAME_SIZE 48
