summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2021-08-04 16:55:17 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2021-08-04 16:56:07 +0200
commit2ce4db60d003a96cf7d9319f2016a593953d8f22 (patch)
tree5256e9379802745db4436cbe25bd0c2ddf32caa1
parentnet-misc/econnman: keyword ~riscv (diff)
downloadgentoo-2ce4db60d003a96cf7d9319f2016a593953d8f22.tar.gz
gentoo-2ce4db60d003a96cf7d9319f2016a593953d8f22.tar.bz2
gentoo-2ce4db60d003a96cf7d9319f2016a593953d8f22.zip
net-p2p/ktorrent: Fix upstream patch
Upstream commit c8701e6a9ff52c04c364e8f5dd8f32f44bfeaa93 Closes: https://bugs.gentoo.org/806390 Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
-rw-r--r--net-p2p/ktorrent/files/ktorrent-21.04.3-fix-tests.patch17
1 files changed, 2 insertions, 15 deletions
diff --git a/net-p2p/ktorrent/files/ktorrent-21.04.3-fix-tests.patch b/net-p2p/ktorrent/files/ktorrent-21.04.3-fix-tests.patch
index a6fe5f7be700..fc644bd80b8e 100644
--- a/net-p2p/ktorrent/files/ktorrent-21.04.3-fix-tests.patch
+++ b/net-p2p/ktorrent/files/ktorrent-21.04.3-fix-tests.patch
@@ -3,24 +3,11 @@ From: =?UTF-8?q?=C3=96mer=20Fad=C4=B1l=20Usta?= <omerusta@gmail.com>
Date: Tue, 18 May 2021 15:15:26 +0000
Subject: [PATCH] Fix tests with new ecm sytle
+* asturm 2021-08-04: Merged w/ c8701e6a9ff52c04c364e8f5dd8f32f44bfeaa93
---
- CMakeLists.txt | 2 ++
plugins/ipfilter/tests/CMakeLists.txt | 7 ++-----
- 2 files changed, 4 insertions(+), 5 deletions(-)
+ 1 file changed, 2 insertions(+), 5 deletions(-)
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e0f67a93..edc64983 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -17,6 +17,8 @@ set (KF5_MIN_VERSION "5.82")
- set (LIBKTORRENT_MIN_VERSION "20.11.70")
- set (Boost_MIN_VERSION "1.71.0")
-
-+cmake_policy(SET CMP0115 OLD)
-+
- find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE)
- set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_MODULE_PATH})
-
diff --git a/plugins/ipfilter/tests/CMakeLists.txt b/plugins/ipfilter/tests/CMakeLists.txt
index ec839aac..6c34b2d0 100644
--- a/plugins/ipfilter/tests/CMakeLists.txt