diff --git a/net-libs/libtorrent/libtorrent-0.13.6.recipe b/net-libs/libtorrent/libtorrent-0.13.7.recipe similarity index 82% rename from net-libs/libtorrent/libtorrent-0.13.6.recipe rename to net-libs/libtorrent/libtorrent-0.13.7.recipe index adc9c0ee3..04bb4aad1 100644 --- a/net-libs/libtorrent/libtorrent-0.13.6.recipe +++ b/net-libs/libtorrent/libtorrent-0.13.7.recipe @@ -2,13 +2,14 @@ SUMMARY="BitTorrent library written in C++ for *nix" DESCRIPTION="libtorrent is a C++ implementation of the BitTorrent protocol \ with the goals of being efficient and easy to use." HOMEPAGE="http://libtorrent.rakshasa.no/" -COPYRIGHT="2005-2016 Jari Sundell" +COPYRIGHT="2005-2018 Jari Sundell" LICENSE="GNU LGPL v2" -REVISION="3" -SOURCE_URI="https://github.com/rakshasa/libtorrent/archive/$portVersion.zip" -CHECKSUM_SHA256="6841043785e0800cc6a7d8f9a1d213495946e3103c2557aaba63fcd78d7b2597" +REVISION="1" +SOURCE_URI="https://github.com/rakshasa/rtorrent/releases/download/v0.9.7/libtorrent-$portVersion.tar.gz" +CHECKSUM_SHA256="c738f60f4d7b6879cd2745fb4310bf24c9287219c1fd619706a9d5499ca7ecc1" +PATCHES="libtorrent-$portVersion.patchset" -ARCHITECTURES="x86 ?x86_gcc2 ?x86_64" +ARCHITECTURES="x86 ?x86_gcc2 x86_64" SECONDARY_ARCHITECTURES="x86" PROVIDES=" @@ -18,6 +19,7 @@ PROVIDES=" REQUIRES=" haiku$secondaryArchSuffix cmd:gettext$secondaryArchSuffix + lib:libcppunit$secondaryArchSuffix lib:libcrypto$secondaryArchSuffix lib:libz$secondaryArchSuffix " diff --git a/net-libs/libtorrent/patches/libtorrent-0.12.5.patch b/net-libs/libtorrent/patches/libtorrent-0.12.5.patch deleted file mode 100644 index 21532c828..000000000 --- a/net-libs/libtorrent/patches/libtorrent-0.12.5.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur libtorrent-0.12.5/rak/socket_address.h libtorrent-0.12.5-haiku/rak/socket_address.h ---- libtorrent-0.12.5/rak/socket_address.h 2008-05-07 12:19:14.000000000 +0000 -+++ libtorrent-0.12.5-haiku/rak/socket_address.h 2009-11-25 03:19:59.000000000 +0000 -@@ -54,6 +54,8 @@ - #include - #include - #include -+ -+typedef unsigned short sa_family_t; - - namespace rak { - diff --git a/net-libs/libtorrent/patches/libtorrent-0.13.7.patchset b/net-libs/libtorrent/patches/libtorrent-0.13.7.patchset new file mode 100644 index 000000000..7551f4041 --- /dev/null +++ b/net-libs/libtorrent/patches/libtorrent-0.13.7.patchset @@ -0,0 +1,27 @@ +From 20901d2aa6674bb2a9887a3775811da0e0cca88e Mon Sep 17 00:00:00 2001 +From: Sergei Reznikov +Date: Thu, 3 Jan 2019 11:47:05 +0300 +Subject: Fix build on Haiku + + +diff --git a/src/net/socket_fd.cc b/src/net/socket_fd.cc +old mode 100755 +new mode 100644 +index 54cb6de..fba9d7c +--- a/src/net/socket_fd.cc ++++ b/src/net/socket_fd.cc +@@ -70,9 +70,11 @@ SocketFd::set_priority(priority_type p) { + check_valid(); + int opt = p; + ++#ifndef __HAIKU__ + if (m_ipv6_socket) + return setsockopt(m_fd, IPPROTO_IPV6, IPV6_TCLASS, &opt, sizeof(opt)) == 0; + else ++#endif + return setsockopt(m_fd, IPPROTO_IP, IP_TOS, &opt, sizeof(opt)) == 0; + } + +-- +2.19.1 +