1 |
commit: ab2d3e9ff887c8d228d5be16ea0047f6d296a022 |
2 |
Author: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jul 8 18:33:55 2017 +0000 |
4 |
Commit: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jul 8 18:34:51 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab2d3e9f |
7 |
|
8 |
app-crypt/gpgme: fix gcc-7 issue |
9 |
|
10 |
Bug: 623622 |
11 |
|
12 |
Package-Manager: Portage-2.3.6, Repoman-2.3.1 |
13 |
|
14 |
app-crypt/gpgme/files/gpgme-1.8.0-gcc-7.patch | 16 ++++++++++++++++ |
15 |
app-crypt/gpgme/gpgme-1.8.0-r3.ebuild | 1 + |
16 |
2 files changed, 17 insertions(+) |
17 |
|
18 |
diff --git a/app-crypt/gpgme/files/gpgme-1.8.0-gcc-7.patch b/app-crypt/gpgme/files/gpgme-1.8.0-gcc-7.patch |
19 |
new file mode 100644 |
20 |
index 00000000000..9dd3e85cbfb |
21 |
--- /dev/null |
22 |
+++ b/app-crypt/gpgme/files/gpgme-1.8.0-gcc-7.patch |
23 |
@@ -0,0 +1,16 @@ |
24 |
+diff --git a/lang/qt/src/qgpgmenewcryptoconfig.cpp b/lang/qt/src/qgpgmenewcryptoconfig.cpp |
25 |
+index eb3af56..af47594 100644 |
26 |
+--- a/lang/qt/src/qgpgmenewcryptoconfig.cpp |
27 |
++++ b/lang/qt/src/qgpgmenewcryptoconfig.cpp |
28 |
+@@ -51,2 +51,3 @@ |
29 |
+ #include <cassert> |
30 |
++#include <functional> /* std::mem_fn */ |
31 |
+ |
32 |
+diff --git a/lang/qt/src/threadedjobmixin.h b/lang/qt/src/threadedjobmixin.h |
33 |
+index 32b23db..c4f85c2 100644 |
34 |
+--- a/lang/qt/src/threadedjobmixin.h |
35 |
++++ b/lang/qt/src/threadedjobmixin.h |
36 |
+@@ -53,2 +53,3 @@ |
37 |
+ #include <cassert> |
38 |
++#include <functional> /* std::function */ |
39 |
+ |
40 |
|
41 |
diff --git a/app-crypt/gpgme/gpgme-1.8.0-r3.ebuild b/app-crypt/gpgme/gpgme-1.8.0-r3.ebuild |
42 |
index 852f9033430..c18cb6e64d6 100644 |
43 |
--- a/app-crypt/gpgme/gpgme-1.8.0-r3.ebuild |
44 |
+++ b/app-crypt/gpgme/gpgme-1.8.0-r3.ebuild |
45 |
@@ -39,6 +39,7 @@ REQUIRED_USE="qt5? ( cxx ) python? ( ${PYTHON_REQUIRED_USE} )" |
46 |
PATCHES=( |
47 |
"${FILESDIR}"/${PN}-1.1.8-et_EE.patch |
48 |
"${FILESDIR}"/${P}-cmake.patch |
49 |
+ "${FILESDIR}"/${P}-gcc-7.patch |
50 |
) |
51 |
|
52 |
do_python() { |