[arch-commits] Commit in libtorrent-rasterbar/trunk (PKGBUILD boost-1.67.patch)

[Evangelos Foutras]

    Date: Thursday, May 31, 2018 @ 14:38:27
  Author: foutrelis
Revision: 325443

Fix build with boost 1.67

Added:
  libtorrent-rasterbar/trunk/boost-1.67.patch
Modified:
  libtorrent-rasterbar/trunk/PKGBUILD

------------------+
 PKGBUILD         |    9 ++++++--
 boost-1.67.patch |   58 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 65 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-05-31 13:38:44 UTC (rev 325442)
+++ PKGBUILD	2018-05-31 14:38:27 UTC (rev 325443)
@@ -15,8 +15,10 @@
 makedepends=('boost' 'python2' 'python')
 options=('!emptydirs')
 _pkgver=${pkgver//./_}
-source=(https://github.com/arvidn/libtorrent/archive/libtorrent-${_pkgver}/$pkgname-$pkgver.tar.gz)
-sha512sums=('95479ff0cbce299edccaaeb435c31b07c05f45e319f3480645d2ae45a9bdc01866edb1329426c6835a7c0cba2d6347254f5f023009ff78405b813c131b78addb')
+source=(https://github.com/arvidn/libtorrent/archive/libtorrent-${_pkgver}/$pkgname-$pkgver.tar.gz
+        boost-1.67.patch)
+sha512sums=('95479ff0cbce299edccaaeb435c31b07c05f45e319f3480645d2ae45a9bdc01866edb1329426c6835a7c0cba2d6347254f5f023009ff78405b813c131b78addb'
+            '7230185c1595b9a6b7686d71812addb65852a901212a0050371f40ecd0686ae7f2f2e11e950c2bd26820005fa6d2c7f68fcbf44416c7a2c78b083aa95773fadf')
 
 prepare() {
   mkdir py2 py3
@@ -25,6 +27,9 @@
   # Avoid depending on newer processors
   sed -i 's/-msse4.2//' configure.ac
 
+  # https://github.com/arvidn/libtorrent/issues/2947
+  patch -Np1 -i ../boost-1.67.patch
+
   ./autotool.sh
 }
 

Added: boost-1.67.patch
===================================================================
--- boost-1.67.patch	                        (rev 0)
+++ boost-1.67.patch	2018-05-31 14:38:27 UTC (rev 325443)
@@ -0,0 +1,58 @@
+From 64d6b4900448097b0157abb328621dd211e2947d Mon Sep 17 00:00:00 2001
+From: arvidn <arvid at libtorrent.org>
+Date: Wed, 11 Apr 2018 13:48:42 +0200
+Subject: [PATCH] fix boost-1.67 build
+
+---
+ include/libtorrent/ip_filter.hpp | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/include/libtorrent/ip_filter.hpp b/include/libtorrent/ip_filter.hpp
+index 4e47b39a1d..4455624449 100644
+--- a/include/libtorrent/ip_filter.hpp
++++ b/include/libtorrent/ip_filter.hpp
+@@ -41,10 +41,16 @@ POSSIBILITY OF SUCH DAMAGE.
+ #include <vector>
+ 
+ #include <boost/limits.hpp>
+-#include <boost/utility.hpp>
+ #include <boost/cstdint.hpp>
+ #include <boost/tuple/tuple.hpp>
+ 
++#include <boost/version.hpp>
++#if BOOST_VERSION >= 106700
++#include <boost/next_prior.hpp>
++#else
++#include <boost/utility.hpp>
++#endif
++
+ #include "libtorrent/aux_/disable_warnings_pop.hpp"
+ 
+ #include "libtorrent/address.hpp"
+From 9cd0ae67e74a507c1b9ff9c057ee97dda38ccb81 Mon Sep 17 00:00:00 2001
+From: arvidn <arvid at libtorrent.org>
+Date: Fri, 13 Apr 2018 08:42:39 +0200
+Subject: [PATCH] another boost-1.67 build fix
+
+---
+ src/kademlia/routing_table.cpp | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/src/kademlia/routing_table.cpp b/src/kademlia/routing_table.cpp
+index a23500b69f..dfc3500930 100644
+--- a/src/kademlia/routing_table.cpp
++++ b/src/kademlia/routing_table.cpp
+@@ -54,6 +54,13 @@ POSSIBILITY OF SUCH DAMAGE.
+ #include <boost/cstdint.hpp>
+ #include <boost/bind.hpp>
+ 
++#include <boost/version.hpp>
++#if BOOST_VERSION >= 106700
++#include <boost/next_prior.hpp>
++#else
++#include <boost/utility.hpp>
++#endif
++
+ #include "libtorrent/aux_/disable_warnings_pop.hpp"
+ 
+ using boost::uint8_t;