diff options
| -rw-r--r-- | UPDATING | 17 | ||||
| -rw-r--r-- | x11-wm/xfce4-session/Makefile | 1 | ||||
| -rw-r--r-- | x11-wm/xfce4-session/files/patch-scripts_xscreensaver.desktop.in | 7 | ||||
| -rw-r--r-- | x11-wm/xfce4-session/files/pkg-message.in | 29 | ||||
| -rw-r--r-- | x11/xfce4-screensaver/Makefile | 2 |
5 files changed, 56 insertions, 0 deletions
@@ -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@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@FreeBSD.org diff --git a/x11-wm/xfce4-session/Makefile b/x11-wm/xfce4-session/Makefile index 79f4bdc355cc..df4332b35946 100644 --- a/x11-wm/xfce4-session/Makefile +++ b/x11-wm/xfce4-session/Makefile @@ -3,6 +3,7 @@ PORTNAME= xfce4-session PORTVERSION= 4.14.0 +PORTREVISION= 1 CATEGORIES= x11-wm xfce MASTER_SITES= XFCE DIST_SUBDIR= xfce4 diff --git a/x11-wm/xfce4-session/files/patch-scripts_xscreensaver.desktop.in b/x11-wm/xfce4-session/files/patch-scripts_xscreensaver.desktop.in new file mode 100644 index 000000000000..4978645971f7 --- /dev/null +++ b/x11-wm/xfce4-session/files/patch-scripts_xscreensaver.desktop.in @@ -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 diff --git a/x11-wm/xfce4-session/files/pkg-message.in b/x11-wm/xfce4-session/files/pkg-message.in index 037d0de3ad71..0c148f0f234c 100644 --- a/x11-wm/xfce4-session/files/pkg-message.in +++ b/x11-wm/xfce4-session/files/pkg-message.in @@ -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 } ] diff --git a/x11/xfce4-screensaver/Makefile b/x11/xfce4-screensaver/Makefile index 055d7c55dc1a..23f3b7bcb6e4 100644 --- a/x11/xfce4-screensaver/Makefile +++ b/x11/xfce4-screensaver/Makefile @@ -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 |