diff options
| author | Eric Bavier <bavier@member.fsf.org> | 2016-10-17 23:59:53 -0500 |
|---|---|---|
| committer | Eric Bavier <bavier@member.fsf.org> | 2018-01-08 16:03:55 -0600 |
| commit | 5424f9bcab01d7017550d79cdf42daea87151da0 (patch) | |
| tree | d6309651875ede5fb4a79e3096d112d8f6b36637 /gnu/packages/patches | |
| parent | 7f9866a312f12b619df1baa83d889b82fb5874cf (diff) | |
| download | guix-5424f9bcab01d7017550d79cdf42daea87151da0.tar.gz | |
gnu: ledger: Fix test failures.
* gnu/packages/patches/ledger-revert-boost-python-fix.patch, gnu/packages/patches/ledger-fix-uninitialized.patch: New patches. * gnu/local.mk (dist_patch_DATA): Add them. * gnu/packages/finance.scm (ledger)[source]: Use them.
Diffstat (limited to 'gnu/packages/patches')
| -rw-r--r-- | gnu/packages/patches/ledger-fix-uninitialized.patch | 27 | ||||
| -rw-r--r-- | gnu/packages/patches/ledger-revert-boost-python-fix.patch | 39 |
2 files changed, 66 insertions, 0 deletions
diff --git a/gnu/packages/patches/ledger-fix-uninitialized.patch b/gnu/packages/patches/ledger-fix-uninitialized.patch new file mode 100644 index 0000000000..128c90ec13 --- /dev/null +++ b/gnu/packages/patches/ledger-fix-uninitialized.patch @@ -0,0 +1,27 @@ +This fixes failures of tests "BaseLine_opt-datetime-format" and +"BaseLine_opt-time-report", which were printing an unexpected trailing '*' on +the last line of output, e.g.: + + @@ -5,4 +5,4 @@ + 04/05/13 12:00 PM 04/05/13 01:30 PM 1.50h Lunch + 04/05/13 11:30 AM 04/05/13 12:00 PM 30.0m Walk + -------------------------------------------------- + - + + * + +Reported upstream at +https://groups.google.com/d/msg/ledger-cli/EeJUrUk8YDc/pIR-LOTVEAAJ + +diff --git a/src/account.h b/src/account.h +index 1b97463d..f2555593 100644 +--- a/src/account.h ++++ b/src/account.h +@@ -187,7 +187,7 @@ public: + + datetime_t earliest_checkin; + datetime_t latest_checkout; +- bool latest_checkout_cleared; ++ bool latest_checkout_cleared = false; + + std::set<path> filenames; + std::set<string> accounts_referenced; diff --git a/gnu/packages/patches/ledger-revert-boost-python-fix.patch b/gnu/packages/patches/ledger-revert-boost-python-fix.patch new file mode 100644 index 0000000000..99f48f6e46 --- /dev/null +++ b/gnu/packages/patches/ledger-revert-boost-python-fix.patch @@ -0,0 +1,39 @@ +From 01220484f428a447e9b00e071a0d85185f30e1de Mon Sep 17 00:00:00 2001 +From: Alexis Hildebrandt <afh@surryhill.net> +Date: Wed, 22 Jun 2016 15:43:37 +0200 +Subject: [PATCH] Revert "[python] Add fix for Boost.Python compile errors" + +This reverts commit 11590e134eafa768ccc4a171cc7fb216e906095f. +--- + src/py_commodity.cc | 3 --- + src/py_journal.cc | 3 --- + 2 files changed, 6 deletions(-) + +diff --git a/src/py_commodity.cc b/src/py_commodity.cc +index 5aafa6c..c457e64 100644 +--- a/src/py_commodity.cc ++++ b/src/py_commodity.cc +@@ -243,9 +243,6 @@ namespace { + + void export_commodity() + { +-#if BOOST_VERSION >= 106000 +- python::register_ptr_to_python< shared_ptr<commodity_pool_t> >(); +-#endif + class_< commodity_pool_t, shared_ptr<commodity_pool_t>, + boost::noncopyable > ("CommodityPool", no_init) + .add_property("null_commodity", +diff --git a/src/py_journal.cc b/src/py_journal.cc +index c1c38a9..879f954 100644 +--- a/src/py_journal.cc ++++ b/src/py_journal.cc +@@ -232,9 +232,6 @@ void export_journal() + boost::noncopyable >("PostHandler") + ; + +-#if BOOST_VERSION >= 106000 +- python::register_ptr_to_python< shared_ptr<collector_wrapper> >(); +-#endif + class_< collector_wrapper, shared_ptr<collector_wrapper>, + boost::noncopyable >("PostCollectorWrapper", no_init) + .def("__len__", &collector_wrapper::length) |