diff options
| author |   Alexander Vershilov <qnikst@gentoo.org> | 2013-09-14 04:40:40 +0000 |
|---|---|---|
| committer | Alexander Vershilov <qnikst@gentoo.org> | 2013-09-14 04:40:40 +0000 |
| commit | 675f7ce433aa7944fe664bf3fbec4d0f255fbca9 (patch) | |
| tree | a5e3525befa83f720fd0e77fd609ac35f38da1f1 /net-libs | |
| parent | Whitespace (diff) | |
| download | gentoo-2-675f7ce433aa7944fe664bf3fbec4d0f255fbca9.tar.gz gentoo-2-675f7ce433aa7944fe664bf3fbec4d0f255fbca9.tar.bz2 gentoo-2-675f7ce433aa7944fe664bf3fbec4d0f255fbca9.zip | |
fix bug #483318, thanks to Joerg Neikes
(Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key 0xEAD50D64D8D3571A!)
Diffstat (limited to 'net-libs')
| -rw-r--r-- | net-libs/zeromq/ChangeLog | 6 | ||||
| -rw-r--r-- | net-libs/zeromq/files/zeromq-3.2.3-unused-variable.patch | 30 | ||||
| -rw-r--r-- | net-libs/zeromq/zeromq-3.2.3.ebuild | 3 |
3 files changed, 37 insertions, 2 deletions
diff --git a/net-libs/zeromq/ChangeLog b/net-libs/zeromq/ChangeLog index b42ab939ee81..41b0fa5ddb7d 100644 --- a/net-libs/zeromq/ChangeLog +++ b/net-libs/zeromq/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-libs/zeromq # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/zeromq/ChangeLog,v 1.39 2013/09/01 15:56:18 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/zeromq/ChangeLog,v 1.40 2013/09/14 04:40:40 qnikst Exp $ + + 14 Sep 2013; Alexander Vershilov <qnikst@gentoo.org> + +files/zeromq-3.2.3-unused-variable.patch, zeromq-3.2.3.ebuild: + fix bug #483318, thanks to Joerg Neikes 01 Sep 2013; Fabian Groffen <grobian@gentoo.org> zeromq-3.2.2.ebuild, zeromq-3.2.3.ebuild: diff --git a/net-libs/zeromq/files/zeromq-3.2.3-unused-variable.patch b/net-libs/zeromq/files/zeromq-3.2.3-unused-variable.patch new file mode 100644 index 000000000000..8307cf12bdff --- /dev/null +++ b/net-libs/zeromq/files/zeromq-3.2.3-unused-variable.patch @@ -0,0 +1,30 @@ +diff -Nur zeromq-3.2.3/tests/test_disconnect_inproc.cpp zeromq-3.2.3a/tests/test_disconnect_inproc.cpp +--- zeromq-3.2.3/tests/test_disconnect_inproc.cpp 2013-09-12 16:45:38.204739478 +0200 ++++ zeromq-3.2.3a/tests/test_disconnect_inproc.cpp 2013-09-12 17:13:06.487156998 +0200 +@@ -40,13 +40,13 @@ + zmq_msg_t msg; + zmq_msg_init (&msg); + zmq_msg_recv (&msg, pubSocket, 0); +- int msgSize = zmq_msg_size(&msg); + char* buffer = (char*)zmq_msg_data(&msg); + + if (buffer[0] == 0) { + assert(isSubscribed); + isSubscribed = false; +- } else { ++ } ++ else { + assert(!isSubscribed); + isSubscribed = true; + } +@@ -64,10 +64,6 @@ + zmq_msg_t msg; + zmq_msg_init (&msg); + zmq_msg_recv (&msg, subSocket, 0); +- int msgSize = zmq_msg_size(&msg); +- char* buffer = (char*)zmq_msg_data(&msg); +- +- + zmq_getsockopt (subSocket, ZMQ_RCVMORE, &more, &more_size); + zmq_msg_close (&msg); + diff --git a/net-libs/zeromq/zeromq-3.2.3.ebuild b/net-libs/zeromq/zeromq-3.2.3.ebuild index ec05acf3502d..d4159a54eb22 100644 --- a/net-libs/zeromq/zeromq-3.2.3.ebuild +++ b/net-libs/zeromq/zeromq-3.2.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/zeromq/zeromq-3.2.3.ebuild,v 1.4 2013/09/01 15:56:18 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/zeromq/zeromq-3.2.3.ebuild,v 1.5 2013/09/14 04:40:40 qnikst Exp $ EAPI=5 @@ -24,6 +24,7 @@ DEPEND="|| ( sys-devel/gcc sys-devel/gcc-apple ) RDEPEND="" src_prepare() { + epatch "${FILESDIR}"/${P}-unused-variable.patch einfo "Removing bundled OpenPGM library" sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.in || die rm -r "${S}"/foreign/openpgm/libpgm* || die |