ledger: update to 3.3.2;adopt.

This commit is contained in:
André Cerqueira 2023-11-13 15:26:24 +00:00 committed by Duncan Overbruck
parent 4e2d6eef06
commit 0972c3d8f7
4 changed files with 30 additions and 59 deletions

View file

@ -1,30 +0,0 @@
--- a/src/system.hh.in
+++ b/src/system.hh.in
@@ -134,7 +134,7 @@
#include <boost/algorithm/string.hpp>
#include <boost/any.hpp>
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
#include <boost/cast.hpp>
#include <boost/current_function.hpp>
@@ -184,6 +184,8 @@
#include <boost/regex.hpp>
#endif // HAVE_BOOST_REGEX_UNICODE
+#include <boost/scoped_ptr.hpp>
+
#include <boost/tokenizer.hpp>
#include <boost/tuple/tuple.hpp>
--- a/src/utils.h
+++ b/src/utils.h
@@ -81,6 +81,7 @@
namespace ledger {
using namespace boost;
+ using namespace boost::placeholders;
typedef std::string string;
typedef std::list<string> strings_list;

View file

@ -1,20 +1,21 @@
--- a/cmake/FindUtfcpp.cmake.old 2016-01-13 19:14:05.737426666 +0100
+++ b/cmake/FindUtfcpp.cmake 2016-01-13 19:13:28.952877141 +0100
@@ -1,23 +1,8 @@
-# - Try to find utfcpp
-# Once done, this will define
-#
-# UTFCPP_FOUND - system has utfcpp's utf8.h
-# UTFCPP_PATH - the utfcpp include directories
-
---
cmake/FindUtfcpp.cmake | 15 +++------------
1 file changed, 3 insertions(+), 12 deletions(-)
diff --git a/cmake/FindUtfcpp.cmake b/cmake/FindUtfcpp.cmake
index c9d3e06..762cf58 100644
--- a/cmake/FindUtfcpp.cmake
+++ b/cmake/FindUtfcpp.cmake
@@ -6,18 +6,9 @@
include(CheckCXXSourceCompiles)
-set(UTFCPP_FOUND FALSE)
-
-find_path(UTFCPP_INCLUDE_DIR
- NAMES utf8.h
- HINTS "${UTFCPP_PATH}"
- PATHS "${PROJECT_SOURCE_DIR}/lib/utfcpp/v2_0/source"
- PATHS "${PROJECT_SOURCE_DIR}/lib/utfcpp/v3/source"
-)
-
-if (UTFCPP_INCLUDE_DIR)
@ -22,8 +23,10 @@
- set(UTFCPP_FOUND TRUE)
-endif()
+set(UTFCPP_FOUND TRUE)
+set(UTFCPP_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/lib/utfcpp/v2_0/source")
+set(UTFCPP_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/lib/utfcpp/v3/source")
+set(CMAKE_REQUIRED_INCLUDES "${UTFCPP_INCLUDE_DIR}")
check_cxx_source_compiles("
#include <string>
--
2.42.0

View file

@ -1,12 +0,0 @@
Index: CMakeLists.txt
===================================================================
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -41,7 +41,6 @@ if (BUILD_DEBUG)
set(CMAKE_BUILD_TYPE Debug)
set(DEBUG_MODE 1)
else()
- set(CMAKE_BUILD_TYPE Release)
set(DEBUG_MODE 0)
endif()

View file

@ -1,15 +1,23 @@
# Template file for 'ledger'
pkgname=ledger
version=3.2.1
revision=5
version=3.3.2
revision=1
build_style=cmake
makedepends="boost-devel gmp-devel mpfr-devel gettext-devel libedit-devel"
short_desc="Double-entry accounting system with a command-line reporting interface"
maintainer="Orphaned <orphan@voidlinux.org>"
maintainer="André Cerqueira <acerqueira021@gmail.com>"
license="BSD-3-Clause"
homepage="https://www.ledger-cli.org/"
distfiles="https://github.com/ledger/${pkgname}/archive/v${version}.tar.gz"
checksum=92bf09bc385b171987f456fe3ee9fa998ed5e40b97b3acdd562b663aa364384a
checksum=555296ee1e870ff04e2356676977dcf55ebab5ad79126667bc56464cb1142035
post_extract() {
# see upstream: https://github.com/ledger/ledger/issues/1783
# > It seems to fail in a non-deterministic manner. If you run it long
# > enough, it might fail.
rm -f test/baseline/cmd-pricedb.test
rm -f test/baseline/cmd-prices.test
}
post_install() {
rm -Rf ${DESTDIR}/usr/local
@ -17,6 +25,8 @@ post_install() {
mv ${DESTDIR}/usr/lib64 ${DESTDIR}/usr/lib
fi
vcompletion contrib/ledger-completion.bash bash
vlicense LICENSE.md
}