From pav@oook.cz  Mon Jun  9 05:08:13 2003
Return-Path: <pav@oook.cz>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 9937337B401
	for <FreeBSD-gnats-submit@freebsd.org>; Mon,  9 Jun 2003 05:08:13 -0700 (PDT)
Received: from e0-a3.b1.lan.prg.vol.cz (e0-a3.b1.lan.prg.vol.cz [195.122.204.155])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 706D243F93
	for <FreeBSD-gnats-submit@freebsd.org>; Mon,  9 Jun 2003 05:08:12 -0700 (PDT)
	(envelope-from pav@oook.cz)
Received: from pav.hide.vol.cz (localhost [127.0.0.1])
	by e0-a3.b1.lan.prg.vol.cz (8.12.9/8.12.9) with ESMTP id h59C8AOx097378
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 9 Jun 2003 14:08:10 +0200 (CEST)
	(envelope-from pav@pav.hide.vol.cz)
Received: (from pav@localhost)
	by pav.hide.vol.cz (8.12.9/8.12.9/Submit) id h59C89PJ097377;
	Mon, 9 Jun 2003 14:08:09 +0200 (CEST)
	(envelope-from pav)
Message-Id: <200306091208.h59C89PJ097377@pav.hide.vol.cz>
Date: Mon, 9 Jun 2003 14:08:09 +0200 (CEST)
From: Pav Lucistnik <pav@oook.cz>
Reply-To: Pav Lucistnik <pav@oook.cz>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [maintainer update] textproc/meld fix hardcoded path
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         53087
>Category:       ports
>Synopsis:       [maintainer update] textproc/meld fix hardcoded path
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jun 09 05:10:11 PDT 2003
>Closed-Date:    Wed Jun 11 19:41:44 PDT 2003
>Last-Modified:  Wed Jun 11 19:41:44 PDT 2003
>Originator:     Pav Lucistnik
>Release:        FreeBSD 4.8-STABLE i386
>Organization:
>Environment:
System: FreeBSD pav.hide.vol.cz 4.8-STABLE FreeBSD 4.8-STABLE #1: Tue May 20 09:27:29 CEST 2003 root@pav.hide.vol.cz:/usr/obj/usr/src/sys/PAV i386


>Description:
Fix hardcoded path of GNOME pixmaps directory (valid on Linux).

Submitted by: Sergey Akifyev <asa@gascom.ru>

>How-To-Repeat:
	
>Fix:

--- Makefile.orig	Tue Apr 22 09:31:09 2003
+++ Makefile	Mon Jun  9 13:52:31 2003
@@ -24,6 +24,7 @@
 post-patch:
 	@${REINPLACE_CMD} -e 's|os.path.dirname(sys.argv\[0\])|"${PYTHON_SITELIBDIR}/meldapp"|' ${WRKSRC}/misc.py
 	@${REINPLACE_CMD} -e 's|/"+os.path.abspath(misc.appdir("manual/index.html") )|${PREFIX}/share/doc/meld/index.html"|' ${WRKSRC}/meldapp.py
+	@${REINPLACE_CMD} -e 's|/usr/share/pixmaps|${X11BASE}/share/gnome/pixmaps|' ${WRKSRC}/cvsview.py
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/meld ${PREFIX}/bin


>Release-Note:
>Audit-Trail:

From: Pav Lucistnik <pav@oook.cz>
To: freebsd-gnats-submit@freebsd.org
Cc:  
Subject: Re: ports/53087: [maintainer update] textproc/meld fix hardcoded
 path
Date: Mon, 9 Jun 2003 15:46:46 +0200 (CEST)

 - Fix timezone offset in CVS view (and make it usable).
   Fix was sent to Meld people.
   Again submitted by: Sergey Akifyev <asa@gascom.ru>
 
 Commiter please add this as new file files/patch-cvsview.py:
 
 --- cvsview.py.orig     Mon Jun  9 15:36:40 2003
 +++ cvsview.py  Mon Jun  9 15:37:53 2003
 @@ -90,7 +90,7 @@
                  if plus >= 0:
                      cotime = 0
                  try:
 -                    cotime = time.mktime( time.strptime(date) )
 +                    cotime = time.mktime( time.strptime(date) ) - time.timezone
                  except ValueError, e:
                      if not date.startswith("Result of merge"):
                          print "Unable to parse date '%s' in '%s/CVS/Entries'" % (date, directory)
 
 
 -- 
 Pav Lucistnik <pav@oook.cz>
 printk("Penguin %d is stuck in the bottle.\n", i);
     2.0.38 /usr/src/linux/arch/sparc/kernel/smp.c
State-Changed-From-To: open->closed 
State-Changed-By: lioux 
State-Changed-When: Wed Jun 11 19:41:43 PDT 2003 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=53087 
>Unformatted:
