[gentoo-commits] repo/gentoo:master commit in: app-office/ledger/files/, app-office/ledger/

[Andreas Sturmlechner]

commit:     90863b09bea41eb793557549ec84c8d9ca144df4
Author:     Francesco Turco <fturco <AT> fastmail <DOT> fm>
AuthorDate: Thu Sep  7 20:26:04 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Oct 28 16:51:36 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90863b09

app-office/ledger: Fix build with >=dev-libs/boost-1.61

Gentoo-bug: 609108
Closes: https://github.com/gentoo/gentoo/pull/5655

 app-office/ledger/files/ledger-3.1.1-boost.patch | 22 ++++++++++++++++++++++
 app-office/ledger/ledger-3.1.1.ebuild            |  2 ++
 2 files changed, 24 insertions(+)

diff --git a/app-office/ledger/files/ledger-3.1.1-boost.patch b/app-office/ledger/files/ledger-3.1.1-boost.patch
new file mode 100644
index 00000000000..b69a42a5011
--- /dev/null
+++ b/app-office/ledger/files/ledger-3.1.1-boost.patch
@@ -0,0 +1,22 @@
+From 1856b8c4902498843f4da37a7aaeb2ce85acc1d3 Mon Sep 17 00:00:00 2001
+From: Denis <dkasak@××××××××××××××××××××.com>
+Date: Mon, 12 Sep 2016 12:49:40 +0200
+Subject: [PATCH] Fix compilation error with boost 1.61
+
+---
+ src/item.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/item.h b/src/item.h
+index ca16d87b3..4dc6df7e6 100644
+--- a/src/item.h
++++ b/src/item.h
+@@ -92,7 +92,7 @@ class item_t : public supports_flags<uint_least16_t>, public scope_t
+ 
+   typedef std::pair<optional<value_t>, bool> tag_data_t;
+   typedef std::map<string, tag_data_t,
+-                   function<bool(string, string)> > string_map;
++                   std::function<bool(string, string)> > string_map;
+ 
+   state_t              _state;
+   optional<date_t>     _date;

diff --git a/app-office/ledger/ledger-3.1.1.ebuild b/app-office/ledger/ledger-3.1.1.ebuild
index f32cda9c830..31ed49d068b 100644
--- a/app-office/ledger/ledger-3.1.1.ebuild
+++ b/app-office/ledger/ledger-3.1.1.ebuild
@@ -42,6 +42,8 @@ DEPEND="
 	)
 "
 
+PATCHES=( "${FILESDIR}/${P}-boost.patch" ) # bug 609108
+
 # Building with python integration seems to fail without 8G available
 # RAM(!)  Since the memory check in check-reqs doesn't count swap, it
 # may be unfair to fail the build entirely on the memory test alone.