From benhutch@byers.xfiles.org.uk Sun Aug  8 10:13:01 1999
Return-Path: <benhutch@byers.xfiles.org.uk>
Received: from byers.xfiles.org.uk (byers.xfiles.org.uk [194.200.230.245])
	by hub.freebsd.org (Postfix) with ESMTP id D97B614E52
	for <FreeBSD-gnats-submit@freebsd.org>; Sun,  8 Aug 1999 10:12:48 -0700 (PDT)
	(envelope-from benhutch@byers.xfiles.org.uk)
Received: (from benhutch@localhost)
	by byers.xfiles.org.uk (8.9.3/8.9.3) id SAA85537;
	Sun, 8 Aug 1999 18:10:36 +0100 (BST)
	(envelope-from benhutch)
Message-Id: <199908081710.SAA85537@byers.xfiles.org.uk>
Date: Sun, 8 Aug 1999 18:10:36 +0100 (BST)
From: benhutch@root.org.uk
Sender: benhutch@byers.xfiles.org.uk
Reply-To: benhutch@xfiles.org.uk
To: FreeBSD-gnats-submit@freebsd.org
Subject: windowmaker port patch for single icon mode with GNOME
X-Send-Pr-Version: 3.2

>Number:         13033
>Category:       ports
>Synopsis:       windowmaker port patch for single icon mode with GNOME
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sun Aug  8 10:20:00 PDT 1999
>Closed-Date:    Sat Oct 2 09:16:43 PDT 1999
>Last-Modified:  Sat Oct  2 09:16:53 PDT 1999
>Originator:     
>Release:        
>Organization:
>Environment:
>Description:
 Submitter-Id:   current-users
 Originator:     Ben Hutchinson
 Confidential:   no
 Severity:       non-critical
 Priority:       low
 Category:       ports
 Release:        FreeBSD 4.0-CURRENT i386
 Class:          change-request
 Environment: 
 
 	windowmaker-0.60.0
 
 Description: 
 
 	The current windowmaker port does not allow people to have only
 one icon per application instance.  The --enable-single-icon option to
 WindowMaker's configure script allows this.  The below patch brings this
 option into the port's Makefile.
 	patch-aa fixes a small typo in the source code which shows up
 when the --enable-gnome and --enable-single-icon options to configure
 are used.  This bug has been submitted back to the WindowMaker folks.
 	I haven't tested this with KDE support, since I don't have KDE
 installed, and don't wish it to be.  It is such a small change that I
 very much doubt it will have any effect on the KDE support.
 
 How-To-Repeat: 
 
 	cd /usr/ports/x11-wm/windowmaker && `USE_GNOME=yes USE_SINGLE_ICON=yes make install
 
 Fix: 
 	
 diff -urN windowmaker.O/Makefile windowmaker/Makefile
 --- windowmaker.O/Makefile	Thu Aug  5 14:09:27 1999
 +++ windowmaker/Makefile	Thu Aug  5 14:38:58 1999
 @@ -46,6 +46,10 @@
  CONFIGURE_ARGS+=	--enable-kde
  .endif
  
 +.if defined(USE_SINGLE_ICON)
 +CONFIGURE_ARGS+=	--enable-single-icon
 +.endif
 +
  .SILENT:
  
  .if !defined(USE_KDE) && !defined(USE_GNOME)
 diff -urN windowmaker.O/patches/patch-aa windowmaker/patches/patch-aa
 --- windowmaker.O/patches/patch-aa	Thu Jan  1 01:00:00 1970
 +++ windowmaker/patches/patch-aa	Thu Aug  5 14:11:46 1999
 @@ -0,0 +1,10 @@
 +--- src/dock.c.O	Thu Aug  5 14:06:21 1999
 ++++ src/dock.c	Thu Aug  5 14:07:03 1999
 +@@ -3526,7 +3526,6 @@
 + 	((btn->icon->owner == NULL) && (btn->applist != NULL))) {
 + 	    if (btn->icon->owner == NULL)
 + 	    	btn->icon->owner = btn->applist->wapp->main_window_desc;
 +-    }
 + #else
 +     if (btn->icon->owner && !(event->xbutton.state & ControlMask)) {
 + #endif
 
 
>How-To-Repeat:
>Fix:
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: gnats-admin->freebsd-ports 
Responsible-Changed-By: hoek 
Responsible-Changed-When: Sun Aug 22 13:46:12 PDT 1999 
Responsible-Changed-Why:  
Misfiled PR 
State-Changed-From-To: open->closed  
State-Changed-By: cpiazza 
State-Changed-When: Sat Oct 2 09:16:43 PDT 1999 
State-Changed-Why:  
Hook added, thanks! 
>Unformatted:
