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 47A9C139694 for ; Fri, 23 Jun 2017 22:29:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4060C234033; Fri, 23 Jun 2017 22:29:36 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0EE7C234033 for ; Fri, 23 Jun 2017 22:29:35 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 C06623419E1 for ; Fri, 23 Jun 2017 22:29:34 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 63E417483 for ; Fri, 23 Jun 2017 22:29:33 +0000 (UTC) From: "Sven Wegener" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sven Wegener" Message-ID: <1498256968.3e279c58bee61b557823357a52b23c101902807d.swegener@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-nntp/nzbget/files/, net-nntp/nzbget/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-nntp/nzbget/files/nzbget-19.0_pre2021-fix-no-parcheck.patch net-nntp/nzbget/nzbget-19.0_pre2021.ebuild X-VCS-Directories: net-nntp/nzbget/ net-nntp/nzbget/files/ X-VCS-Committer: swegener X-VCS-Committer-Name: Sven Wegener X-VCS-Revision: 3e279c58bee61b557823357a52b23c101902807d X-VCS-Branch: master Date: Fri, 23 Jun 2017 22:29:33 +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-Archives-Salt: bf4828d5-b956-40a8-ac05-d15cef15abb5 X-Archives-Hash: 1009da64e818434b9156c2aa5390f875 commit: 3e279c58bee61b557823357a52b23c101902807d Author: Louis Sautier gmail com> AuthorDate: Fri Jun 23 21:32:22 2017 +0000 Commit: Sven Wegener gentoo org> CommitDate: Fri Jun 23 22:29:28 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e279c58 net-nntp/nzbget: fix compilation of pre2021 with USE=-parcheck Gentoo-Bug: 622532 Package-Manager: Portage-2.3.6, Repoman-2.3.2 Closes: https://github.com/gentoo/gentoo/pull/4977 .../nzbget-19.0_pre2021-fix-no-parcheck.patch | 46 ++++++++++++++++++++++ net-nntp/nzbget/nzbget-19.0_pre2021.ebuild | 2 + 2 files changed, 48 insertions(+) diff --git a/net-nntp/nzbget/files/nzbget-19.0_pre2021-fix-no-parcheck.patch b/net-nntp/nzbget/files/nzbget-19.0_pre2021-fix-no-parcheck.patch new file mode 100644 index 00000000000..e87fb7ced1a --- /dev/null +++ b/net-nntp/nzbget/files/nzbget-19.0_pre2021-fix-no-parcheck.patch @@ -0,0 +1,46 @@ +From 928e0a60061d33252de0b490c80477e77dde0627 Mon Sep 17 00:00:00 2001 +From: Andrey Prygunkov +Date: Fri, 23 Jun 2017 23:22:49 +0200 +Subject: [PATCH] fixed #399: error when compiling without par-check + +--- + daemon/queue/DirectRenamer.cpp | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/daemon/queue/DirectRenamer.cpp b/daemon/queue/DirectRenamer.cpp +index 585ce941..2dd0f95b 100644 +--- a/daemon/queue/DirectRenamer.cpp ++++ b/daemon/queue/DirectRenamer.cpp +@@ -51,6 +51,7 @@ class RenameContentAnalyzer : public ArticleContentAnalyzer + bool m_parFile = false; + }; + ++#ifndef DISABLE_PARCHECK + class DirectParRepairer : public Par2::Par2Repairer + { + public: +@@ -161,7 +162,7 @@ void DirectParLoader::LoadParFile(const char* parFile) + m_parHashes.emplace_back(filename.c_str(), hash.c_str()); + } + } +- ++#endif + + std::unique_ptr DirectRenamer::MakeArticleContentAnalyzer() + { +@@ -219,6 +220,7 @@ void DirectRenamer::FileDownloaded(DownloadQueue* downloadQueue, FileInfo* fileI + + void DirectRenamer::CheckState(DownloadQueue* downloadQueue, NzbInfo* nzbInfo) + { ++#ifndef DISABLE_PARCHECK + if (nzbInfo->GetDirectRenameStatus() > NzbInfo::tsRunning) + { + return; +@@ -270,6 +272,7 @@ void DirectRenamer::CheckState(DownloadQueue* downloadQueue, NzbInfo* nzbInfo) + return; + } + } ++#endif + } + + // Unpause smallest par-files from each par-set diff --git a/net-nntp/nzbget/nzbget-19.0_pre2021.ebuild b/net-nntp/nzbget/nzbget-19.0_pre2021.ebuild index c6d86f04383..6abcc452e54 100644 --- a/net-nntp/nzbget/nzbget-19.0_pre2021.ebuild +++ b/net-nntp/nzbget/nzbget-19.0_pre2021.ebuild @@ -33,6 +33,8 @@ DOCS=( ChangeLog README nzbget.conf ) S=${WORKDIR}/${PN}-${PV/_pre*/-testing} +PATCHES=( "${FILESDIR}/${P}-fix-no-parcheck.patch" ) + check_compiler() { if [[ ${MERGE_TYPE} != binary ]] && ! test-flag-CXX -std=c++14; then eerror "${P} requires a C++14-capable compiler. Your current compiler"