upstream patchs as per bug #153857

Package-Manager: portage-2.1.2_rc1-r1

6 files changed, 145 insertions, 8 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/Manifest b/net-im/twinkle/Manifest
index 075f9071a74a..38ddab2794f3 100644
--- a/net-im/twinkle/Manifest
+++ b/net-im/twinkle/Manifest
@@ -9,6 +9,14 @@ AUX twinkle-0.8-autoconfspeex.patch 1310 RMD160 608ab280a0ad17fc9b40571c77ffce12
 MD5 dd2e8f14edbe35a2b3d0180d6a022d08 files/twinkle-0.8-autoconfspeex.patch 1310
 RMD160 608ab280a0ad17fc9b40571c77ffce127882bc7b files/twinkle-0.8-autoconfspeex.patch 1310
 SHA256 2caaa10216d5ae3b5a41cd29ff847a0ecd7ec88460a5fe49867bf4146d84871e files/twinkle-0.8-autoconfspeex.patch 1310
+AUX twinkle-0.9-dtmf.patch 1081 RMD160 3fc896814b58e8f2fe27adcbb157e1373ef3c660 SHA1 0f1c24ebaa35452aaae7d34291d021f02aca7832 SHA256 023d6673553340e9f27b9d9fc6f11a3c22b44550150cdb42ad8a0d8ba169560c
+MD5 72c944205109a6266d35e330b2484822 files/twinkle-0.9-dtmf.patch 1081
+RMD160 3fc896814b58e8f2fe27adcbb157e1373ef3c660 files/twinkle-0.9-dtmf.patch 1081
+SHA256 023d6673553340e9f27b9d9fc6f11a3c22b44550150cdb42ad8a0d8ba169560c files/twinkle-0.9-dtmf.patch 1081
+AUX twinkle-0.9-invite4xx.patch 393 RMD160 75c719c6cc1f06587f14d72dbc3ad988bf6edacd SHA1 82db060d8544f31468be4a964a15333caad6cb67 SHA256 4c3f3042ec8e1957f854b7884ca405aae7af68ce7c64cafad31e5b75c51af855
+MD5 4d81b1ef98fee6aba75ffebafb1fbe73 files/twinkle-0.9-invite4xx.patch 393
+RMD160 75c719c6cc1f06587f14d72dbc3ad988bf6edacd files/twinkle-0.9-invite4xx.patch 393
+SHA256 4c3f3042ec8e1957f854b7884ca405aae7af68ce7c64cafad31e5b75c51af855 files/twinkle-0.9-invite4xx.patch 393
 DIST twinkle-0.8.1.tar.gz 982496 RMD160 7637d322355bae3608f5fc7e8879f2720fa4520b SHA1 b00b0e41de0a833f30f0373c50a72adcffcd92aa SHA256 a1d7df3f6e6ef758028f7f30982e434c513cce4ac4cd759d76dfd859a93bc3b3
 DIST twinkle-0.8.tar.gz 1033092 RMD160 1adc000e9c0e6ef76599a968399e8287aec5f158 SHA1 816bb482d7a70045d6586929121b22da39571264 SHA256 075e6358e17a185b089bffeda4643b95f7a485e911c499b62e4f77a971315337
 DIST twinkle-0.9.tar.gz 1012524 RMD160 f6b8b70a9630687cf7f100c9dde888289d97f082 SHA1 b0ef83aa738ec5504f0d0785b9be868835344284 SHA256 22f536aaf6a7aa6870c31d03190b206509cfc8b6147c3af7080d6dbfa5a992b6
@@ -20,14 +28,18 @@ EBUILD twinkle-0.8.ebuild 1211 RMD160 150a8875f21da45cfa2a0a8fa0814421f0e6e9a0 S
 MD5 f29901f80ad9255a808aba4072f7e9d2 twinkle-0.8.ebuild 1211
 RMD160 150a8875f21da45cfa2a0a8fa0814421f0e6e9a0 twinkle-0.8.ebuild 1211
 SHA256 70af5b68fc0aa7a6db8de4f8bcfd3bf6d48c0c577fbe959da77169d385da2ff6 twinkle-0.8.ebuild 1211
