[crux-commits] ports/opt (3.5): spectrwm: update to 3.4.0

crux at crux.nu crux at crux.nu
Sat Jun 20 16:06:03 UTC 2020


commit b2f092a12a89000e8340ef6230fd7bfadb454c8e
Author: Juergen Daubert <jue at jue.li>
Date:   Sat Jun 20 18:05:25 2020 +0200

    spectrwm: update to 3.4.0

diff --git a/spectrwm/.signature b/spectrwm/.signature
index 3a5497d9d..f48c94b1a 100644
--- a/spectrwm/.signature
+++ b/spectrwm/.signature
@@ -1,6 +1,6 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/ac9HBsB9Sy3Zanyw0wSjd9VARiHEi/+Djx0ENExpKjuNG5VPydYWOS8PhbgGAs+z7OZC9z2stk3wbPXeQu6WgA=
-SHA256 (Pkgfile) = 4735a33c83c1c2d2e48e517fdc377267accad32c00c383e61d800427ab782688
+RWSE3ohX2g5d/S5Tr4qDXolKPVSA/o5GtDsVRskE+f3HY+VrLTOToYshlWMVdQq2mPbu+nSWc9TRMb/hbAWwax089s2uiOJEowo=
+SHA256 (Pkgfile) = 4a92d9e373b4ee89caed46cbc14f2a65068a696c36d2b771691a45e3ff7dea08
 SHA256 (.footprint) = 353b10b6033a1b5dd0ace6434990102537b6c5d3dd9d448ce73cd4d810c3d334
-SHA256 (SPECTRWM_3_3_0.tar.gz) = ee4e40d7f97f0318a8f26e7551aefea7b7b2d21609615736c87e812122c8f140
-SHA256 (spectrwm-remove_libswmhack.patch) = 7d389a8715cfb4799207a916aa6dd113bee1cff04fcd0d490ed24d354b743288
+SHA256 (SPECTRWM_3_4_0.tar.gz) = 85972fdda157ad9f5dae73f9859bf71c73ce2227e6bb29e3fb82f529c82f146b
+SHA256 (spectrwm-remove_libswmhack.patch) = 3ca7cea91b9d2fabaef923d929fb205e9047cd2771e33f455e48edb22d19716a
diff --git a/spectrwm/Pkgfile b/spectrwm/Pkgfile
index 75a3b91c0..247e5d0df 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 xorg-libxrandr
 
 name=spectrwm
-version=3.3.0
+version=3.4.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 7f3cba23e..cd3271f48 100644
--- a/spectrwm/spectrwm-remove_libswmhack.patch
+++ b/spectrwm/spectrwm-remove_libswmhack.patch
@@ -1,7 +1,7 @@
-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 @@
+diff -Nru spectrwm-SPECTRWM_3_4_0.orig/linux/Makefile spectrwm-SPECTRWM_3_4_0/linux/Makefile
+--- spectrwm-SPECTRWM_3_4_0.orig/linux/Makefile	2020-06-18 19:13:58.945671800 +0200
++++ spectrwm-SPECTRWM_3_4_0/linux/Makefile	2020-06-18 19:14:28.289107455 +0200
+@@ -14,7 +14,7 @@
  
  MAINT_CFLAGS   = -std=c99 -Wmissing-prototypes -Wall -Wextra -Wshadow -Wno-uninitialized -g
  MAINT_LDFLAGS  = -Wl,--as-needed
@@ -10,19 +10,19 @@ diff -Nru spectrwm-SPECTRWM_3_3_0.orig/linux/Makefile spectrwm-SPECTRWM_3_3_0/li
  
  ifneq ("${BUILDVERSION}", "")
  MAINT_CPPFLAGS += -DSPECTRWM_BUILDSTR=\"$(BUILDVERSION)\"
-@@ -28,7 +28,7 @@
- LIB_CPPFLAGS = $(shell pkg-config --cflags x11)
- LIB_LDLIBS   = $(shell pkg-config --libs   x11) -ldl
+@@ -29,7 +29,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) $(BIN_LDFLAGS) $(LDFLAGS) -o $@ $+ $(BIN_LDLIBS) $(LDLIBS)
-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 @@
+diff -Nru spectrwm-SPECTRWM_3_4_0.orig/spectrwm.c spectrwm-SPECTRWM_3_4_0/spectrwm.c
+--- spectrwm-SPECTRWM_3_4_0.orig/spectrwm.c	2020-06-18 19:13:58.949005145 +0200
++++ spectrwm-SPECTRWM_3_4_0/spectrwm.c	2020-06-18 19:14:28.292440799 +0200
+@@ -309,9 +309,9 @@
  #define SWM_CONF_DEFAULT	(0)
  #define SWM_CONF_KEYMAPPING	(1)
  
@@ -34,7 +34,7 @@ diff -Nru spectrwm-SPECTRWM_3_3_0.orig/spectrwm.c spectrwm-SPECTRWM_3_3_0/spectr
  
  char			**start_argv;
  xcb_atom_t		a_state;
-@@ -4483,6 +4483,7 @@
+@@ -4526,6 +4526,7 @@
  
  	close(xcb_get_file_descriptor(conn));
  
@@ -42,7 +42,7 @@ diff -Nru spectrwm-SPECTRWM_3_3_0.orig/spectrwm.c spectrwm-SPECTRWM_3_3_0/spectr
  	if ((ret = getenv("LD_PRELOAD"))) {
  		if (asprintf(&ret, "%s:%s", SWM_LIB, ret) == -1) {
  			warn("spawn: asprintf LD_PRELOAD");
-@@ -4493,6 +4494,7 @@
+@@ -4536,6 +4537,7 @@
  	} else {
  		setenv("LD_PRELOAD", SWM_LIB, 1);
  	}


More information about the crux-commits mailing list