[61884] trunk/dports/net/psi
rowue at macports.org
rowue at macports.org
Tue Dec 22 16:59:12 PST 2009
Revision: 61884
http://trac.macports.org/changeset/61884
Author: rowue at macports.org
Date: 2009-12-22 16:59:11 -0800 (Tue, 22 Dec 2009)
Log Message:
-----------
Update to version 0.14
Modified Paths:
--------------
trunk/dports/net/psi/Portfile
trunk/dports/net/psi/files/patch-configure.diff
trunk/dports/net/psi/files/patch-src-applicationinfo.cpp.diff
trunk/dports/net/psi/files/patch-src-pluginhost.cpp.diff
trunk/dports/net/psi/files/patch-src-pluginhost.h.diff
trunk/dports/net/psi/files/patch-src-pluginmanager.cpp.diff
trunk/dports/net/psi/files/patch-src-pluginmanager.h.diff
trunk/dports/net/psi/files/patch-src-plugins-include-eventfilter.h.diff
trunk/dports/net/psi/files/patch-src-plugins-include-iqfilter.h.diff
trunk/dports/net/psi/files/patch-src-plugins-include-psiplugin.h.diff
trunk/dports/net/psi/files/patch-src-plugins-include-stanzasender.h.diff
trunk/dports/net/psi/files/patch-src-psiaccount.cpp.diff
trunk/dports/net/psi/files/patch-src-psichatdlg.cpp.diff
trunk/dports/net/psi/files/patch-src-psichatdlg.h.diff
trunk/dports/net/psi/files/patch-src-src.pro.diff
Modified: trunk/dports/net/psi/Portfile
===================================================================
--- trunk/dports/net/psi/Portfile 2009-12-23 00:54:24 UTC (rev 61883)
+++ trunk/dports/net/psi/Portfile 2009-12-23 00:59:11 UTC (rev 61884)
@@ -4,8 +4,8 @@
PortSystem 1.0
name psi
-version 0.13
-revision 2
+version 0.14
+# revision 0
categories net chat
maintainers rowue
description jabber-based instant messaging client
@@ -19,9 +19,9 @@
master_sites sourceforge
use_bzip2 yes
-checksums md5 ddc1a2a35dc155ca46ad6ecaeccdf894 \
- sha1 36d9d058531b29a47f94418b6e8a8b75e5446adf \
- rmd160 7557aea37d837eede5f28ec481eaa74dcc7958f5
+checksums md5 9d7dcce3bcab53b741a712199bd986be \
+ sha1 f5f8e1a427339a4e9113b5fa513b01a42ae1be4b \
+ rmd160 0c4a07726c2f9819da0f8aa8f1982e939f1fc20f
depends_lib lib:libz:zlib \
port:qt4-mac
@@ -52,6 +52,8 @@
variant plugins description {Build with experimental Plugin Support} {
+
+patch.pre_args -p1
patchfiles-append patch-configure.diff \
patch-src-applicationinfo.cpp.diff \
Modified: trunk/dports/net/psi/files/patch-configure.diff
===================================================================
--- trunk/dports/net/psi/files/patch-configure.diff 2009-12-23 00:54:24 UTC (rev 61883)
+++ trunk/dports/net/psi/files/patch-configure.diff 2009-12-23 00:59:11 UTC (rev 61884)
@@ -1,15 +1,18 @@
---- configure 2009-07-26 23:02:02.000000000 +0200
-+++ configure 2009-08-05 22:53:55.000000000 +0200
-@@ -40,6 +40,8 @@
- --disable-aspell Disable use of ASPELL
+diff --git a/configure b/configure
+index a5bdd58..d56acea 100755
+--- a/configure
++++ b/configure
+@@ -48,6 +48,9 @@ Dependency options:
--with-aspell-inc=[path] Path to Aspell include files
--with-aspell-lib=[path] Path to Aspell library files
+ --disable-enchant Disable use of enchant
+ --disable-plugins Disable use of Plugins
+ --enable-plugins Enable Psi Plugin support
- --enable-debug Enable debugging support
++
EOT
-@@ -242,6 +244,16 @@
+ }
+@@ -274,6 +277,16 @@ while [ $# -gt 0 ]; do
shift
;;
@@ -23,23 +26,22 @@
+ shift
+ ;;
+
- --enable-debug)
- QC_ENABLE_DEBUG="Y"
+ --verbose)
+ QC_VERBOSE="Y"
shift
-@@ -286,6 +298,8 @@
- echo QC_DISABLE_aspell=$QC_DISABLE_aspell
+@@ -318,6 +331,8 @@ echo QC_DISABLE_aspell=$QC_DISABLE_aspell
echo QC_WITH_ASPELL_INC=$QC_WITH_ASPELL_INC
echo QC_WITH_ASPELL_LIB=$QC_WITH_ASPELL_LIB
+ echo QC_DISABLE_enchant=$QC_DISABLE_enchant
+echo QC_DISABLE_plugins=$QC_DISABLE_plugins
+echo QC_ENABLE_PLUGINS=$QC_ENABLE_PLUGINS
- echo QC_ENABLE_DEBUG=$QC_ENABLE_DEBUG
echo
fi
-@@ -1062,6 +1076,50 @@
- return true;
+
+@@ -1614,6 +1629,48 @@ public:
+ #endif
}
};
-+
+#line 1 "plugins.qcm"
+/*
+-----BEGIN QCMOD-----
@@ -78,30 +80,31 @@
+ qWarning(" PLUGIN SUPPORT IS STILL UNFINISHED !!!");
+ qWarning(" THE PLUGIN INTERFACE /WILL/ CHANGE !!!");
+ qWarning(" USE AT YOUR OWN RISK !!!");
-+
++
+ return true;
+ }
+};
-+
- #line 1 "debug.qcm"
- /*
- -----BEGIN QCMOD-----
-@@ -1190,6 +1248,9 @@
- o = new qc_aspell(conf);
- o->required = false;
- o->disabled = false;
-+ o = new qc_plugins(conf);
-+ o->required = false;
-+ o->disabled = false;
- o = new qc_debug(conf);
+
+ EOT
+ cat >$1/modules_new.cpp <<EOT
+@@ -1665,6 +1722,10 @@ cat >$1/modules_new.cpp <<EOT
+ o = new qc_conf(conf);
o->required = true;
o->disabled = false;
-@@ -2211,6 +2272,8 @@
- export QC_DISABLE_aspell
- export QC_WITH_ASPELL_INC
++ o = new qc_plugins(conf);
++ o->required = false;
++ o->disabled = false;
++
+
+ EOT
+ cat >$1/conf4.h <<EOT
+@@ -2710,6 +2771,9 @@ export QC_WITH_ASPELL_INC
export QC_WITH_ASPELL_LIB
+ export QC_DISABLE_enchant
+ export QC_VERBOSE
+export QC_DISABLE_plugins
+export QC_ENABLE_PLUGINS
- export QC_ENABLE_DEBUG
- export QC_VERBOSE
++
rm -rf .qconftemp
+ (
+ mkdir .qconftemp
Modified: trunk/dports/net/psi/files/patch-src-applicationinfo.cpp.diff
===================================================================
--- trunk/dports/net/psi/files/patch-src-applicationinfo.cpp.diff 2009-12-23 00:54:24 UTC (rev 61883)
+++ trunk/dports/net/psi/files/patch-src-applicationinfo.cpp.diff 2009-12-23 00:59:11 UTC (rev 61884)
@@ -1,11 +1,14 @@
---- src/applicationinfo.cpp 2009-07-26 23:03:04.000000000 +0200
-+++ src/applicationinfo.cpp 2009-08-05 22:53:55.000000000 +0200
-@@ -27,7 +27,7 @@
+diff --git a/src/applicationinfo.cpp b/src/applicationinfo.cpp
+index b3cbc09..39a0d42 100644
+--- a/src/applicationinfo.cpp
++++ b/src/applicationinfo.cpp
+@@ -26,8 +26,8 @@
+ // Should also be overridable through an optional file.
#define PROG_NAME "Psi"
- //#define PROG_VERSION "0.13-dev" " (" __DATE__ ")"; //CVS Builds are dated
--#define PROG_VERSION "0.13";
-+#define PROG_VERSION "0.13-patched";
+ //#define PROG_VERSION "0.14-dev" " (" __DATE__ ")"; //CVS Builds are dated
+-#define PROG_VERSION "0.14";
++#define PROG_VERSION "0.14-patched";
#define PROG_CAPS_NODE "http://psi-im.org/caps";
- #define PROG_CAPS_VERSION "0.13-dev-rev2";
+ #define PROG_CAPS_VERSION "caps-b75d8d2b25";
#define PROG_IPC_NAME "org.psi-im.Psi" // must not contain '\\' character on Windows
Modified: trunk/dports/net/psi/files/patch-src-pluginhost.cpp.diff
===================================================================
--- trunk/dports/net/psi/files/patch-src-pluginhost.cpp.diff 2009-12-23 00:54:24 UTC (rev 61883)
+++ trunk/dports/net/psi/files/patch-src-pluginhost.cpp.diff 2009-12-23 00:59:11 UTC (rev 61884)
@@ -1,5 +1,7 @@
---- src/pluginhost.cpp 2009-07-26 23:02:02.000000000 +0200
-+++ src/pluginhost.cpp 2009-08-05 22:53:55.000000000 +0200
+diff --git a/src/pluginhost.cpp b/src/pluginhost.cpp
+index b3ff446..06e5260 100644
+--- a/src/pluginhost.cpp
++++ b/src/pluginhost.cpp
@@ -17,6 +17,7 @@
#include "iqnamespacefilter.h"
#include "eventfilter.h"
@@ -28,7 +30,7 @@
{
load(); // reads plugin name, etc
unload();
-@@ -250,6 +256,12 @@
+@@ -250,6 +256,12 @@ bool PluginHost::enable()
qDebug("connecting option accessor");
o->setOptionAccessingHost(this);
}
@@ -41,7 +43,7 @@
connected_ = true;
}
-@@ -396,7 +408,8 @@
+@@ -396,7 +408,8 @@ bool PluginHost::processEvent(int account, const QDomElement& e)
* \param subject Message subject
* \return Continue processing the event; true if the stanza should be silently discarded.
*/
@@ -51,7 +53,7 @@
{
bool handled = false;
EventFilter *ef = qobject_cast<EventFilter*>(plugin_);
-@@ -406,6 +419,28 @@
+@@ -406,6 +419,28 @@ bool PluginHost::processMessage(int account, const QString& jidFrom, const QStri
return handled;
}
@@ -80,7 +82,7 @@
//-- StanzaSender ---------------------------------------------------
-@@ -564,6 +599,8 @@
+@@ -564,6 +599,8 @@ void PluginHost::removeIqNamespaceFilter(const QRegExp &ns, IqNamespaceFilter *f
*/
void PluginHost::setPluginOption( const QString& option, const QVariant& value)
{
@@ -89,7 +91,7 @@
// TODO(mck)
//PsiPlugin* plugin=NULL;
-@@ -587,6 +624,7 @@
+@@ -587,6 +624,7 @@ void PluginHost::setPluginOption( const QString& option, const QVariant& value)
*/
QVariant PluginHost::getPluginOption(const QString& option)
{
@@ -97,7 +99,7 @@
return QVariant(); // TODO(mck)
}
-@@ -617,6 +655,31 @@
+@@ -617,6 +655,31 @@ QVariant PluginHost::getGlobalOption(const QString& option)
}
Modified: trunk/dports/net/psi/files/patch-src-pluginhost.h.diff
===================================================================
--- trunk/dports/net/psi/files/patch-src-pluginhost.h.diff 2009-12-23 00:54:24 UTC (rev 61883)
+++ trunk/dports/net/psi/files/patch-src-pluginhost.h.diff 2009-12-23 00:59:11 UTC (rev 61884)
@@ -1,5 +1,7 @@
---- src/pluginhost.h 2009-07-26 23:02:02.000000000 +0200
-+++ src/pluginhost.h 2009-08-05 22:53:55.000000000 +0200
+diff --git a/src/pluginhost.h b/src/pluginhost.h
+index 41f68d7..535b6a9 100644
+--- a/src/pluginhost.h
++++ b/src/pluginhost.h
@@ -17,6 +17,7 @@
class QWidget;
@@ -8,7 +10,7 @@
class PluginManager;
class IqNamespaceFilter;
-@@ -54,7 +55,13 @@
+@@ -54,7 +55,13 @@ public:
// for EventFilter
bool processEvent(int account, const QDomElement& e);
@@ -23,7 +25,7 @@
// StanzaSendingHost
void sendStanza(int account, const QDomElement& xml);
-@@ -74,6 +81,14 @@
+@@ -74,6 +81,14 @@ public:
void setGlobalOption(const QString& option, const QVariant& value);
QVariant getGlobalOption(const QString& option);
Modified: trunk/dports/net/psi/files/patch-src-pluginmanager.cpp.diff
===================================================================
--- trunk/dports/net/psi/files/patch-src-pluginmanager.cpp.diff 2009-12-23 00:54:24 UTC (rev 61883)
+++ trunk/dports/net/psi/files/patch-src-pluginmanager.cpp.diff 2009-12-23 00:59:11 UTC (rev 61884)
@@ -1,6 +1,8 @@
---- src/pluginmanager.cpp 2009-07-26 23:02:02.000000000 +0200
-+++ src/pluginmanager.cpp 2009-08-05 22:53:55.000000000 +0200
-@@ -147,6 +147,7 @@
+diff --git a/src/pluginmanager.cpp b/src/pluginmanager.cpp
+index c08aab4..babedd3 100644
+--- a/src/pluginmanager.cpp
++++ b/src/pluginmanager.cpp
+@@ -147,6 +147,7 @@ void PluginManager::loadEnabledPlugins()
*/
void PluginManager::optionChanged(const QString& option)
{
@@ -8,7 +10,7 @@
//QString("%1.%2").arg(loadOptionPrefix).arg(shortNames_[plugin]);
//TODO(mck): implement this... for now, enabling/disabling requires psi restart
-@@ -236,7 +237,7 @@
+@@ -236,7 +237,7 @@ QStringList PluginManager::availablePlugins()
QWidget* PluginManager::optionsWidget(const QString& plugin)
{
QWidget* widget = 0;
@@ -16,8 +18,8 @@
+ if (hosts_.contains(plugin) && hosts_[plugin]->isEnabled()) {
widget = hosts_[plugin]->optionsWidget();
} else {
- qWarning(qPrintable(QString("Attempting to get options for %1 which doesn't exist").arg(plugin)));
-@@ -254,19 +255,60 @@
+ qWarning("Attempting to get options for %s which doesn't exist", qPrintable(plugin));
+@@ -254,19 +255,60 @@ QWidget* PluginManager::optionsWidget(const QString& plugin)
* \param event Incoming event
* \return Continue processing the event; true if the event should be silently discarded.
*/
@@ -83,7 +85,7 @@
* \brief Give each plugin the opportunity to process the incoming event
*
* Each plugin is passed the event in turn. Any plugin may then modify the event
-@@ -280,10 +322,13 @@
+@@ -280,10 +322,13 @@ bool PluginManager::processEvent(const PsiAccount* account, QDomElement& event)
{
bool handled = false;
foreach (PluginHost* host, hosts_.values()) {
@@ -101,7 +103,7 @@
}
return handled;
}
-@@ -304,10 +349,13 @@
+@@ -304,10 +349,13 @@ bool PluginManager::incomingXml(int account, const QDomElement &xml)
{
bool handled = false;
foreach (PluginHost* host, hosts_.values()) {
@@ -119,7 +121,7 @@
}
return handled;
}
-@@ -369,6 +417,62 @@
+@@ -369,6 +417,62 @@ bool PluginManager::verifyStanza(const QString& stanza)
return true;
}
Modified: trunk/dports/net/psi/files/patch-src-pluginmanager.h.diff
===================================================================
--- trunk/dports/net/psi/files/patch-src-pluginmanager.h.diff 2009-12-23 00:54:24 UTC (rev 61883)
+++ trunk/dports/net/psi/files/patch-src-pluginmanager.h.diff 2009-12-23 00:59:11 UTC (rev 61884)
@@ -1,5 +1,7 @@
---- src/pluginmanager.h 2009-07-26 23:02:02.000000000 +0200
-+++ src/pluginmanager.h 2009-08-05 22:53:55.000000000 +0200
+diff --git a/src/pluginmanager.h b/src/pluginmanager.h
+index 2c485e8..090d8b9 100644
+--- a/src/pluginmanager.h
++++ b/src/pluginmanager.h
@@ -13,6 +13,7 @@
#include <QDomElement>
@@ -8,7 +10,7 @@
class PsiAccount;
class PsiPlugin;
-@@ -46,11 +47,26 @@
+@@ -46,11 +47,26 @@ public:
QWidget* optionsWidget(const QString& plugin);
bool processEvent(const PsiAccount* account, QDomElement& eventXml);
Modified: trunk/dports/net/psi/files/patch-src-plugins-include-eventfilter.h.diff
===================================================================
--- trunk/dports/net/psi/files/patch-src-plugins-include-eventfilter.h.diff 2009-12-23 00:54:24 UTC (rev 61883)
+++ trunk/dports/net/psi/files/patch-src-plugins-include-eventfilter.h.diff 2009-12-23 00:59:11 UTC (rev 61884)
@@ -1,6 +1,8 @@
---- src/plugins/include/eventfilter.h 2009-07-26 23:02:03.000000000 +0200
-+++ src/plugins/include/eventfilter.h 2009-08-05 22:53:55.000000000 +0200
-@@ -11,7 +11,15 @@
+diff --git a/src/plugins/include/eventfilter.h b/src/plugins/include/eventfilter.h
+index c16908d..453542c 100644
+--- a/src/plugins/include/eventfilter.h
++++ b/src/plugins/include/eventfilter.h
+@@ -11,7 +11,15 @@ public:
// true = handled, don't pass to next handler
virtual bool processEvent(int account, const QDomElement& e) = 0;
Modified: trunk/dports/net/psi/files/patch-src-plugins-include-iqfilter.h.diff
===================================================================
--- trunk/dports/net/psi/files/patch-src-plugins-include-iqfilter.h.diff 2009-12-23 00:54:24 UTC (rev 61883)
+++ trunk/dports/net/psi/files/patch-src-plugins-include-iqfilter.h.diff 2009-12-23 00:59:11 UTC (rev 61884)
@@ -1,10 +1,12 @@
---- src/plugins/include/iqfilter.h 2009-07-26 23:02:03.000000000 +0200
-+++ src/plugins/include/iqfilter.h 2009-08-05 22:53:55.000000000 +0200
-@@ -13,4 +13,5 @@
+diff --git a/src/plugins/include/iqfilter.h b/src/plugins/include/iqfilter.h
+index 1c3f355..95c6e99 100644
+--- a/src/plugins/include/iqfilter.h
++++ b/src/plugins/include/iqfilter.h
+@@ -13,4 +13,5 @@ public:
Q_DECLARE_INTERFACE(IqFilter, "org.psi-im.IqFilter/0.1");
-#endif
-\ Kein Zeilenumbruch am Dateiende.
+\ No newline at end of file
+#endif
+
Modified: trunk/dports/net/psi/files/patch-src-plugins-include-psiplugin.h.diff
===================================================================
--- trunk/dports/net/psi/files/patch-src-plugins-include-psiplugin.h.diff 2009-12-23 00:54:24 UTC (rev 61883)
+++ trunk/dports/net/psi/files/patch-src-plugins-include-psiplugin.h.diff 2009-12-23 00:59:11 UTC (rev 61884)
@@ -1,6 +1,8 @@
---- src/plugins/include/psiplugin.h 2009-07-26 23:02:03.000000000 +0200
-+++ src/plugins/include/psiplugin.h 2009-08-05 22:53:55.000000000 +0200
-@@ -87,6 +87,15 @@
+diff --git a/src/plugins/include/psiplugin.h b/src/plugins/include/psiplugin.h
+index 85a835a..f85cd89 100644
+--- a/src/plugins/include/psiplugin.h
++++ b/src/plugins/include/psiplugin.h
+@@ -87,6 +87,15 @@ public:
*/
virtual bool disable() = 0;
Modified: trunk/dports/net/psi/files/patch-src-plugins-include-stanzasender.h.diff
===================================================================
--- trunk/dports/net/psi/files/patch-src-plugins-include-stanzasender.h.diff 2009-12-23 00:54:24 UTC (rev 61883)
+++ trunk/dports/net/psi/files/patch-src-plugins-include-stanzasender.h.diff 2009-12-23 00:59:11 UTC (rev 61884)
@@ -1,10 +1,12 @@
---- src/plugins/include/stanzasender.h 2009-07-26 23:02:03.000000000 +0200
-+++ src/plugins/include/stanzasender.h 2009-08-05 22:53:55.000000000 +0200
-@@ -13,4 +13,5 @@
+diff --git a/src/plugins/include/stanzasender.h b/src/plugins/include/stanzasender.h
+index 8e10960..96ee26e 100644
+--- a/src/plugins/include/stanzasender.h
++++ b/src/plugins/include/stanzasender.h
+@@ -13,4 +13,5 @@ public:
Q_DECLARE_INTERFACE(StanzaSender, "org.psi-im.StanzaSender/0.1");
-#endif
-\ Kein Zeilenumbruch am Dateiende.
+\ No newline at end of file
+#endif
+
Modified: trunk/dports/net/psi/files/patch-src-psiaccount.cpp.diff
===================================================================
--- trunk/dports/net/psi/files/patch-src-psiaccount.cpp.diff 2009-12-23 00:54:24 UTC (rev 61883)
+++ trunk/dports/net/psi/files/patch-src-psiaccount.cpp.diff 2009-12-23 00:59:11 UTC (rev 61884)
@@ -1,16 +1,8 @@
---- src/psiaccount.cpp 2009-07-26 23:02:03.000000000 +0200
-+++ src/psiaccount.cpp 2009-08-05 22:53:55.000000000 +0200
-@@ -901,9 +901,6 @@
-
- PsiAccount::~PsiAccount()
- {
--#ifdef __GNUC__
--#warning "Uncomment these"
--#endif
- #ifdef PSI_PLUGINS
- // PluginManager::instance()->removeClient(this);
- #endif
-@@ -1288,6 +1285,10 @@
+diff --git a/src/psiaccount.cpp b/src/psiaccount.cpp
+index 98aa922..945d411 100644
+--- a/src/psiaccount.cpp
++++ b/src/psiaccount.cpp
+@@ -1286,6 +1286,10 @@ void PsiAccount::login()
// disconnect or stop reconnecting
void PsiAccount::logout(bool fast, const Status &s)
{
@@ -21,7 +13,7 @@
if(!isActive())
return;
-@@ -1889,6 +1890,10 @@
+@@ -1887,6 +1891,10 @@ void PsiAccount::client_resourceAvailable(const Jid &j, const Resource &r)
UserResourceList::Iterator rit = u->userResourceList().find(j.resource());
bool found = (rit == u->userResourceList().end()) ? false: true;
if(!found) {
@@ -32,7 +24,7 @@
popupType = PopupOnline;
UserResource ur(r);
-@@ -2044,6 +2049,10 @@
+@@ -2043,6 +2051,10 @@ void PsiAccount::client_resourceUnavailable(const Jid &j, const Resource &r)
PsiGrowlNotifier::instance()->popup(this, PsiPopup::AlertOffline, j, r, u);
#endif
}
@@ -43,15 +35,15 @@
}
void PsiAccount::client_presenceError(const Jid &j, int, const QString &str)
-@@ -3002,7 +3011,6 @@
- if(pp)
- p = *pp;
+@@ -3001,7 +3013,6 @@ ChatDlg *PsiAccount::ensureChatDlg(const Jid &j)
+ if(!pp.isNull())
+ p = pp;
#ifdef __GNUC__
-#warning "Removed reparenting call from qwextend"
#endif
//reparent_good(window, 0, false);
if(!p.isNull())
-@@ -3639,6 +3647,25 @@
+@@ -3638,6 +3649,25 @@ void PsiAccount::dj_sendMessage(const Message &m, bool log)
}
}
@@ -77,7 +69,7 @@
d->client->sendMessage(nm);
// only toggle if not an invite or body is not empty
-@@ -3913,6 +3940,53 @@
+@@ -3913,6 +3943,53 @@ void PsiAccount::handleEvent(PsiEvent* e, ActivationType activationType)
}
//FIXME(KIS): must now cause the event to be recreated from this xml or such. Horrid.
#endif
@@ -131,7 +123,7 @@
if(d->acc.opt_log && activationType != FromXml) {
if(e->type() == PsiEvent::Message || e->type() == PsiEvent::Auth) {
-@@ -3926,20 +4000,6 @@
+@@ -3926,20 +4003,6 @@ void PsiAccount::handleEvent(PsiEvent* e, ActivationType activationType)
MessageEvent *me = (MessageEvent *)e;
const Message &m = me->message();
Modified: trunk/dports/net/psi/files/patch-src-psichatdlg.cpp.diff
===================================================================
--- trunk/dports/net/psi/files/patch-src-psichatdlg.cpp.diff 2009-12-23 00:54:24 UTC (rev 61883)
+++ trunk/dports/net/psi/files/patch-src-psichatdlg.cpp.diff 2009-12-23 00:59:11 UTC (rev 61884)
@@ -1,17 +1,19 @@
---- src/psichatdlg.cpp 2009-07-26 23:02:03.000000000 +0200
-+++ src/psichatdlg.cpp 2009-08-05 22:53:55.000000000 +0200
+diff --git a/src/psichatdlg.cpp b/src/psichatdlg.cpp
+index ac1ddea..59c0d0d 100644
+--- a/src/psichatdlg.cpp
++++ b/src/psichatdlg.cpp
@@ -40,6 +40,7 @@
#include "jidutil.h"
#include "textutil.h"
#include "xmpp_tasks.h"
+#include "pluginmanager.h"
+ #include "lastactivitytask.h"
- #define MCMDCHAT "http://psi-im.org/ids/mcmd#chatmain"
-@@ -301,6 +302,12 @@
+@@ -326,6 +327,12 @@ void PsiChatDlg::initToolButtons()
act_compact_ = new IconAction(tr("Toggle Compact/Full Size"), "psi/compact", tr("Toggle Compact/Full Size"), 0, this);
- connect(act_compact_, SIGNAL(activated()), SLOT(toggleSmallChat()));
+ connect(act_compact_, SIGNAL(triggered()), SLOT(toggleSmallChat()));
+
+#ifdef PSI_PLUGINS
+ act_plugins_ = PluginManager::instance()->getChatDlgMenuEntries(this,
@@ -21,7 +23,7 @@
}
void PsiChatDlg::initToolBar()
-@@ -319,6 +326,13 @@
+@@ -344,6 +351,13 @@ void PsiChatDlg::initToolBar()
if (account()->voiceCaller()) {
ui_.toolbar->addAction(act_voice_);
}
@@ -35,7 +37,7 @@
}
void PsiChatDlg::contextMenuEvent(QContextMenuEvent *)
-@@ -476,6 +490,13 @@
+@@ -501,6 +515,13 @@ void PsiChatDlg::buildMenu()
pm_settings_->addAction(act_info_);
pm_settings_->addAction(act_history_);
Modified: trunk/dports/net/psi/files/patch-src-psichatdlg.h.diff
===================================================================
--- trunk/dports/net/psi/files/patch-src-psichatdlg.h.diff 2009-12-23 00:54:24 UTC (rev 61883)
+++ trunk/dports/net/psi/files/patch-src-psichatdlg.h.diff 2009-12-23 00:59:11 UTC (rev 61884)
@@ -1,6 +1,8 @@
---- src/psichatdlg.h 2009-07-26 23:02:03.000000000 +0200
-+++ src/psichatdlg.h 2009-08-05 22:53:55.000000000 +0200
-@@ -77,6 +77,10 @@
+diff --git a/src/psichatdlg.h b/src/psichatdlg.h
+index 6fb026a..6a1a05e 100644
+--- a/src/psichatdlg.h
++++ b/src/psichatdlg.h
+@@ -77,6 +77,10 @@ private:
IconAction* act_file_;
IconAction* act_compact_;
IconAction* act_voice_;
@@ -11,4 +13,3 @@
QAction *act_mini_cmd_;
-
Modified: trunk/dports/net/psi/files/patch-src-src.pro.diff
===================================================================
--- trunk/dports/net/psi/files/patch-src-src.pro.diff 2009-12-23 00:54:24 UTC (rev 61883)
+++ trunk/dports/net/psi/files/patch-src-src.pro.diff 2009-12-23 00:59:11 UTC (rev 61884)
@@ -1,11 +1,13 @@
---- src/src.pro 2009-07-26 23:02:03.000000000 +0200
-+++ src/src.pro 2009-08-05 22:53:55.000000000 +0200
-@@ -10,7 +10,7 @@
+diff --git a/src/src.pro b/src/src.pro
+index fb573a0..a8b32ed 100644
+--- a/src/src.pro
++++ b/src/src.pro
+@@ -10,7 +10,7 @@ CONFIG += qt thread x11
#CONFIG += use_crash
CONFIG += pep
#CONFIG += whiteboarding
-#CONFIG += psi_plugins
+CONFIG += psi_plugins
DEFINES += QT_STATICPLUGIN
+ DEFINES += QT3_SUPPORT_WARNINGS
- # Import several very useful Makefile targets
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20091222/ebe39ddd/attachment-0001.html>
More information about the macports-changes
mailing list