Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/net-im/psi/files
diff options
context:
space:
mode:
authorPeter Volkov <pva@gentoo.org>2009-12-04 09:44:02 +0000
committerPeter Volkov <pva@gentoo.org>2009-12-04 09:44:02 +0000
commit9667e7c2130936c8a599192a1bfc25ce7393112e (patch)
treedb9f95fc61550da79f7573c765ae92d57d30790f /net-im/psi/files
parentVersion Bump. (diff)
downloadgentoo-2-9667e7c2130936c8a599192a1bfc25ce7393112e.tar.gz
gentoo-2-9667e7c2130936c8a599192a1bfc25ce7393112e.tar.bz2
gentoo-2-9667e7c2130936c8a599192a1bfc25ce7393112e.zip
Version bump, thank Rion and Vadim Efimov for report.
(Portage version: 2.2_rc51/cvs/Linux i686)
Diffstat (limited to 'net-im/psi/files')
-rw-r--r--net-im/psi/files/psi-0.10-gpg2.patch12
-rw-r--r--net-im/psi/files/psi-desktop2.patch15
-rw-r--r--net-im/psi/files/psi-echoplugin.patch12
-rw-r--r--net-im/psi/files/psi-indicator.pngbin300 -> 0 bytes
-rw-r--r--net-im/psi/files/psi-jingle-gcc4.patch56
-rw-r--r--net-im/psi/files/psi-pathfix2.patch12
-rw-r--r--net-im/psi/files/psi-ptr_64bit_fix.patch11
-rw-r--r--net-im/psi/files/psi-reverse_trayicon2.patch33
8 files changed, 0 insertions, 151 deletions
diff --git a/net-im/psi/files/psi-0.10-gpg2.patch b/net-im/psi/files/psi-0.10-gpg2.patch
deleted file mode 100644
index cd2b3a95fe45..000000000000
--- a/net-im/psi/files/psi-0.10-gpg2.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urNp psi-0.10.org/src/tools/openpgp/gpgop.cpp psi-0.10/src/tools/openpgp/gpgop.cpp
---- psi-0.10.org/src/tools/openpgp/gpgop.cpp 2005-08-21 20:44:28.000000000 +0300
-+++ psi-0.10/src/tools/openpgp/gpgop.cpp 2007-06-28 18:55:55.000000000 +0300
-@@ -377,7 +377,7 @@ void GpgOp::proc_statusLine(const QStrin
- rest = str.mid(n+1);
- }
-
-- if(s == "NEED_PASSPHRASE") {
-+ if(s == "GET_HIDDEN") {
- if(!(d->tryAgent && getenv("GPG_AGENT_INFO"))) {
- if(!d->didPassphrase) {
- d->didPassphrase = true;
diff --git a/net-im/psi/files/psi-desktop2.patch b/net-im/psi/files/psi-desktop2.patch
deleted file mode 100644
index 119a0dd2e7d0..000000000000
--- a/net-im/psi/files/psi-desktop2.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Naur psi-0.10-test3-orig/psi.desktop psi-0.10-test3/psi.desktop
---- psi-0.10-test3-orig/psi.desktop 2005-11-07 00:39:22.000000000 +0000
-+++ psi-0.10-test3/psi.desktop 2005-11-07 01:16:22.000000000 +0000
-@@ -1,7 +1,11 @@
- Encoding=UTF-8
- Name=Psi
- GenericName=Jabber Client
-+GenericName[pl]=Klient Jabbera
-+GenericName[fr]=Client Jabber
- Comment=Communicate over the Jabber network
-+Comment[pl]=Komunikator sieci Jabber
-+Comment[fr]=Communiquer sur le réseau Jabber
- Icon=psi
- Exec=psi
- Terminal=false
diff --git a/net-im/psi/files/psi-echoplugin.patch b/net-im/psi/files/psi-echoplugin.patch
deleted file mode 100644
index 47f0e5220d79..000000000000
--- a/net-im/psi/files/psi-echoplugin.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru psi-dev-snapshot-2007-02-04-orig/src/plugins/generic/echo/echoplugin.cpp psi-dev-snapshot-2007-02-04/src/plugins/generic/echo/echoplugin.cpp
---- psi-dev-snapshot-2007-02-04-orig/src/plugins/generic/echo/echoplugin.cpp 2007-02-04 06:30:25.000000000 +0100
-+++ psi-dev-snapshot-2007-02-04/src/plugins/generic/echo/echoplugin.cpp 2007-02-05 02:29:04.000000000 +0100
-@@ -60,7 +60,7 @@
- {
- qWarning(qPrintable(QString("Received message '%1', echoing back to %2").arg(message).arg(fromDisplay)));
- QVariant option;
-- emit getGlobalOption(message, &option);
-+ emit getGlobalOption(message, option);
- QString reply;
- if (option.isValid())
- reply=QString("<message to=\"%1\" type=\"chat\"><body>Option %2 = %3 </body></message>").arg(fromJid).arg(message).arg(option.toString());
diff --git a/net-im/psi/files/psi-indicator.png b/net-im/psi/files/psi-indicator.png
deleted file mode 100644
index b349dc364b7b..000000000000
--- a/net-im/psi/files/psi-indicator.png
+++ /dev/null
Binary files differ
diff --git a/net-im/psi/files/psi-jingle-gcc4.patch b/net-im/psi/files/psi-jingle-gcc4.patch
deleted file mode 100644
index c2c50e48b64c..000000000000
--- a/net-im/psi/files/psi-jingle-gcc4.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-Nur in psi-dev-snapshot-2006-10-16.fixed: conf.log.
-Nur in psi-dev-snapshot-2006-10-16.fixed: conf.pri.
-Nur in psi-dev-snapshot-2006-10-16.fixed: Makefile.
-Nur in psi-dev-snapshot-2006-10-16.fixed: psi.
-Nur in psi-dev-snapshot-2006-10-16.fixed/src: config.h.
-Nur in psi-dev-snapshot-2006-10-16.fixed/src: Makefile.
-Nur in psi-dev-snapshot-2006-10-16.fixed/src: .moc.
-Nur in psi-dev-snapshot-2006-10-16.fixed/src: .obj.
-Nur in psi-dev-snapshot-2006-10-16.fixed/src: psi.
-Nur in psi-dev-snapshot-2006-10-16.fixed/src: .rcc.
-Nur in psi-dev-snapshot-2006-10-16.fixed/src: .ui.
-Nur in psi-dev-snapshot-2006-10-16.fixed/third-party/libjingle: liblibjingle.a.
-Nur in psi-dev-snapshot-2006-10-16.fixed/third-party/libjingle: Makefile.
-Nur in psi-dev-snapshot-2006-10-16.fixed/third-party/libjingle: .obj.
-diff -aurp psi-dev-snapshot-2006-10-16/third-party/libjingle/talk/base/base64.h psi-dev-snapshot-2006-10-16.fixed/third-party/libjingle/talk/base/base64.h
---- psi-dev-snapshot-2006-10-16/third-party/libjingle/talk/base/base64.h 2006-10-16 06:30:14.000000000 +0200
-+++ psi-dev-snapshot-2006-10-16.fixed/third-party/libjingle/talk/base/base64.h 2006-10-16 20:44:28.000000000 +0200
-@@ -22,8 +22,8 @@ public:
- static string decode(const string & data);
- static string encodeFromArray(const char * data, size_t len);
- private:
-- static const string Base64::Base64Table;
-- static const string::size_type Base64::DecodeTable[];
-+ static const string Base64Table;
-+ static const string::size_type DecodeTable[];
- };
-
- #endif
-diff -aurp psi-dev-snapshot-2006-10-16/third-party/libjingle/talk/base/stringutils.h psi-dev-snapshot-2006-10-16.fixed/third-party/libjingle/talk/base/stringutils.h
---- psi-dev-snapshot-2006-10-16/third-party/libjingle/talk/base/stringutils.h 2006-10-16 06:30:14.000000000 +0200
-+++ psi-dev-snapshot-2006-10-16.fixed/third-party/libjingle/talk/base/stringutils.h 2006-10-16 20:45:25.000000000 +0200
-@@ -255,7 +255,7 @@ size_t asccpyn(wchar_t* buffer, size_t b
- template<>
- struct Traits<char> {
- typedef std::string string;
-- inline static const char* Traits<char>::empty_str() { return ""; }
-+ inline static const char* empty_str() { return ""; }
- };
-
- ///////////////////////////////////////////////////////////////////////////////
-diff -aurp psi-dev-snapshot-2006-10-16/third-party/libjingle/talk/xmpp/xmppclient.h psi-dev-snapshot-2006-10-16.fixed/third-party/libjingle/talk/xmpp/xmppclient.h
---- psi-dev-snapshot-2006-10-16/third-party/libjingle/talk/xmpp/xmppclient.h 2006-10-16 06:30:14.000000000 +0200
-+++ psi-dev-snapshot-2006-10-16.fixed/third-party/libjingle/talk/xmpp/xmppclient.h 2006-10-16 21:12:38.000000000 +0200
-@@ -133,7 +133,7 @@ private:
- }
- }
-
-- std::string XmppClient::GetStateName(int state) const {
-+ std::string GetStateName(int state) const {
- switch (state) {
- case STATE_PRE_XMPP_LOGIN: return "PRE_XMPP_LOGIN";
- case STATE_START_XMPP_LOGIN: return "START_XMPP_LOGIN";
-Nur in psi-dev-snapshot-2006-10-16.fixed/third-party/qca: libqca.a.
-Nur in psi-dev-snapshot-2006-10-16.fixed/third-party/qca: Makefile.
-Nur in psi-dev-snapshot-2006-10-16.fixed/third-party/qca: .moc.
-Nur in psi-dev-snapshot-2006-10-16.fixed/third-party/qca: .obj.
diff --git a/net-im/psi/files/psi-pathfix2.patch b/net-im/psi/files/psi-pathfix2.patch
deleted file mode 100644
index fe4ca3831a78..000000000000
--- a/net-im/psi/files/psi-pathfix2.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur psi-0.10-test1-orig/src/src.pro psi-0.10-test1/src/src.pro
---- psi-0.10-test1-orig/src/src.pro 2005-08-21 17:44:36.000000000 +0000
-+++ psi-0.10-test1/src/src.pro 2005-08-24 22:19:38.000000000 +0000
-@@ -4,7 +4,7 @@
-
- # Configuration
- TEMPLATE = app
--CONFIG += qt thread x11
-+CONFIG += qt thread x11 no_fixpath
-
- CONFIG += debug
- #CONFIG += use_crash
diff --git a/net-im/psi/files/psi-ptr_64bit_fix.patch b/net-im/psi/files/psi-ptr_64bit_fix.patch
deleted file mode 100644
index ab428fc32886..000000000000
--- a/net-im/psi/files/psi-ptr_64bit_fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur psi-dev-snapshot-2007-01-12-orig/src/pluginmanager.cpp psi-dev-snapshot-2007-01-12/src/pluginmanager.cpp
---- psi-dev-snapshot-2007-01-12-orig/src/pluginmanager.cpp 2007-01-12 06:30:08.000000000 +0100
-+++ psi-dev-snapshot-2007-01-12/src/pluginmanager.cpp 2007-01-13 01:54:03.000000000 +0100
-@@ -422,7 +422,6 @@
- */
- void PluginManager::sendStanza( const PsiAccount* account, const QString& stanza)
- {
-- qDebug(qPrintable(QString("Want to send stanza to account %2").arg((int)account)));
- if (!clients_.contains(account) || !verifyStanza(stanza))
- return;
- clients_[account]->send(stanza);
diff --git a/net-im/psi/files/psi-reverse_trayicon2.patch b/net-im/psi/files/psi-reverse_trayicon2.patch
deleted file mode 100644
index d23d4d63e2aa..000000000000
--- a/net-im/psi/files/psi-reverse_trayicon2.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-
-Created by Przemysław 'Troll' Maciąg <pmaciag (at) gmail (dot) com>
-
-In cvs for 0.9.3 version somebody broke's trayicon...
-This patch restores ability to show proper trayicon
-in FVWM and few others (light) WM's.
-
-diff -u -p -r1.24 -r1.26
---- src/tools/trayicon/trayicon_x11.cpp 2004/02/28 16:52:39 1.24
-+++ src/tools/trayicon/trayicon_x11.cpp 2004/08/20 03:22:01 1.26
-@@ -251,11 +261,6 @@ TrayIconFreeDesktop::TrayIconFreeDesktop
-
- if ( manager_window != None )
- send_message(dsp, manager_window, SYSTEM_TRAY_REQUEST_DOCK, winId(), 0, 0);
-- else
-- {
-- object->hide();
-- return;
-- }
-
- // some KDE mumbo-jumbo... why is it there? anybody?
- Atom kwm_dockwindow_atom = XInternAtom(dsp, "KWM_DOCKWINDOW", false);
-@@ -345,9 +371,7 @@ void TrayIcon::sysInstall()
- d = (TrayIconPrivate *)(new TrayIconFreeDesktop(this, pm));
-
- sysUpdateToolTip();
-+ d->show();
--
-- if ( v_isWMDock )
-- d->show();
- }
-
- void TrayIcon::sysRemove()