1 |
commit: 914552b9e04847f6b4c5224953cf0c11b919ae1c |
2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Jan 31 22:30:43 2020 +0000 |
4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Jan 31 22:31:29 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=914552b9 |
7 |
|
8 |
x11-wm/aewm: Fix CFLAGS=-fno-common |
9 |
|
10 |
Package-Manager: Portage-2.3.86, Repoman-2.3.20 |
11 |
Closes: https://bugs.gentoo.org/707680 |
12 |
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org> |
13 |
|
14 |
x11-wm/aewm/aewm-1.3.12-r1.ebuild | 3 ++- |
15 |
x11-wm/aewm/files/aewm-1.3.12-fno-common.patch | 25 +++++++++++++++++++++++++ |
16 |
2 files changed, 27 insertions(+), 1 deletion(-) |
17 |
|
18 |
diff --git a/x11-wm/aewm/aewm-1.3.12-r1.ebuild b/x11-wm/aewm/aewm-1.3.12-r1.ebuild |
19 |
index c0d52983ed8..3efbc6c7a7e 100644 |
20 |
--- a/x11-wm/aewm/aewm-1.3.12-r1.ebuild |
21 |
+++ b/x11-wm/aewm/aewm-1.3.12-r1.ebuild |
22 |
@@ -1,4 +1,4 @@ |
23 |
-# Copyright 1999-2019 Gentoo Authors |
24 |
+# Copyright 1999-2020 Gentoo Authors |
25 |
# Distributed under the terms of the GNU General Public License v2 |
26 |
|
27 |
EAPI=7 |
28 |
@@ -26,6 +26,7 @@ DEPEND=" |
29 |
" |
30 |
PATCHES=( |
31 |
"${FILESDIR}"/${P}-r1-gentoo.patch |
32 |
+ "${FILESDIR}"/${P}-fno-common.patch |
33 |
) |
34 |
|
35 |
src_compile() { |
36 |
|
37 |
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 |
38 |
new file mode 100644 |
39 |
index 00000000000..e885161ce88 |
40 |
--- /dev/null |
41 |
+++ b/x11-wm/aewm/files/aewm-1.3.12-fno-common.patch |
42 |
@@ -0,0 +1,25 @@ |
43 |
+--- aedesk.c |
44 |
++++ b/aedesk.c |
45 |
+@@ -11,10 +11,6 @@ |
46 |
+ |
47 |
+ #define UMOD(x, y) ((((long)(x) % (long)(y)) + (y)) % (y)) |
48 |
+ |
49 |
+-Display *dpy; |
50 |
+-Window root; |
51 |
+-Atom net_cur_desk, net_num_desks; |
52 |
+- |
53 |
+ static unsigned long parse_desk(char *spec); |
54 |
+ |
55 |
+ int main(int argc, char **argv) |
56 |
+--- aepanel.c |
57 |
++++ b/aepanel.c |
58 |
+@@ -36,9 +36,6 @@ |
59 |
+ void sig_handler(int); |
60 |
+ void set_strut(Window, strut_t *); |
61 |
+ |
62 |
+-Atom net_wm_strut; |
63 |
+-Atom net_wm_strut_partial; |
64 |
+-Atom net_wm_wintype; |
65 |
+ Atom net_wm_wintype_dock; |
66 |
+ |
67 |
+ #define NAME_SIZE 48 |