commit d51a90fbf58751d568d99e5ea17575cf6aacf3d0 Author: Juergen Daubert <jue@jue.li> Date: Wed Oct 4 14:47:42 2017 +0200 spectrwm: update to 3.1.0 diff --git a/spectrwm/.md5sum b/spectrwm/.md5sum index 80d2dced1..dad4b116f 100644 --- a/spectrwm/.md5sum +++ b/spectrwm/.md5sum @@ -1,2 +1,2 @@ -b95af7630bfc1cae4de07286ac7e2318 SPECTRWM_3_0_2.tar.gz -7090cd60f503116e9a7bc8c7bb71e616 spectrwm-remove_libswmhack.patch +d5314b0ec74d4b3845c3f0d2f6f5c75c SPECTRWM_3_1_0.tar.gz +af1d2e2da60c67507f94824528de8be7 spectrwm-remove_libswmhack.patch diff --git a/spectrwm/.signature b/spectrwm/.signature index 3cbfd9ae4..310bbec0c 100644 --- a/spectrwm/.signature +++ b/spectrwm/.signature @@ -1,6 +1,6 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/cnw9UAVdn4bphmu/9WGugoiLcudh2BsxC1MI/6BAqeqD0Qspu3wf3UroJ+V75RdMr3EmMcYimuk+nF36bVAaAM= -SHA256 (Pkgfile) = 2732fb86ce12172df41dc2984ee8edb838c8994aa111595a5d61966694c6b67f +RWSE3ohX2g5d/bXp084XO4POSNwLFg3BEUZfrxXCbtqS/gu1Zg+UTam5W6Wp9YIXEcJJUjmHzNU5JX+T/PLxZUfrG3q8dWUW7ww= +SHA256 (Pkgfile) = 483ebfac56681d04fd9f52de5dcc41650f096b59c1eab2adfe6f82972765c7e8 SHA256 (.footprint) = 353b10b6033a1b5dd0ace6434990102537b6c5d3dd9d448ce73cd4d810c3d334 -SHA256 (SPECTRWM_3_0_2.tar.gz) = 82ce0280039de642c41684f3096abb0388926b60c37987ca1dbc53a0913cab18 -SHA256 (spectrwm-remove_libswmhack.patch) = 6d7fc790b7cfadd0063a9ed224a58d09f695a2bee36238cc74b3df00a35fc9b3 +SHA256 (SPECTRWM_3_1_0.tar.gz) = b7a5e24fe6d923aadab947d354ff44ad742b721daaf334584e8eea9e15649d9a +SHA256 (spectrwm-remove_libswmhack.patch) = 3163948b44e7928861a63ae318e34bcd00af8a82054c9888fd28fa965be7fb37 diff --git a/spectrwm/Pkgfile b/spectrwm/Pkgfile index eb899b264..6a90de2ff 100644 --- a/spectrwm/Pkgfile +++ b/spectrwm/Pkgfile @@ -4,7 +4,7 @@ # Depends on: xorg-libxcursor xorg-libxft xorg-xcb-util-keysyms xorg-xcb-util-wm name=spectrwm -version=3.0.2 +version=3.1.0 release=1 source=(https://github.com/conformal/spectrwm/archive/SPECTRWM_${version//./_}.tar.gz $name-remove_libswmhack.patch) diff --git a/spectrwm/spectrwm-remove_libswmhack.patch b/spectrwm/spectrwm-remove_libswmhack.patch index 27d2483a9..f618398fb 100644 --- a/spectrwm/spectrwm-remove_libswmhack.patch +++ b/spectrwm/spectrwm-remove_libswmhack.patch @@ -1,27 +1,28 @@ -diff -Nru spectrwm-3.0.2.orig/linux/Makefile spectrwm-3.0.2/linux/Makefile ---- spectrwm-3.0.2.orig/linux/Makefile 2016-05-24 11:53:05.831647479 +0200 -+++ spectrwm-3.0.2/linux/Makefile 2016-05-24 11:57:34.912071921 +0200 -@@ -10,14 +10,14 @@ - LIBMAJORVERSION = $(shell . $(CURDIR)/../lib/shlib_version; echo $$major) +diff -Nru spectrwm-3.1.0.orig/linux/Makefile spectrwm-3.1.0/linux/Makefile +--- spectrwm-3.1.0.orig/linux/Makefile 2017-10-04 14:09:54.457071082 +0200 ++++ spectrwm-3.1.0/linux/Makefile 2017-10-04 14:14:40.116766035 +0200 +@@ -11,7 +11,7 @@ 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 + MAINT_LDFLAGS = -Wl,--as-needed +-MAINT_CPPFLAGS = -I. -D_GNU_SOURCE -DSWM_LIB=\"$(LIBDIR)/libswmhack.so.$(LIBVERSION)\" ++MAINT_CPPFLAGS = -I. -D_GNU_SOURCE ifneq ("${BUILDVERSION}", "") MAINT_CPPFLAGS += -DSPECTRWM_BUILDSTR=\"$(BUILDVERSION)\" - endif +@@ -26,7 +26,7 @@ + LIB_CPPFLAGS = $(shell pkg-config --cflags x11) + LIB_LDLIBS = $(shell pkg-config --libs x11) -ldl -all: spectrwm libswmhack.so.$(LIBVERSION) +all: spectrwm spectrwm: spectrwm.o linux.o - $(CC) $(MAINT_LDFLAGS) $(LDFLAGS) -o $@ $+ $(MAINT_LDLIBS) $(LDLIBS) -diff -Nru spectrwm-3.0.2.orig/spectrwm.c spectrwm-3.0.2/spectrwm.c ---- spectrwm-3.0.2.orig/spectrwm.c 2016-05-24 11:53:05.831647479 +0200 -+++ spectrwm-3.0.2/spectrwm.c 2016-05-24 11:57:03.713195913 +0200 -@@ -273,9 +273,9 @@ + $(CC) $(MAINT_LDFLAGS) $(BIN_LDFLAGS) $(LDFLAGS) -o $@ $+ $(BIN_LDLIBS) $(LDLIBS) +diff -Nru spectrwm-3.1.0.orig/spectrwm.c spectrwm-3.1.0/spectrwm.c +--- spectrwm-3.1.0.orig/spectrwm.c 2017-10-04 14:09:54.457071082 +0200 ++++ spectrwm-3.1.0/spectrwm.c 2017-10-04 14:13:46.335374611 +0200 +@@ -274,9 +274,9 @@ #define SWM_CONF_DEFAULT (0) #define SWM_CONF_KEYMAPPING (1) @@ -33,7 +34,7 @@ diff -Nru spectrwm-3.0.2.orig/spectrwm.c spectrwm-3.0.2/spectrwm.c char **start_argv; xcb_atom_t a_state; -@@ -3712,6 +3712,7 @@ +@@ -3761,6 +3761,7 @@ close(xcb_get_file_descriptor(conn)); @@ -41,7 +42,7 @@ diff -Nru spectrwm-3.0.2.orig/spectrwm.c spectrwm-3.0.2/spectrwm.c if ((ret = getenv("LD_PRELOAD"))) { if (asprintf(&ret, "%s:%s", SWM_LIB, ret) == -1) { warn("spawn: asprintf LD_PRELOAD"); -@@ -3722,6 +3723,7 @@ +@@ -3771,6 +3772,7 @@ } else { setenv("LD_PRELOAD", SWM_LIB, 1); }