+EBUILD twinkle-0.9-r1.ebuild 1505 RMD160 f87a86ca45ebb5f9b3586b0ac49b2d09f026bde2 SHA1 d15f48ee87f51f66ce976790ef87203016402609 SHA256 9f292cffb7a64e010cdd5e85c1ab6796210f27629c086f180fed5e64f0ca72a5
+MD5 7ea5262a4a6aa08aa2078cb910cf4339 twinkle-0.9-r1.ebuild 1505
+RMD160 f87a86ca45ebb5f9b3586b0ac49b2d09f026bde2 twinkle-0.9-r1.ebuild 1505
+SHA256 9f292cffb7a64e010cdd5e85c1ab6796210f27629c086f180fed5e64f0ca72a5 twinkle-0.9-r1.ebuild 1505
 EBUILD twinkle-0.9.ebuild 1421 RMD160 5e08de224162f4a9b72339a01b00d7e6d02e50ec SHA1 b0db7d47bf614fd2506a46bf0a0a8cd145db671d SHA256 77a337583ef41cd6c7e4470dcfab5c7151d7984586a8b09f45a1f9439dbcb8ac
 MD5 3411d02d5ce416a6640d3bb627da8235 twinkle-0.9.ebuild 1421
 RMD160 5e08de224162f4a9b72339a01b00d7e6d02e50ec twinkle-0.9.ebuild 1421
 SHA256 77a337583ef41cd6c7e4470dcfab5c7151d7984586a8b09f45a1f9439dbcb8ac twinkle-0.9.ebuild 1421
-MISC ChangeLog 3999 RMD160 7b1c650b852e5221bb44f429d7ff6087f2709460 SHA1 d3ee5eaeaaec80f26744f2a0392b52863157ff0c SHA256 140e8cc7b6bbb17ebe02129321ee5bafb8cbbd1eeae9f3143aff45c37c3b407e
-MD5 68f6ebe721f601e13ef19137a4ad079f ChangeLog 3999
-RMD160 7b1c650b852e5221bb44f429d7ff6087f2709460 ChangeLog 3999
-SHA256 140e8cc7b6bbb17ebe02129321ee5bafb8cbbd1eeae9f3143aff45c37c3b407e ChangeLog 3999
+MISC ChangeLog 4247 RMD160 7991d7e1cca3b4f36064302cc7f65ea4f231c4ee SHA1 a68d7437eb71e5f8e8e5a96a74eaa20d75e08440 SHA256 016141d5d146e47ba8a3d54b3b66a5242e5615f538abb5a9b45f46f43aba1e4b
+MD5 bc84e98fbb189340ae580c2597735e0d ChangeLog 4247
+RMD160 7991d7e1cca3b4f36064302cc7f65ea4f231c4ee ChangeLog 4247
+SHA256 016141d5d146e47ba8a3d54b3b66a5242e5615f538abb5a9b45f46f43aba1e4b ChangeLog 4247
 MISC metadata.xml 458 RMD160 51da9f8eb28d451a724fa7b687894976057263c1 SHA1 789cc96e32af0b71920e2df2c8ab7f45c1e9279d SHA256 9ee142b0e5854bae9e0365b52f6f0cf00a3b428c0c199ccce029108d03f42996
 MD5 81380b5fa13f903ff321873d95ed35bb metadata.xml 458
 RMD160 51da9f8eb28d451a724fa7b687894976057263c1 metadata.xml 458
@@ -41,10 +53,13 @@ SHA256 bb632ffa2e1448fa996dba6ddc4da3cf4494ef461f68f4348466a0580181432f files/di
 MD5 6878c2315906eb2513bc498959415f2f files/digest-twinkle-0.9 238
 RMD160 efa1199d4550bd36803280378c6cf64a5c94f9b3 files/digest-twinkle-0.9 238
 SHA256 87da7cca46528de6459ae95978fae5b00aaf557a264996221caefbe0dfeaddd6 files/digest-twinkle-0.9 238
+MD5 6878c2315906eb2513bc498959415f2f files/digest-twinkle-0.9-r1 238
+RMD160 efa1199d4550bd36803280378c6cf64a5c94f9b3 files/digest-twinkle-0.9-r1 238
+SHA256 87da7cca46528de6459ae95978fae5b00aaf557a264996221caefbe0dfeaddd6 files/digest-twinkle-0.9-r1 238
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux)
 
-iD8DBQFFKpj0mdTrptrqvGERAm46AJ91RsZ/pijpoW9cv9vFTTcNRdmXxQCfYCBN
-FWRXVTAefKeT97K6E4AMRHQ=
-=ol8m
+iD8DBQFFSvUwmdTrptrqvGERApNeAJ9aWMH2/G+RSlJlz3+6EgmCoJPrDwCeOoWB
+PTRJGaD3nsREb7QSHfdix6g=
+=kt4M
 -----END PGP SIGNATURE-----
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"
+}