opt/spectrwm/spectrwm-remove_libswmhack.patch

53 lines
1.7 KiB
Diff
Raw Normal View History

2019-12-20 14:27:53 +01:00
diff -Nru spectrwm-SPECTRWM_3_3_0.orig/linux/Makefile spectrwm-SPECTRWM_3_3_0/linux/Makefile
--- spectrwm-SPECTRWM_3_3_0.orig/linux/Makefile 2019-12-19 19:15:12.054168461 +0100
+++ spectrwm-SPECTRWM_3_3_0/linux/Makefile 2019-12-19 19:15:39.420060857 +0100
@@ -13,7 +13,7 @@
2014-08-25 17:31:44 +02:00
MAINT_CFLAGS = -std=c99 -Wmissing-prototypes -Wall -Wextra -Wshadow -Wno-uninitialized -g
2017-10-04 14:47:42 +02:00
MAINT_LDFLAGS = -Wl,--as-needed
-MAINT_CPPFLAGS = -I. -D_GNU_SOURCE -DSWM_LIB=\"$(LIBDIR)/libswmhack.so.$(LIBVERSION)\"
+MAINT_CPPFLAGS = -I. -D_GNU_SOURCE
2014-08-25 17:31:44 +02:00
ifneq ("${BUILDVERSION}", "")
2016-05-27 14:52:29 +02:00
MAINT_CPPFLAGS += -DSPECTRWM_BUILDSTR=\"$(BUILDVERSION)\"
2019-12-20 14:27:53 +01:00
@@ -28,7 +28,7 @@
2017-10-04 14:47:42 +02:00
LIB_CPPFLAGS = $(shell pkg-config --cflags x11)
LIB_LDLIBS = $(shell pkg-config --libs x11) -ldl
2016-05-27 14:52:29 +02:00
-all: spectrwm libswmhack.so.$(LIBVERSION)
+all: spectrwm
spectrwm: spectrwm.o linux.o
2017-10-04 14:47:42 +02:00
$(CC) $(MAINT_LDFLAGS) $(BIN_LDFLAGS) $(LDFLAGS) -o $@ $+ $(BIN_LDLIBS) $(LDLIBS)
2019-12-20 14:27:53 +01:00
diff -Nru spectrwm-SPECTRWM_3_3_0.orig/spectrwm.c spectrwm-SPECTRWM_3_3_0/spectrwm.c
--- spectrwm-SPECTRWM_3_3_0.orig/spectrwm.c 2019-12-19 19:15:12.054168461 +0100
+++ spectrwm-SPECTRWM_3_3_0/spectrwm.c 2019-12-19 19:15:39.420060857 +0100
@@ -295,9 +295,9 @@
#define SWM_CONF_DEFAULT (0)
#define SWM_CONF_KEYMAPPING (1)
-#ifndef SWM_LIB
+/* #ifndef SWM_LIB
#define SWM_LIB "/usr/local/lib/libswmhack.so"
-#endif
+#endif */
char **start_argv;
xcb_atom_t a_state;
2019-12-20 14:27:53 +01:00
@@ -4483,6 +4483,7 @@
close(xcb_get_file_descriptor(conn));
2016-05-16 15:56:49 +02:00
+ /*
if ((ret = getenv("LD_PRELOAD"))) {
if (asprintf(&ret, "%s:%s", SWM_LIB, ret) == -1) {
warn("spawn: asprintf LD_PRELOAD");
2019-12-20 14:27:53 +01:00
@@ -4493,6 +4494,7 @@
2016-05-16 15:56:49 +02:00
} else {
setenv("LD_PRELOAD", SWM_LIB, 1);
}
+ */
if (asprintf(&ret, "%d", ws_idx) == -1) {
warn("spawn: asprintf SWM_WS");