diff options
Diffstat (limited to 'net-im/twinkle')
| -rw-r--r-- | net-im/twinkle/ChangeLog | 9 | ||||
| -rw-r--r-- | net-im/twinkle/files/digest-twinkle-0.9-r1 | 3 | ||||
| -rw-r--r-- | net-im/twinkle/files/twinkle-0.9-dtmf.patch | 40 | ||||
| -rw-r--r-- | net-im/twinkle/files/twinkle-0.9-invite4xx.patch | 16 | ||||
| -rw-r--r-- | net-im/twinkle/twinkle-0.9-r1.ebuild | 56 |
5 files changed, 123 insertions, 1 deletions
diff --git a/net-im/twinkle/ChangeLog b/net-im/twinkle/ChangeLog index b618a5fe757c..eb4749b16470 100644 --- a/net-im/twinkle/ChangeLog +++ b/net-im/twinkle/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-im/twinkle # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/twinkle/ChangeLog,v 1.21 2006/10/09 18:38:01 dragonheart Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/twinkle/ChangeLog,v 1.22 2006/11/03 07:42:05 dragonheart Exp $ + +*twinkle-0.9-r1 (03 Nov 2006) + + 03 Nov 2006; Daniel Black <dragonheart@gentoo.org> + +files/twinkle-0.9-dtmf.patch, +files/twinkle-0.9-invite4xx.patch, + +twinkle-0.9-r1.ebuild: + upstream patch as per bug #153857 thanks to Christopher Covington 09 Oct 2006; Daniel Black <dragonheart@gentoo.org> twinkle-0.9.ebuild: added desktop entry - bug #147999 thanks to Michiel de Bruijne diff --git a/net-im/twinkle/files/digest-twinkle-0.9-r1 b/net-im/twinkle/files/digest-twinkle-0.9-r1 new file mode 100644 index 000000000000..0f87aa58bd88 --- /dev/null +++ b/net-im/twinkle/files/digest-twinkle-0.9-r1 @@ -0,0 +1,3 @@ +MD5 74ef85e9f4570cec10bd23d301f5549e twinkle-0.9.tar.gz 1012524 +RMD160 f6b8b70a9630687cf7f100c9dde888289d97f082 twinkle-0.9.tar.gz 1012524 +SHA256 22f536aaf6a7aa6870c31d03190b206509cfc8b6147c3af7080d6dbfa5a992b6 twinkle-0.9.tar.gz 1012524 diff --git a/net-im/twinkle/files/twinkle-0.9-dtmf.patch b/net-im/twinkle/files/twinkle-0.9-dtmf.patch new file mode 100644 index 000000000000..e6370210e20c --- /dev/null +++ b/net-im/twinkle/files/twinkle-0.9-dtmf.patch @@ -0,0 +1,40 @@ +Index: src/session.cpp +=================================================================== +--- src/session.cpp (revision 223) ++++ src/session.cpp (working copy) +@@ -653,18 +653,19 @@ + case DTMF_AUTO: + case DTMF_INBAND: + get_line()->ci_set_dtmf_supported(true, true); ++ ui->cb_dtmf_supported(get_line()->get_line_number()); + break; + case DTMF_RFC2833: + get_line()->ci_set_dtmf_supported(false); ++ ui->cb_dtmf_not_supported(get_line()->get_line_number()); + break; + case DTMF_INFO: + get_line()->ci_set_dtmf_supported(true, false, true); ++ ui->cb_dtmf_supported(get_line()->get_line_number()); + break; + default: + assert(false); + } +- +- ui->cb_line_state_changed(); + } + + audio_rtp_session->run(); +@@ -675,10 +676,10 @@ + MEMMAN_DELETE(audio_rtp_session); + delete audio_rtp_session; + audio_rtp_session = NULL; ++ ++ get_line()->ci_set_dtmf_supported(false); ++ ui->cb_line_state_changed(); + } +- +- get_line()->ci_set_dtmf_supported(false); +- ui->cb_line_state_changed(); + } + + t_audio_session *t_session::get_audio_session(void) const { diff --git a/net-im/twinkle/files/twinkle-0.9-invite4xx.patch b/net-im/twinkle/files/twinkle-0.9-invite4xx.patch new file mode 100644 index 000000000000..e9d1535ae4f9 --- /dev/null +++ b/net-im/twinkle/files/twinkle-0.9-invite4xx.patch @@ -0,0 +1,16 @@ +Index: src/line.cpp +=================================================================== +--- src/line.cpp (revision 225) ++++ src/line.cpp (working copy) +@@ -966,9 +966,8 @@ + } else { + d->recvd_response(r, tuid, tid); + } +- } +- +- if (r->hdr_cseq.method == INVITE) { ++ } else { ++ d->recvd_response(r, tuid, tid); + pending_dialogs.remove(d); + MEMMAN_DELETE(d); + delete d; diff --git a/net-im/twinkle/twinkle-0.9-r1.ebuild b/net-im/twinkle/twinkle-0.9-r1.ebuild new file mode 100644 index 000000000000..14197e871ebb --- /dev/null +++ b/net-im/twinkle/twinkle-0.9-r1.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-im/twinkle/twinkle-0.9-r1.ebuild,v 1.1 2006/11/03 07:42:05 dragonheart Exp $ + +inherit eutils qt3 + +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 ~x86" +IUSE="arts speex ilbc zrtp" + +# 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.1 + $(qt_min_version 3.3.0) + arts? ( kde-base/arts ) + media-libs/libsndfile + dev-libs/boost + speex? ( media-libs/speex ) + ilbc? ( dev-libs/ilbc-rfc3951 ) + zrtp? ( net-libs/libzrtpcpp )" + +DEPEND="${RDEPEND} + dev-util/pkgconfig" + +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}"/${PN}-0.4.1-badcflags.patch + epatch "${FILESDIR}"/${P}-dtmf.patch + epatch "${FILESDIR}"/${P}-invite4xx.patch +} + +src_compile() { + econf \ + $(use_with ilbc) \ + $(use_with arts) \ + $(use_with zrtp) \ + $(use_with speex) || die 'Error: conf failed' + emake || die "Error: emake failed!" +} + +src_install() { + emake DESTDIR="${D}" install || die + dodoc AUTHORS NEWS README THANKS + domenu twinkle.desktop +} + +pkg_postinst() { + einfo "if you get crashes on startup re-emerge commoncpp2 ccrtp and twinkle" + einfo "see http://www.xs4all.nl/~mfnboer/twinkle/faq.html#crash_startup" +} |