commit 3704cebbb3a2f15389ecca44a375d358bb917e68 Author: Juergen Daubert <jue@jue.li> Date: Wed Nov 27 14:20:07 2013 +0100 spectrwm: remove the buggy LD_PRELOAD stuff diff --git a/spectrwm/.footprint b/spectrwm/.footprint index 02fe24f..b4bdbe2 100644 --- a/spectrwm/.footprint +++ b/spectrwm/.footprint @@ -3,9 +3,6 @@ drwxr-xr-x root/root usr/bin/ lrwxrwxrwx root/root usr/bin/scrotwm -> spectrwm -rwxr-xr-x root/root usr/bin/spectrwm drwxr-xr-x root/root usr/lib/ -lrwxrwxrwx root/root usr/lib/libswmhack.so -> libswmhack.so.0.0 -lrwxrwxrwx root/root usr/lib/libswmhack.so.0 -> libswmhack.so.0.0 --rwxr-xr-x root/root usr/lib/libswmhack.so.0.0 drwxr-xr-x root/root usr/man/ drwxr-xr-x root/root usr/man/man1/ -rw-r--r-- root/root usr/man/man1/spectrwm.1.gz diff --git a/spectrwm/.md5sum b/spectrwm/.md5sum index 150c2dc..cda74b6 100644 --- a/spectrwm/.md5sum +++ b/spectrwm/.md5sum @@ -1,2 +1,3 @@ 23e32c1e292f2fc94ed88195ffe60023 spectrwm-2.4.0.tgz 1ebde41a8b57b6e116e6effd7a911dc9 spectrwm-fix_unbind.patch +be5fdf53ebac908ad037ad937de5ba3a spectrwm-remove_libswmhack.patch diff --git a/spectrwm/Pkgfile b/spectrwm/Pkgfile index 34a3fe6..614acf6 100644 --- a/spectrwm/Pkgfile +++ b/spectrwm/Pkgfile @@ -5,12 +5,13 @@ name=spectrwm version=2.4.0 -release=1 +release=2 source=(https://opensource.conformal.com/snapshots/$name/$name-$version.tgz - $name-fix_unbind.patch) + $name-fix_unbind.patch $name-remove_libswmhack.patch) build () { cd $name-$version/linux + patch -p 1 -d .. -i $SRC/$name-remove_libswmhack.patch patch -p 1 -d .. -i $SRC/$name-fix_unbind.patch make PREFIX=/usr MANDIR=/usr/man DESTDIR=$PKG install rm $PKG/usr/man/man1/spectrwm_*.1 diff --git a/spectrwm/spectrwm-remove_libswmhack.patch b/spectrwm/spectrwm-remove_libswmhack.patch new file mode 100644 index 0000000..f2920f3 --- /dev/null +++ b/spectrwm/spectrwm-remove_libswmhack.patch @@ -0,0 +1,59 @@ +diff -Nru spectrwm-2.4.0.orig/linux/Makefile spectrwm-2.4.0/linux/Makefile +--- spectrwm-2.4.0.orig/linux/Makefile 2013-11-27 12:41:41.935783480 +0100 ++++ spectrwm-2.4.0/linux/Makefile 2013-11-27 12:44:47.562396671 +0100 +@@ -1,5 +1,5 @@ + CFLAGS+= -std=c99 -Wmissing-prototypes -Wall -Wextra -Wshadow -Wno-uninitialized -g +-CFLAGS+= -D_GNU_SOURCE -I. -I/usr/include/freetype2 -DSWM_LIB=\"libswmhack.so.$(LVERS)\" ++CFLAGS+= -D_GNU_SOURCE -I. -I/usr/include/freetype2 + LDADD+= -lX11 -lX11-xcb -lxcb -lxcb-icccm -lxcb-randr -lxcb-keysyms -lxcb-util -lxcb-xtest -lXft -lXcursor + + PREFIX?= /usr/local +@@ -16,7 +16,7 @@ + CFLAGS+= -DSPECTRWM_BUILDSTR=\"$(BUILDVERSION)\" + endif + +-all: spectrwm libswmhack.so.$(LVERS) ++all: spectrwm + + spectrwm.c: + ln -sf ../spectrwm.c +@@ -39,15 +39,12 @@ + install -m 755 -d $(DESTDIR)$(LIBDIR) + install -m 755 -d $(DESTDIR)$(MANDIR)/man1 + install -m 755 spectrwm $(DESTDIR)$(BINDIR) +- install -m 755 libswmhack.so.$(LVERS) $(DESTDIR)$(LIBDIR) + install -m 644 ../spectrwm.1 $(DESTDIR)$(MANDIR)/man1/spectrwm.1 + install -m 644 ../spectrwm_es.1 $(DESTDIR)$(MANDIR)/man1/spectrwm_es.1 + install -m 644 ../spectrwm_it.1 $(DESTDIR)$(MANDIR)/man1/spectrwm_it.1 + install -m 644 ../spectrwm_pt.1 $(DESTDIR)$(MANDIR)/man1/spectrwm_pt.1 + install -m 644 ../spectrwm_ru.1 $(DESTDIR)$(MANDIR)/man1/spectrwm_ru.1 + ln -sf spectrwm $(DESTDIR)$(BINDIR)/scrotwm +- ln -sf libswmhack.so.0.0 $(DESTDIR)$(LIBDIR)/libswmhack.so.0 +- ln -sf libswmhack.so.0.0 $(DESTDIR)$(LIBDIR)/libswmhack.so + + clean: + rm -f spectrwm *.o *.so libswmhack.so.* spectrwm.c swm_hack.c version.h +diff -Nru spectrwm-2.4.0.orig/spectrwm.c spectrwm-2.4.0/spectrwm.c +--- spectrwm-2.4.0.orig/spectrwm.c 2013-11-27 12:41:41.935783480 +0100 ++++ spectrwm-2.4.0/spectrwm.c 2013-11-27 12:50:27.810081824 +0100 +@@ -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; +@@ -3117,7 +3117,7 @@ + + close(xcb_get_file_descriptor(conn)); + +- setenv("LD_PRELOAD", SWM_LIB, 1); ++ /* setenv("LD_PRELOAD", SWM_LIB, 1); */ + + if (asprintf(&ret, "%d", ws_idx) == -1) { + warn("spawn: asprintf SWM_WS");