diff options
Diffstat (limited to 'net-im/twinkle')
| -rw-r--r-- | net-im/twinkle/ChangeLog | 11 | ||||
| -rw-r--r-- | net-im/twinkle/Manifest | 8 | ||||
| -rw-r--r-- | net-im/twinkle/files/twinkle-1.2-zrtp.patch | 98 | ||||
| -rw-r--r-- | net-im/twinkle/twinkle-1.2-r1.ebuild | 67 | ||||
| -rw-r--r-- | net-im/twinkle/twinkle-1.4.ebuild (renamed from net-im/twinkle/twinkle-1.2.ebuild) | 17 |
5 files changed, 18 insertions, 183 deletions
diff --git a/net-im/twinkle/ChangeLog b/net-im/twinkle/ChangeLog index c8531429c25a..26a27c7b40fb 100644 --- a/net-im/twinkle/ChangeLog +++ b/net-im/twinkle/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-im/twinkle -# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/twinkle/ChangeLog,v 1.43 2008/08/24 03:57:46 dragonheart Exp $ +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-im/twinkle/ChangeLog,v 1.44 2009/01/27 17:57:49 dragonheart Exp $ + +*twinkle-1.4 (27 Jan 2009) + + 27 Jan 2009; Daniel Black <dragonheart@gentoo.org> + -files/twinkle-1.2-zrtp.patch, -twinkle-1.2.ebuild, + -twinkle-1.2-r1.ebuild, +twinkle-1.4.ebuild: + version bump and cleanout *twinkle-1.3.1 (24 Aug 2008) diff --git a/net-im/twinkle/Manifest b/net-im/twinkle/Manifest index 13c824b23651..bcde20d583fb 100644 --- a/net-im/twinkle/Manifest +++ b/net-im/twinkle/Manifest @@ -1,14 +1,12 @@ AUX twinkle-0.4.1-badcflags.patch 492 RMD160 136c6387c0053d0457e4be766a8bfdbaeaccc5b1 SHA1 12ec8f94c73dd25fb82ed2c556ad72a8f5a394e8 SHA256 7bcb91795fa0e9c0db4dc174151ed9b3850eeca132844330d65d8429949296d9 AUX twinkle-1.0.1-icmp.patch 569 RMD160 c3d56c9f2221a9ed29e99b7bde9df104a6094dca SHA1 6f5ecbb700af176251c054320e2b5f878b8347e0 SHA256 f1995018874fad61d1b7a49d0c90cf9ad29e150c4947ae5c90e398e169f91cfc -AUX twinkle-1.2-zrtp.patch 3836 RMD160 c099b5a3c3b0e037734ca3af258e21e07650dcbe SHA1 7d116ed43c37832b681f7d7cde9b924422b944bd SHA256 7db8565ec86bea58feeaedb2854e1c6fdb5eea9944697f300bdac1e7db755662 AUX twinkle-1.3.1-withoutkde.patch 401 RMD160 8bb54a4017be0a168ebcc964d6f2803bc498f591 SHA1 2e1afa7ba0457b7d4968f4ee9b689cd6a7269996 SHA256 9206e92ef9da362993275fe0db50e9eed87ebcc11fb2eba719d85bde36a1ab27 AUX twinkle.desktop.patch 250 RMD160 788925b507d7fcfb8456bbef6dade0e9dae31c7e SHA1 510f834035f698f805514ea1bde0f5703d1736f7 SHA256 c384de5a69863d6dddbfc8f4376fb2e7ac6fa18acc3ba55676d02ef69f90f600 DIST twinkle-1.0.1.tar.gz 1256457 RMD160 094aa44f014427ff919831e4fa02976736390a8d SHA1 d8894d803e2cc08e181cd71001a4f5e0fa9434ef SHA256 91beee47027d25c746acf92afd4cb3efbe906c005dbb929b496dd31b6b9d3b99 -DIST twinkle-1.2.tar.gz 1445224 RMD160 d4b21f46a6e40f4e796eb4d401b8de971c3dbbe2 SHA1 e54a9d451fb109fd66349e65028cba8c8372b165 SHA256 978a220eb5b40458d52fce8e0e7ab38fc6a81adb477a9d0673bdf77bcae1b4a3 DIST twinkle-1.3.1.tar.gz 1505752 RMD160 69e90cd14a407c3b9986ca9a585697a8b43e9e3e SHA1 6b0c1f2bcd3fa04e873686d63e5387766152c79b SHA256 eba60ee98a0c8845234c76785aa451971aa1851bc98353b682a3afbdb5180f12 +DIST twinkle-1.4.tar.gz 1577409 RMD160 9e632f6f682fe44fdfd8f2fc5ebcf51025e5623e SHA1 724b974596f5f725cce9a899a725e8b1f734f16e SHA256 7b6f55386f35f0a84f3b15ed39825962a65304d0142d8aaaca5005e00cfe3523 EBUILD twinkle-1.0.1-r1.ebuild 1753 RMD160 da820bce962fc6b862a3fa059d7ee97a8a4cb7a3 SHA1 181c742cc6a27319f45821bb9b846b1edf0c7c9b SHA256 69146ff8234349b94ce01386dce4f677c8ac97963b34809bc6f5a19280406956 -EBUILD twinkle-1.2-r1.ebuild 1696 RMD160 cba01c86e9673c8e5243b43c4f4b0d08f70dc014 SHA1 64c01ad95ec1b00d240d795cda4f42d9d1eca2e4 SHA256 b6e0dcc98cae874da4446b2230b5542a86d697d50398dbc332fcf905cca4c7fe -EBUILD twinkle-1.2.ebuild 1590 RMD160 6f25c90fb4f1ff489857aab0a98d432d682514cf SHA1 ea69d6e9a471b1f69caef90b5fd024cdcc1ebb4f SHA256 436da5d1cdac3d089ace2cd1b817d054714ac1980705a9d11e1deb0ee15e1528 EBUILD twinkle-1.3.1.ebuild 1504 RMD160 887fa9780ead20052ee8b8b4d068f4fb70661caa SHA1 bd8f906e6cf60171cad4c712b6384c300b46ce31 SHA256 d4b368a244522d8113df7aefeb8813598a967199f59d65fe1cf4532655510a86 -MISC ChangeLog 8269 RMD160 e7599182bf95d5158981b43a178af6adc4e962ab SHA1 2de14d98cded2b3195205d11bf24cc4d7afd6fc3 SHA256 905f507524ce8c95aef47840edc2414376c72ca7e475c6bec93a7b9e43e80bb5 +EBUILD twinkle-1.4.ebuild 1427 RMD160 17ea2091ed98bc11607f6c45c0a82a3af85f64f6 SHA1 4ea29ff5b906e6162171753820cea32697b1dfbf SHA256 3f68ff6c9ae9099faece6614b6ef1edefbdc0a56b45768358c87b3b8aa6ce266 +MISC ChangeLog 8480 RMD160 20a46f6d0b71c9546b8721692b24267202ad8aac SHA1 13e17a4133be6baad4031052b587654ebb2ba744 SHA256 a3f87cce5cd93e8e8809702d486a3d01e654795d200eddfdc75d657ccd393817 MISC metadata.xml 669 RMD160 3cafb4dca8f6e7e14568c5565ae604a3b997a8e4 SHA1 903267899c47c5b80eac0e07a18cf73723fef533 SHA256 e0f82424abfd4c18cfe89191c41d3e7531bb620cd78ffc1aeafcb7b7a4f853a6 diff --git a/net-im/twinkle/files/twinkle-1.2-zrtp.patch b/net-im/twinkle/files/twinkle-1.2-zrtp.patch deleted file mode 100644 index 1163884b6ad2..000000000000 --- a/net-im/twinkle/files/twinkle-1.2-zrtp.patch +++ /dev/null @@ -1,98 +0,0 @@ -diff -ru twinkle-1.2-orig/configure.in twinkle-1.2/configure.in ---- twinkle-1.2-orig/configure.in 2008-03-09 19:28:14.000000000 +1100 -+++ twinkle-1.2/configure.in 2008-05-01 22:19:00.000000000 +1000 -@@ -256,6 +256,10 @@ - AC_CHECK_HEADER(libzrtpcpp/ZrtpQueue.h, [], - [AC_MSG_ERROR([zrtp header files missing])]) - AC_DEFINE(HAVE_ZRTP, 1, [Define to 1 if you have the <libzrtpcpp> library.]) -+ AC_CHECK_HEADER(libzrtpcpp/ZrtpCodes.h, -+ [AC_DEFINE(HAVE_ZRTP_1_1, 1, [Define to 1 if you have the <libzrtpcpp> library version 1.1 or later.]) -+ AC_DEFINE(ZRTP_NAMESPACE(x), GnuZrtpCodes::x, [namespace macro required to cause compatiblity beween zrtp 1.1 and previous versions])], -+ [AC_DEFINE(ZRTP_NAMESPACE(x), x, [namespace macro required to cause compatiblity beween zrtp 1.1 and previous versions])]) - LIBS="-lzrtpcpp $LIBS" - echo "LIBS += -lzrtpcpp" >> $QT_INCL_PRO - have_zrtp="yes" -diff -ru twinkle-1.2-orig/src/audio/twinkle_zrtp_ui.h twinkle-1.2/src/audio/twinkle_zrtp_ui.h ---- twinkle-1.2-orig/src/audio/twinkle_zrtp_ui.h 2008-02-27 08:10:48.000000000 +1100 -+++ twinkle-1.2/src/audio/twinkle_zrtp_ui.h 2008-05-01 22:25:01.000000000 +1000 -@@ -30,6 +30,9 @@ - #include <iostream> - #include <libzrtpcpp/ZrtpQueue.h> - #include <libzrtpcpp/ZrtpUserCallback.h> -+#ifdef HAVE_ZRTP_1_1 -+#include <libzrtpcpp/ZrtpCodes.h> -+#endif - #include "audio_session.h" - #include "userintf.h" - -@@ -44,8 +47,8 @@ - virtual void secureOff(); - virtual void showSAS(std::string sas); - virtual void confirmGoClear(); -- virtual void showMessage(MessageSeverity sev, std::string message); -- virtual void zrtpNegotiationFailed(MessageSeverity severity, std::string msg); -+ virtual void showMessage(ZRTP_NAMESPACE(MessageSeverity) sev, std::string message); -+ virtual void zrtpNegotiationFailed(ZRTP_NAMESPACE(MessageSeverity) severity, std::string msg); - virtual void zrtpNotSuppOther(); - - private: ---- twinkle-1.2-orig/src/audio/twinkle_zrtp_ui.cpp 2008-02-27 08:10:50.000000000 +1100 -+++ twinkle-1.2/src/audio/twinkle_zrtp_ui.cpp 2008-05-01 22:49:54.000000000 +1000 -@@ -32,7 +32,11 @@ - extern t_phone *phone; - - TwinkleZrtpUI::TwinkleZrtpUI(ZrtpQueue* queue, t_audio_session* session) : -+#ifdef HAVE_ZRTP_1_1 -+ ZrtpUserCallback((const ZrtpUserCallback&) queue), audioSession(session) -+#else - ZrtpUserCallback(queue), audioSession(session) -+#endif - {} - - void TwinkleZrtpUI::secureOn(std::string cipher) { -@@ -96,7 +100,7 @@ - ui->cb_async_zrtp_confirm_go_clear(lineno); - } - --void TwinkleZrtpUI::showMessage(MessageSeverity sev, std::string message) { -+void TwinkleZrtpUI::showMessage(ZRTP_NAMESPACE(MessageSeverity) sev, std::string message) { - t_line *line = audioSession->get_line(); - int lineno = line->get_line_number(); - -@@ -106,11 +110,11 @@ - msg += message; - - switch (sev) { -- case Info: -+ case ZRTP_NAMESPACE(Info): - log_file->write_report(msg, "TwinkleZrtpUI::showMessage", LOG_NORMAL, - LOG_INFO); - break; -- case Warning: -+ case ZRTP_NAMESPACE(Warning): - log_file->write_report(msg, "TwinkleZrtpUI::showMessage", LOG_NORMAL, - LOG_WARNING); - break; -@@ -120,7 +124,7 @@ - } - } - --void TwinkleZrtpUI::zrtpNegotiationFailed(MessageSeverity severity, std::string msg) { -+void TwinkleZrtpUI::zrtpNegotiationFailed(ZRTP_NAMESPACE(MessageSeverity) severity, std::string msg) { - t_line *line = audioSession->get_line(); - int lineno = line->get_line_number(); - -@@ -130,11 +134,11 @@ - m += msg; - - switch (severity) { -- case Info: -+ case ZRTP_NAMESPACE(Info): - log_file->write_report(m, "TwinkleZrtpUI::zrtpNegotiationFailed", LOG_NORMAL, - LOG_INFO); - break; -- case Warning: -+ case ZRTP_NAMESPACE(Warning): - log_file->write_report(m, "TwinkleZrtpUI::zrtpNegotiationFailed", LOG_NORMAL, - LOG_WARNING); - break; diff --git a/net-im/twinkle/twinkle-1.2-r1.ebuild b/net-im/twinkle/twinkle-1.2-r1.ebuild deleted file mode 100644 index d56b961c70d3..000000000000 --- a/net-im/twinkle/twinkle-1.2-r1.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/twinkle/twinkle-1.2-r1.ebuild,v 1.3 2008/08/22 23:41:37 dragonheart Exp $ - -EAPI=1 -ARTS_REQUIRED="never" -inherit eutils qt3 kde autotools - -DESCRIPTION="a soft phone for your VOIP communcations using SIP" -HOMEPAGE="http://www.twinklephone.com/" -SRC_URI="http://www.xs4all.nl/~mfnboer/twinkle/download/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -IUSE="arts speex ilbc zrtp kdehiddenvisibility" - -# Requires libqt-mt actually... Is that *always* built, or do we need to check? -RDEPEND=">=net-libs/ccrtp-1.5.0 - >=dev-cpp/commoncpp2-1.4.2 - x11-libs/qt:3 - media-libs/libsndfile - dev-libs/boost - speex? ( media-libs/speex ) - ilbc? ( dev-libs/ilbc-rfc3951 ) - zrtp? ( >=net-libs/libzrtpcpp-1.3.0 ) - media-libs/alsa-lib" - -DEPEND="${RDEPEND} - dev-util/pkgconfig" - -pkg_setup() { - if use speex && has_version '~media-libs/speex-1.2_beta2' && - ! built_with_use 'media-libs/speex' 'wideband' ; then - eerror "You need to build media-libs/speex with USE=wideband enabled." - die "Speex w/o wideband-support detected." - fi -} - -src_unpack() { - unpack ${A} - epatch "${FILESDIR}"/${P}-zrtp.patch - cd "${S}" - eautoreconf -} - -src_compile() { - local myconf=" \ - $(use_with ilbc) \ - $(use_with arts) \ - $(use_with zrtp) \ - $(use_with speex)" - set-kdedir - kde_src_compile -} - -src_install() { - kde_src_install - dodoc THANKS - domenu twinkle.desktop -} - -pkg_postinst() { - elog "if you get crashes on startup re-emerge commoncpp2 ccrtp and twinkle" - elog "see http://www.xs4all.nl/~mfnboer/twinkle/faq.html#crash_startup" - kde_pkg_postinst -} diff --git a/net-im/twinkle/twinkle-1.2.ebuild b/net-im/twinkle/twinkle-1.4.ebuild index 1718e0cea640..a6f484ff0b40 100644 --- a/net-im/twinkle/twinkle-1.2.ebuild +++ b/net-im/twinkle/twinkle-1.4.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/twinkle/twinkle-1.2.ebuild,v 1.4 2008/08/22 23:41:37 dragonheart Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/twinkle/twinkle-1.4.ebuild,v 1.1 2009/01/27 17:57:49 dragonheart Exp $ EAPI=1 ARTS_REQUIRED="never" @@ -13,11 +13,11 @@ SRC_URI="http://www.xs4all.nl/~mfnboer/twinkle/download/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -IUSE="arts speex ilbc zrtp kdehiddenvisibility" +IUSE="kde arts speex ilbc zrtp kdehiddenvisibility" # Requires libqt-mt actually... Is that *always* built, or do we need to check? -RDEPEND=">=net-libs/ccrtp-1.5.0 - >=dev-cpp/commoncpp2-1.4.2 +RDEPEND=">=net-libs/ccrtp-1.6.0 + >=dev-cpp/commoncpp2-1.6.1 x11-libs/qt:3 media-libs/libsndfile dev-libs/boost @@ -39,6 +39,7 @@ pkg_setup() { src_compile() { local myconf=" \ + $(use_with kde) \ $(use_with ilbc) \ $(use_with arts) \ $(use_with zrtp) \ @@ -52,9 +53,3 @@ src_install() { dodoc THANKS domenu twinkle.desktop } - -pkg_postinst() { - elog "if you get crashes on startup re-emerge commoncpp2 ccrtp and twinkle" - elog "see http://www.xs4all.nl/~mfnboer/twinkle/faq.html#crash_startup" - kde_pkg_postinst -} |