diff options
| -rw-r--r-- | net-im/psi/Manifest | 32 | ||||
| -rw-r--r-- | net-im/psi/files/digest-psi-0.11_beta4 | 3 | ||||
| -rw-r--r-- | net-im/psi/files/psi-desktop2.patch | 15 | ||||
| -rw-r--r-- | net-im/psi/files/psi-indicator.png | bin | 0 -> 300 bytes | |||
| -rw-r--r-- | net-im/psi/files/psi-jingle-gcc4.patch | 56 | ||||
| -rw-r--r-- | net-im/psi/files/psi-pathfix2.patch | 12 | ||||
| -rw-r--r-- | net-im/psi/files/psi-reverse_trayicon2.patch | 33 | ||||
| -rw-r--r-- | net-im/psi/files/qdebug.patch | 11 | ||||
| -rw-r--r-- | net-im/psi/psi-0.11_beta4.ebuild | 80 |
9 files changed, 242 insertions, 0 deletions
diff --git a/net-im/psi/Manifest b/net-im/psi/Manifest new file mode 100644 index 00000000..0ce397cd --- /dev/null +++ b/net-im/psi/Manifest @@ -0,0 +1,32 @@ +AUX psi-desktop2.patch 508 RMD160 50037b740407ec36e5d01386f145f5f055e4eae0 SHA1 71ddba6d8cafa8b7de218620dd7373758cc064d9 SHA256 b4045dafc0bc00b0167449693fc3e9b2f53041a070a93954f8939ee0866efa8e +MD5 73fdd72109e3a7469c80d96ed5f5d410 files/psi-desktop2.patch 508 +RMD160 50037b740407ec36e5d01386f145f5f055e4eae0 files/psi-desktop2.patch 508 +SHA256 b4045dafc0bc00b0167449693fc3e9b2f53041a070a93954f8939ee0866efa8e files/psi-desktop2.patch 508 +AUX psi-indicator.png 300 RMD160 507ab090f82276492bbf6af23eab78e2f8c8ccf2 SHA1 2adcd9b63b2f0ba98415c8bb526d1a57c24d88f4 SHA256 a0e9adcd0409d23c9033170ceb8f22980ba6d5e14f19234630f9986bfb94bce2 +MD5 0d5cafd17325fc912c4855252d73378f files/psi-indicator.png 300 +RMD160 507ab090f82276492bbf6af23eab78e2f8c8ccf2 files/psi-indicator.png 300 +SHA256 a0e9adcd0409d23c9033170ceb8f22980ba6d5e14f19234630f9986bfb94bce2 files/psi-indicator.png 300 +AUX psi-jingle-gcc4.patch 3220 RMD160 6c7b6f7874d7ddea19847a94608bee790314be7d SHA1 654e0ce48b3dabbb5be264f479c852227087242b SHA256 b8fc648ec149acba256a4ca406095a6c134a8b1862430375f39d56aa739f2b74 +MD5 a0ce27e0edfbf558e4e3f97a6d012147 files/psi-jingle-gcc4.patch 3220 +RMD160 6c7b6f7874d7ddea19847a94608bee790314be7d files/psi-jingle-gcc4.patch 3220 +SHA256 b8fc648ec149acba256a4ca406095a6c134a8b1862430375f39d56aa739f2b74 files/psi-jingle-gcc4.patch 3220 +AUX psi-pathfix2.patch 364 RMD160 029db596437aba9d85a8cbde30d8f1247f6cf050 SHA1 43165fa61e08b6a60249efed830c58b1693b879f SHA256 2f9e94219e858f8ea9a8771adac90430dc6199d6f8de2cc6778288583580d0d8 +MD5 0dacabdec9ce29cc56faadeeff01ec3b files/psi-pathfix2.patch 364 +RMD160 029db596437aba9d85a8cbde30d8f1247f6cf050 files/psi-pathfix2.patch 364 +SHA256 2f9e94219e858f8ea9a8771adac90430dc6199d6f8de2cc6778288583580d0d8 files/psi-pathfix2.patch 364 +AUX psi-reverse_trayicon2.patch 937 RMD160 bbf8ba2c512ceab7b3fe82af12ff9b647d6b3c9f SHA1 78f492bf1a2dbac8924c7eaeb2f193fac71493b5 SHA256 2a690a7cda661884ce3424530ac6569a7fcb1e6c97342c120767a0d5058c403c +MD5 c2528c15be8277434647506d791663d8 files/psi-reverse_trayicon2.patch 937 +RMD160 bbf8ba2c512ceab7b3fe82af12ff9b647d6b3c9f files/psi-reverse_trayicon2.patch 937 +SHA256 2a690a7cda661884ce3424530ac6569a7fcb1e6c97342c120767a0d5058c403c files/psi-reverse_trayicon2.patch 937 +AUX qdebug.patch 524 RMD160 6c287659cf9970fa1b4e251cf11e2dcb8d42d580 SHA1 23445b3a6c667063a81245deededc112154c1ef4 SHA256 c01f8e62fe14bdbf4257f65b984549a57f7952bf2ebe1a7789fdb4d9250d717b +MD5 dfb75b63ca9645b085b8f9c099cff084 files/qdebug.patch 524 +RMD160 6c287659cf9970fa1b4e251cf11e2dcb8d42d580 files/qdebug.patch 524 +SHA256 c01f8e62fe14bdbf4257f65b984549a57f7952bf2ebe1a7789fdb4d9250d717b files/qdebug.patch 524 +DIST psi-0.11-beta4.tar.bz2 2332694 RMD160 67fad43ffe807ae0ca1496c7e7ae27a817995788 SHA1 0b7a2037ed1f6ad0ab46e5672af98861cbd60064 SHA256 37dddbfb3e47a55b4b98f10013055a9a1cacbc307837d521823a43b118465cff +EBUILD psi-0.11_beta4.ebuild 2137 RMD160 002e326b5130713313e6658277dd20ff5546308c SHA1 82a233c35ad0753b1cb9de2a1ec04ce970fe59ce SHA256 bc1cfef372afe8ad6d8a635ca660d760543480459b5064dcfa58ecc66f19da61 +MD5 d573748df88ec2b9f2de916aa55b8531 psi-0.11_beta4.ebuild 2137 +RMD160 002e326b5130713313e6658277dd20ff5546308c psi-0.11_beta4.ebuild 2137 +SHA256 bc1cfef372afe8ad6d8a635ca660d760543480459b5064dcfa58ecc66f19da61 psi-0.11_beta4.ebuild 2137 +MD5 7a6a4725644b9d487d4e3604ee0a44ff files/digest-psi-0.11_beta4 250 +RMD160 72a223bf9e19c5e61c11793968f07e4f9371c2f2 files/digest-psi-0.11_beta4 250 +SHA256 5203ec59ce1327febd3d1456193a6978fcf1917bb4d4fbdf93436424b6f2461e files/digest-psi-0.11_beta4 250 diff --git a/net-im/psi/files/digest-psi-0.11_beta4 b/net-im/psi/files/digest-psi-0.11_beta4 new file mode 100644 index 00000000..48aa19f1 --- /dev/null +++ b/net-im/psi/files/digest-psi-0.11_beta4 @@ -0,0 +1,3 @@ +MD5 61aec8eb6d6ff600331fad8c5123b4c0 psi-0.11-beta4.tar.bz2 2332694 +RMD160 67fad43ffe807ae0ca1496c7e7ae27a817995788 psi-0.11-beta4.tar.bz2 2332694 +SHA256 37dddbfb3e47a55b4b98f10013055a9a1cacbc307837d521823a43b118465cff psi-0.11-beta4.tar.bz2 2332694 diff --git a/net-im/psi/files/psi-desktop2.patch b/net-im/psi/files/psi-desktop2.patch new file mode 100644 index 00000000..119a0dd2 --- /dev/null +++ b/net-im/psi/files/psi-desktop2.patch @@ -0,0 +1,15 @@ +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-indicator.png b/net-im/psi/files/psi-indicator.png Binary files differnew file mode 100644 index 00000000..b349dc36 --- /dev/null +++ b/net-im/psi/files/psi-indicator.png diff --git a/net-im/psi/files/psi-jingle-gcc4.patch b/net-im/psi/files/psi-jingle-gcc4.patch new file mode 100644 index 00000000..c2c50e48 --- /dev/null +++ b/net-im/psi/files/psi-jingle-gcc4.patch @@ -0,0 +1,56 @@ +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 new file mode 100644 index 00000000..fe4ca383 --- /dev/null +++ b/net-im/psi/files/psi-pathfix2.patch @@ -0,0 +1,12 @@ +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-reverse_trayicon2.patch b/net-im/psi/files/psi-reverse_trayicon2.patch new file mode 100644 index 00000000..d23d4d63 --- /dev/null +++ b/net-im/psi/files/psi-reverse_trayicon2.patch @@ -0,0 +1,33 @@ + +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() diff --git a/net-im/psi/files/qdebug.patch b/net-im/psi/files/qdebug.patch new file mode 100644 index 00000000..c5e357c3 --- /dev/null +++ b/net-im/psi/files/qdebug.patch @@ -0,0 +1,11 @@ +--- src/pluginmanager.cpp.ori 2006-12-21 22:14:40.000000000 +0100 ++++ src/pluginmanager.cpp 2006-12-21 22:14:44.000000000 +0100 +@@ -422,7 +422,7 @@ + */ + void PluginManager::sendStanza( const PsiAccount* account, const QString& stanza) + { +- qDebug(qPrintable(QString("Want to send stanza to account %2").arg((int)account))); ++ /*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/psi-0.11_beta4.ebuild b/net-im/psi/psi-0.11_beta4.ebuild new file mode 100644 index 00000000..171a5f0b --- /dev/null +++ b/net-im/psi/psi-0.11_beta4.ebuild @@ -0,0 +1,80 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-0.11_beta4.ebuild,v 1.1 2006/12/04 13:05:38 hanno Exp $ + +inherit eutils qt4 + +MY_PV="${PV/_/-}" +MY_P="${PN}-${MY_PV}" + +HTTPMIRR="http://vivid.dat.pl/psi" +IUSE="sasl spell ssl xscreensaver" + +DESCRIPTION="QT 4.x Jabber Client, with Licq-like interface" +HOMEPAGE="http:/psi-im.org/" +# translations from http://tanoshi.net/language.html +# polish translation contains special texts for patches from extras-version +SRC_URI="http://psi-im.org/files/beta/0.11/beta4/${MY_P}.tar.bz2" +SLOT="0" +LICENSE="GPL-2" +KEYWORDS="~x86" + +S="${WORKDIR}/${MY_P}" + +DEPEND="$(qt4_min_version 4.2) + spell? ( app-text/aspell ) + sasl? ( dev-libs/cyrus-sasl ) + dev-libs/expat + dev-libs/glib + media-libs/alsa-lib + media-libs/fontconfig + media-libs/freetype + media-libs/speex + ~net-libs/ortp-0.7.1 + x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + x11-libs/libXcursor + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libXi + x11-libs/libXinerama + x11-libs/libXrandr + x11-libs/libXrender + ssl? ( dev-libs/openssl ) + media-libs/libpng + sys-libs/zlib + xscreensaver? ( x11-misc/xscreensaver )" + +RDEPEND="${DEPEND}" + +src_compile() { + epatch ${FILESDIR}/psi-jingle-gcc4.patch + epatch ${FILESDIR}/qdebug.patch + # growl is mac osx extension only - maybe someday we will want this + local myconf="--disable-growl" + + use xscreensaver || myconf="${myconf} --disable-xss" + use sasl || myconf="${myconf} --disable-cyrussasl" + use spell || myconf="${myconf} --disable-aspell" + use ssl || myconf="${myconf} --disable-openssl" + + chmod a+x configure-jingle + QTDIR=/usr/lib ./configure-jingle \ + --prefix=/usr \ + --enable-jingle \ + --enable-plugins \ + ${myconf} || die "configure failed" + emake || die "make failed" +} + +src_install() { + emake INSTALL_ROOT="${D}" install || die "emake install failed" + + #this way the docs will also be installed in the standard gentoo dir + for i in roster system emoticons; do + newdoc ${S}/iconsets/${i}/README README.${i} + done; + newdoc certs/README README.certs + dodoc ChangeLog README TODO +} |
