blob: abae569a502646c4da5fc9b05230f58fd25b9b98 (
plain)
1 diff -Nru spectrwm-2.6.2.orig/linux/Makefile spectrwm-2.6.2/linux/Makefile
2 --- spectrwm-2.6.2.orig/linux/Makefile 2015-01-28 10:05:22.673613660 +0100
3 +++ spectrwm-2.6.2/linux/Makefile 2015-01-28 10:05:39.922993318 +0100
4 @@ -10,7 +10,7 @@
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 @@ -48,9 +48,6 @@
14 install -m 755 -d $(DESTDIR)$(XSESSIONSDIR)
15 install -m 755 spectrwm $(DESTDIR)$(BINDIR)
16 ln -sf spectrwm $(DESTDIR)$(BINDIR)/scrotwm
17 - install -m 644 libswmhack.so.$(LIBVERSION) $(DESTDIR)$(LIBDIR)
18 - ln -sf libswmhack.so.$(LIBVERSION) $(DESTDIR)$(LIBDIR)/libswmhack.so.$(LIBMAJORVERSION)
19 - ln -sf libswmhack.so.$(LIBVERSION) $(DESTDIR)$(LIBDIR)/libswmhack.so
20 install -m 644 ../spectrwm.1 $(DESTDIR)$(MANDIR)/man1/spectrwm.1
21 install -m 644 ../spectrwm_es.1 $(DESTDIR)$(MANDIR)/es/man1/spectrwm.1
22 install -m 644 ../spectrwm_it.1 $(DESTDIR)$(MANDIR)/it/man1/spectrwm.1
23 diff -Nru spectrwm-2.6.2.orig/spectrwm.c spectrwm-2.6.2/spectrwm.c
24 --- spectrwm-2.6.2.orig/spectrwm.c 2015-01-28 10:05:22.676946874 +0100
25 +++ spectrwm-2.6.2/spectrwm.c 2015-01-28 10:05:39.922993318 +0100
26 @@ -301,9 +301,9 @@
27 #define SWM_CONF_DEFAULT (0)
28 #define SWM_CONF_KEYMAPPING (1)
29
30 -#ifndef SWM_LIB
31 +/* #ifndef SWM_LIB
32 #define SWM_LIB "/usr/local/lib/libswmhack.so"
33 -#endif
34 +#endif */
35
36 char **start_argv;
37 xcb_atom_t a_state;
38 @@ -3430,7 +3430,7 @@
39
40 close(xcb_get_file_descriptor(conn));
41
42 - setenv("LD_PRELOAD", SWM_LIB, 1);
43 + /* setenv("LD_PRELOAD", SWM_LIB, 1); */
44
45 if (asprintf(&ret, "%d", ws_idx) == -1) {
46 warn("spawn: asprintf SWM_WS");
|
