summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2014-05-06 15:20:33 +0000
committerJeroen Roovers <jer@gentoo.org>2014-05-06 15:20:33 +0000
commit1e1ec56fc4431ad84a6d8b116236679b8843b05c (patch)
tree5c94043ebeeea75972a709c936aadc6a4cebe186 /x11-misc/synergy
parentdrop py2.6 add pypy support (diff)
downloadgentoo-2-1e1ec56fc4431ad84a6d8b116236679b8843b05c.tar.gz
gentoo-2-1e1ec56fc4431ad84a6d8b116236679b8843b05c.tar.bz2
gentoo-2-1e1ec56fc4431ad84a6d8b116236679b8843b05c.zip
Define src_prepare() to control which eclass applies patches (and run epatch_user). Fix a memory leak (bug #505978).
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Diffstat (limited to 'x11-misc/synergy')
-rw-r--r--x11-misc/synergy/ChangeLog7
-rw-r--r--x11-misc/synergy/files/synergy-1.4.17_p2055-CSocketMultiplexer.patch13
-rw-r--r--x11-misc/synergy/synergy-1.4.17_p2055.ebuild7
3 files changed, 25 insertions, 2 deletions
diff --git a/x11-misc/synergy/ChangeLog b/x11-misc/synergy/ChangeLog
index d0834de83397..e5eb03bd5a1f 100644
--- a/x11-misc/synergy/ChangeLog
+++ b/x11-misc/synergy/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for x11-misc/synergy
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/synergy/ChangeLog,v 1.109 2014/05/06 02:32:21 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/synergy/ChangeLog,v 1.110 2014/05/06 15:20:33 jer Exp $
+
+ 06 May 2014; Jeroen Roovers <jer@gentoo.org> synergy-1.4.17_p2055.ebuild,
+ +files/synergy-1.4.17_p2055-CSocketMultiplexer.patch:
+ Define src_prepare() to control which eclass applies patches (and run
+ epatch_user). Fix a memory leak (bug #505978).
*synergy-1.4.17_p2055 (06 May 2014)
diff --git a/x11-misc/synergy/files/synergy-1.4.17_p2055-CSocketMultiplexer.patch b/x11-misc/synergy/files/synergy-1.4.17_p2055-CSocketMultiplexer.patch
new file mode 100644
index 000000000000..0e99fd3bce5d
--- /dev/null
+++ b/x11-misc/synergy/files/synergy-1.4.17_p2055-CSocketMultiplexer.patch
@@ -0,0 +1,13 @@
+http://synergy-project.org/spit/issues/details/2935/
+https://bugs.gentoo.org/show_bug.cgi?id=505978
+
+--- a/src/lib/net/SocketMultiplexer.cpp
++++ b/src/lib/net/SocketMultiplexer.cpp
+@@ -243,6 +243,7 @@
+ for (CSocketJobMap::iterator i = m_socketJobMap.begin();
+ i != m_socketJobMap.end();) {
+ if (*(i->second) == NULL) {
++ m_socketJobs.erase(i->second);
+ m_socketJobMap.erase(i++);
+ m_update = true;
+ }
diff --git a/x11-misc/synergy/synergy-1.4.17_p2055.ebuild b/x11-misc/synergy/synergy-1.4.17_p2055.ebuild
index 46c7f4487184..be2523629c30 100644
--- a/x11-misc/synergy/synergy-1.4.17_p2055.ebuild
+++ b/x11-misc/synergy/synergy-1.4.17_p2055.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/synergy/synergy-1.4.17_p2055.ebuild,v 1.1 2014/05/06 02:32:21 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/synergy/synergy-1.4.17_p2055.ebuild,v 1.2 2014/05/06 15:20:33 jer Exp $
EAPI=5
inherit eutils flag-o-matic gnome2-utils cmake-utils qt4-r2
@@ -48,10 +48,15 @@ PATCHES=(
"${FILESDIR}/${PN}-1.4.17_p2055-cryptopp.patch"
"${FILESDIR}/${PN}-1.4.17_p2055-test.patch"
"${FILESDIR}/${PN}-1.4.17_p2055-gentoo.patch"
+ "${FILESDIR}/${PN}-1.4.17_p2055-CSocketMultiplexer.patch"
)
S=${WORKDIR}/${P/_p*/}-Source
+src_prepare() {
+ cmake-utils_src_prepare
+}
+
src_configure() {
local mycmakeargs=$(cmake-utils_use_with test GENTOO_TEST)
cmake-utils_src_configure