1 diff -Nru spectrwm-SPECTRWM_3_2_0.orig/linux/Makefile spectrwm-SPECTRWM_3_2_0/linux/Makefile
2 --- spectrwm-SPECTRWM_3_2_0.orig/linux/Makefile 2018-09-09 13:19:53.214649480 +0200
3 +++ spectrwm-SPECTRWM_3_2_0/linux/Makefile 2018-09-09 13:20:23.310647277 +0200
4 @@ -11,7 +11,7 @@
5
6 MAINT_CFLAGS = -std=c99 -Wmissing-prototypes -Wall -Wextra -Wshadow -Wno-uninitialized -g
7 MAINT_LDFLAGS = -Wl,--as-needed
8 -MAINT_CPPFLAGS = -I. -D_GNU_SOURCE -DSWM_LIB=\"$(LIBDIR)/libswmhack.so.$(LIBVERSION)\"
9 +MAINT_CPPFLAGS = -I. -D_GNU_SOURCE
10
11 ifneq ("${BUILDVERSION}", "")
12 MAINT_CPPFLAGS += -DSPECTRWM_BUILDSTR=\"$(BUILDVERSION)\"
13 @@ -26,7 +26,7 @@
14 LIB_CPPFLAGS = $(shell pkg-config --cflags x11)
15 LIB_LDLIBS = $(shell pkg-config --libs x11) -ldl
16
17 -all: spectrwm libswmhack.so.$(LIBVERSION)
18 +all: spectrwm
19
20 spectrwm: spectrwm.o linux.o
21 $(CC) $(MAINT_LDFLAGS) $(BIN_LDFLAGS) $(LDFLAGS) -o $@ $+ $(BIN_LDLIBS) $(LDLIBS)
22 diff -Nru spectrwm-SPECTRWM_3_2_0.orig/spectrwm.c spectrwm-SPECTRWM_3_2_0/spectrwm.c
23 --- spectrwm-SPECTRWM_3_2_0.orig/spectrwm.c 2018-09-09 13:19:53.214649480 +0200
24 +++ spectrwm-SPECTRWM_3_2_0/spectrwm.c 2018-09-09 13:20:23.313980536 +0200
25 @@ -290,9 +290,9 @@
26 #define SWM_CONF_DEFAULT (0)
27 #define SWM_CONF_KEYMAPPING (1)
28
29 -#ifndef SWM_LIB
30 +/* #ifndef SWM_LIB
31 #define SWM_LIB "/usr/local/lib/libswmhack.so"
32 -#endif
33 +#endif */
34
35 char **start_argv;
36 xcb_atom_t a_state;
37 @@ -3884,6 +3884,7 @@
38
39 close(xcb_get_file_descriptor(conn));
40
41 + /*
42 if ((ret = getenv("LD_PRELOAD"))) {
43 if (asprintf(&ret, "%s:%s", SWM_LIB, ret) == -1) {
44 warn("spawn: asprintf LD_PRELOAD");
45 @@ -3894,6 +3895,7 @@
46 } else {
47 setenv("LD_PRELOAD", SWM_LIB, 1);
48 }
49 + */
50
51 if (asprintf(&ret, "%d", ws_idx) == -1) {
52 warn("spawn: asprintf SWM_WS");
|
