commit: 162fa47c3f48c4c9ee29527086cfc482f4785280
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue May 2 21:48:16 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue May 2 22:32:36 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=162fa47c
kde-apps/libkleo: Fix build with GCC-6.3
Package-Manager: Portage-2.3.5, Repoman-2.3.1
.../files/libkleo-4.4.2017.04-gcc-6.3.patch | 39 ++++++++++++++++++++++
kde-apps/libkleo/libkleo-4.4.2017.04.ebuild | 2 ++
2 files changed, 41 insertions(+)
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
new file mode 100644
index 00000000000..79023520d73
--- /dev/null
+++ b/kde-apps/libkleo/files/libkleo-4.4.2017.04-gcc-6.3.patch
@@ -0,0 +1,39 @@
+commit 272601864851e4411421ffe7fce764e01b5b1bfa
+Author: Andreas Sturmlechner <andreas.sturmlech...@gmail.com>
+Date: Wed May 3 00:16:05 2017 +0200
+
+ libkleo: Fix build with GCC-6.3
+
+ Thanks-to: Arfrever Frehtes Taifersar Arahesis <arfre...@apache.org>
+
+diff --git a/libkleo/backends/qgpgme/qgpgmekeylistjob.cpp
b/libkleo/backends/qgpgme/qgpgmekeylistjob.cpp
+index 4d26eb8772..c9c4642c62 100644
+--- a/libkleo/backends/qgpgme/qgpgmekeylistjob.cpp
++++ b/libkleo/backends/qgpgme/qgpgmekeylistjob.cpp
+@@ -85,7 +85,7 @@ static QGpgMEKeyListJob::result_type list_keys( Context *
ctx, QStringList pats,
+ if ( pats.size() < 2 ) {
+ std::vector<Key> keys;
+ const KeyListResult r = do_list_keys( ctx, pats, keys, secretOnly );
+- return make_tuple( r, keys, QString(), Error() );
++ return boost::make_tuple( r, keys, QString(), Error() );
+ }
+
+ // The communication channel between gpgme and gpgsm is limited in
+@@ -109,7 +109,7 @@ retry:
+ chunkSize /= 2;
+ if ( chunkSize < 1 )
+ // chunks smaller than one can't be -> return the error.
+- return make_tuple( this_result, keys, QString(), Error() );
++ return boost::make_tuple( this_result, keys, QString(), Error() );
+ else
+ goto retry;
+ }
+@@ -119,7 +119,7 @@ retry:
+ break;
+ pats = pats.mid( chunkSize );
+ } while ( !pats.empty() );
+- return make_tuple( result, keys, QString(), Error() );
++ return boost::make_tuple( result, keys, QString(), Error() );
+ }
+
+ Error QGpgMEKeyListJob::start( const QStringList & patterns, bool secretOnly
) {
diff --git a/kde-apps/libkleo/libkleo-4.4.2017.04.ebuild
b/kde-apps/libkleo/libkleo-4.4.2017.04.ebuild
index 3d99209b665..36af6104b52 100644
--- a/kde-apps/libkleo/libkleo-4.4.2017.04.ebuild
+++ b/kde-apps/libkleo/libkleo-4.4.2017.04.ebuild
@@ -22,3 +22,5 @@ RDEPEND="${DEPEND}
KMSAVELIBS="true"
KMEXTRACTONLY="kleopatra/"
+
+PATCHES=( "${FILESDIR}/${P}-gcc-6.3.patch" )
