[gentoo-commits] repo/gentoo:master commit in: dev-vcs/monotone/, dev-vcs/monotone/files/

[David Seifert]

commit:     f0b1fd53dd05451d68ca0317020ce6e569eb7851
Author:     Peter Levine <plevine457 <AT> gmail <DOT> com>
AuthorDate: Fri May 26 03:16:08 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Fri May 26 20:59:50 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0b1fd53

dev-vcs/monotone: Fix building with GCC-6

Bug: https://bugs.gentoo.org/show_bug.cgi?id=594538
Package-Manager: Portage-2.3.6, Repoman-2.3.2
Closes: https://github.com/gentoo/gentoo/pull/4764

 dev-vcs/monotone/files/monotone-1.0-gcc6.patch | 64 ++++++++++++++++++++++++++
 dev-vcs/monotone/monotone-1.0-r4.ebuild        |  3 +-
 2 files changed, 66 insertions(+), 1 deletion(-)

diff --git a/dev-vcs/monotone/files/monotone-1.0-gcc6.patch b/dev-vcs/monotone/files/monotone-1.0-gcc6.patch
new file mode 100644
index 00000000000..f9e1751e09b
--- /dev/null
+++ b/dev-vcs/monotone/files/monotone-1.0-gcc6.patch
@@ -0,0 +1,64 @@
+Bug: https://bugs.gentoo.org/594538
+
+--- a/src/cache_logger.hh
++++ b/src/cache_logger.hh
+@@ -23,7 +23,7 @@
+   // if given the empty filename, do nothing
+   explicit cache_logger(std::string const & filename, int max_size);
+ 
+-  bool logging() const { return _impl; }
++  bool logging() const { return static_cast<bool>(_impl); }
+ 
+   void log_exists(bool exists, int position, int item_count, int est_size) const;
+   void log_touch(bool exists, int position, int item_count, int est_size) const;
+--- a/src/cmd_ws_commit.cc
++++ b/src/cmd_ws_commit.cc
+@@ -1170,7 +1170,7 @@
+     {
+       for (attr_map_t::iterator i = node->attrs.begin();
+            i != node->attrs.end(); ++i)
+-        i->second = make_pair(false, "");
++        i->second = make_pair(false, attr_value(""));
+     }
+   else
+     {
+@@ -1179,7 +1179,7 @@
+       E(node->attrs.find(a_key) != node->attrs.end(), origin::user,
+         F("path '%s' does not have attribute '%s'")
+         % path % a_key);
+-      node->attrs[a_key] = make_pair(false, "");
++      node->attrs[a_key] = make_pair(false, attr_value(""));
+     }
+ 
+   cset cs;
+--- a/src/roster.cc
++++ b/src/roster.cc
+@@ -223,7 +223,7 @@
+ 
+ bool marking_map::contains(node_id nid) const
+ {
+-  return _store.get_if_present(nid);
++  return static_cast<bool>(_store.get_if_present(nid));
+ }
+ 
+ void marking_map::remove_marking(node_id nid)
+@@ -727,7 +727,7 @@
+ bool
+ roster_t::has_node(node_id n) const
+ {
+-  return nodes.get_if_present(n);
++  return static_cast<bool>(nodes.get_if_present(n));
+ }
+ 
+ bool
+@@ -1898,8 +1898,8 @@
+       node_t const &left_node = left_roster.all_nodes().get_if_present(i->first);
+       node_t const &right_node = right_roster.all_nodes().get_if_present(i->first);
+ 
+-      bool exists_in_left = (left_node);
+-      bool exists_in_right = (right_node);
++      bool exists_in_left = static_cast<bool>(left_node);
++      bool exists_in_right = static_cast<bool>(right_node);
+ 
+       if (!exists_in_left && !exists_in_right)
+         mark_new_node(new_rid, n, new_markings);

diff --git a/dev-vcs/monotone/monotone-1.0-r4.ebuild b/dev-vcs/monotone/monotone-1.0-r4.ebuild
index ba474c6a345..a04a8dd6684 100644
--- a/dev-vcs/monotone/monotone-1.0-r4.ebuild
+++ b/dev-vcs/monotone/monotone-1.0-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # QA failiures reported in https://code.monotone.ca/p/monotone/issues/181/
@@ -43,6 +43,7 @@ src_prepare() {
 	epatch "${FILESDIR}/monotone-1.0-boost-1.53.patch"
 	epatch "${FILESDIR}/monotone-1.0-pcre3.patch"
 	epatch "${FILESDIR}/monotone-1.0-texinfo-5.1.patch"
+	epatch "${FILESDIR}/monotone-1.0-gcc6.patch"
 }
 
 src_configure() {