From lars@0x20.net  Sat Jun 16 23:22:39 2007
Return-Path: <lars@0x20.net>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 58C1B16A41F
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 16 Jun 2007 23:22:39 +0000 (UTC)
	(envelope-from lars@0x20.net)
Received: from mail.0x20.net (mail.0x20.net [217.69.67.217])
	by mx1.freebsd.org (Postfix) with ESMTP id 00D5913C45E
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 16 Jun 2007 23:22:38 +0000 (UTC)
	(envelope-from lars@0x20.net)
Received: from maggie.bsd-geek.de (dslb-084-060-197-176.pools.arcor-ip.net [84.60.197.176])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(No client certificate requested)
	(Authenticated sender: lala)
	by mail.0x20.net (Postfix) with ESMTP id 99B8B39E20
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 17 Jun 2007 01:22:37 +0200 (CEST)
Received: from maggie.bsd-geek.de (localhost [127.0.0.1])
	by maggie.bsd-geek.de (8.14.1/8.14.1) with ESMTP id l5GNMX4V045568
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 17 Jun 2007 01:22:33 +0200 (CEST)
	(envelope-from lars@maggie.bsd-geek.de)
Received: (from root@localhost)
	by maggie.bsd-geek.de (8.14.1/8.14.1/Submit) id l5GNMWfx045567;
	Sun, 17 Jun 2007 01:22:32 +0200 (CEST)
	(envelope-from lars)
Message-Id: <200706162322.l5GNMWfx045567@maggie.bsd-geek.de>
Date: Sun, 17 Jun 2007 01:22:32 +0200 (CEST)
From: Lars Engels <lars.engels@0x20.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [MAINTAINER] x11/mrxvt-devel: Add patch
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         113782
>Category:       ports
>Synopsis:       [MAINTAINER] x11/mrxvt-devel: Add patch
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    miwi
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jun 16 23:30:02 GMT 2007
>Closed-Date:    Mon Jun 18 16:14:57 GMT 2007
>Last-Modified:  Mon Jun 18 16:20:02 GMT 2007
>Originator:     Lars Engels
>Release:        FreeBSD 7.0-CURRENT i386
>Organization:
>Environment:
System: FreeBSD maggie.bsd-geek.de 7.0-CURRENT FreeBSD 7.0-CURRENT #2: Wed Jun  6 21:12:35 CEST
>Description:
Add a patch by Stanislav Mekhanoshin <rampitec AT gmail.com> that lets you add an
application icon to mrxvt.
To enable it, add 
mrxvt*appIcon: /usr/local/share/pixmaps/mrxvt.xpm
to your mrxvtrc.

Added file(s):
- files/patch-src-main.c
- files/patch-src-rxvt.h
- files/patch-src-xdefaults.c

Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:

--- mrxvt-devel-0.5.2_2.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/x11/mrxvt-devel/Makefile,v
retrieving revision 1.7
diff -u -u -r1.7 Makefile
--- Makefile	19 May 2007 20:27:06 -0000	1.7
+++ Makefile	16 Jun 2007 23:20:41 -0000
@@ -7,7 +7,7 @@
 
 PORTNAME=	mrxvt-devel
 PORTVERSION=	0.5.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	materm
Index: files/patch-src-init.c
===================================================================
RCS file: /home/ncvs/ports/x11/mrxvt-devel/files/patch-src-init.c,v
retrieving revision 1.1
diff -u -u -r1.1 patch-src-init.c
--- files/patch-src-init.c	31 Oct 2006 08:50:35 -0000	1.1
+++ files/patch-src-init.c	16 Jun 2007 23:20:41 -0000
@@ -1,7 +1,5 @@
-Index: src/init.c
-===================================================================
---- src/init.c	(revision 195)
-+++ src/init.c	(working copy)
+--- src/init.c.orig	Sat Jun 16 23:26:00 2007
++++ src/init.c	Sat Jun 16 23:26:19 2007
 @@ -41,7 +41,7 @@
  # define DEBUG_X
  #else
@@ -11,3 +9,22 @@
  #endif
  
  #if DEBUG_LEVEL
