From owner-svn-ports-all@freebsd.org Tue Apr 2 11:21:22 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7F0DC1562450; Tue, 2 Apr 2019 11:21:22 +0000 (UTC) (envelope-from woodsb02@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) server-signature RSA-PSS (4096 bits) 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 1AA5387501; Tue, 2 Apr 2019 11:21:22 +0000 (UTC) (envelope-from woodsb02@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 BE46E2532A; Tue, 2 Apr 2019 11:21:21 +0000 (UTC) (envelope-from woodsb02@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x32BLL1b007855; Tue, 2 Apr 2019 11:21:21 GMT (envelope-from woodsb02@FreeBSD.org) Received: (from woodsb02@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x32BLLWl007854; Tue, 2 Apr 2019 11:21:21 GMT (envelope-from woodsb02@FreeBSD.org) Message-Id: <201904021121.x32BLLWl007854@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: woodsb02 set sender to woodsb02@FreeBSD.org using -f From: Ben Woods Date: Tue, 2 Apr 2019 11:21:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r497560 - in head/x11-wm/xfce4-session: . files X-SVN-Group: ports-head X-SVN-Commit-Author: woodsb02 X-SVN-Commit-Paths: in head/x11-wm/xfce4-session: . files X-SVN-Commit-Revision: 497560 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 1AA5387501 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.97)[-0.968,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 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: Tue, 02 Apr 2019 11:21:22 -0000 Author: woodsb02 Date: Tue Apr 2 11:21:21 2019 New Revision: 497560 URL: https://svnweb.freebsd.org/changeset/ports/497560 Log: x11-wm/xfce4-session: Add xflock4 option for xfce4-screensaver-command This will ensure the "Super+L" key combination locks the screen when x11/xfce4-screensaver is being used. Approved by: madpilot (xfce) Differential Revision: https://reviews.freebsd.org/D19771 Modified: head/x11-wm/xfce4-session/Makefile head/x11-wm/xfce4-session/files/patch-scripts_xflock4 Modified: head/x11-wm/xfce4-session/Makefile ============================================================================== --- head/x11-wm/xfce4-session/Makefile Tue Apr 2 09:01:09 2019 (r497559) +++ head/x11-wm/xfce4-session/Makefile Tue Apr 2 11:21:21 2019 (r497560) @@ -3,7 +3,7 @@ PORTNAME= xfce4-session PORTVERSION= 4.12.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= x11-wm xfce MASTER_SITES= XFCE/src/xfce/${PORTNAME}/${PORTVERSION:R} DIST_SUBDIR= xfce4 Modified: head/x11-wm/xfce4-session/files/patch-scripts_xflock4 ============================================================================== --- head/x11-wm/xfce4-session/files/patch-scripts_xflock4 Tue Apr 2 09:01:09 2019 (r497559) +++ head/x11-wm/xfce4-session/files/patch-scripts_xflock4 Tue Apr 2 11:21:21 2019 (r497560) @@ -1,6 +1,6 @@ --- scripts/xflock4.orig 2014-08-30 18:24:02 UTC +++ scripts/xflock4 -@@ -21,7 +21,7 @@ +@@ -21,13 +21,14 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # @@ -9,7 +9,15 @@ export PATH # Lock by xscreensaver or gnome-screensaver, if a respective daemon is running -@@ -35,12 +35,14 @@ done + for lock_cmd in \ + "xscreensaver-command -lock" \ +- "gnome-screensaver-command --lock" ++ "gnome-screensaver-command --lock" \ ++ "xfce4-screensaver-command --lock" + do + $lock_cmd >/dev/null 2>&1 && exit + done +@@ -35,12 +36,14 @@ done # else run another access locking utility, if installed for lock_cmd in \ "xlock -mode blank" \