summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2012-11-22 03:37:59 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2012-11-22 03:37:59 +0000
commit513523b22444d04995bfdfb394f7879d3c2c55f0 (patch)
tree8d378a2fe7faea7daf3df8f90a0aba264c4c5b99 /dev-libs/boost
parentVersion bump KDE Telepathy 0.5.1 (diff)
downloadgentoo-2-513523b22444d04995bfdfb394f7879d3c2c55f0.tar.gz
gentoo-2-513523b22444d04995bfdfb394f7879d3c2c55f0.tar.bz2
gentoo-2-513523b22444d04995bfdfb394f7879d3c2c55f0.zip
Add patch to fix boost's tuple library. Thanks to Alex in bug #443992.
(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key 1CD13C8AD4301342)
Diffstat (limited to 'dev-libs/boost')
-rw-r--r--dev-libs/boost/ChangeLog8
-rw-r--r--dev-libs/boost/boost-1.52.0-r4.ebuild (renamed from dev-libs/boost/boost-1.52.0-r3.ebuild)5
-rw-r--r--dev-libs/boost/files/boost-1.52.0-tuple.patch11
3 files changed, 21 insertions, 3 deletions
diff --git a/dev-libs/boost/ChangeLog b/dev-libs/boost/ChangeLog
index 7882320666c3..96e70d9e968d 100644
--- a/dev-libs/boost/ChangeLog
+++ b/dev-libs/boost/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for dev-libs/boost
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/ChangeLog,v 1.282 2012/11/18 16:10:49 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/ChangeLog,v 1.283 2012/11/22 03:37:58 flameeyes Exp $
+
+*boost-1.52.0-r4 (22 Nov 2012)
+
+ 22 Nov 2012; Diego E. Pettenò <flameeyes@gentoo.org> +boost-1.52.0-r4.ebuild,
+ +files/boost-1.52.0-tuple.patch, -boost-1.52.0-r3.ebuild:
+ Add patch to fix boost's tuple library. Thanks to Alex in bug #443992.
*boost-1.52.0-r3 (18 Nov 2012)
diff --git a/dev-libs/boost/boost-1.52.0-r3.ebuild b/dev-libs/boost/boost-1.52.0-r4.ebuild
index b5b78910379a..86592460bf1a 100644
--- a/dev-libs/boost/boost-1.52.0-r3.ebuild
+++ b/dev-libs/boost/boost-1.52.0-r4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.52.0-r3.ebuild,v 1.1 2012/11/18 16:10:49 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.52.0-r4.ebuild,v 1.1 2012/11/22 03:37:58 flameeyes Exp $
EAPI="5"
PYTHON_DEPEND="python? *"
@@ -75,7 +75,8 @@ src_prepare() {
"${FILESDIR}/${PN}-1.48.0-disable_libboost_python3.patch" \
"${FILESDIR}/${PN}-1.48.0-python_linking.patch" \
"${FILESDIR}/${PN}-1.48.0-disable_icu_rpath.patch" \
- "${FILESDIR}/remove-toolset-1.48.0.patch"
+ "${FILESDIR}/remove-toolset-1.48.0.patch" \
+ "${FILESDIR}/${PN}-1.52.0-tuple.patch"
# Avoid a patch for now
for file in libs/context/src/asm/*.S; do
diff --git a/dev-libs/boost/files/boost-1.52.0-tuple.patch b/dev-libs/boost/files/boost-1.52.0-tuple.patch
new file mode 100644
index 000000000000..08bab8600b86
--- /dev/null
+++ b/dev-libs/boost/files/boost-1.52.0-tuple.patch
@@ -0,0 +1,11 @@
+--- boost/signals2/detail/variadic_slot_invoker.hpp.org 2012-11-20 09:15:55.000000000 +0400
++++ boost/signals2/detail/variadic_slot_invoker.hpp 2012-11-20 09:19:56.000000000 +0400
+@@ -20,7 +20,7 @@
+ // if compiler has std::tuple use it instead of boost::tuple
+ // because boost::tuple does not have variadic template support at present.
+ #ifdef BOOST_NO_CXX11_HDR_TUPLE
+-#include <boost/tuple.hpp>
++#include <boost/tuple/tuple.hpp>
+ #define BOOST_SIGNALS2_TUPLE boost::tuple
+ #else
+ #include <tuple>