cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

x11/sawfish: fix build with -fno-common

Browse Source 
Cherry-picked from upstream repository, no new release yet.
This commit is contained in:
naddy 2021-02-04 16:00:48 +00:00
parent 7f8a615fc1
commit 8f422506a6
5 changed files with 106 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
x11/sawfish/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.84 2020/11/11 09:51:46 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.85 2021/02/04 16:00:48 naddy Exp $
COMMENT= extensible window manager
VERSION= 1.12.90
DISTNAME= sawfish_${VERSION}
PKGNAME= sawfish-${VERSION}
REVISION= 0
REVISION= 1
CATEGORIES= x11

30
x11/sawfish/patches/patch-src_flippers_c Normal file
View File

@ -0,0 +1,30 @@
$OpenBSD: patch-src_flippers_c,v 1.1 2021/02/04 16:00:48 naddy Exp $
Fix "multiple definition of" errors
https://github.com/SawfishWM/sawfish/commit/d4364707a58d335dab4d6ca11b761fd91ef2434d
Index: src/flippers.c
--- src/flippers.c.orig
+++ src/flippers.c
@@ -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);

24
x11/sawfish/patches/patch-src_functions_c Normal file
View File

@ -0,0 +1,24 @@
$OpenBSD: patch-src_functions_c,v 1.1 2021/02/04 16:00:48 naddy Exp $
Fix "multiple definition of" errors
https://github.com/SawfishWM/sawfish/commit/d4364707a58d335dab4d6ca11b761fd91ef2434d
Index: src/functions.c
--- src/functions.c.orig
+++ src/functions.c
@@ -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);

26
x11/sawfish/patches/patch-src_sawfish_subrs_h Normal file
View File

@ -0,0 +1,26 @@
$OpenBSD: patch-src_sawfish_subrs_h,v 1.1 2021/02/04 16:00:48 naddy Exp $
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);

24
x11/sawfish/patches/patch-src_windows_c Normal file
View File

@ -0,0 +1,24 @@
$OpenBSD: patch-src_windows_c,v 1.1 2021/02/04 16:00:48 naddy Exp $
Fix "multiple definition of" errors
https://github.com/SawfishWM/sawfish/commit/d4364707a58d335dab4d6ca11b761fd91ef2434d
Index: src/windows.c
--- src/windows.c.orig
+++ src/windows.c
@@ -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);