summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLouis Sautier <sautier.louis@gmail.com>2017-06-23 23:32:22 +0200
committerSven Wegener <swegener@gentoo.org>2017-06-23 22:29:28 +0000
commit3e279c58bee61b557823357a52b23c101902807d (patch)
tree4e0f2e849db89b0b774ecf642d9d116788b3fff6 /net-nntp
parentapp-backup/dar: Removed old. (diff)
downloadgentoo-3e279c58bee61b557823357a52b23c101902807d.tar.gz
gentoo-3e279c58bee61b557823357a52b23c101902807d.tar.bz2
gentoo-3e279c58bee61b557823357a52b23c101902807d.zip
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
Diffstat (limited to 'net-nntp')
-rw-r--r--net-nntp/nzbget/files/nzbget-19.0_pre2021-fix-no-parcheck.patch46
-rw-r--r--net-nntp/nzbget/nzbget-19.0_pre2021.ebuild2
2 files changed, 48 insertions, 0 deletions
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 <hugbug@users.sourceforge.net>
+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<ArticleContentAnalyzer> 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"