From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-980885-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 5FD981396D9
for <garchives@archives.gentoo.org>; Sat, 28 Oct 2017 16:51:58 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 9FDDE2BC0FA;
Sat, 28 Oct 2017 16:51:57 +0000 (UTC)
Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 6E8432BC0FA
for <gentoo-commits@lists.gentoo.org>; Sat, 28 Oct 2017 16:51:57 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 2A446341669
for <gentoo-commits@lists.gentoo.org>; Sat, 28 Oct 2017 16:51:56 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id AB2FB41F
for <gentoo-commits@lists.gentoo.org>; Sat, 28 Oct 2017 16:51:54 +0000 (UTC)
From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" <asturm@gentoo.org>
Message-ID: <1509209496.90863b09bea41eb793557549ec84c8d9ca144df4.asturm@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/ledger/files/, app-office/ledger/
X-VCS-Repository: repo/gentoo
X-VCS-Files: app-office/ledger/files/ledger-3.1.1-boost.patch app-office/ledger/ledger-3.1.1.ebuild
X-VCS-Directories: app-office/ledger/ app-office/ledger/files/
X-VCS-Committer: asturm
X-VCS-Committer-Name: Andreas Sturmlechner
X-VCS-Revision: 90863b09bea41eb793557549ec84c8d9ca144df4
X-VCS-Branch: master
Date: Sat, 28 Oct 2017 16:51:54 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: ff9f6ad1-a676-4ed6-a7d2-6e1c0ed726fb
X-Archives-Hash: a525a2b7e087bb837a09e291fcc3ca53
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@users.noreply.github.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.