[44634] trunk/dports/net/psi-otr
rowue at macports.org
rowue at macports.org
Wed Dec 31 19:16:53 PST 2008
Revision: 44634
http://trac.macports.org/changeset/44634
Author: rowue at macports.org
Date: 2008-12-31 19:16:53 -0800 (Wed, 31 Dec 2008)
Log Message:
-----------
Update to psi-otr 0.4 (conjunction with psi 0.12)
Modified Paths:
--------------
trunk/dports/net/psi-otr/Portfile
trunk/dports/net/psi-otr/files/patch-psi-otr.pro.diff
trunk/dports/net/psi-otr/files/patch-src-otrconnection.cpp.diff
trunk/dports/net/psi-otr/files/patch-src-psi-otr.cpp.diff
Modified: trunk/dports/net/psi-otr/Portfile
===================================================================
--- trunk/dports/net/psi-otr/Portfile 2009-01-01 03:14:43 UTC (rev 44633)
+++ trunk/dports/net/psi-otr/Portfile 2009-01-01 03:16:53 UTC (rev 44634)
@@ -3,8 +3,7 @@
PortSystem 1.0
name psi-otr
-version 0.3
-revision 1
+version 0.4
categories net chat
maintainers rowue at digitalis.org
description otr-plugin for psi - for plugin-enabled psi
@@ -15,29 +14,27 @@
platforms darwin
-homepage http://www.tfh-berlin.de/~s717689/
-master_sites http://www.tfh-berlin.de/~s717689/files/
+homepage http://www.tfh-berlin.de/~s30935/
+master_sites http://www.tfh-berlin.de/~s30935/files/
-checksums md5 1d3c073b3f77376e521eb15a88d66d5a \
- sha1 9294112c51d54caa66e81162d75d425b08fe663b \
- rmd160 31540ec1878616b8e64dfc3d4cd9913dc494f146
+checksums md5 a931c1d23ada4698e846f7839decc866 \
+ sha1 2029fc822d3484b2f2f4e281d1b67df3300604e3 \
+ rmd160 661384cbc2b0dc0edc8c548a2948ba36fe9ad11c
depends_lib port:psi \
port:libotr
patchfiles patch-psi-otr.pro.diff \
- patch-src-psi-otr.cpp.diff \
- patch-src-otrconnection.cpp.diff
+ patch-src-otrconnection.cpp.diff \
+ patch-src-psi-otr.cpp.diff
configure {
- ui_msg ${worksrcpath}
- cd ${worksrcpath}
- system "qmake"
+ system "qmake-mac"
}
destroot {
xinstall -m 755 -d ${destroot}/Applications/MacPorts/psi.app/Contents/Resources/plugins
- file copy ${worksrcpath}/libpsi-otr.dylib ${destroot}/Applications/MacPorts/psi.app/Contents/Resources/plugins
+ file copy ${worksrcpath}/libpsi-otr.bundle ${destroot}/Applications/MacPorts/psi.app/Contents/Resources/plugins
}
Modified: trunk/dports/net/psi-otr/files/patch-psi-otr.pro.diff
===================================================================
--- trunk/dports/net/psi-otr/files/patch-psi-otr.pro.diff 2009-01-01 03:14:43 UTC (rev 44633)
+++ trunk/dports/net/psi-otr/files/patch-psi-otr.pro.diff 2009-01-01 03:16:53 UTC (rev 44634)
@@ -1,10 +1,9 @@
---- psi-otr.pro.orig 2008-01-14 23:01:56.000000000 +0100
-+++ psi-otr.pro 2008-01-14 23:00:00.000000000 +0100
-@@ -7,10 +7,10 @@
- CONFIG += release
+--- psi-otr.pro 2008-05-12 19:42:05.000000000 +0200
++++ psi-otr.pro 2008-12-31 19:23:29.000000000 +0100
+@@ -8,9 +8,10 @@
LIBS += -lotr
DEPENDPATH += .
--INCLUDEPATH += .
+ INCLUDEPATH += .
+INCLUDEPATH += /opt/local/include
QT += xml
DESTDIR = .
Modified: trunk/dports/net/psi-otr/files/patch-src-otrconnection.cpp.diff
===================================================================
--- trunk/dports/net/psi-otr/files/patch-src-otrconnection.cpp.diff 2009-01-01 03:14:43 UTC (rev 44633)
+++ trunk/dports/net/psi-otr/files/patch-src-otrconnection.cpp.diff 2009-01-01 03:16:53 UTC (rev 44634)
@@ -1,12 +1,11 @@
---- src/otrconnection.cpp.orig 2007-11-13 02:21:18.000000000 +0100
-+++ src/otrconnection.cpp 2008-02-02 16:11:06.000000000 +0100
-@@ -54,6 +54,9 @@
- ui_ops.gone_insecure = (*OtrConnection::cb_gone_insecure);
+--- src/otrconnection.cpp 2008-09-04 23:10:17.000000000 +0200
++++ src/otrconnection.cpp 2008-12-31 19:25:56.000000000 +0100
+@@ -54,7 +54,7 @@
ui_ops.still_secure = (*OtrConnection::cb_still_secure);
ui_ops.log_message = (*OtrConnection::cb_log_message);
-+ ui_ops.max_message_size = NULL;
-+ ui_ops.account_name = NULL;
-+ ui_ops.account_name_free = NULL;
- }
-
+-#if OTRL_VERSION_MAJOR==3 && OTRL_VERSION_MINOR==1
++#if OTRL_VERSION_MAJOR==3 && OTRL_VERSION_MINOR==2
+ ui_ops.max_message_size = NULL;
+ ui_ops.account_name = NULL;
+ ui_ops.account_name_free = NULL;
Modified: trunk/dports/net/psi-otr/files/patch-src-psi-otr.cpp.diff
===================================================================
--- trunk/dports/net/psi-otr/files/patch-src-psi-otr.cpp.diff 2009-01-01 03:14:43 UTC (rev 44633)
+++ trunk/dports/net/psi-otr/files/patch-src-psi-otr.cpp.diff 2009-01-01 03:16:53 UTC (rev 44634)
@@ -1,29 +1,14 @@
---- src/psi-otr.cpp.orig 2008-03-20 19:55:35.000000000 +0100
-+++ src/psi-otr.cpp 2008-03-20 22:21:10.000000000 +0100
-@@ -24,6 +24,7 @@
-
-
- #include "psi-otr.h"
-+#include <QDebug>
-
- /**
- * The default constructor.
-@@ -141,8 +142,16 @@
- removeResourceFromJid(fromJid).toStdString().c_str(),
+--- src/psi-otr.cpp 2008-09-04 20:45:27.000000000 +0200
++++ src/psi-otr.cpp 2008-12-31 19:27:24.000000000 +0100
+@@ -198,8 +198,10 @@
removeResourceFromJid(toJid).toStdString().c_str(),
QString(message.toUtf8()).toStdString().c_str());
--
-- return QString::fromUtf8(encrypted);
-+
-+ // Bad ugly hack
-+ if (encrypted != NULL && strlen(encrypted)>1) {
-+ return QString::fromUtf8(encrypted);
-+ } else if ((encrypted != NULL) && (strlen(encrypted) != 0)) {
+
+- if (encrypted != NULL && strlen(encrypted) > 0) {
++ if (encrypted != NULL && strlen(encrypted) > 1) {
+ return QString::fromUtf8(encrypted);
++ } else {
+ return message;
-+ }
-+
-+ return QString();
-+
+ }
+ return QString();
}
-
-
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20081231/2dc8329d/attachment.html>
More information about the macports-changes
mailing list