From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-crypt/qca/files/, app-crypt/qca/
Date: Wed, 6 Jun 2018 15:11:54 +0000 (UTC) [thread overview]
Message-ID: <1528297901.b6a7aac0a023ae6b4f41f4b998108f861685a1af.asturm@gentoo> (raw)
commit: b6a7aac0a023ae6b4f41f4b998108f861685a1af
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 6 15:10:01 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jun 6 15:11:41 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6a7aac0
app-crypt/qca: Actually fix deps
Package-Manager: Portage-2.3.40, Repoman-2.3.9
app-crypt/qca/files/qca-2.1.3-deps.patch | 38 ++++++++++++++++++++++++++++++++
app-crypt/qca/qca-2.1.3-r2.ebuild | 1 +
2 files changed, 39 insertions(+)
diff --git a/app-crypt/qca/files/qca-2.1.3-deps.patch b/app-crypt/qca/files/qca-2.1.3-deps.patch
new file mode 100644
index 00000000000..e1ef2e5c0e7
--- /dev/null
+++ b/app-crypt/qca/files/qca-2.1.3-deps.patch
@@ -0,0 +1,38 @@
+From e854f357f4037e2c8c781ebd04ec5164a882b9b3 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Thu, 12 Apr 2018 00:45:50 +0200
+Subject: [PATCH] Make Qt5Network conditional on BUILD_TESTS
+
+Summary: I did not find it in use somewhere else.
+
+Reviewers: iromanov, sitter, rjvbb
+
+Reviewed By: rjvbb
+
+Subscribers: fvogt
+
+Differential Revision: https://phabricator.kde.org/D12129
+---
+ CMakeLists.txt | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 28b0169..65b95f8 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -59,7 +59,11 @@ if (Qt5Core_FOUND)
+ message(STATUS "Building with Qt5 support")
+ # Got from ECM
+ # Distros have no ECM. So I just copied required cmake modules.
+- find_package(Qt5Transitional REQUIRED Core Network)
++ if(BUILD_TESTS)
++ find_package(Qt5Transitional REQUIRED Core Network)
++ else()
++ find_package(Qt5Transitional REQUIRED Core)
++ endif()
+ include(ECMQt4To5Porting)
+
+ include(GNUInstallDirs)
+--
+2.17.1
+
diff --git a/app-crypt/qca/qca-2.1.3-r2.ebuild b/app-crypt/qca/qca-2.1.3-r2.ebuild
index d93996ca867..a1d5bbb0df5 100644
--- a/app-crypt/qca/qca-2.1.3-r2.ebuild
+++ b/app-crypt/qca/qca-2.1.3-r2.ebuild
@@ -50,6 +50,7 @@ RDEPEND="${COMMON_DEPEND}
PATCHES=(
"${FILESDIR}/${PN}-disable-pgp-test.patch"
"${FILESDIR}/${P}-c++11.patch"
+ "${FILESDIR}/${P}-deps.patch"
)
qca_plugin_use() {
next reply other threads:[~2018-06-06 15:11 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-06 15:11 Andreas Sturmlechner [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-07-25 8:23 [gentoo-commits] repo/gentoo:master commit in: app-crypt/qca/files/, app-crypt/qca/ Andreas Sturmlechner
2023-04-13 18:50 Sam James
2021-08-09 5:57 Andreas Sturmlechner
2021-04-07 8:36 Andreas Sturmlechner
2021-03-05 10:52 Andreas Sturmlechner
2021-01-24 13:03 Andreas Sturmlechner
2017-06-09 16:39 Johannes Huber
2017-03-21 10:42 Alon Bar-Lev
2016-04-19 14:21 Johannes Huber
2015-11-10 16:29 Michael Palimaka
2015-09-24 19:14 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=1528297901.b6a7aac0a023ae6b4f41f4b998108f861685a1af.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