| 1 |
commit: 16bb6578f08e3f00144e693e60e2df5e9ccd598a |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue May 2 21:48:51 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=16bb6578 |
| 7 |
|
| 8 |
kde-apps/kleopatra: Fix build with GCC-6.3 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.5, Repoman-2.3.1 |
| 11 |
|
| 12 |
.../files/kleopatra-4.4.2017.04-gcc-6.3.patch | 36 ++++++++++++++++++++++ |
| 13 |
kde-apps/kleopatra/kleopatra-4.4.2017.04.ebuild | 2 ++ |
| 14 |
2 files changed, 38 insertions(+) |
| 15 |
|
| 16 |
diff --git a/kde-apps/kleopatra/files/kleopatra-4.4.2017.04-gcc-6.3.patch b/kde-apps/kleopatra/files/kleopatra-4.4.2017.04-gcc-6.3.patch |
| 17 |
new file mode 100644 |
| 18 |
index 00000000000..2960166dfb7 |
| 19 |
--- /dev/null |
| 20 |
+++ b/kde-apps/kleopatra/files/kleopatra-4.4.2017.04-gcc-6.3.patch |
| 21 |
@@ -0,0 +1,36 @@ |
| 22 |
+commit 0e75bb7dff48261f8754005586e3d1b22ecfc4d2 |
| 23 |
+Author: Andreas Sturmlechner <andreas.sturmlechner@×××××.com> |
| 24 |
+Date: Tue May 2 23:41:46 2017 +0200 |
| 25 |
+ |
| 26 |
+ kleopatra: Fix build with GCC 6.3.0 |
| 27 |
+ |
| 28 |
+ Signed-off-by: Andreas Sturmlechner <andreas.sturmlechner@×××××.com> |
| 29 |
+ |
| 30 |
+diff --git a/kleopatra/utils/stl_util.h b/kleopatra/utils/stl_util.h |
| 31 |
+index 35024d398f..c02188608e 100644 |
| 32 |
+--- a/kleopatra/utils/stl_util.h |
| 33 |
++++ b/kleopatra/utils/stl_util.h |
| 34 |
+@@ -347,7 +347,7 @@ namespace kdtools { |
| 35 |
+ template <typename O, typename I, typename P> |
| 36 |
+ O copy_if( const I & i, P p ) { |
| 37 |
+ O o; |
| 38 |
+- copy_if( boost::begin( i ), boost::end( i ), std::back_inserter( o ), p ); |
| 39 |
++ kdtools::copy_if( boost::begin( i ), boost::end( i ), std::back_inserter( o ), p ); |
| 40 |
+ return o; |
| 41 |
+ } |
| 42 |
+ |
| 43 |
+@@ -385,12 +385,12 @@ namespace kdtools { |
| 44 |
+ |
| 45 |
+ template <typename C> |
| 46 |
+ bool none_of( const C & c ) { |
| 47 |
+- return none_of( boost::begin( c ), boost::end( c ) ); |
| 48 |
++ return kdtools::none_of( boost::begin( c ), boost::end( c ) ); |
| 49 |
+ } |
| 50 |
+ |
| 51 |
+ template <typename C, typename P> |
| 52 |
+ bool none_of( const C & c, P p ) { |
| 53 |
+- return none_of( boost::begin( c ), boost::end( c ), p ); |
| 54 |
++ return kdtools::none_of( boost::begin( c ), boost::end( c ), p ); |
| 55 |
+ } |
| 56 |
+ |
| 57 |
+ template <typename C, typename B> |
| 58 |
|
| 59 |
diff --git a/kde-apps/kleopatra/kleopatra-4.4.2017.04.ebuild b/kde-apps/kleopatra/kleopatra-4.4.2017.04.ebuild |
| 60 |
index 8cb2925d73b..7336129e706 100644 |
| 61 |
--- a/kde-apps/kleopatra/kleopatra-4.4.2017.04.ebuild |
| 62 |
+++ b/kde-apps/kleopatra/kleopatra-4.4.2017.04.ebuild |
| 63 |
@@ -34,6 +34,8 @@ KMEXTRACTONLY=" |
| 64 |
" |
| 65 |
KMLOADLIBS="libkleo" |
| 66 |
|
| 67 |
+PATCHES=( "${FILESDIR}/${P}-gcc-6.3.patch" ) |
| 68 |
+ |
| 69 |
src_unpack() { |
| 70 |
if use handbook; then |
| 71 |
KMEXTRA=" |
Archives