From 310510ddd68ac57efd293cbe5b5c38165f1ed4b0449be94e1f49f34674ba8ae2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Mon, 18 Jan 2016 13:53:49 +0000 Subject: [PATCH] - Add boost-deprecated-type_traits.patch to fix deprecated type_traits usage in boost/graph/adjacency_matrix.hpp header. OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/boost?expand=0&rev=162 --- boost-deprecated-type_traits.patch | 13 +++++++++++++ boost.changes | 6 ++++++ boost.spec | 3 ++- 3 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 boost-deprecated-type_traits.patch diff --git a/boost-deprecated-type_traits.patch b/boost-deprecated-type_traits.patch new file mode 100644 index 0000000..8863c43 --- /dev/null +++ b/boost-deprecated-type_traits.patch @@ -0,0 +1,13 @@ +Index: boost_1_60_0/boost/graph/adjacency_matrix.hpp +=================================================================== +--- boost_1_60_0.orig/boost/graph/adjacency_matrix.hpp ++++ boost_1_60_0/boost/graph/adjacency_matrix.hpp +@@ -443,7 +443,7 @@ namespace boost { + // graph type. Instead, use directedS, which also provides the + // functionality required for a Bidirectional Graph (in_edges, + // in_degree, etc.). +- BOOST_STATIC_ASSERT(type_traits::ice_not<(is_same::value)>::value); ++ BOOST_STATIC_ASSERT(!(is_same::value)); + + typedef typename mpl::if_::type diff --git a/boost.changes b/boost.changes index 385626b..5778f42 100644 --- a/boost.changes +++ b/boost.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jan 18 13:50:06 UTC 2016 - idonmez@suse.com + +- Add boost-deprecated-type_traits.patch to fix deprecated + type_traits usage in boost/graph/adjacency_matrix.hpp header. + ------------------------------------------------------------------- Mon Jan 4 13:28:22 UTC 2016 - idonmez@suse.com diff --git a/boost.spec b/boost.spec index 20de1bb..73bf332 100644 --- a/boost.spec +++ b/boost.spec @@ -88,7 +88,7 @@ Patch13: boost-visibility.patch Patch14: boost-1.57.0-python-libpython_dep.patch Patch15: boost-1.57.0-python-abi_letters.patch Patch16: boost-1.55.0-python-test-PyImport_AppendInittab.patch - +Patch17: boost-deprecated-type_traits.patch BuildRequires: chrpath BuildRequires: dos2unix BuildRequires: fdupes @@ -442,6 +442,7 @@ find -type f ! \( -name \*.sh -o -name \*.py -o -name \*.pl \) -exec chmod -x {} %patch14 -p1 %patch15 -p1 %patch16 -p1 +%patch17 -p1 #stupid build machinery copies .orig files find . -name \*.orig -exec rm {} +