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

[Felix Yan]

    Date: Wednesday, June 27, 2018 @ 15:35:08
  Author: felixonmars
Revision: 327702

upgpkg: libtorrent-rasterbar 1:1.1.8-1

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

------------------+
 PKGBUILD         |   13 +++--------
 boost-1.67.patch |   58 -----------------------------------------------------
 2 files changed, 4 insertions(+), 67 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-06-27 15:04:57 UTC (rev 327701)
+++ PKGBUILD	2018-06-27 15:35:08 UTC (rev 327702)
@@ -4,8 +4,8 @@
 # Contributor: Hugo Doria <hugo at archlinux.org>
 
 pkgname=libtorrent-rasterbar
-pkgver=1.1.7
-pkgrel=2
+pkgver=1.1.8
+pkgrel=1
 epoch=1
 pkgdesc="A C++ BitTorrent library that aims to be a good alternative to all the other implementations around"
 url="http://www.rasterbar.com/products/libtorrent/"
@@ -15,10 +15,8 @@
 makedepends=('boost' 'python2' 'python')
 options=('!emptydirs')
 _pkgver=${pkgver//./_}
-source=(https://github.com/arvidn/libtorrent/archive/libtorrent-${_pkgver}/$pkgname-$pkgver.tar.gz
-        boost-1.67.patch)
-sha512sums=('95479ff0cbce299edccaaeb435c31b07c05f45e319f3480645d2ae45a9bdc01866edb1329426c6835a7c0cba2d6347254f5f023009ff78405b813c131b78addb'
-            '7230185c1595b9a6b7686d71812addb65852a901212a0050371f40ecd0686ae7f2f2e11e950c2bd26820005fa6d2c7f68fcbf44416c7a2c78b083aa95773fadf')
+source=(https://github.com/arvidn/libtorrent/archive/libtorrent-${_pkgver}/$pkgname-$pkgver.tar.gz)
+sha512sums=('0db79b60093fc771d3fb0a2df7d420ae874da0e5c0968e4cc28052c999ed259f339d4e8b271923a0dc71ec1433d50ad5b680d873ea3dbfa17e663e265c02975b')
 
 prepare() {
   mkdir py2 py3
@@ -27,9 +25,6 @@
   # 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
 }
 

Deleted: boost-1.67.patch
===================================================================
--- boost-1.67.patch	2018-06-27 15:04:57 UTC (rev 327701)
+++ boost-1.67.patch	2018-06-27 15:35:08 UTC (rev 327702)
@@ -1,58 +0,0 @@
-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;