From owner-svn-ports-all@freebsd.org Fri Jun 19 09:28:26 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 45B2D345B84; Fri, 19 Jun 2020 09:28:26 +0000 (UTC) (envelope-from zeising@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49pD4p17NGz3Ycp; Fri, 19 Jun 2020 09:28:26 +0000 (UTC) (envelope-from zeising@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 21FD019102; Fri, 19 Jun 2020 09:28:26 +0000 (UTC) (envelope-from zeising@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 05J9SQE0024434; Fri, 19 Jun 2020 09:28:26 GMT (envelope-from zeising@FreeBSD.org) Received: (from zeising@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05J9SP7i024430; Fri, 19 Jun 2020 09:28:25 GMT (envelope-from zeising@FreeBSD.org) Message-Id: <202006190928.05J9SP7i024430@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: zeising set sender to zeising@FreeBSD.org using -f From: Niclas Zeising Date: Fri, 19 Jun 2020 09:28:25 +0000 (UTC) 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 X-SVN-Group: ports-head X-SVN-Commit-Author: zeising X-SVN-Commit-Paths: in head/x11-wm/spectrwm: . files X-SVN-Commit-Revision: 539601 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 19 Jun 2020 09:28:26 -0000 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);