diff options
| author |   Sam James <sam@gentoo.org> | 2021-09-05 03:20:35 +0100 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2021-09-05 03:22:14 +0100 |
| commit | 103255c242edc16d375bd8f9948213485965344f (patch) | |
| tree | be1101b64ec595cce57a62b6490593280addea24 /dev-libs/boost | |
| parent | net-im/telegram-desktop: Bump to 3.0.1 (diff) | |
| download | gentoo-103255c242edc16d375bd8f9948213485965344f.tar.gz gentoo-103255c242edc16d375bd8f9948213485965344f.tar.bz2 gentoo-103255c242edc16d375bd8f9948213485965344f.zip | |
dev-libs/boost: add additional geometry patches
Some internal includes were missing within boost/geometry.
Acked-by: David Seifert <soap@gentoo.org>
Bug: https://bugs.gentoo.org/808087
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'dev-libs/boost')
| -rw-r--r-- | dev-libs/boost/Manifest | 1 | ||||
| -rw-r--r-- | dev-libs/boost/boost-1.77.0-r2.ebuild (renamed from dev-libs/boost/boost-1.77.0-r1.ebuild) | 4 | ||||
| -rw-r--r-- | dev-libs/boost/files/boost-1.77-math-deprecated-include.patch | 40 |
3 files changed, 4 insertions, 41 deletions
diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest index 20cf00e42926..553e397f12dd 100644 --- a/dev-libs/boost/Manifest +++ b/dev-libs/boost/Manifest @@ -1,2 +1,3 @@ +DIST boost-1.77.0-patches.tar.xz 6996 BLAKE2B c561bb5eacdb6c3a49582407f1d85f22dd60de6caa494087d473f91926dd1eb0bffed7054ee5cc32e5263f450342fda29f0cee7a329ef524701730b027285e14 SHA512 82e323ac44c3e94630ac4ed48c6eeb2231128fa876c9b54ccb02d070bf0debf205061f44ceca76e4067362360a596408a31420d60fe006e6be8b2ead75dc3248 DIST boost_1_76_0.tar.bz2 110073117 BLAKE2B 45445e6a9725cb99131e0b831b2fac0840d083692c13887b41adeac5cb8b3732026db3641d6be20591a676b78a87fcf363eb9b1508f87ed26039bba6a1ced533 SHA512 5d68bed98c57e03b4cb2420d9b856e5f0669561a6142a4b0c9c8a58dc5b6b28e16ccbb16ac559c3a3198c45769a246bf996b96cb7b6a019dd15f05c2270e9429 DIST boost_1_77_0.tar.bz2 110361537 BLAKE2B 106aeb09ec7705b595f2ca966a76c53c649eac6fac50d88c156862e0991c33c89a2f3a09edcbcb453fa44bf71cdde030b35d0a0889ad97b65f3a868cb877a532 SHA512 39b45c9b60bc5a2a4c669a4463d1272c1e093376b2fb374d7f20a84ea10a3e23bb04b335a735a83a04575731f874d9bff77e89acd947524b3fbbae1b26ae1f2f diff --git a/dev-libs/boost/boost-1.77.0-r1.ebuild b/dev-libs/boost/boost-1.77.0-r2.ebuild index 9a715e088959..74412ce61b95 100644 --- a/dev-libs/boost/boost-1.77.0-r1.ebuild +++ b/dev-libs/boost/boost-1.77.0-r2.ebuild @@ -13,6 +13,7 @@ MAJOR_V="$(ver_cut 1-2)" DESCRIPTION="Boost Libraries for C++" HOMEPAGE="https://www.boost.org/" SRC_URI="https://boostorg.jfrog.io/artifactory/main/release/${PV}/source/boost_${MY_PV}.tar.bz2" +SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-patches.tar.xz" S="${WORKDIR}/${PN}_${MY_PV}" LICENSE="Boost-1.0" @@ -53,7 +54,8 @@ PATCHES=( "${FILESDIR}"/${PN}-1.73-boost-mpi-python-PEP-328.patch "${FILESDIR}"/${PN}-1.74-CVE-2012-2677.patch "${FILESDIR}"/${PN}-1.76-sparc-define.patch - "${FILESDIR}"/${PN}-1.77-math-deprecated-include.patch + "${WORKDIR}"/${PN}-1.77-math-deprecated-include.patch + "${WORKDIR}"/${PN}-1.77-geometry.patch ) python_bindings_needed() { diff --git a/dev-libs/boost/files/boost-1.77-math-deprecated-include.patch b/dev-libs/boost/files/boost-1.77-math-deprecated-include.patch deleted file mode 100644 index 44943243eaac..000000000000 --- a/dev-libs/boost/files/boost-1.77-math-deprecated-include.patch +++ /dev/null @@ -1,40 +0,0 @@ -https://github.com/boostorg/math/commit/720536a08e4e33639869e1b7a99d9ec923409c0b -https://github.com/boostorg/math/issues/675 -https://github.com/boostorg/math/pull/676 - -From 720536a08e4e33639869e1b7a99d9ec923409c0b Mon Sep 17 00:00:00 2001 -From: Matt Borland <matt@mattborland.com> -Date: Mon, 23 Aug 2021 17:48:28 +0300 -Subject: [PATCH] Fix for issue 675 (#676) - ---- a/boost/math/tools/header_deprecated.hpp -+++ a/boost/math/tools/header_deprecated.hpp -@@ -6,12 +6,22 @@ - #ifndef BOOST_MATH_TOOLS_HEADER_DEPRECATED - #define BOOST_MATH_TOOLS_HEADER_DEPRECATED - --#ifdef _MSC_VER --// Expands to "This header is deprecated; use expr instead." --#define BOOST_MATH_HEADER_DEPRECATED(expr) __pragma("This header is deprecated; use " expr " instead.") --#else // GNU, Clang, Intel, IBM, etc. -+#ifndef BOOST_MATH_STANDALONE -+ -+# include <boost/config/header_deprecated.hpp> -+# define BOOST_MATH_HEADER_DEPRECATED(expr) BOOST_HEADER_DEPRECATED(expr) -+ -+#else -+ -+# ifdef _MSC_VER - // Expands to "This header is deprecated; use expr instead." --#define BOOST_MATH_HEADER_DEPRECATED(expr) _Pragma("This header is deprecated; use " expr " instead.") --#endif -+# define BOOST_MATH_HEADER_DEPRECATED(expr) __pragma("This header is deprecated; use " expr " instead.") -+# else // GNU, Clang, Intel, IBM, etc. -+// Expands to "This header is deprecated use expr instead" -+# define BOOST_MATH_HEADER_DEPRECATED_MESSAGE(expr) _Pragma(#expr) -+# define BOOST_MATH_HEADER_DEPRECATED(expr) BOOST_MATH_HEADER_DEPRECATED_MESSAGE(message "This header is deprecated use " expr " instead") -+# endif -+ -+#endif // BOOST_MATH_STANDALONE - - #endif // BOOST_MATH_TOOLS_HEADER_DEPRECATED |