From ehaupt@milkyway.critical.ch  Sat Jun  2 22:07:08 2007
Return-Path: <ehaupt@milkyway.critical.ch>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 9FC0216A41F
	for <FreeBSD-gnats-submit@freebsd.org>; Sat,  2 Jun 2007 22:07:08 +0000 (UTC)
	(envelope-from ehaupt@milkyway.critical.ch)
Received: from mx.critical.ch (milkyway.critical.ch [62.2.45.169])
	by mx1.freebsd.org (Postfix) with ESMTP id 3B24C13C46E
	for <FreeBSD-gnats-submit@freebsd.org>; Sat,  2 Jun 2007 22:07:08 +0000 (UTC)
	(envelope-from ehaupt@milkyway.critical.ch)
Received: from milkyway.critical.ch (localhost.critical.ch [127.0.0.1])
	by mx.critical.ch (8.13.8/8.13.8/critical-1.0) with ESMTP id l52Lf9v9059871
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 2 Jun 2007 23:41:10 +0200 (CEST)
	(envelope-from ehaupt@milkyway.critical.ch)
Received: (from ehaupt@localhost)
	by milkyway.critical.ch (8.13.8/8.13.8/Submit) id l52Lf9QZ059870;
	Sat, 2 Jun 2007 23:41:09 +0200 (CEST)
	(envelope-from ehaupt)
Message-Id: <200706022141.l52Lf9QZ059870@milkyway.critical.ch>
Date: Sat, 2 Jun 2007 23:41:09 +0200 (CEST)
From: Emanuel Haupt <ehaupt@freebsd.org>
Reply-To: Emanuel Haupt <ehaupt@freebsd.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [patch] x11-wm/xfce4-wm - Add an optional patch to reverse the mouse workspace changing direction
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         113269
>Category:       ports
>Synopsis:       [patch] x11-wm/xfce4-wm - Add an optional patch to reverse the mouse workspace changing direction
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    oliver
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jun 02 22:10:05 GMT 2007
>Closed-Date:    Tue Jun 19 04:54:12 GMT 2007
>Last-Modified:  Tue Jun 19 05:00:20 GMT 2007
>Originator:     Emanuel Haupt
>Release:        FreeBSD 6.2-RELEASE i386
>Organization:
>Environment:
System: FreeBSD milkyway.critical.ch 6.2-RELEASE FreeBSD 6.2-RELEASE #0: Fri Jan 12 10:40:27 UTC 2007 root@dessler.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC i386


	
>Description:
This implements an optional patch to reverse the mouse workspace changing
direction. This option is not activated by default. The request for such a
config option has been sent to the authors.

Also remove blank line at the end of pkg-plist and replace spaces with a tab in
the Makefile.
>How-To-Repeat:
	
>Fix:

	

--- xfce4-wm.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/x11-wm/xfce4-wm/Makefile,v
retrieving revision 1.40
diff -u -r1.40 Makefile
--- Makefile	19 May 2007 20:32:56 -0000	1.40
+++ Makefile	2 Jun 2007 21:32:46 -0000
@@ -18,7 +18,7 @@
 
 CONFIGURE_ARGS=	--enable-xinerama
 GNU_CONFIGURE=	yes
-INSTALLS_ICONS= yes
+INSTALLS_ICONS=	yes
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
@@ -29,7 +29,8 @@
 USE_XLIB=	yes
 
 OPTIONS=	COMPOSITE	"Support the experimental X11 Composite extension"	on \
-		STARTUP 	"Enable startup notification support"			on
+		STARTUP 	"Enable startup notification support"			on \
+		REVMOUSE	"Reverse mouse workspace changing direction"		off
 
 .include <bsd.port.pre.mk>
 
@@ -46,6 +47,10 @@
 CONFIGURE_ARGS+=--disable-startup-notification
 .endif
 
+.if defined(WITH_REVMOUSE)
+EXTRA_PATCHES=	${FILESDIR}/extrapatch-src__events.c
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|\(#define ShapeInput 2\);|\1|' \
 		${WRKSRC}/src/frame.c
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/x11-wm/xfce4-wm/pkg-plist,v
retrieving revision 1.17
diff -u -r1.17 pkg-plist
--- pkg-plist	22 Jan 2007 16:45:04 -0000	1.17
+++ pkg-plist	2 Jun 2007 21:32:46 -0000
@@ -1320,4 +1320,3 @@
 @dirrmtry share/icons/hicolor/scalable/apps
 @dirrmtry share/icons/hicolor/scalable
 @dirrmtry share/themes
-
Index: files/extrapatch-src__events.c
===================================================================
RCS file: files/extrapatch-src__events.c
diff -N files/extrapatch-src__events.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/extrapatch-src__events.c	2 Jun 2007 21:32:46 -0000
@@ -0,0 +1,16 @@
+--- ./src/events.c.orig	Mon Apr  2 21:48:20 2007
++++ ./src/events.c	Sat Jun  2 23:02:58 2007
+@@ -860,11 +860,11 @@
+ 
+     if (ev->button == Button4)
+     {
+-        workspaceSwitch (screen_info, screen_info->current_ws - 1, NULL, TRUE, ev->time);
++        workspaceSwitch (screen_info, screen_info->current_ws + 1, NULL, TRUE, ev->time);
+     }
+     else if (ev->button == Button5)
+     {
+-        workspaceSwitch (screen_info, screen_info->current_ws + 1, NULL, TRUE, ev->time);
++        workspaceSwitch (screen_info, screen_info->current_ws - 1, NULL, TRUE, ev->time);
+     }
+ }
+ 
--- xfce4-wm.patch ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->oliver 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Sat Jun 2 22:10:13 UTC 2007 
Responsible-Changed-Why:  
Over to maintainer 

http://www.freebsd.org/cgi/query-pr.cgi?pr=113269 
State-Changed-From-To: open->closed 
State-Changed-By: oliver 
State-Changed-When: Tue Jun 19 04:53:58 UTC 2007 
State-Changed-Why:  
Committed, Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=113269 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/113269: commit references a PR
Date: Tue, 19 Jun 2007 04:53:15 +0000 (UTC)

 oliver      2007-06-19 04:53:09 UTC
 
   FreeBSD ports repository
 
   Modified files:
     x11-wm/xfce4-wm      Makefile pkg-plist 
   Log:
   add an optional patch which reverses the mouse workspace changing
   direction.
   
   PR:             ports/113269
   Submitted by:   ehaupt
   
   Revision  Changes    Path
   1.41      +7 -2      ports/x11-wm/xfce4-wm/Makefile
   1.18      +0 -1      ports/x11-wm/xfce4-wm/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/113269: commit references a PR
Date: Tue, 19 Jun 2007 04:53:47 +0000 (UTC)

 oliver      2007-06-19 04:53:44 UTC
 
   FreeBSD ports repository
 
   Added files:
     x11-wm/xfce4-wm/files extrapatch-src__events.c 
   Log:
   add an optional patch which reverses the mouse workspace changing
   direction.
   
   PR:             ports/113269
   Submitted by:   ehaupt
   
   Revision  Changes    Path
   1.1       +16 -0     ports/x11-wm/xfce4-wm/files/extrapatch-src__events.c (new)
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
