[arch-commits] Commit in libtorrent-rasterbar/repos (3 files)

[Felix Yan]

    Date: Thursday, May 31, 2018 @ 14:47:12
  Author: felixonmars
Revision: 325445

archrelease: copy trunk to staging-x86_64

Added:
  libtorrent-rasterbar/repos/staging-x86_64/
  libtorrent-rasterbar/repos/staging-x86_64/PKGBUILD
    (from rev 325444, libtorrent-rasterbar/trunk/PKGBUILD)
  libtorrent-rasterbar/repos/staging-x86_64/boost-1.67.patch
    (from rev 325444, libtorrent-rasterbar/trunk/boost-1.67.patch)

------------------+
 PKGBUILD         |   68 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 boost-1.67.patch |   58 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 126 insertions(+)

Copied: libtorrent-rasterbar/repos/staging-x86_64/PKGBUILD (from rev 325444, libtorrent-rasterbar/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD	                        (rev 0)
+++ staging-x86_64/PKGBUILD	2018-05-31 14:47:12 UTC (rev 325445)
@@ -0,0 +1,68 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Ionut Biru <ibiru at archlinux.org>
+# Contributor: Hugo Doria <hugo at archlinux.org>
+
+pkgname=libtorrent-rasterbar
+pkgver=1.1.7
+pkgrel=2
+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/"
+arch=('x86_64')
+license=('BSD')
+depends=('boost-libs')
+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')
+
+prepare() {
+  mkdir py2 py3
+  cd libtorrent-libtorrent-${_pkgver}
+
+  # 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
+}
+
+_build() (
+  cd py$1
+
+  # FS#50745
+  _boost="boost_python"
+  if [ $1 -eq 3 ]; then _boost="boost_python3"; fi
+
+  # https://github.com/qbittorrent/qBittorrent/issues/5265#issuecomment-220007436
+  CXXFLAGS="$CXXFLAGS -std=c++11" \
+  PYTHON=/usr/bin/python$1 \
+  ../libtorrent-libtorrent-${_pkgver}/configure \
+    --prefix=/usr \
+    --enable-python-binding \
+    --enable-examples \
+    --disable-static \
+    --with-libiconv \
+    --with-boost-python=$_boost
+)
+
+build() {
+  _build 2
+  _build 3
+}
+
+package() {
+  make -C py2 DESTDIR="$pkgdir" install
+  make -C py3 DESTDIR="$pkgdir" install
+  install -Dm644 libtorrent-libtorrent-${_pkgver}/COPYING \
+    "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+
+  # Remove most example binaries
+  rm "$pkgdir"/usr/bin/{*_test,*_tester,simple_client,stats_counters}
+}

Copied: libtorrent-rasterbar/repos/staging-x86_64/boost-1.67.patch (from rev 325444, libtorrent-rasterbar/trunk/boost-1.67.patch)
===================================================================
--- staging-x86_64/boost-1.67.patch	                        (rev 0)
+++ staging-x86_64/boost-1.67.patch	2018-05-31 14:47:12 UTC (rev 325445)
@@ -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;