From: Alex Alexander <wired@gentoo.org>
Date: Mon, 19 Jul 2010 18:07:30 +0000 (+0000)
Subject: fixed bug #291713
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4936940a99304c3c9b83ed673f624cdd94538364;p=gentoo.git

fixed bug #291713
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
---

diff --git a/x11-misc/synergy/ChangeLog b/x11-misc/synergy/ChangeLog
index cd216ce01c49..bee720145629 100644
--- a/x11-misc/synergy/ChangeLog
+++ b/x11-misc/synergy/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/synergy
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/synergy/ChangeLog,v 1.60 2009/10/30 09:24:21 wired Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/synergy/ChangeLog,v 1.61 2010/07/19 18:07:30 wired Exp $
+
+*synergy-1.3.1-r2 (19 Jul 2010)
+
+  19 Jul 2010; Alex Alexander <wired@gentoo.org> +synergy-1.3.1-r2.ebuild,
+  +files/synergy-1.3.1-infinite-timeout-fix.patch:
+  fixed bug #291713. Thanks to Jozef Siska for pointing to the patch :)
 
 *synergy-1.3.1-r1 (30 Oct 2009)
 
diff --git a/x11-misc/synergy/Manifest b/x11-misc/synergy/Manifest
index fbed2b409f9f..ff16859e2688 100644
--- a/x11-misc/synergy/Manifest
+++ b/x11-misc/synergy/Manifest
@@ -1,7 +1,29 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX synergy-1.3.1+gcc-4.3.patch 4463 RMD160 e7c4fb526ec0011a3a9b9974dc20956ccef03a22 SHA1 b3a179405bc5b98c2379e13c27a760b543f7a476 SHA256 0dfcdedce8de2cf1285a7af30652eba7234d95d769f762774975ea4d0f293375
+AUX synergy-1.3.1-infinite-timeout-fix.patch 548 RMD160 59f2740e7da43d77ffb82704dab4c90a8c1e0821 SHA1 1fd4646f6b0000f44a7b6d12fe13ca6872c41143 SHA256 9038062a1e678ef858f161393332acdde9124beca45cedff9179582f33d20cca
 AUX synergy-1.3.1-stuttered-delay-fix.patch 2144 RMD160 0b375058a69d7f74e5f0da45e16b26bb114eb38f SHA1 b4be9b68a7caae1aa5476139e10566c380a80169 SHA256 4ffbbaea726e507e024d550459fb0ab25a9da70cb90245400e86d035bbd9a1b9
 DIST synergy-1.3.1.tar.gz 793172 RMD160 5f5d7cb8fcfb57a6c8eae83fb53c704cb85c6c16 SHA1 03113ec8aadfecaeba8e369b083f4fb5b44f5c62 SHA256 4a15e26456498dda5f3aa7d688a4892e0c50394a2f01685136fbc954bacc9691
 EBUILD synergy-1.3.1-r1.ebuild 1505 RMD160 533a7aa6a13363bded155070b4ba915c369aba6b SHA1 23f23ee03045a759bf5431b2b4d7ac476220dc99 SHA256 01222850654e54021f2bf3d94a26bf384530de45c72a92661d8e636704d214f5
+EBUILD synergy-1.3.1-r2.ebuild 1579 RMD160 4516305b50eb0dac0df5e919e5d7aeb5c5ac150e SHA1 46dae06c7f56e111e4af59a69477bd85cc4451c5 SHA256 a3dff5870f7a4047809f837d056b9d907da54f763cbdfabd83d41daff4df62c1
 EBUILD synergy-1.3.1.ebuild 1427 RMD160 5fd8e2b3c2e4adbfa10a79d9a608f8a41fa6d777 SHA1 987920d242b123b19cca0c637f2bd6eb8e5ff2a7 SHA256 3c6f65e2d4284ce44add8f33d224d7a44c3cf6c4f7783f0a73004bb8346a36fe
-MISC ChangeLog 7959 RMD160 0c759d5a13d66b1249af176bd8b3234863640442 SHA1 cbc8221f5218fafce897b363f18935ee50fec163 SHA256 1bec30ef37cec04cee38bee992b9ff7e359392d2ce599f5f39d587072dd88bf4
+MISC ChangeLog 8191 RMD160 c1b055c33b4e40e04f3dd5c5a18dc0e90e7b7317 SHA1 3405301ca17a4faf53c1d81b4a9088c1a055c177 SHA256 5f9b50c984b545878845ea44e79da260532b24f83f5a46035a2f7da2348fc5a2
 MISC metadata.xml 270 RMD160 6aa4dff8f35775a40f4d04bfca8e1e24161e9585 SHA1 d38202d496f7bbe77326209191e346917562d9ab SHA256 f683d99386ed59553eff64672bda4e5ecc840de7f5cdf8aa4c117b1dd3b2235a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.12 (GNU/Linux)
