1 |
commit: 162fa47c3f48c4c9ee29527086cfc482f4785280 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue May 2 21:48:16 2017 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue May 2 22:32:36 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=162fa47c |
7 |
|
8 |
kde-apps/libkleo: Fix build with GCC-6.3 |
9 |
|
10 |
Package-Manager: Portage-2.3.5, Repoman-2.3.1 |
11 |
|
12 |
.../files/libkleo-4.4.2017.04-gcc-6.3.patch | 39 ++++++++++++++++++++++ |
13 |
kde-apps/libkleo/libkleo-4.4.2017.04.ebuild | 2 ++ |
14 |
2 files changed, 41 insertions(+) |
15 |
|
16 |
diff --git a/kde-apps/libkleo/files/libkleo-4.4.2017.04-gcc-6.3.patch b/kde-apps/libkleo/files/libkleo-4.4.2017.04-gcc-6.3.patch |
17 |
new file mode 100644 |
18 |
index 00000000000..79023520d73 |
19 |
--- /dev/null |
20 |
+++ b/kde-apps/libkleo/files/libkleo-4.4.2017.04-gcc-6.3.patch |
21 |
@@ -0,0 +1,39 @@ |
22 |
+commit 272601864851e4411421ffe7fce764e01b5b1bfa |
23 |
+Author: Andreas Sturmlechner <andreas.sturmlechner@×××××.com> |
24 |
+Date: Wed May 3 00:16:05 2017 +0200 |
25 |
+ |
26 |
+ libkleo: Fix build with GCC-6.3 |
27 |
+ |
28 |
+ Thanks-to: Arfrever Frehtes Taifersar Arahesis <Arfrever@××××××.Org> |
29 |
+ |
30 |
+diff --git a/libkleo/backends/qgpgme/qgpgmekeylistjob.cpp b/libkleo/backends/qgpgme/qgpgmekeylistjob.cpp |
31 |
+index 4d26eb8772..c9c4642c62 100644 |
32 |
+--- a/libkleo/backends/qgpgme/qgpgmekeylistjob.cpp |
33 |
++++ b/libkleo/backends/qgpgme/qgpgmekeylistjob.cpp |
34 |
+@@ -85,7 +85,7 @@ static QGpgMEKeyListJob::result_type list_keys( Context * ctx, QStringList pats, |
35 |
+ if ( pats.size() < 2 ) { |
36 |
+ std::vector<Key> keys; |
37 |
+ const KeyListResult r = do_list_keys( ctx, pats, keys, secretOnly ); |
38 |
+- return make_tuple( r, keys, QString(), Error() ); |
39 |
++ return boost::make_tuple( r, keys, QString(), Error() ); |
40 |
+ } |
41 |
+ |
42 |
+ // The communication channel between gpgme and gpgsm is limited in |
43 |
+@@ -109,7 +109,7 @@ retry: |
44 |
+ chunkSize /= 2; |
45 |
+ if ( chunkSize < 1 ) |
46 |
+ // chunks smaller than one can't be -> return the error. |
47 |
+- return make_tuple( this_result, keys, QString(), Error() ); |
48 |
++ return boost::make_tuple( this_result, keys, QString(), Error() ); |
49 |
+ else |
50 |
+ goto retry; |
51 |
+ } |
52 |
+@@ -119,7 +119,7 @@ retry: |
53 |
+ break; |
54 |
+ pats = pats.mid( chunkSize ); |
55 |
+ } while ( !pats.empty() ); |
56 |
+- return make_tuple( result, keys, QString(), Error() ); |
57 |
++ return boost::make_tuple( result, keys, QString(), Error() ); |
58 |
+ } |
59 |
+ |
60 |
+ Error QGpgMEKeyListJob::start( const QStringList & patterns, bool secretOnly ) { |
61 |
|
62 |
diff --git a/kde-apps/libkleo/libkleo-4.4.2017.04.ebuild b/kde-apps/libkleo/libkleo-4.4.2017.04.ebuild |
63 |
index 3d99209b665..36af6104b52 100644 |
64 |
--- a/kde-apps/libkleo/libkleo-4.4.2017.04.ebuild |
65 |
+++ b/kde-apps/libkleo/libkleo-4.4.2017.04.ebuild |
66 |
@@ -22,3 +22,5 @@ RDEPEND="${DEPEND} |
67 |
|
68 |
KMSAVELIBS="true" |
69 |
KMEXTRACTONLY="kleopatra/" |
70 |
+ |
71 |
+PATCHES=( "${FILESDIR}/${P}-gcc-6.3.patch" ) |