From 4c3e54e07f14520b4ece949ff6384b1a89f431d1 Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Tue, 29 Jan 2019 11:19:35 +0100 Subject: [PATCH] ledger: Backport commit (see #3187) --- packages/ledger/build.sh | 2 +- ...039680cde39bd50404d1466f3ad50e012b68.patch | 24 +++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 packages/ledger/dab0039680cde39bd50404d1466f3ad50e012b68.patch diff --git a/packages/ledger/build.sh b/packages/ledger/build.sh index 56aae45c9..ae46be54d 100644 --- a/packages/ledger/build.sh +++ b/packages/ledger/build.sh @@ -2,7 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://www.ledger-cli.org TERMUX_PKG_DESCRIPTION="Powerful, double-entry accounting system" TERMUX_PKG_LICENSE="BSD 3-Clause" TERMUX_PKG_VERSION=3.1.1 -TERMUX_PKG_REVISION=7 +TERMUX_PKG_REVISION=8 TERMUX_PKG_SRCURL=https://github.com/ledger/ledger/archive/v${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=90f06561ab692b192d46d67bc106158da9c6c6813cc3848b503243a9dfd8548a TERMUX_PKG_DEPENDS="boost, libedit, libmpfr, utf8cpp, libgmp" diff --git a/packages/ledger/dab0039680cde39bd50404d1466f3ad50e012b68.patch b/packages/ledger/dab0039680cde39bd50404d1466f3ad50e012b68.patch new file mode 100644 index 000000000..7f2db0e12 --- /dev/null +++ b/packages/ledger/dab0039680cde39bd50404d1466f3ad50e012b68.patch @@ -0,0 +1,24 @@ +From dab0039680cde39bd50404d1466f3ad50e012b68 Mon Sep 17 00:00:00 2001 +From: Ivy Foster +Date: Thu, 26 Oct 2017 17:10:48 -0500 +Subject: [PATCH] src/global.cc: do not parse user-specified init-file twice + +--- + src/global.cc | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/src/global.cc b/src/global.cc +index b1c45d45f..37765a9b3 100644 +--- a/src/global.cc ++++ b/src/global.cc +@@ -136,9 +136,7 @@ void global_scope_t::read_init() + path init_file; + if (HANDLED(init_file_)) { + init_file=HANDLER(init_file_).str(); +- if (exists(init_file)) { +- parse_init(init_file); +- } else { ++ if (!exists(init_file)) { + throw_(parse_error, _f("Could not find specified init file %1%") % init_file); + } + } else {