From 76fd4de2a8574b255cb8c84fd769a2eabc8b3aca Mon Sep 17 00:00:00 2001
From: Jeroen Roovers <jer@gentoo.org>
Date: Mon, 27 Jan 2020 19:02:11 +0100
Subject: x11-wm/wmfs: Fix CFLAGS=-fno-common

- EAPI=7
- Convert sed script to patch
- Fix W and event_handle for CFLAGS=-fno-common
- Respect CC
- Apply one lingering upstream patch

Package-Manager: Portage-2.3.85, Repoman-2.3.20
Closes: https://bugs.gentoo.org/show_bug.cgi?id=706654
Signed-off-by: Jeroen Roovers <jer@gentoo.org>
---
 x11-wm/wmfs/files/wmfs-99999999-fno-common.patch | 92 ++++++++++++++++++++++++
 1 file changed, 92 insertions(+)
 create mode 100644 x11-wm/wmfs/files/wmfs-99999999-fno-common.patch

(limited to 'x11-wm/wmfs/files/wmfs-99999999-fno-common.patch')

diff --git a/x11-wm/wmfs/files/wmfs-99999999-fno-common.patch b/x11-wm/wmfs/files/wmfs-99999999-fno-common.patch
new file mode 100644
index 000000000000..0ff0ce0ebc9e
--- /dev/null
+++ b/x11-wm/wmfs/files/wmfs-99999999-fno-common.patch
@@ -0,0 +1,92 @@
+--- a/src/client.c
++++ b/src/client.c
+@@ -12,6 +12,7 @@
+ #include "draw.h"
+ #include "screen.h"
+ #include "mouse.h"
++#include "wmfs.h"
+ 
+ #define CLIENT_RESIZE_DIR(D)                                    \
+      void uicb_client_resize_##D(Uicb cmd)                      \
+--- a/src/event.c
++++ b/src/event.c
+@@ -21,6 +21,9 @@
+           if(!m->use_area || (m->use_area && INAREA(ev->x, ev->y, m->area))) \
+                if(m->func)                                                   \
+                     m->func(m->cmd);
++
++void (*event_handle[MAX_EV])(XEvent*);
++
+ static void
+ event_buttonpress(XEvent *e)
+ {
+--- a/src/event.h
++++ b/src/event.h
+@@ -17,6 +17,6 @@
+ 
+ void event_init(void);
+ 
+-void (*event_handle[MAX_EV])(XEvent*);
++extern void (*event_handle[MAX_EV])(XEvent*);
+ 
+ #endif /* EVENT_H */
+--- a/src/ewmh.c
++++ b/src/ewmh.c
+@@ -7,6 +7,7 @@
+ #include "util.h"
+ #include "screen.h"
+ #include "client.h"
++#include "wmfs.h"
+ 
+ /* Taken From standards.freedesktop.org */
+ #define _NET_WM_STATE_REMOVE 0 /* remove/unset property */
+--- a/src/mouse.c
++++ b/src/mouse.c
+@@ -9,6 +9,7 @@
+ #include "client.h"
+ #include "layout.h"
+ #include "draw.h"
++#include "wmfs.h"
+ 
+ #define _REV_SBORDER(c) draw_reversed_rect(W->root, c, false);
+ 
+--- a/src/status.c
++++ b/src/status.c
+@@ -9,6 +9,7 @@
+ #include "infobar.h"
+ #include "util.h"
+ #include "draw.h"
++#include "wmfs.h"
+ 
+ #include <string.h>
+ 
+--- a/src/wmfs.c
++++ b/src/wmfs.c
+@@ -25,6 +25,8 @@
+ #include "layout.h"
+ #include "systray.h"
+ 
++struct wmfs *W;
++
+ int
+ wmfs_error_handler(Display *d, XErrorEvent *event)
+ {
+@@ -617,8 +619,6 @@ main(int argc, char **argv)
+           }
+      }
+ 
+-     W = (struct wmfs*)xcalloc(1, sizeof(struct wmfs));
+-
+      /* Default path ~/.config/wmfs/wmfsrc */
+      W->confpath = path;
+ 
+--- a/src/wmfs.h
++++ b/src/wmfs.h
+@@ -444,6 +444,6 @@ void uicb_reload(Uicb cmd);
+ void uicb_quit(Uicb cmd);
+ 
+ /* Single global variable */
+-struct wmfs *W;
++extern struct wmfs *W;
+ 
+ #endif /* WMFS_H */
-- 
cgit v1.2.3-18-g5258