Bug 178090 - [patch] x11-wm/xfce4-session: xflock4 patch
Summary: [patch] x11-wm/xfce4-session: xflock4 patch
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Olivier Duchateau
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-04-23 20:10 UTC by Tijl Coosemans
Modified: 2013-04-25 18:00 UTC (History)
0 users

See Also:

Attachments
xfce4-session.patch (573 bytes, patch)
2013-04-23 20:10 UTC, Tijl Coosemans 		no flags Details | Diff
View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Tijl Coosemans 2013-04-23 20:10:00 UTC 
I have a keyboard shortcut that runs xflock4. It runs slock (x11/slock)
and then switches off the display with xset.

The problem is that the display is switched off too soon, before I've
released the keys. So when I release the keys the xorg server switches
the screen back on.

The attached patch adds a short delay.
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2013-04-23 20:10:08 UTC 
Responsible Changed
From-To: freebsd-ports-bugs->freebsd-xfce

Over to maintainer (via the GNATS Auto Assign Tool)
Comment 2 Olivier Duchateau freebsd_committer freebsd_triage 2013-04-24 18:37:33 UTC 
Responsible Changed
From-To: freebsd-xfce->olivierd

I'll take it.
Comment 3 dfilter service freebsd_committer freebsd_triage 2013-04-25 17:52:13 UTC 
Author: olivierd
Date: Thu Apr 25 16:52:05 2013
New Revision: 316522
URL: http://svnweb.freebsd.org/changeset/ports/316522

Log:
  - Add delay when x11/slock is used (xflock4 script)
  
  While I'm here,
  - Adopt USES for desktop-file-utils, gettext, and athfix
  - Add patch when NLS is unset
  
  PR:		178090
  Submitted by:	tijl@

Added:
  head/x11-wm/xfce4-session/files/patch-configure   (contents, props changed)
Modified:
  head/x11-wm/xfce4-session/Makefile
  head/x11-wm/xfce4-session/files/patch-scripts_xflock4   (contents, props changed)
  head/x11-wm/xfce4-session/pkg-plist

Modified: head/x11-wm/xfce4-session/Makefile
==============================================================================
--- head/x11-wm/xfce4-session/Makefile	Thu Apr 25 15:36:19 2013	(r316521)
+++ head/x11-wm/xfce4-session/Makefile	Thu Apr 25 16:52:05 2013	(r316522)
@@ -3,7 +3,7 @@
 
 PORTNAME=	xfce4-session
 PORTVERSION=	4.10.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-wm xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
 DIST_SUBDIR=	xfce4
@@ -24,15 +24,15 @@ GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack gtk20 glib20 intltool intlhack desktopfileutils
-USES=		pkgconfig
+USE_GNOME=	gtk20 glib20 intltool intlhack
+USES=		desktop-file-utils pathfix pkgconfig
 USE_LDCONFIG=	yes
 USE_XFCE=	configenv libmenu libutil panel xfconf
 USE_XORG=	x11 sm ice
 
 CONFIGURE_ARGS+=--enable-legacy-sm \
 		--disable-libgnome-keyring \
-		--with-xsession-prefix=${LOCALBASE}
+		--with-xsession-prefix=${PREFIX}
 
 SUB_FILES=	pkg-message
 PKGMESSAGE=	${WRKDIR}/pkg-message
@@ -46,7 +46,7 @@ PLIST_SUB=	VERSION="4.6"
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=	gettext
 CONFIGURE_ARGS+=	--enable-nls
 PLIST_SUB+=	NLS=""
 .else
@@ -62,6 +62,5 @@ post-install:
 	@${ECHO_MSG}
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_MSG}
-	@-update-desktop-database
 
 .include <bsd.port.mk>

Added: head/x11-wm/xfce4-session/files/patch-configure
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11-wm/xfce4-session/files/patch-configure	Thu Apr 25 16:52:05 2013	(r316522)
@@ -0,0 +1,11 @@
+--- ./configure.orig	2012-04-28 20:43:34.000000000 +0000
++++ ./configure	2013-04-24 23:04:07.000000000 +0000
+@@ -14200,7 +14200,7 @@
+ 
+     fi
+   fi
+-     USE_NLS=yes
++#     USE_NLS=yes
+ 
+ 
+     gt_cv_have_gettext=no

Modified: head/x11-wm/xfce4-session/files/patch-scripts_xflock4
==============================================================================
--- head/x11-wm/xfce4-session/files/patch-scripts_xflock4	Thu Apr 25 15:36:19 2013	(r316521)
+++ head/x11-wm/xfce4-session/files/patch-scripts_xflock4	Thu Apr 25 16:52:05 2013	(r316522)
@@ -1,5 +1,5 @@
---- scripts/xflock4.orig	2012-04-28 22:43:27.000000000 +0200
-+++ scripts/xflock4	2012-05-16 22:18:05.000000000 +0200
+--- scripts/xflock4.orig	2012-04-28 20:43:27.000000000 +0000
++++ scripts/xflock4	2013-04-24 19:55:56.000000000 +0000
 @@ -21,7 +21,7 @@
  #  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  #
@@ -9,3 +9,11 @@
  export PATH
  
  # Lock by xscreensaver or gnome-screensaver, if a respective daemon is running
+@@ -41,6 +41,7 @@
+     if command -v -- $1 >/dev/null 2>&1; then
+         $lock_cmd >/dev/null 2>&1 &
+ 	# turn off display backlight:
++	sleep 1
+ 	xset dpms force off
+         exit
+     fi

Modified: head/x11-wm/xfce4-session/pkg-plist
==============================================================================
--- head/x11-wm/xfce4-session/pkg-plist	Thu Apr 25 15:36:19 2013	(r316521)
+++ head/x11-wm/xfce4-session/pkg-plist	Thu Apr 25 16:52:05 2013	(r316522)
@@ -144,5 +144,3 @@ share/themes/Default/balou/themerc
 @dirrmtry etc/xdg/xfce4/xfconf/xfce-perchannel-xml
 @dirrmtry etc/xdg/xfce4/xfconf
 @dirrmtry etc/xdg/xfce4
-@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 4 Olivier Duchateau freebsd_committer freebsd_triage 2013-04-25 17:55:31 UTC 
State Changed
From-To: open->closed

Committed, with minor changes. Thanks!