blob: 27d2483a9866860203ff83a30835afa1672a348a (
plain)
1 diff -Nru spectrwm-3.0.2.orig/linux/Makefile spectrwm-3.0.2/linux/Makefile
2 --- spectrwm-3.0.2.orig/linux/Makefile 2016-05-24 11:53:05.831647479 +0200
3 +++ spectrwm-3.0.2/linux/Makefile 2016-05-24 11:57:34.912071921 +0200
4 @@ -10,14 +10,14 @@
5 LIBMAJORVERSION = $(shell . $(CURDIR)/../lib/shlib_version; echo $$major)
6
7 MAINT_CFLAGS = -std=c99 -Wmissing-prototypes -Wall -Wextra -Wshadow -Wno-uninitialized -g
8 -MAINT_CPPFLAGS = -D_GNU_SOURCE -I. -I/usr/include/freetype2 -DSWM_LIB=\"$(LIBDIR)/libswmhack.so.$(LIBVERSION)\"
9 +MAINT_CPPFLAGS = -D_GNU_SOURCE -I. -I/usr/include/freetype2
10 MAINT_LDLIBS = -lX11 -lX11-xcb -lxcb -lxcb-icccm -lxcb-randr -lxcb-keysyms -lxcb-util -lxcb-xtest -lXft -lXcursor
11
12 ifneq ("${BUILDVERSION}", "")
13 MAINT_CPPFLAGS += -DSPECTRWM_BUILDSTR=\"$(BUILDVERSION)\"
14 endif
15
16 -all: spectrwm libswmhack.so.$(LIBVERSION)
17 +all: spectrwm
18
19 spectrwm: spectrwm.o linux.o
20 $(CC) $(MAINT_LDFLAGS) $(LDFLAGS) -o $@ $+ $(MAINT_LDLIBS) $(LDLIBS)
21 diff -Nru spectrwm-3.0.2.orig/spectrwm.c spectrwm-3.0.2/spectrwm.c
22 --- spectrwm-3.0.2.orig/spectrwm.c 2016-05-24 11:53:05.831647479 +0200
23 +++ spectrwm-3.0.2/spectrwm.c 2016-05-24 11:57:03.713195913 +0200
24 @@ -273,9 +273,9 @@
25 #define SWM_CONF_DEFAULT (0)
26 #define SWM_CONF_KEYMAPPING (1)
27
28 -#ifndef SWM_LIB
29 +/* #ifndef SWM_LIB
30 #define SWM_LIB "/usr/local/lib/libswmhack.so"
31 -#endif
32 +#endif */
33
34 char **start_argv;
35 xcb_atom_t a_state;
36 @@ -3712,6 +3712,7 @@
37
38 close(xcb_get_file_descriptor(conn));
39
40 + /*
41 if ((ret = getenv("LD_PRELOAD"))) {
42 if (asprintf(&ret, "%s:%s", SWM_LIB, ret) == -1) {
43 warn("spawn: asprintf LD_PRELOAD");
44 @@ -3722,6 +3723,7 @@
45 } else {
46 setenv("LD_PRELOAD", SWM_LIB, 1);
47 }
48 + */
49
50 if (asprintf(&ret, "%d", ws_idx) == -1) {
51 warn("spawn: asprintf SWM_WS");
|
