Got reaction from maintainer:
> Date: Tue, 02 May 2023 13:34:32 +0300
> From s@brnkv.ru Tue May 2 12:36:35 2023
> To: Martin Ziemer <horrad@horrad.de>, "ports@openbsd.org" <ports@openbsd.org>
> Subject: Re: [update patch] ledger v3.2.1 -> v3.3.2
>
> Hi, Martin!
>
> looks good for me. However, I didn't test it.
>
> --
>
> Sergey
Am Thu, Apr 13, 2023 at 10:33:49AM +0200 schrieb Martin Ziemer:
> This patch updates ledger from v3.2.1 to v3.3.2.
>
> Patched test cases with random output order to succeed every time instead of
> only sometimes by adding sort by date.
>
> Tested on amd64
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/productivity/ledger/Makefile,v
> retrieving revision 1.34
> diff -u -p -r1.34 Makefile
> --- Makefile 13 Nov 2022 15:29:11 -0000 1.34
> +++ Makefile 30 Mar 2023 13:49:19 -0000
> @@ -1,9 +1,8 @@
> COMMENT = command line double-entry accounting ledger
>
> -GH_TAGNAME = v3.2.1
> +GH_TAGNAME = v3.3.2
> GH_ACCOUNT = ledger
> GH_PROJECT = ledger
> -REVISION = 1
>
> SHARED_LIBS += ledger 1.0 # 3.0
>
> @@ -24,7 +23,9 @@ MODULES = devel/cmake \
> lang/python
> COMPILER = base-clang ports-gcc
>
> -BUILD_DEPENDS = devel/utfcpp
> +BUILD_DEPENDS = devel/utfcpp \
> + print/texinfo
> +
> LIB_DEPENDS = devel/boost \
> devel/gmp \
> devel/mpfr
> @@ -43,7 +44,7 @@ post-install:
> .for i in ledger3
> cd ${WRKBUILD}/doc/ && \
> cp ${WRKSRC}/doc/$i.texi . && \
> - makeinfo --force --no-split -o ${PREFIX}/info/$i.info $i.texi
> + gmakeinfo --force --no-split -o ${PREFIX}/info/$i.info $i.texi
> .endfor
> ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ledger/
> .for d in LICENSE.md doc/GLOSSARY.md
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/productivity/ledger/distinfo,v
> retrieving revision 1.8
> diff -u -p -r1.8 distinfo
> --- distinfo 2 Oct 2020 19:14:58 -0000 1.8
> +++ distinfo 30 Mar 2023 13:49:19 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (ledger-3.2.1.tar.gz) = kr8JvDhbFxmH9Fb+Pun6mY7V5AuXs6zdVitmOqNkOEo=
> -SIZE (ledger-3.2.1.tar.gz) = 790959
> +SHA256 (ledger-3.3.2.tar.gz) = VVKW7h6HD/BOI1ZnaXfc9V66ta15EmZnvFZGTLEUIDU=
> +SIZE (ledger-3.3.2.tar.gz) = 825274
> Index: patches/patch-doc_CMakeLists_txt
> ===================================================================
> RCS file: /cvs/ports/productivity/ledger/patches/patch-doc_CMakeLists_txt,v
> retrieving revision 1.2
> diff -u -p -r1.2 patch-doc_CMakeLists_txt
> --- patches/patch-doc_CMakeLists_txt 11 Mar 2022 19:51:43 -0000 1.2
> +++ patches/patch-doc_CMakeLists_txt 30 Mar 2023 13:49:19 -0000
> @@ -1,8 +1,9 @@
> Don't install .info files for they haven't been generated by the time
> they're installed (see comment in Makefile).
>
> ---- doc/CMakeLists.txt.orig Thu Aug 11 23:12:09 2016
> -+++ doc/CMakeLists.txt Thu Aug 11 23:13:41 2016
> +Index: doc/CMakeLists.txt
> +--- doc/CMakeLists.txt.orig
> ++++ doc/CMakeLists.txt
> @@ -122,17 +122,3 @@ if (CMAKE_INSTALL_MANDIR)
> install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/ledger.1
> DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 COMPONENT doc)
> @@ -11,8 +12,8 @@ they're installed (see comment in Makefi
> -foreach(file ${ledger_doc_files})
> - get_filename_component(file_ext ${file} EXT)
> -
> -- if(file_ext STREQUAL ".info")
> -- if(CMAKE_INSTALL_INFODIR)
> +- if (file_ext STREQUAL ".info")
> +- if (CMAKE_INSTALL_INFODIR)
> - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${file}
> - DESTINATION ${CMAKE_INSTALL_INFODIR} COMPONENT doc)
> - endif()
> Index: patches/patch-src_expr_cc
> ===================================================================
> RCS file: patches/patch-src_expr_cc
> diff -N patches/patch-src_expr_cc
> --- patches/patch-src_expr_cc 11 Mar 2022 19:51:43 -0000 1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,16 +0,0 @@
> -Fix compilation with Boost 1.76
> -https://github.com/ledger/ledger/commit/69e6b89cf8d2820d28174e7ffaea1c59a0f84d3f
> -
> -Index: src/expr.cc
> ---- src/expr.cc.orig
> -+++ src/expr.cc
> -@@ -35,6 +35,9 @@
> - #include "parser.h"
> - #include "scope.h"
> -
> -+#include <boost/smart_ptr/scoped_ptr.hpp>
> -+
> -+
> - namespace ledger {
> -
> - expr_t::expr_t() : base_type()
> Index: patches/patch-src_format_h
> ===================================================================
> RCS file: patches/patch-src_format_h
> diff -N patches/patch-src_format_h
> --- patches/patch-src_format_h 11 Mar 2022 19:51:43 -0000 1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,15 +0,0 @@
> -Fix compilation with Boost 1.76
> -https://github.com/ledger/ledger/commit/69e6b89cf8d2820d28174e7ffaea1c59a0f84d3f
> -
> -Index: src/format.h
> ---- src/format.h.orig
> -+++ src/format.h
> -@@ -45,6 +45,8 @@
> - #include "expr.h"
> - #include "unistring.h"
> -
> -+#include <boost/smart_ptr/scoped_ptr.hpp>
> -+
> - namespace ledger {
> -
> - class unistring;
> Index: patches/patch-test_baseline_cmd-pricedb_test
> ===================================================================
> RCS file: patches/patch-test_baseline_cmd-pricedb_test
> diff -N patches/patch-test_baseline_cmd-pricedb_test
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-test_baseline_cmd-pricedb_test 30 Mar 2023 13:49:19 -0000
> @@ -0,0 +1,23 @@
> +Sort output to pass tests
> +
> +Index: test/baseline/cmd-pricedb.test
> +--- test/baseline/cmd-pricedb.test.orig
> ++++ test/baseline/cmd-pricedb.test
> +@@ -14,7 +14,7 @@
> + C 15.80 USD @ 0.63 GBP
> + D
> +
> +-test pricedb
> ++test pricedb --sort date
> + P 2012/01/02 00:00:00 GBP 1.20 EUR
> + P 2012/01/03 00:00:00 EUR 1.3166666667 USD
> + P 2012/01/04 00:00:00 USD 0.63 GBP
> +@@ -32,7 +32,7 @@ test pricedb USD
> + P 2012/01/04 00:00:00 USD 0.63 GBP
> + end test
> +
> +-test pricedb U
> ++test pricedb U --sort date
> + P 2012/01/03 00:00:00 EUR 1.3166666667 USD
> + P 2012/01/04 00:00:00 USD 0.63 GBP
> + end test
> Index: patches/patch-test_baseline_cmd-prices_test
> ===================================================================
> RCS file: patches/patch-test_baseline_cmd-prices_test
> diff -N patches/patch-test_baseline_cmd-prices_test
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-test_baseline_cmd-prices_test 30 Mar 2023 13:49:19 -0000
> @@ -0,0 +1,23 @@
> +Sort output to pass tests
> +
> +Index: test/baseline/cmd-prices.test
> +--- test/baseline/cmd-prices.test.orig
> ++++ test/baseline/cmd-prices.test
> +@@ -14,7 +14,7 @@
> + C 15.80 USD @ 0.63 GBP
> + D
> +
> +-test prices
> ++test prices --sort date
> + 2012/01/02 GBP 1.20 EUR
> + 2012/01/03 EUR 1.3166666667 USD
> + 2012/01/04 USD 0.63 GBP
> +@@ -32,7 +32,7 @@ test prices GBP
> + 2012/01/02 GBP 1.20 EUR
> + end test
> +
> +-test prices U
> ++test prices U --sort date
> + 2012/01/03 EUR 1.3166666667 USD
> + 2012/01/04 USD 0.63 GBP
> + end test
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/productivity/ledger/pkg/PLIST,v
> retrieving revision 1.7
> diff -u -p -r1.7 PLIST
> --- pkg/PLIST 11 Mar 2022 19:51:43 -0000 1.7
> +++ pkg/PLIST 30 Mar 2023 13:49:19 -0000
> @@ -20,6 +20,7 @@ include/ledger/flags.h
> include/ledger/format.h
> include/ledger/generate.h
> include/ledger/global.h
> +include/ledger/gpgme.h
> include/ledger/history.h
> include/ledger/item.h
> include/ledger/iterators.h
> @@ -37,7 +38,6 @@ include/ledger/predicate.h
> include/ledger/print.h
> include/ledger/pstream.h
> include/ledger/ptree.h
> -include/ledger/pyfstream.h
> include/ledger/pyinterp.h
> include/ledger/pyutils.h
> include/ledger/query.h
> @@ -58,7 +58,7 @@ include/ledger/utils.h
> include/ledger/value.h
> include/ledger/views.h
> include/ledger/xact.h
> -info/ledger3.info
> +@info info/ledger3.info
> @lib lib/libledger.so.${LIBledger_VERSION}
> @man man/man1/ledger.1
> share/doc/ledger/
>
No comments:
Post a Comment