Submitted By:            Douglas R. Reno <renodr at linuxfromscratch dot org>
Date:                    2020-05-13
Initial Package Version: 1.12.0
Upstream Status:         Applied
Origin:                  Upstream (https://github.com/SawfishWM/sawfish/commit/d4364707a58d335dab4d6ca11b761fd91ef2434d)
Description:             Fixes building Sawfish with GCC-10.

diff -Naurp sawfish_1.12.0.orig/src/flippers.c sawfish_1.12.0/src/flippers.c
--- sawfish_1.12.0.orig/src/flippers.c	2016-08-13 03:26:23.000000000 -0500
+++ sawfish_1.12.0/src/flippers.c	2020-05-13 21:18:03.354163435 -0500
@@ -22,10 +22,6 @@
 
 static Window edge_left, edge_right, edge_top, edge_bottom;
 
-DEFSYM(left, "left");
-DEFSYM(right, "right");
-DEFSYM(top, "top");
-DEFSYM(bottom, "bottom");
 DEFSYM(enter_flipper_hook, "enter-flipper-hook");
 DEFSYM(leave_flipper_hook, "leave-flipper-hook");
 
@@ -155,10 +151,6 @@ flippers_init (void)
 
     rep_pop_structure (tem);
 
-    rep_INTERN (left);
-    rep_INTERN (right);
-    rep_INTERN (top);
-    rep_INTERN (bottom);
     rep_INTERN_SPECIAL (enter_flipper_hook);
     rep_INTERN_SPECIAL (leave_flipper_hook);
     Fset(Qenter_flipper_hook, Qnil);
diff -Naurp sawfish_1.12.0.orig/src/functions.c sawfish_1.12.0/src/functions.c
--- sawfish_1.12.0.orig/src/functions.c	2016-08-13 03:26:23.000000000 -0500
+++ sawfish_1.12.0/src/functions.c	2020-05-13 21:18:22.731449966 -0500
@@ -65,7 +65,6 @@ static int xinerama_heads;
 # endif
 #endif
 
-DEFSYM(root, "root");
 DEFSYM(after_restacking_hook, "after-restacking-hook");
 DEFSYM(position, "position");
 DEFSYM(spacing, "spacing");
@@ -1406,7 +1405,6 @@ functions_init (void)
     rep_ADD_SUBR(Ssend_client_message);
     rep_pop_structure (tem);
 
-    rep_INTERN(root);
     rep_INTERN_SPECIAL(after_restacking_hook);
     Fset(Qafter_restacking_hook, Qnil);
     rep_INTERN(position);
diff -Naurp sawfish_1.12.0.orig/src/sawfish_subrs.h sawfish_1.12.0/src/sawfish_subrs.h
--- sawfish_1.12.0.orig/src/sawfish_subrs.h	2016-08-13 03:26:23.000000000 -0500
+++ sawfish_1.12.0/src/sawfish_subrs.h	2020-05-13 21:19:03.746049658 -0500
@@ -79,7 +79,7 @@ extern void (*event_handlers[LASTEvent])
 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);
diff -Naurp sawfish_1.12.0.orig/src/windows.c sawfish_1.12.0/src/windows.c
--- sawfish_1.12.0.orig/src/windows.c	2016-08-13 03:26:23.000000000 -0500
+++ sawfish_1.12.0/src/windows.c	2020-05-13 21:19:24.107344123 -0500
@@ -75,7 +75,6 @@ DEFSYM(north_west, "north-west");
 DEFSYM(north, "north");
 DEFSYM(north_east, "north-east");
 DEFSYM(west, "west");
-DEFSYM(center, "center");
 DEFSYM(east, "east");
 DEFSYM(south_west, "south-west");
 DEFSYM(south, "south");
@@ -1845,7 +1844,6 @@ windows_init (void)
     rep_INTERN(north);
     rep_INTERN(north_east);
     rep_INTERN(west);
-    rep_INTERN(center);
     rep_INTERN(east);
     rep_INTERN(south_west);
     rep_INTERN(south);