Ensure that there is only one variable definition per each object, as

the C (and C++) standards mandated for years and compilers started to
enforce as of recently (Clang 11, GCC 10).

Reported by:	pkg-fallout

3 files changed, 33 insertions, 0 deletions

diff --git a/x11-wm/oroborus/files/patch-src_hints.c b/x11-wm/oroborus/files/patch-src_hints.c
new file mode 100644
index 000000000000..22ce580fbcbb
--- /dev/null
+++ b/x11-wm/oroborus/files/patch-src_hints.c
@@ -0,0 +1,11 @@
+--- src/hints.c.orig	2006-01-12 15:40:43 UTC
++++ src/hints.c
+@@ -43,7 +43,7 @@ Atom win_hints, win_state, win_client_list, win_layer,
+   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)
diff --git a/x11-wm/oroborus/files/patch-src_keyboard.c b/x11-wm/oroborus/files/patch-src_keyboard.c
new file mode 100644
index 000000000000..8472d51d97b2
--- /dev/null
+++ b/x11-wm/oroborus/files/patch-src_keyboard.c
@@ -0,0 +1,11 @@
+--- src/keyboard.c.orig	2006-01-12 15:40:43 UTC
++++ src/keyboard.c
+@@ -35,6 +35,8 @@
+ #include <stdio.h>
+ #endif
+ 
++int NumLockMask, CapsLockMask, ScrollLockMask;
++
+ void
+ parseKeyString (Display * dpy, MyKey * key, char *str)
+ {
diff --git a/x11-wm/oroborus/files/patch-src_keyboard.h b/x11-wm/oroborus/files/patch-src_keyboard.h
new file mode 100644
index 000000000000..afed4997a5fa
--- /dev/null
+++ b/x11-wm/oroborus/files/patch-src_keyboard.h
@@ -0,0 +1,11 @@
+--- src/keyboard.h.orig	2006-01-12 15:40:43 UTC
++++ 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 */
+