From owner-freebsd-ports Thu Jul 25 23:30:18 2002 Delivered-To: freebsd-ports@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6C14D37B401 for ; Thu, 25 Jul 2002 23:30:03 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 51D1443E65 for ; Thu, 25 Jul 2002 23:30:02 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6Q6U2JU023987 for ; Thu, 25 Jul 2002 23:30:02 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6Q6U2NN023986; Thu, 25 Jul 2002 23:30:02 -0700 (PDT) Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 57ED837B400 for ; Thu, 25 Jul 2002 23:26:43 -0700 (PDT) Received: from chen.org.nz (chen.org.nz [210.54.19.51]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8D37D43E65 for ; Thu, 25 Jul 2002 23:26:42 -0700 (PDT) (envelope-from jonc@chen.org.nz) Received: from grimoire.chen.org.nz (localhost [127.0.0.1]) by chen.org.nz (8.12.5/8.12.5) with ESMTP id g6Q6QfUd096503 for ; Fri, 26 Jul 2002 18:26:41 +1200 (NZST) (envelope-from jonc@grimoire.chen.org.nz) Received: (from jonc@localhost) by grimoire.chen.org.nz (8.12.5/8.12.5/Submit) id g6Q6QfOb096502; Fri, 26 Jul 2002 18:26:41 +1200 (NZST) (envelope-from jonc) Message-Id: <200207260626.g6Q6QfOb096502@grimoire.chen.org.nz> Date: Fri, 26 Jul 2002 18:26:41 +1200 (NZST) From: Jonathan Chen Reply-To: Jonathan Chen To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/40998: patch for psi-0.8.6 (net/psi) to fix missing line breaks in chat box Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >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 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("").arg(color) + QString("[%1]").arg(timestr) + QString(" *%1 ").arg(expandEntities(who)) + txt + ""); + + t->append(QString("
").arg(color) + QString("[%1]").arg(timestr) + QString(" *%1 ").arg(expandEntities(who)) + txt + ""); + } + else { + if(option.chatSays) + - t->append(QString("").arg(color) + QString("[%1] ").arg(timestr) + expandEntities(who) + QString(" says:
") + txt); + + t->append(QString("
").arg(color) + QString("[%1] ").arg(timestr) + expandEntities(who) + QString(" says:
") + txt); + else + - t->append(QString("").arg(color) + QString("[%1] <").arg(timestr) + expandEntities(who) + QString("> ") + txt); + + t->append(QString("
").arg(color) + QString("[%1] <").arg(timestr) + expandEntities(who) + QString("> ") + txt); + } + if(!msg.subject.isEmpty()) { + t->append(QString("") + tr("Subject:") + " " + 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