+
+iQIcBAEBCAAGBQJMRJTTAAoJEDZF8K7rm0r6Bq4QAK2MICp89XIylhfr8Jwtkbdv
+84ioVVR6z9TCuWw4cBwjM14CkKcU75V4buMaNR62BX8j6uUvVR4jJ2kbgWHmMi60
+RGLSKK6oUqsy0RldBV++ZKJbfQC1mloVapU5vGT6pMeKxlR2Ott2dx0QFfQBRjTJ
+0beOPhAc8yS/J04JzeF2Y3RqeOjoREh57TOLLK9Jaa+x3dVXdQeAKdi/A/oT47iY
+JUrcgRcD3M3GB3OmH6YT3AJsvLsPgmtoTTyJ3EbnMon66Dhzdd8EqTE7keRveaQ+
+hsY+mqkg2fbtetCRzVIfZxDESGh5cunDe6QiSUrP4aqS9rgAeEJlKd/8XTH9WV62
+PVyMoMzED83H7CUykRLvVNQrxTs8HW+1uuyKrUPSmw1nmEF2Y1TbkKVvgUk/IGIu
+fDzGDGoR+8CtPoMCWC2bV0w5nG6H59r8uTVCGvHCV/NywbismZQGBDIw7R4BEkQK
+NllDMngE+aoZy/rnR4whkmlKxj11co/VeOOif3VuoZVhwPlaffpR/1r6gT2vgdkg
+KB0PUzGxf4KoTPGowAwfaNin0ye8G9f3vbcnN1t7a8NuZ85BfypkUJTzwb9w7nvk
+eew9eXWR1JyR6oWckUre6uY+kz8aNSvm6xSgVHCbeWJ9R4z49xKBWBjDIPgDwQC7
+iaUN0O8iFsHqmmfHPSc0
+=k2o/
+-----END PGP SIGNATURE-----
diff --git a/x11-misc/synergy/files/synergy-1.3.1-infinite-timeout-fix.patch b/x11-misc/synergy/files/synergy-1.3.1-infinite-timeout-fix.patch
new file mode 100644
index 000000000000..d63e49209390
--- /dev/null
+++ b/x11-misc/synergy/files/synergy-1.3.1-infinite-timeout-fix.patch
@@ -0,0 +1,11 @@
+--- lib/platform/CXWindowsEventQueueBuffer.cpp~	2009-02-23 01:37:24.000000000 +0100
++++ lib/platform/CXWindowsEventQueueBuffer.cpp	2009-02-23 01:55:05.000000000 +0100
+@@ -117,7 +117,7 @@
+ 	// we want to give the cpu a chance s owe up this to 25ms
+ #define TIMEOUT_DELAY 25
+ 
+-	while( remaining > 0 && QLength(m_display)==0 && retval==0){
++	while( ((dtimeout < 0.0) || (remaining > 0)) && QLength(m_display)==0 && retval==0){
+ #if HAVE_POLL
+ 	retval = poll(pfds, 1, TIMEOUT_DELAY); //16ms = 60hz, but we make it > to play nicely with the cpu
+ #else
diff --git a/x11-misc/synergy/synergy-1.3.1-r2.ebuild b/x11-misc/synergy/synergy-1.3.1-r2.ebuild
new file mode 100644
index 000000000000..01f64a5b632c
--- /dev/null
+++ b/x11-misc/synergy/synergy-1.3.1-r2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/synergy/synergy-1.3.1-r2.ebuild,v 1.1 2010/07/19 18:07:30 wired Exp $
+
+inherit eutils autotools
+
+DESCRIPTION="Lets you easily share a single mouse and keyboard between multiple computers."
+SRC_URI="mirror://sourceforge/${PN}2/${P}.tar.gz"
+HOMEPAGE="http://synergy2.sourceforge.net/"
+LICENSE="GPL-2"
+KEYWORDS="~arm ~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+SLOT="0"
+IUSE=""
+
+RDEPEND="x11-libs/libXtst
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXinerama"
+DEPEND="${RDEPEND}
+	x11-proto/xextproto
+	x11-proto/xproto
+	x11-proto/kbproto
+	x11-proto/xineramaproto
+	x11-libs/libXt"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}+gcc-4.3.patch"
+
+	# fix for #257794
+	epatch "${FILESDIR}/${P}-stuttered-delay-fix.patch"
+
+	# fix for #291713
+	epatch "${FILESDIR}/${P}-infinite-timeout-fix.patch"
+
+	# Remove -Werror usage.
+	sed -i -e '/ACX_CXX_WARNINGS_ARE_ERRORS/d' \
+		configure.in || die "unable to sed out -Werror usage."
+	eautoreconf
+}
+
+src_compile() {
+	# debug causes an assertion error in switchInDirection()
+	econf --sysconfdir=/etc \
+		--disable-dependency-tracking \
+		--disable-debug
+	emake || die
+}
+
+src_install () {
+	make DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog NEWS README
+	insinto /etc
+	doins "${S}"/examples/synergy.conf
+}
+
+pkg_postinst() {
+	elog
+	elog "${PN} can also be used to connect to computers running Windows."
+	elog "Visit ${HOMEPAGE} to find the Windows client."
+	elog
+}