svn commit: r513008 - in head: . x11-wm/xfce4-session x11-wm/xfce4-session/files x11/xfce4-screensaver

[Guido Falsi]

Author: madpilot
Date: Fri Sep 27 09:00:33 2019
New Revision: 513008
URL: https://svnweb.freebsd.org/changeset/ports/513008

Log:
  - Make xfce4-session install the xscreensaver.desktop session startup
    file disabled by default
  - Modify name of program in .desktop file for xfce4-screensaver,
    so that the UI does not show two identical lines when both it and
    xscreensaver are installed
  - Add UPDATING note and update xfce4-session pkg-message to explain
    the issue to users
  
  PR:		240804, 240810, 240811
  Submitted by:	John <jlmales at gmail.com>

Added:
  head/x11-wm/xfce4-session/files/patch-scripts_xscreensaver.desktop.in   (contents, props changed)
Modified:
  head/UPDATING
  head/x11-wm/xfce4-session/Makefile
  head/x11-wm/xfce4-session/files/pkg-message.in
  head/x11/xfce4-screensaver/Makefile

Modified: head/UPDATING
==============================================================================
--- head/UPDATING	Fri Sep 27 08:52:15 2019	(r513007)
+++ head/UPDATING	Fri Sep 27 09:00:33 2019	(r513008)
@@ -5,6 +5,23 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20190927:
+  AFFECTS: users of XFCE desktop
+  AUTHOR: madpilot at FreeBSD.org
+
+  Due to changes in the XFCE 4.14 metaport, systems could end up with
+  both xscreensaver and xfce4-screensaver installed and enabled
+  simultaneously.
+
+  This can cause conflicts and problems unlocking the screen.
+
+  To avoid problems, please make sure to have only one enabled by
+  going to the Application Autostart tab of the Session and Startup
+  settings applet and enable only one Screensaver there.
+
+  Some further information can be found in the xfce4-session
+  pkg-message dispolayed on installation and upgrade.
+
 20190920:
   AFFECTS: users of net-mgmt/pushgateway
   AUTHOR: 0mp at FreeBSD.org

Modified: head/x11-wm/xfce4-session/Makefile
==============================================================================
--- head/x11-wm/xfce4-session/Makefile	Fri Sep 27 08:52:15 2019	(r513007)
+++ head/x11-wm/xfce4-session/Makefile	Fri Sep 27 09:00:33 2019	(r513008)
@@ -3,6 +3,7 @@
 
 PORTNAME=	xfce4-session
 PORTVERSION=	4.14.0
+PORTREVISION=	1
 CATEGORIES=	x11-wm xfce
 MASTER_SITES=	XFCE
 DIST_SUBDIR=	xfce4

Added: head/x11-wm/xfce4-session/files/patch-scripts_xscreensaver.desktop.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11-wm/xfce4-session/files/patch-scripts_xscreensaver.desktop.in	Fri Sep 27 09:00:33 2019	(r513008)
@@ -0,0 +1,7 @@
+--- scripts/xscreensaver.desktop.in.orig	2019-08-11 20:11:06 UTC
++++ scripts/xscreensaver.desktop.in
+@@ -7,3 +7,4 @@ Icon=preferences-desktop-screensaver
+ Exec=xscreensaver -no-splash
+ TryExec=xscreensaver
+ OnlyShowIn=XFCE;
++Hidden=true

Modified: head/x11-wm/xfce4-session/files/pkg-message.in
==============================================================================
--- head/x11-wm/xfce4-session/files/pkg-message.in	Fri Sep 27 08:52:15 2019	(r513007)
+++ head/x11-wm/xfce4-session/files/pkg-message.in	Fri Sep 27 09:00:33 2019	(r513008)
@@ -21,6 +21,35 @@ polkit.addRule(function (action, subject) {
     return polkit.Result.YES;
   }
 });
+
+
+This port installs a startup file for xscreensaver but it is
+didabled by default. This is so because the XFCE metaport
+installs xfce4-screensaver to autostart and having both enabled
+causes conflicts.
+
+If you want to change the screen saver being used and enable
+xscreensaver please go to the Session and Startup settings, and in
+the Aplication Autostart tab enable only the relevant screensaver:
+
+Screensaver -> to enable xscreensaver
+XFCE Screensaver -> to enable xfce4-screensaver
+EOM
+}
+{
+  type: upgrade
+  message: <<EOM
+This port installs a startup file for xscreensaver but it is
+didabled by default. This is so because the XFCE metaport
+installs xfce4-screensaver to autostart and having both enabled
+causes conflicts.
+
+If you want to change the screen saver being used and enable
+xscreensaver please go to the Session and Startup settings, and in
+the Aplication Autostart tab enable only the relevant screensaver:
+
+Screensaver -> to enable xscreensaver
+XFCE Screensaver -> to enable xfce4-screensaver
 EOM
 }
 ]

Modified: head/x11/xfce4-screensaver/Makefile
==============================================================================
--- head/x11/xfce4-screensaver/Makefile	Fri Sep 27 08:52:15 2019	(r513007)
+++ head/x11/xfce4-screensaver/Makefile	Fri Sep 27 09:00:33 2019	(r513008)
@@ -2,6 +2,7 @@
 
 PORTNAME=	xfce4-screensaver
 PORTVERSION=	0.1.8
+PORTREVISION=	1
 CATEGORIES=	x11 xfce
 MASTER_SITES=	XFCE/apps
 DIST_SUBDIR=	xfce4
@@ -65,6 +66,7 @@ post-patch-PAM-on:
 
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/${SCREENSAVER_DIR}
+	@${REINPLACE_CMD} 's/^\(Name[^=]*=\)\(.*\)/\1XFCE \2/' ${STAGEDIR}${PREFIX}/etc/xdg/autostart/xfce4-screensaver.desktop
 
 post-install-PAM-on:
 	${INSTALL_DATA} ${FILESDIR}/xfce-screensaver.pam ${STAGEDIR}${PREFIX}/etc/pam.d/xfce-screensaver