From 54de75b28f7e262256bf6324ecb8ac78ef247769 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Wed, 30 Jan 2019 17:05:25 +0000 Subject: [PATCH] Patched for Boost 1.69 header changes Also needs changes to bindings/python/src/error_code.cpp from https://github.com/arvidn/libtorrent/commit/939b380fda5f9ec3fe05ab98350fe4a8eb454f5e --- rb_libtorrent-boost169.patch | 10 ++++++++++ rb_libtorrent.spec | 7 ++++++- 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 rb_libtorrent-boost169.patch diff --git a/rb_libtorrent-boost169.patch b/rb_libtorrent-boost169.patch new file mode 100644 index 0000000..090af9d --- /dev/null +++ b/rb_libtorrent-boost169.patch @@ -0,0 +1,10 @@ +--- libtorrent-rasterbar-1.1.9/include/libtorrent/config.hpp~ 2019-01-30 16:22:52.936733759 +0000 ++++ libtorrent-rasterbar-1.1.9/include/libtorrent/config.hpp 2019-01-30 16:22:55.472730824 +0000 +@@ -51,6 +51,7 @@ + #include + #include + #include ++#include + #include // for snprintf + #include // for IOV_MAX + diff --git a/rb_libtorrent.spec b/rb_libtorrent.spec index 179501a..9bc7237 100644 --- a/rb_libtorrent.spec +++ b/rb_libtorrent.spec @@ -16,7 +16,7 @@ Name: rb_libtorrent Version: 1.1.9 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A C++ BitTorrent library aiming to be the best alternative License: BSD @@ -28,6 +28,7 @@ Source3: %{name}-COPYING.zlib Patch0: %{name}-1.0.1-boost_noncopyable.patch Patch1: %{name}-1.1.9-system-tommath.patch Patch2: disable_failed_test.patch +Patch3: %{name}-boost169.patch %if 0%{?rhel} # aarch64 is broken and I have zero interest in fixing it @@ -124,6 +125,7 @@ Python applications. #patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 rm include/libtorrent/tommath* src/mpi.cpp sed -i -e 's|include/libtorrent/version.hpp|../include/libtorrent/version.hpp|' configure configure.ac @@ -276,6 +278,9 @@ find %{buildroot} -name '*.la' -or -name '*.a' | xargs rm -f %endif # with python3 %changelog +* Wed Jan 30 2019 Jonathan Wakely - 1.1.9-2 +- Add patch for Boost 1.69 header changes + * Thu Aug 09 2018 Leigh Scott - 1.1.9-1 - Upgrade to 1.1.9