public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-p2p/ktorrent/files/
Date: Wed,  4 Aug 2021 14:56:31 +0000 (UTC)	[thread overview]
Message-ID: <1628088967.2ce4db60d003a96cf7d9319f2016a593953d8f22.asturm@gentoo> (raw)

commit:     2ce4db60d003a96cf7d9319f2016a593953d8f22
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Aug  4 14:55:17 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Aug  4 14:56:07 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ce4db60

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 <AT> gentoo.org>

 net-p2p/ktorrent/files/ktorrent-21.04.3-fix-tests.patch | 17 ++---------------
 1 file 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 a6fe5f7be70..fc644bd80b8 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


             reply	other threads:[~2021-08-04 14:56 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-08-04 14:56 Andreas Sturmlechner [this message]
  -- strict thread matches above, loose matches on Subject: below --
2019-01-06 12:06 [gentoo-commits] repo/gentoo:master commit in: net-p2p/ktorrent/files/ Andreas Sturmlechner
2018-07-21 16:51 Andreas Sturmlechner
2016-03-08 14:34 Michael Palimaka

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1628088967.2ce4db60d003a96cf7d9319f2016a593953d8f22.asturm@gentoo \
    --to=asturm@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox