From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 91D2D138359 for ; Wed, 18 Nov 2020 21:05:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DB959E09D0; Wed, 18 Nov 2020 21:05:51 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BEECEE09D0 for ; Wed, 18 Nov 2020 21:05:51 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A3089335DA7 for ; Wed, 18 Nov 2020 21:05:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E4E073A2 for ; Wed, 18 Nov 2020 21:05:48 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1605733522.dcc79770bc78ebb3855a50a6397862828f9a93e3.asturm@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtnetwork/ X-VCS-Repository: proj/qt X-VCS-Files: dev-qt/qtnetwork/qtnetwork-5.15.9999.ebuild X-VCS-Directories: dev-qt/qtnetwork/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: dcc79770bc78ebb3855a50a6397862828f9a93e3 X-VCS-Branch: master Date: Wed, 18 Nov 2020 21:05:48 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 38a4d130-71bf-40c2-a269-9034fcfe36e8 X-Archives-Hash: 50325286e6c3c873610b7c82d8eb1339 commit: dcc79770bc78ebb3855a50a6397862828f9a93e3 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Nov 17 23:38:39 2020 +0000 Commit: Andreas Sturmlechner gentoo 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 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 +}