From a7a62f416cf64b3856961d45d42ee03cbcccf1c5 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Aug 09 2021 15:31:52 +0000 Subject: Patched and rebuilt for Boost 1.76 --- diff --git a/libndn-cxx.spec b/libndn-cxx.spec index a40569d..be33f71 100644 --- a/libndn-cxx.spec +++ b/libndn-cxx.spec @@ -5,6 +5,7 @@ Summary: C++ library implementing Named Data Networking primitives License: LGPLv3+ and (BSD or LGPLv3+) and (GPLv3+ or LGPLv3+) URL: http://named-data.net Source0: http://named-data.net/downloads/ndn-cxx-%{version}.tar.bz2 +Patch0: ndn-cxx-boost176-bind.patch BuildRequires: sqlite-devel cryptopp-devel boost-devel pkgconfig openssl-devel BuildRequires: boost-python3-devel python3-devel gcc-c++ @@ -22,6 +23,7 @@ developing applications that use %{name}. %prep %setup -qn ndn-cxx-%{version} +%patch -p1 %build @@ -61,8 +63,8 @@ export LD_LIBRARY_PATH=$PWD/build %{_libdir}/pkgconfig/libndn-cxx.pc %changelog -* Fri Aug 06 2021 Jonathan Wakely - 0.7.1-4 -- Rebuilt for Boost 1.76 +* Mon Aug 09 2021 Jonathan Wakely - 0.7.1-4 +- Patched and rebuilt for Boost 1.76 * Thu Jul 22 2021 Fedora Release Engineering - 0.7.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/ndn-cxx-boost176-bind.patch b/ndn-cxx-boost176-bind.patch new file mode 100644 index 0000000..918b898 --- /dev/null +++ b/ndn-cxx-boost176-bind.patch @@ -0,0 +1,21 @@ +--- ndn-cxx-0.7.1/ndn-cxx/detail/common.hpp~ 2021-08-09 16:28:51.175511141 +0100 ++++ ndn-cxx-0.7.1/ndn-cxx/detail/common.hpp 2021-08-09 16:30:29.126990993 +0100 +@@ -87,6 +87,10 @@ + /// \cond + // Bug 2109 workaround + #define BOOST_BIND_NO_PLACEHOLDERS ++#include ++#if BOOST_VERSION >= 107500 ++#include ++#else + #include + namespace boost { + #define NDN_CXX_SPECIALIZE_BOOST_IS_PLACEHOLDER_FOR_STD_PLACEHOLDER(N) \ +@@ -108,6 +112,7 @@ + NDN_CXX_SPECIALIZE_BOOST_IS_PLACEHOLDER_FOR_STD_PLACEHOLDER(9) + #undef NDN_CXX_SPECIALIZE_BOOST_IS_PLACEHOLDER_FOR_STD_PLACEHOLDER + } // namespace boost ++#endif + /// \endcond + + #include