From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3FFA7138359 for ; Sat, 11 Jul 2020 01:25:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0022AE0858; Sat, 11 Jul 2020 01:25:14 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D9432E0848 for ; Sat, 11 Jul 2020 01:25:14 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 94A6434F0F5 for ; Sat, 11 Jul 2020 01:25:12 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1BC01233 for ; Sat, 11 Jul 2020 01:25:11 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1594430696.bff063654b29e7bdbee46aed1ad899b60f1ec2e8.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/libktorrent/files/, net-libs/libktorrent/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-libs/libktorrent/files/libktorrent-2.2.0-fix-MultiFileCache.patch net-libs/libktorrent/libktorrent-2.2.0-r1.ebuild X-VCS-Directories: net-libs/libktorrent/files/ net-libs/libktorrent/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: bff063654b29e7bdbee46aed1ad899b60f1ec2e8 X-VCS-Branch: master Date: Sat, 11 Jul 2020 01:25:11 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 12f47ced-efb0-439c-87ef-062746b085fe X-Archives-Hash: 68c82af38acef96bb548d0a91673943a commit: bff063654b29e7bdbee46aed1ad899b60f1ec2e8 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Jul 11 01:11:43 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Jul 11 01:24:56 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bff06365 net-libs/libktorrent: Fix a bug in MultiFileCache Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Andreas Sturmlechner gentoo.org> .../libktorrent-2.2.0-fix-MultiFileCache.patch | 26 +++++++++ net-libs/libktorrent/libktorrent-2.2.0-r1.ebuild | 64 ++++++++++++++++++++++ 2 files changed, 90 insertions(+) diff --git a/net-libs/libktorrent/files/libktorrent-2.2.0-fix-MultiFileCache.patch b/net-libs/libktorrent/files/libktorrent-2.2.0-fix-MultiFileCache.patch new file mode 100644 index 00000000000..bafdbaffefa --- /dev/null +++ b/net-libs/libktorrent/files/libktorrent-2.2.0-fix-MultiFileCache.patch @@ -0,0 +1,26 @@ +From 5b0abf8378d497c5a8881771518df6a02404d031 Mon Sep 17 00:00:00 2001 +From: Alexander Trufanov +Date: Tue, 16 Jun 2020 13:47:42 +0300 +Subject: [PATCH] Fix a bug in MultiFileCache + +Differential Revision: https://phabricator.kde.org/D29852 +--- + src/diskio/multifilecache.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/diskio/multifilecache.cpp b/src/diskio/multifilecache.cpp +index 0a513ad..882630e 100644 +--- a/src/diskio/multifilecache.cpp ++++ b/src/diskio/multifilecache.cpp +@@ -455,7 +455,7 @@ namespace bt + off = file_off + (piece_off - chunk_off); + len = piece_len; + } +- else if(piece_off >= chunk_off && piece_len < chunk_off + chunk_len) ++ else if(piece_off >= chunk_off && piece_off < chunk_off + chunk_len) + { + // The start of the piece lies partially in the current file + off = file_off + (piece_off - chunk_off); +-- +GitLab + diff --git a/net-libs/libktorrent/libktorrent-2.2.0-r1.ebuild b/net-libs/libktorrent/libktorrent-2.2.0-r1.ebuild new file mode 100644 index 00000000000..08d032bf53f --- /dev/null +++ b/net-libs/libktorrent/libktorrent-2.2.0-r1.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +ECM_TEST="forceoptional" +KDE_ORG_CATEGORY="network" +KFMIN=5.60.0 +QTMIN=5.12.3 +VIRTUALX_REQUIRED="test" +inherit ecm kde.org + +DESCRIPTION="BitTorrent library based on KDE Frameworks" +HOMEPAGE="https://kde.org/applications/internet/org.kde.ktorrent +https://userbase.kde.org/KTorrent" +SRC_URI="mirror://kde/stable/ktorrent/5.2.0/${P}.tar.xz" + +LICENSE="GPL-2+" +SLOT="5" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" +IUSE="" + +BDEPEND="sys-devel/gettext" +COMMON_DEPEND=" + app-crypt/qca:2[qt5(+)] + >=dev-libs/gmp-6.0.0a:0= + dev-libs/libgcrypt:0= + >=dev-qt/qtnetwork-${QTMIN}:5 + >=dev-qt/qtxml-${QTMIN}:5 + >=kde-frameworks/karchive-${KFMIN}:5 + >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/kcrash-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kio-${KFMIN}:5 + >=kde-frameworks/solid-${KFMIN}:5 +" +DEPEND="${COMMON_DEPEND} + dev-libs/boost +" +RDEPEND="${COMMON_DEPEND} + !dev-libs/botan[gmp(-)] +" + +PATCHES=( "${FILESDIR}/${P}-fix-MultiFileCache.patch" ) # 2.2 branch + +src_prepare() { + ecm_src_prepare + + # Gentoo workaround because gmp.h in MULTILIB_WRAPPED_HEADERS is breaking this + sed -i -e "/^find_package/ s/\"\${LibGMP_MIN_VERSION}\" //" \ + CMakeLists.txt || die + sed -i -e "/^find_dependency/ s/ \"@LibGMP_MIN_VERSION@\"//" \ + KF5TorrentConfig.cmake.in || die +} + +src_test() { + # failing network tests + local myctestargs=( + -E "(fin|packetloss|send|superseedtest|transmit|utppolltest)" + ) + + ecm_src_test +}