kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add patch to fix missing line breaks in the chat box

Browse source 
Bump PORTREVISION

PR:		ports/40998
Submitted by:	maintainer, Samuel Kesterson <samuelk@k-labs.com>
This commit is contained in:
Patrick Li 2002-07-28 05:35:42 +00:00
parent 0660c879c3
commit a5dd14f3c0
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=63650
8 changed files with 60 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
net-im/psi/Makefile
View file

@ -7,6 +7,7 @@
PORTNAME= psi PORTNAME= psi
PORTVERSION= 0.8.6 PORTVERSION= 0.8.6
PORTREVISION= 1
CATEGORIES= net CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME} MASTER_SITE_SUBDIR= ${PORTNAME}
@ -23,7 +24,7 @@ MAKE_ARGS= QTDIR=${X11BASE}
EXTRA_PATCHES= ${WRKDIR}/patch-common.cpp EXTRA_PATCHES= ${WRKDIR}/patch-common.cpp
pre-patch: pre-patch:
${SED} s,%%PREFIX%%,${PREFIX}, ${PATCHDIR}/template.patch-common.cpp > \ ${SED} s,%%DATADIR%%,${DATADIR}, ${PATCHDIR}/template.patch-common.cpp > \
${WRKDIR}/patch-common.cpp ${WRKDIR}/patch-common.cpp
pre-build: pre-build:

24
net-im/psi/files/patch-src::chatdlg.cpp Normal file
View file

@ -0,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)));

3
net-im/psi/files/patch-src::ndns.cpp
View file

@ -1,3 +1,6 @@
$FreeBSD$
--- src/ndns.cpp.orig Thu Jul 11 18:49:42 2002 --- src/ndns.cpp.orig Thu Jul 11 18:49:42 2002
+++ src/ndns.cpp Thu Jul 11 18:40:24 2002 +++ src/ndns.cpp Thu Jul 11 18:40:24 2002
@@ -51,6 +51,7 @@ @@ -51,6 +51,7 @@

2
net-im/psi/files/template.patch-common.cpp
View file

@ -7,7 +7,7 @@ $FreeBSD$
QString getResourcesDir() QString getResourcesDir()
{ {
- return "/usr/local/psi"; - return "/usr/local/psi";
+ return "%%PREFIX%%/share/psi"; + return "%%DATADIR%%";
} }
QString getHomeDir() QString getHomeDir()

3
net/psi/Makefile
View file

@ -7,6 +7,7 @@
PORTNAME= psi PORTNAME= psi
PORTVERSION= 0.8.6 PORTVERSION= 0.8.6
PORTREVISION= 1
CATEGORIES= net CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME} MASTER_SITE_SUBDIR= ${PORTNAME}
@ -23,7 +24,7 @@ MAKE_ARGS= QTDIR=${X11BASE}
EXTRA_PATCHES= ${WRKDIR}/patch-common.cpp EXTRA_PATCHES= ${WRKDIR}/patch-common.cpp
pre-patch: pre-patch:
${SED} s,%%PREFIX%%,${PREFIX}, ${PATCHDIR}/template.patch-common.cpp > \ ${SED} s,%%DATADIR%%,${DATADIR}, ${PATCHDIR}/template.patch-common.cpp > \
${WRKDIR}/patch-common.cpp ${WRKDIR}/patch-common.cpp
pre-build: pre-build:

24
net/psi/files/patch-src::chatdlg.cpp Normal file
View file

@ -0,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)));

3
net/psi/files/patch-src::ndns.cpp
View file

@ -1,3 +1,6 @@
$FreeBSD$
--- src/ndns.cpp.orig Thu Jul 11 18:49:42 2002 --- src/ndns.cpp.orig Thu Jul 11 18:49:42 2002
+++ src/ndns.cpp Thu Jul 11 18:40:24 2002 +++ src/ndns.cpp Thu Jul 11 18:40:24 2002
@@ -51,6 +51,7 @@ @@ -51,6 +51,7 @@

2
net/psi/files/template.patch-common.cpp
View file

@ -7,7 +7,7 @@ $FreeBSD$
QString getResourcesDir() QString getResourcesDir()
{ {
- return "/usr/local/psi"; - return "/usr/local/psi";
+ return "%%PREFIX%%/share/psi"; + return "%%DATADIR%%";
} }
QString getHomeDir() QString getHomeDir()