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: app-crypt/qca/files/, app-crypt/qca/
Date: Sun, 24 Jan 2021 13:03:45 +0000 (UTC)	[thread overview]
Message-ID: <1611493395.a2d112f5512cc3cb26f25a12085cc4be6ccc13f1.asturm@gentoo> (raw)

commit:     a2d112f5512cc3cb26f25a12085cc4be6ccc13f1
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 11 00:28:36 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jan 24 13:03:15 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2d112f5

app-crypt/qca: Fix build with GCC-11

Closes: https://bugs.gentoo.org/764047
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 app-crypt/qca/files/qca-2.3.1-gcc11.patch | 30 ++++++++++++++++++++++++++++++
 app-crypt/qca/qca-2.3.1.ebuild            |  7 +++++--
 2 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/app-crypt/qca/files/qca-2.3.1-gcc11.patch b/app-crypt/qca/files/qca-2.3.1-gcc11.patch
new file mode 100644
index 00000000000..cd4eaab8688
--- /dev/null
+++ b/app-crypt/qca/files/qca-2.3.1-gcc11.patch
@@ -0,0 +1,30 @@
+From f015cc64889035c084138864e2e030ece19c257b Mon Sep 17 00:00:00 2001
+From: Jeff Law <law@redhat.com>
+Date: Dec 04 2020 03:55:48 +0000
+Subject: Fix missing includes for gcc-11
+
+
+diff --git a/src/qca_cert.cpp b/src/qca_cert.cpp
+index 5e73d98..225aecd 100644
+--- a/src/qca_cert.cpp
++++ b/src/qca_cert.cpp
+@@ -19,6 +19,7 @@
+  *
+  */
+ 
++#include <memory>
+ #include "qca_cert.h"
+ 
+ #include "qca_publickey.h"
+diff --git a/src/qca_default.cpp b/src/qca_default.cpp
+index fd35702..db87e87 100644
+--- a/src/qca_default.cpp
++++ b/src/qca_default.cpp
+@@ -19,6 +19,7 @@
+  *
+  */
+ 
++#include <memory>
+ #include "qca_core.h"
+ 
+ #include <QMutex>

diff --git a/app-crypt/qca/qca-2.3.1.ebuild b/app-crypt/qca/qca-2.3.1.ebuild
index b954f235e01..4414a43132b 100644
--- a/app-crypt/qca/qca-2.3.1.ebuild
+++ b/app-crypt/qca/qca-2.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -39,7 +39,10 @@ DEPEND="${RDEPEND}
 	)
 "
 
-PATCHES=( "${FILESDIR}/${PN}-disable-pgp-test.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-disable-pgp-test.patch"
+	"${FILESDIR}/${P}-gcc11.patch" # bug 764047
+)
 
 qca_plugin_use() {
 	echo -DWITH_${2:-$1}_PLUGIN=$(usex "$1")


             reply	other threads:[~2021-01-24 13:03 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-01-24 13:03 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
2018-06-06 15:11 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=1611493395.a2d112f5512cc3cb26f25a12085cc4be6ccc13f1.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