Skip site navigation (1)Skip section navigation (2) 
Date:      Fri, 26 Jul 2002 18:26:41 +1200 (NZST)
From:      Jonathan Chen <jonc@chen.org.nz>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/40998: patch for psi-0.8.6 (net/psi) to fix missing line breaks in chat box
Message-ID:  <200207260626.g6Q6QfOb096502@grimoire.chen.org.nz>
next in thread | raw e-mail | index | archive | help 

>Number:         40998
>Category:       ports
>Synopsis:       patch for psi-0.8.6 (net/psi) to fix missing line breaks in chat box
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jul 25 23:30:01 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator:     Jonathan Chen
>Release:        FreeBSD 4.6-STABLE i386
>Organization:
chen.org.nz
>Environment:
System: FreeBSD grimoire.chen.org.nz 4.6-STABLE FreeBSD 4.6-STABLE #0: Sun Jul 21 19:15:39 NZST 2002 root@grimoire.chen.org.nz:/usr/obj/usr/src/sys/GRIMOIRE i386
>Description:
A patch submitted by Samuel Kesterson <samuelk@k-labs.com> to fix
missing line-breaks in psi-0.8.6's chat-box.

The author contends that it's a problem with qt-3.0.3, fixed in qt-3.0.5;
but since we aren't up to qt-3.0.5 yet, a workaround is required.

>How-To-Repeat:
>Fix:

A new patch file is created. The committer may need to move it
to the files/ directory (since patch(1) doesn't appear to place
new files correctly).

diff -c -N -r /usr/ports/net/psi/Makefile ./Makefile
*** /usr/ports/net/psi/Makefile	Sun Jul 14 12:24:48 2002
--- ./Makefile	Fri Jul 26 17:54:22 2002
***************
*** 7,12 ****
--- 7,13 ----
  
  PORTNAME=	psi
  PORTVERSION=	0.8.6
+ PORTREVISION=	1
  CATEGORIES=	net
  MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
  MASTER_SITE_SUBDIR=	${PORTNAME}
***************
*** 23,29 ****
  EXTRA_PATCHES=	${WRKDIR}/patch-common.cpp
  
  pre-patch:
! 	${SED} s,%%PREFIX%%,${PREFIX}, ${PATCHDIR}/template.patch-common.cpp > \
  		${WRKDIR}/patch-common.cpp
  
  pre-build:
--- 24,30 ----
  EXTRA_PATCHES=	${WRKDIR}/patch-common.cpp
  
  pre-patch:
! 	${SED} s,%%DATADIR%%,${DATADIR}, ${PATCHDIR}/template.patch-common.cpp > \
  		${WRKDIR}/patch-common.cpp
  
  pre-build:
diff -c -N -r /usr/ports/net/psi/files/patch-src::chatdlg.cpp ./files/patch-src::chatdlg.cpp
*** /usr/ports/net/psi/files/patch-src::chatdlg.cpp	Thu Jan  1 12:00:00 1970
--- ./files/patch-src::chatdlg.cpp	Thu Jul 25 20:07:47 2002
***************
*** 0 ****
--- 1,24 ----
+ $FreeBSD$
+ 
+ A workaround for a bug in qt-3.0.3. This patch file should be removed
+ if we ever upgrade to qt-3.0.5
+ 
+ --- src/chatdlg.cpp.orig	Tue Jul 23 21:08:25 2002
+ +++ src/chatdlg.cpp	Tue Jul 23 21:09:59 2002
+ @@ -384,13 +384,13 @@
+  
+  	//t->setUpdatesEnabled(FALSE);
+  	if(emote) {
+ -		t->append(QString("<font color=\"%1\">").arg(color) + QString("[%1]").arg(timestr) + QString(" *%1 ").arg(expandEntities(who)) + txt + "</font>");
+ +		t->append(QString("<BR><font color=\"%1\">").arg(color) + QString("[%1]").arg(timestr) + QString(" *%1 ").arg(expandEntities(who)) + txt + "</font>");
+  	}
+  	else {
+  		if(option.chatSays)
+ -			t->append(QString("<font color=\"%1\">").arg(color) + QString("[%1] ").arg(timestr) + expandEntities(who) + QString(" says:</font><br>") + txt);
+ +			t->append(QString("<BR><font color=\"%1\">").arg(color) + QString("[%1] ").arg(timestr) + expandEntities(who) + QString(" says:</font><br>") + txt);
+  		else
+ -			t->append(QString("<font color=\"%1\">").arg(color) + QString("[%1] &lt;").arg(timestr) + expandEntities(who) + QString("&gt;</font> ") + txt);
+ +			t->append(QString("<BR><font color=\"%1\">").arg(color) + QString("[%1] &lt;").arg(timestr) + expandEntities(who) + QString("&gt;</font> ") + txt);
+  	}
+  	if(!msg.subject.isEmpty()) {
+  		t->append(QString("<b>") + tr("Subject:") + "</b> " + QString("%1").arg(expandEntities(msg.subject)));
diff -c -N -r /usr/ports/net/psi/files/patch-src::ndns.cpp ./files/patch-src::ndns.cpp
*** /usr/ports/net/psi/files/patch-src::ndns.cpp	Sat Jul 13 06:20:36 2002
--- ./files/patch-src::ndns.cpp	Fri Jul 26 17:51:49 2002
***************
*** 1,3 ****
--- 1,6 ----
+ $FreeBSD$
+ 
+ 
  --- src/ndns.cpp.orig	Thu Jul 11 18:49:42 2002
  +++ src/ndns.cpp	Thu Jul 11 18:40:24 2002
  @@ -51,6 +51,7 @@
diff -c -N -r /usr/ports/net/psi/files/template.patch-common.cpp ./files/template.patch-common.cpp
*** /usr/ports/net/psi/files/template.patch-common.cpp	Thu May  2 17:50:40 2002
--- ./files/template.patch-common.cpp	Thu Jul 25 20:04:27 2002
***************
*** 7,13 ****
   QString getResourcesDir()
   {
  -	return "/usr/local/psi";
! +	return "%%PREFIX%%/share/psi";
   }
   
   QString getHomeDir()
--- 7,13 ----
   QString getResourcesDir()
   {
  -	return "/usr/local/psi";
! +	return "%%DATADIR%%";
   }
   
   QString getHomeDir()
>Release-Note:
>Audit-Trail:
>Unformatted:

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200207260626.g6Q6QfOb096502>