From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtnetwork/
Date: Wed, 18 Nov 2020 21:05:48 +0000 (UTC) [thread overview]
Message-ID: <1605733522.dcc79770bc78ebb3855a50a6397862828f9a93e3.asturm@gentoo> (raw)
commit: dcc79770bc78ebb3855a50a6397862828f9a93e3
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 17 23:38:39 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Nov 18 21:05:22 2020 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=dcc79770
dev-qt/qtnetwork: Fix macro redefinition of QT_LINKED_OPENSSL warning
Bug: https://bugs.gentoo.org/652650
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtnetwork/qtnetwork-5.15.9999.ebuild | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/dev-qt/qtnetwork/qtnetwork-5.15.9999.ebuild b/dev-qt/qtnetwork/qtnetwork-5.15.9999.ebuild
index cd62434c..e3ae43aa 100644
--- a/dev-qt/qtnetwork/qtnetwork-5.15.9999.ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5.15.9999.ebuild
@@ -66,3 +66,12 @@ src_configure() {
)
qt5-build_src_configure
}
+
+src_install() {
+ qt5-build_src_install
+ # workaround for bug 652650
+ if use ssl; then
+ sed -e "/^#define QT_LINKED_OPENSSL/s/$/ true/" \
+ -i "${D}${QT5_HEADERDIR}"/Gentoo/${PN}-qconfig.h || die
+ fi
+}
next reply other threads:[~2020-11-18 21:05 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-18 21:05 Andreas Sturmlechner [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-06-22 15:51 [gentoo-commits] proj/qt:master commit in: dev-qt/qtnetwork/ Andreas Sturmlechner
2022-06-18 14:27 Andreas Sturmlechner
2021-12-13 16:34 Andreas Sturmlechner
2021-09-15 20:01 Davide Pesavento
2021-06-20 18:49 Andreas Sturmlechner
2021-05-02 19:52 Andreas Sturmlechner
2020-11-17 21:20 Andreas Sturmlechner
2020-09-29 20:39 Andreas Sturmlechner
2020-04-09 17:32 Andreas Sturmlechner
2019-01-07 1:04 Davide Pesavento
2019-01-07 1:04 Davide Pesavento
2018-02-10 2:50 Michael Palimaka
2018-02-02 11:54 Michael Palimaka
2017-07-23 4:48 Michael Palimaka
2016-06-13 0:11 Davide Pesavento
2015-04-28 14:48 Davide Pesavento
2015-04-28 12:31 Michael Palimaka
2015-04-25 18:23 Michael Palimaka
2015-04-22 16:19 Michael Palimaka
2015-03-26 1:49 Davide Pesavento
2014-07-27 13:51 Davide Pesavento
2014-07-24 1:05 Davide Pesavento
2014-05-11 19:09 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=1605733522.dcc79770bc78ebb3855a50a6397862828f9a93e3.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