Skip site navigation (1)Skip section navigation (2) 
Date:      Fri, 19 Jun 2020 09:28:25 +0000 (UTC)
From:      Niclas Zeising <zeising@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r539601 - in head/x11-wm/spectrwm: . files
Message-ID:  <202006190928.05J9SP7i024430@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: zeising
Date: Fri Jun 19 09:28:25 2020
New Revision: 539601
URL: https://svnweb.freebsd.org/changeset/ports/539601

Log:
  x11-wm/spectrwm: Update to 3.4.0
  
  Update x11-wm/spectrwm to 3.4.0
  Changelog:
  https://github.com/conformal/spectrwm/releases/tag/SPECTRWM_3_4_0

Added:
  head/x11-wm/spectrwm/files/patch-6c1a7ca.c   (contents, props changed)
Modified:
  head/x11-wm/spectrwm/Makefile
  head/x11-wm/spectrwm/distinfo
  head/x11-wm/spectrwm/files/patch-spectrwm.c

Modified: head/x11-wm/spectrwm/Makefile
==============================================================================
--- head/x11-wm/spectrwm/Makefile	Fri Jun 19 08:56:36 2020	(r539600)
+++ head/x11-wm/spectrwm/Makefile	Fri Jun 19 09:28:25 2020	(r539601)
@@ -3,7 +3,7 @@
 
 PORTNAME=	spectrwm
 DISTVERSIONPREFIX=	SPECTRWM_
-DISTVERSION=	3_3_0
+DISTVERSION=	3_4_0
 CATEGORIES=	x11-wm
 
 MAINTAINER=	zeising@FreeBSD.org

Modified: head/x11-wm/spectrwm/distinfo
==============================================================================
--- head/x11-wm/spectrwm/distinfo	Fri Jun 19 08:56:36 2020	(r539600)
+++ head/x11-wm/spectrwm/distinfo	Fri Jun 19 09:28:25 2020	(r539601)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1580952583
-SHA256 (conformal-spectrwm-SPECTRWM_3_3_0_GH0.tar.gz) = ee4e40d7f97f0318a8f26e7551aefea7b7b2d21609615736c87e812122c8f140
-SIZE (conformal-spectrwm-SPECTRWM_3_3_0_GH0.tar.gz) = 161806
+TIMESTAMP = 1592557801
+SHA256 (conformal-spectrwm-SPECTRWM_3_4_0_GH0.tar.gz) = 85972fdda157ad9f5dae73f9859bf71c73ce2227e6bb29e3fb82f529c82f146b
+SIZE (conformal-spectrwm-SPECTRWM_3_4_0_GH0.tar.gz) = 164188

Added: head/x11-wm/spectrwm/files/patch-6c1a7ca.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11-wm/spectrwm/files/patch-6c1a7ca.c	Fri Jun 19 09:28:25 2020	(r539601)
@@ -0,0 +1,42 @@
+From 6c1a7ca9176ff6924239c75f0ccdae7c3189b8bf Mon Sep 17 00:00:00 2001
+From: Reginald Kennedy
+Date: Fri, 19 Jun 2020 12:17:51 +0800
+Subject: [PATCH] Fix always_raise.
+
+---
+ spectrwm.c | 14 +++++---------
+ 1 file changed, 5 insertions(+), 9 deletions(-)
+
+diff --git a/spectrwm.c b/spectrwm.c
+index b2632cc..49640d2 100644
+--- spectrwm.c
++++ spectrwm.c
+@@ -4824,9 +4824,8 @@ focus_win(struct ws_win *win)
+ 	win->focus_redirect = NULL; /* Clear any redirect from this window. */
+ 
+ 	if (ws->r) {
+-		if (ws->cur_layout->flags & SWM_L_MAPONFOCUS ||
+-		    ws->always_raise) {
+-			/* Stack all related. */
++		if (ws->cur_layout->flags & SWM_L_MAPONFOCUS) {
++			/* Only related windows should be mapped. */
+ 			mainw = find_main_window(win);
+ 			TAILQ_FOREACH(w, &ws->stack, stack_entry) {
+ 				if (ICONIC(w))
+@@ -4837,13 +4836,10 @@ focus_win(struct ws_win *win)
+ 				else
+ 					unmap_window(w);
+ 			}
+-
+ 			update_stacking(win->s);
+-		} else if (tile_gap < 0 && !FLOATING(win)) {
+-			/*
+-			 * Windows overlap in the layout.
+-			 * Raise focused win above all tiled wins.
+-			 */
++		} else if ((tile_gap < 0 && !FLOATING(win)) ||
++		    ws->always_raise) {
++			/* Focused window needs to be raised. */
+ 			raise_window(win);
+ 			update_win_stacking(win);
+ 			map_window(win);

Modified: head/x11-wm/spectrwm/files/patch-spectrwm.c
==============================================================================
--- head/x11-wm/spectrwm/files/patch-spectrwm.c	Fri Jun 19 08:56:36 2020	(r539600)
+++ head/x11-wm/spectrwm/files/patch-spectrwm.c	Fri Jun 19 09:28:25 2020	(r539601)
@@ -1,11 +1,11 @@
---- spectrwm.c.orig	2017-10-04 18:36:20 UTC
+--- spectrwm.c.orig	2020-06-17 19:26:40 UTC
 +++ spectrwm.c
-@@ -7960,7 +7960,7 @@ validate_spawns(void)
+@@ -8913,7 +8913,7 @@ validate_spawns(void)
  void
  setup_spawn(void)
  {
--	setconfspawn("lock",		"xlock",		0);
-+	setconfspawn("lock",		"xlock",		SWM_SPAWN_OPTIONAL);
+-	setconfspawn("lock", "xlock", 0, NULL);
++	setconfspawn("lock", "xlock", SWM_SPAWN_OPTIONAL, NULL);
  
- 	setconfspawn("term",		"xterm",		0);
- 	setconfspawn("spawn_term",	"xterm",		0);
+ 	setconfspawn("term", "xterm", 0, NULL);
+ 	setconfspawn("spawn_term", "xterm", 0, NULL);

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202006190928.05J9SP7i024430>