opt/spectrwm/spectrwm-remove_libswmhack.patch

44 lines
1.5 KiB
Diff
Raw Normal View History

2016-05-16 15:56:49 +02:00
diff -Nru spectrwm-3.0.1.orig/linux/Makefile spectrwm-3.0.1/linux/Makefile
--- spectrwm-3.0.1.orig/linux/Makefile 2016-05-16 15:22:06.375506421 +0200
+++ spectrwm-3.0.1/linux/Makefile 2016-05-16 15:27:15.595398541 +0200
2014-08-25 17:31:44 +02:00
@@ -10,7 +10,7 @@
LIBMAJORVERSION = $(shell . $(CURDIR)/../lib/shlib_version; echo $$major)
MAINT_CFLAGS = -std=c99 -Wmissing-prototypes -Wall -Wextra -Wshadow -Wno-uninitialized -g
-MAINT_CPPFLAGS = -D_GNU_SOURCE -I. -I/usr/include/freetype2 -DSWM_LIB=\"$(LIBDIR)/libswmhack.so.$(LIBVERSION)\"
+MAINT_CPPFLAGS = -D_GNU_SOURCE -I. -I/usr/include/freetype2
MAINT_LDLIBS = -lX11 -lX11-xcb -lxcb -lxcb-icccm -lxcb-randr -lxcb-keysyms -lxcb-util -lxcb-xtest -lXft -lXcursor
ifneq ("${BUILDVERSION}", "")
2016-05-16 15:56:49 +02:00
diff -Nru spectrwm-3.0.1.orig/spectrwm.c spectrwm-3.0.1/spectrwm.c
--- spectrwm-3.0.1.orig/spectrwm.c 2016-05-16 15:22:06.378839754 +0200
+++ spectrwm-3.0.1/spectrwm.c 2016-05-16 15:30:08.021987775 +0200
2016-05-05 13:35:57 +02:00
@@ -273,9 +273,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;
2016-05-16 15:56:49 +02:00
@@ -3712,6 +3712,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");
@@ -3722,6 +3723,7 @@
} else {
setenv("LD_PRELOAD", SWM_LIB, 1);
}
+ */
if (asprintf(&ret, "%d", ws_idx) == -1) {
warn("spawn: asprintf SWM_WS");