commit ce9035687ec6df4bd278bf58d06cc564b15687be Author: Juergen Daubert <jue@jue.li> Date: Mon May 16 15:56:49 2016 +0200 spectrwm: update to 3.0.1 diff --git a/spectrwm/.md5sum b/spectrwm/.md5sum index 2a816dc..5ee53e7 100644 --- a/spectrwm/.md5sum +++ b/spectrwm/.md5sum @@ -1,2 +1,2 @@ -49ff00f35b514a72f1e81ee613bbfa8b spectrwm-3.0.0.tgz -e294f5abac9b35c819256094c66150a2 spectrwm-remove_libswmhack.patch +4df6713ad2bea95431e07317573baf0f SPECTRWM_3_0_1.tar.gz +a9d07e98d8536bde4c37c0d6a726d93d spectrwm-remove_libswmhack.patch diff --git a/spectrwm/Pkgfile b/spectrwm/Pkgfile index 68e1b57..1415cdf 100644 --- a/spectrwm/Pkgfile +++ b/spectrwm/Pkgfile @@ -4,14 +4,14 @@ # Depends on: xorg-libxrender fontconfig xorg-xcb-util-keysyms xorg-xcb-util-wm name=spectrwm -version=3.0.0 +version=3.0.1 release=1 -source=(https://opensource.conformal.com/snapshots/$name/$name-$version.tgz +source=(https://github.com/conformal/spectrwm/archive/SPECTRWM_${version//./_}.tar.gz $name-remove_libswmhack.patch) build () { - cd $name-$version/linux - patch -p 1 -d .. -i $SRC/$name-remove_libswmhack.patch + cd $name-SPECTRWM_${version//./_}/linux + patch -p1 -d.. -i $SRC/$name-remove_libswmhack.patch make PREFIX=/usr install -d $PKG/usr/{bin,share/man/man1} install spectrwm $PKG/usr/bin diff --git a/spectrwm/spectrwm-remove_libswmhack.patch b/spectrwm/spectrwm-remove_libswmhack.patch index 185ee3c..7e6c2ee 100644 --- a/spectrwm/spectrwm-remove_libswmhack.patch +++ b/spectrwm/spectrwm-remove_libswmhack.patch @@ -1,6 +1,6 @@ -diff -Nru spectrwm-3.0.0.orig/linux/Makefile spectrwm-3.0.0/linux/Makefile ---- spectrwm-3.0.0.orig/linux/Makefile 2016-05-05 12:01:59.903766554 +0200 -+++ spectrwm-3.0.0/linux/Makefile 2016-05-05 12:02:13.257073357 +0200 +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 @@ -10,7 +10,7 @@ LIBMAJORVERSION = $(shell . $(CURDIR)/../lib/shlib_version; echo $$major) @@ -10,9 +10,9 @@ diff -Nru spectrwm-3.0.0.orig/linux/Makefile spectrwm-3.0.0/linux/Makefile MAINT_LDLIBS = -lX11 -lX11-xcb -lxcb -lxcb-icccm -lxcb-randr -lxcb-keysyms -lxcb-util -lxcb-xtest -lXft -lXcursor ifneq ("${BUILDVERSION}", "") -diff -Nru spectrwm-3.0.0.orig/spectrwm.c spectrwm-3.0.0/spectrwm.c ---- spectrwm-3.0.0.orig/spectrwm.c 2016-05-05 12:01:59.903766554 +0200 -+++ spectrwm-3.0.0/spectrwm.c 2016-05-05 12:02:13.260406683 +0200 +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 @@ -273,9 +273,9 @@ #define SWM_CONF_DEFAULT (0) #define SWM_CONF_KEYMAPPING (1) @@ -25,12 +25,19 @@ diff -Nru spectrwm-3.0.0.orig/spectrwm.c spectrwm-3.0.0/spectrwm.c char **start_argv; xcb_atom_t a_state; -@@ -3712,7 +3712,7 @@ +@@ -3712,6 +3712,7 @@ close(xcb_get_file_descriptor(conn)); -- setenv("LD_PRELOAD", SWM_LIB, 1); -+ /* setenv("LD_PRELOAD", SWM_LIB, 1); */ ++ /* + 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");