ports/x11/sawfish/patches/patch-src_sawfish_subrs_h

24 lines
1.1 KiB
Text

Fix "multiple definition of" errors
https://github.com/SawfishWM/sawfish/commit/d4364707a58d335dab4d6ca11b761fd91ef2434d
Index: src/sawfish_subrs.h
--- src/sawfish_subrs.h.orig
+++ src/sawfish_subrs.h
@@ -79,7 +79,7 @@ extern void (*event_handlers[LASTEvent])(XEvent *ev);
extern Time last_event_time;
extern XEvent *current_x_event;
extern repv Qvisibility_notify_hook, Qdestroy_notify_hook, Qmap_notify_hook,
- Qunmap_notify_hook, Qreparent_notify_hook, Qenter_notify_hook,
+ Qunmap_notify_hook, Qreparent_notify_hook, Qenter_notify_hook, Qroot,
Qleave_notify_hook, Qfocus_in_hook, Qfocus_out_hook, Qclient_message_hook,
Qwindow_moved_hook, Qwindow_resized_hook, Qrandr_change_notify_hook;
extern repv Qiconify_window, Quniconify_window;
@@ -158,7 +158,7 @@ extern void frames_init (void);
extern void frames_kill (void);
/* from functions.c */
-extern repv Qroot, Qafter_restacking_hook, Qposition, Qspacing;
+extern repv Qafter_restacking_hook, Qposition, Qspacing;
extern repv Fdelete_window (repv win);
extern repv Fdestroy_window (repv win);
extern repv Frestack_windows (repv list);