Date: Wed, 31 May 2006 00:18:17 +0100 From: Shaun Amott <shaun@inerd.com> To: FreeBSD-gnats-submit@FreeBSD.org Cc: anray@FreeBSD.org Subject: ports/98175: [MAINTAINER] net-im/psi-gentoo: Fix build on 4.x; add additional patch Message-ID: <1149031097.3159@charon.picobyte.net> Resent-Message-ID: <200605302320.k4UNKCSc087670@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 98175 >Category: ports >Synopsis: [MAINTAINER] net-im/psi-gentoo: Fix build on 4.x; add additional patch >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Tue May 30 23:20:12 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Shaun Amott >Release: FreeBSD 6.1-STABLE i386 >Organization: >Environment: >Description: These affect psi-gentoo, but are applied to the master port. - Fix build on 4.x - Fix master site grouping - Add additional patch >How-To-Repeat: >Fix: --- psi.diff begins here --- Index: psi/Makefile.gentoo =================================================================== RCS file: /home/ncvs/ports/net-im/psi/Makefile.gentoo,v retrieving revision 1.1 diff -u -r1.1 Makefile.gentoo --- psi/Makefile.gentoo 27 May 2006 06:51:50 -0000 1.1 +++ psi/Makefile.gentoo 30 May 2006 23:12:38 -0000 @@ -6,10 +6,11 @@ # MASTER_SITES+= http://vivid.dat.pl/psi/:vivid \ + http://mirror.inerd.com/FreeBSD/distfiles/psi-gentoo/:inerd \ http://csociety-ftp.ecn.purdue.edu/pub/gentoo-portage/net-im/psi/files/:portage \ - ${MASTER_SITE_GENTOO:C/gentoo\/%SUBDIR%/gentoo-portage\/net-im\/psi\/files/g}:portage + ${MASTER_SITE_GENTOO:C/gentoo\/%SUBDIR%\//gentoo-portage\/net-im\/psi\/files\/:portage/g} -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} gentoo-psi-0.10.tar.bz2:vivid psi-indicator.png:portage +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} gentoo-psi-0.10.tar.bz2:vivid psi-indicator.png:portage psi-reverse_trayicon2.patch:inerd EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} gentoo-psi-0.10.tar.bz2 GENTOO_PATCHES= ${WRKDIR}/0.10 PKGNAMESUFFIX= -gentoo @@ -158,12 +159,17 @@ ${GPATCH} -d ${WRKSRC} -p1 < ${GENTOO_PATCHES}/psi-gentoo-version.patch + ${CP} ${DISTDIR}/psi-reverse_trayicon2.patch ${GENTOO_PATCHES} + ${GPATCH} -d ${WRKSRC} -p0 < ${GENTOO_PATCHES}/psi-reverse_trayicon2.patch + # Repair Makefile ${MV} ${WRKSRC}/src/psiaccount.cpp ${WRKSRC}/src/psiaccount.cpp.orig ${SED} -e 's/include"adhoc.h"/include"..\/adhoc.h"/' \ -e 's/include"rc.h"/include"..\/rc.h"/' \ -e 's/include"adhoc_fileserver.h"/include"..\/adhoc_fileserver.h"/' \ ${WRKSRC}/src/psiaccount.cpp.orig > ${WRKSRC}/src/psiaccount.cpp + + cd ${WRKSRC} && ${PATCH} < ${FILESDIR}/gentoopatch-src_psiaccount.cpp # Move misplaced files ${MV} ${WRKSRC}/adhoc.cpp \ Index: psi/distinfo =================================================================== RCS file: /home/ncvs/ports/net-im/psi/distinfo,v retrieving revision 1.11 diff -u -r1.11 distinfo --- psi/distinfo 27 May 2006 06:51:50 -0000 1.11 +++ psi/distinfo 30 May 2006 23:12:38 -0000 @@ -7,3 +7,6 @@ MD5 (psi-indicator.png) = 0d5cafd17325fc912c4855252d73378f SHA256 (psi-indicator.png) = a0e9adcd0409d23c9033170ceb8f22980ba6d5e14f19234630f9986bfb94bce2 SIZE (psi-indicator.png) = 300 +MD5 (psi-reverse_trayicon2.patch) = c2528c15be8277434647506d791663d8 +SHA256 (psi-reverse_trayicon2.patch) = 2a690a7cda661884ce3424530ac6569a7fcb1e6c97342c120767a0d5058c403c +SIZE (psi-reverse_trayicon2.patch) = 937 Index: psi/files/gentoopatch-src_psiaccount.cpp =================================================================== RCS file: psi/files/gentoopatch-src_psiaccount.cpp diff -N psi/files/gentoopatch-src_psiaccount.cpp --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ psi/files/gentoopatch-src_psiaccount.cpp 30 May 2006 23:12:38 -0000 @@ -0,0 +1,38 @@ +--- src/psiaccount.cpp.orig Tue May 30 22:17:08 2006 ++++ src/psiaccount.cpp Tue May 30 19:40:01 2006 +@@ -3049,13 +3049,13 @@ + + values["Sender.jid.full"] = jidSender.full(); + values["Sender.jid.bare"] = jidSender.bare(); +- values["Sender.nick"] = (uSender)? uSender->name() : ""; +- values["Sender.nick-jid"] = jidnick(jidSender.bare(), (uSender)? uSender->name() : ""); ++ values["Sender.nick"] = (uSender)? uSender->name() : (QString)""; ++ values["Sender.nick-jid"] = jidnick(jidSender.bare(), (uSender)? uSender->name() : (QString)""); + + values["Me.jid.full"] = jidMe.resource().isEmpty()? jidMe.full() + "/" + d->client->resource() : jidMe.full(); + values["Me.jid.bare"] = jidMe.bare(); +- values["Me.nick"] = (uMe)? uMe->name() : "";; +- values["Me.nick-jid"] = jidnick(jidMe.bare(), (uMe)? uMe->name() : ""); ++ values["Me.nick"] = (uMe)? uMe->name() : (QString)"";; ++ values["Me.nick-jid"] = jidnick(jidMe.bare(), (uMe)? uMe->name() : (QString)""); + + header = headerTemplate.expand(values); + } +@@ -3081,7 +3081,7 @@ + + Template::ExpandData values; + +- values["fortune"] = (option.fortunes.count())? option.fortunes[rand()%option.fortunes.count()] : ""; ++ values["fortune"] = (option.fortunes.count())? option.fortunes[rand()%option.fortunes.count()] : (QString)""; + + signature = signatureTemplate.expand(values); + +@@ -3146,7 +3146,7 @@ + sepBody = "\n"; + + // signature +- QString signature = (option.useMessageSignature)? expandSignatureTemplate(option.messageSignature, option.autoMessageSignatureDelimiter,FALSE) : ""; ++ QString signature = (option.useMessageSignature)? expandSignatureTemplate(option.messageSignature, option.autoMessageSignatureDelimiter,FALSE) : (QString)""; + + // body/signature separator + // we want to have one empty line between body and signature (at least two '\n'); --- psi.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1149031097.3159>