+@@ -3369,6 +3369,18 @@
+     wm_hint.initial_state = ISSET_OPTION(r, Opt_iconic) ? IconicState
+ 			    : NormalState;
+     wm_hint.window_group = r->TermWin.parent;
++
++    /* window icon hint */
++    if( r->h->rs[Rs_appIcon] ) {
++        XpmReadFileToPixmap(r->Xdisplay, r->TermWin.parent, r->h->rs[Rs_appIcon],
++            &r->h->appIcon, &r->h->appIconMask,0);
++    }
++    if( r->h->appIcon != None &&  r->h->appIconMask != None ) {
++        wm_hint.icon_pixmap = r->h->appIcon;
++        wm_hint.icon_mask = r->h->appIconMask;
++        wm_hint.flags |= IconPixmapHint | IconMaskHint;
++    }
++    
+     /* class hints */
+     class_hint.res_name = (char*) r->h->rs[Rs_name];
+     class_hint.res_class = (char*) APL_CLASS;
Index: files/patch-src-main.c
===================================================================
RCS file: files/patch-src-main.c
diff -N files/patch-src-main.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-src-main.c	16 Jun 2007 23:20:41 -0000
@@ -0,0 +1,28 @@
+--- src/main.c.orig	Sun Oct  1 23:50:39 2006
++++ src/main.c	Sat Jun 16 23:10:08 2007
+@@ -562,6 +562,17 @@
+ #  endif
+ # endif
+ 
++    if( NOT_NULL( r->h->appIcon ) )
++    {
++        XFreePixmap (r->Xdisplay, r->h->appIcon);
++        SET_NULL(r->h->appIcon);
++    }
++    if( NOT_NULL( r->h->appIconMask ) )
++    {
++        XFreePixmap (r->Xdisplay, r->h->appIconMask);
++        SET_NULL(r->h->appIconMask);
++    }
++
+     if (IS_CURSOR(r->term_pointer))
+     {
+ 	XFreeCursor (r->Xdisplay, r->term_pointer);
+@@ -599,6 +610,7 @@
+ 	SET_NULL(r->xftColors);
+     }
+ # endif
++
+     rxvt_free (r->h);		    SET_NULL(r->h);
+     rxvt_free (r);		    SET_NULL(r);
+ 
Index: files/patch-src-rxvt.h
===================================================================
RCS file: files/patch-src-rxvt.h
diff -N files/patch-src-rxvt.h
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-src-rxvt.h	16 Jun 2007 23:20:41 -0000
@@ -0,0 +1,23 @@
+--- src/rxvt.h.orig	Sun Oct  1 23:50:38 2006
++++ src/rxvt.h	Sat Jun 16 23:10:15 2007
+@@ -1109,9 +1109,7 @@
+ 
+ #ifdef BACKGROUND_IMAGE
+     Rs_tabbarPixmap,	/* tabbar background pixmap */
+-# if 0 /* appicon not yet implemented */
+     Rs_appIcon,		/* use pixmap as application icon */
+-# endif
+ #endif
+ 
+ #ifdef HAVE_MENUBAR
+@@ -1704,6 +1702,10 @@
+ 							   succesfully grabbed
+ 							   at prevPos */
+ #endif
++
++    Pixmap          appIcon;
++    Pixmap          appIconMask;
++
+ };
+ 
+ #ifndef __attribute__
Index: files/patch-src-xdefaults.c
===================================================================
RCS file: files/patch-src-xdefaults.c
diff -N files/patch-src-xdefaults.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-src-xdefaults.c	16 Jun 2007 23:20:41 -0000
@@ -0,0 +1,12 @@
+--- src/xdefaults.c.orig	Sun Oct  1 23:50:37 2006
++++ src/xdefaults.c	Sat Jun 16 23:10:19 2007
+@@ -234,9 +234,7 @@
+     STRG(Rs_tabbarPixmap, "tabbarPixmap", "tbpixmap", "file[;geom]", "tabbar background image", 0),
+     BOOL( "tabUsePixmap", "tupixmap", Opt_tabPixmap,
+ 	    "use tabbar background image for tabs" ),
+-# if 0 /* App icon not yet implemented */
+     STRG(Rs_appIcon, "appIcon", "ic", "file[;geom]", "application icon file", 0),
+-#endif
+ #endif	/* BACKGROUND_IMAGE */
+ 
+     BOOL( "utmpInhibit", "ut", Opt_utmpInhibit,
--- mrxvt-devel-0.5.2_2.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->miwi 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Sat Jun 16 23:30:10 UTC 2007 
Responsible-Changed-Why:  
miwi@ wants this PRs 

http://www.freebsd.org/cgi/query-pr.cgi?pr=113782 
State-Changed-From-To: open->closed 
State-Changed-By: miwi 
State-Changed-When: Mon Jun 18 16:14:54 UTC 2007 
State-Changed-Why:  
Committed. Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/113782: commit references a PR
Date: Mon, 18 Jun 2007 16:14:50 +0000 (UTC)

 miwi        2007-06-18 16:14:39 UTC
 
   FreeBSD ports repository
 
   Modified files:
     x11/mrxvt-devel      Makefile 
     x11/mrxvt-devel/files patch-src-init.c 
   Added files:
     x11/mrxvt-devel/files patch-src-main.c patch-src-rxvt.h 
                           patch-src-xdefaults.c 
   Log:
   - Add a application icon to mrxvt. (by Stanislav Mekhanoshin <rampitec AT gmail.com> )
   - Bump PORTREVISION
   
   PR:             113782
   Submitted by:   Lars Engels <lars.engels@0x20.net> (maintainer)
   
   Revision  Changes    Path
   1.8       +1 -1      ports/x11/mrxvt-devel/Makefile
   1.2       +21 -4     ports/x11/mrxvt-devel/files/patch-src-init.c
   1.3       +28 -0     ports/x11/mrxvt-devel/files/patch-src-main.c (new)
   1.1       +23 -0     ports/x11/mrxvt-devel/files/patch-src-rxvt.h (new)
   1.1       +12 -0     ports/x11/mrxvt-devel/files/patch-src-xdefaults.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:
