mirror of
https://github.com/void-linux/void-packages.git
synced 2025-09-04 02:52:58 +02:00
ledger: for boost-1.88
This commit is contained in:
parent
7869617a16
commit
27ca0cf120
2 changed files with 103 additions and 2 deletions
99
srcpkgs/ledger/patches/boost-1.88.patch
Normal file
99
srcpkgs/ledger/patches/boost-1.88.patch
Normal file
|
@ -0,0 +1,99 @@
|
|||
--- a/src/system.hh.in
|
||||
+++ b/src/system.hh.in
|
||||
@@ -144,7 +144,7 @@
|
||||
#include <boost/date_time/posix_time/posix_time_io.hpp>
|
||||
#include <boost/date_time/gregorian/gregorian_io.hpp>
|
||||
|
||||
-#include <boost/filesystem/convenience.hpp>
|
||||
+#include <boost/filesystem.hpp>
|
||||
#include <boost/filesystem/exception.hpp>
|
||||
#include <boost/filesystem/fstream.hpp>
|
||||
#include <boost/filesystem/operations.hpp>
|
||||
--- a/src/filters.cc
|
||||
+++ b/src/filters.cc
|
||||
@@ -237,8 +237,8 @@ void anonymize_posts::render_commodity(a
|
||||
|
||||
void anonymize_posts::operator()(post_t& post)
|
||||
{
|
||||
- boost::uuids::detail::sha1 sha;
|
||||
- unsigned int message_digest[5];
|
||||
+ boost::uuids::detail::sha1 sha;
|
||||
+ boost::uuids::detail::sha1::digest_type message_digest;
|
||||
bool copy_xact_details = false;
|
||||
|
||||
if (last_xact != post.xact) {
|
||||
@@ -260,7 +260,7 @@ void anonymize_posts::operator()(post_t&
|
||||
sha.process_bytes(buf.str().c_str(), buf.str().length());
|
||||
sha.get_digest(message_digest);
|
||||
|
||||
- xact.payee = to_hex(message_digest);
|
||||
+ xact.payee = digest_to_hex(message_digest);
|
||||
xact.note = none;
|
||||
} else {
|
||||
xact.journal = post.xact->journal;
|
||||
@@ -278,7 +278,7 @@ void anonymize_posts::operator()(post_t&
|
||||
sha.process_bytes(buf.str().c_str(), buf.str().length());
|
||||
sha.get_digest(message_digest);
|
||||
|
||||
- account_names.push_front(to_hex(message_digest));
|
||||
+ account_names.push_front(digest_to_hex(message_digest));
|
||||
}
|
||||
|
||||
account_t * new_account =
|
||||
--- a/src/utils.h
|
||||
+++ b/src/utils.h
|
||||
@@ -607,29 +607,39 @@ inline int peek_next_nonws(std::istream&
|
||||
*_p = '\0'; \
|
||||
}
|
||||
|
||||
-inline string to_hex(unsigned int * message_digest, const int len = 1)
|
||||
-{
|
||||
+inline string digest_to_hex(
|
||||
+ const boost::uuids::detail::sha1::digest_type& message_digest,
|
||||
+ size_t len = sizeof(boost::uuids::detail::sha1::digest_type) * 2
|
||||
+) {
|
||||
std::ostringstream buf;
|
||||
+ buf.setf(std::ios_base::hex, std::ios_base::basefield);
|
||||
+ buf.fill('0');
|
||||
|
||||
- for(int i = 0; i < 5 ; i++) {
|
||||
- buf.width(8);
|
||||
- buf.fill('0');
|
||||
- buf << std::hex << message_digest[i];
|
||||
- if (i + 1 >= len)
|
||||
- break; // only output the first LEN dwords
|
||||
+ // sha1::digest_type is an array type and may change between Boost versions
|
||||
+ const size_t count = std::min(
|
||||
+ sizeof(message_digest) / sizeof(message_digest[0]),
|
||||
+ (len - 1) / (sizeof(message_digest[0]) * 2) + 1
|
||||
+ );
|
||||
+ for(size_t i = 0; i < count; i++) {
|
||||
+ buf.width(sizeof(message_digest[i]) * 2);
|
||||
+ buf << (unsigned int)message_digest[i];
|
||||
}
|
||||
- return buf.str();
|
||||
+ string hex = buf.str();
|
||||
+ hex.resize(len, '0'); // in case a partial element is requested
|
||||
+ return hex;
|
||||
}
|
||||
|
||||
-inline string sha1sum(const string& str)
|
||||
-{
|
||||
- boost::uuids::detail::sha1 sha;
|
||||
+inline string sha1sum(
|
||||
+ const string& str,
|
||||
+ size_t len = sizeof(boost::uuids::detail::sha1::digest_type) * 2
|
||||
+) {
|
||||
+ static boost::uuids::detail::sha1 sha;
|
||||
+ boost::uuids::detail::sha1::digest_type message_digest;
|
||||
|
||||
+ sha.reset();
|
||||
sha.process_bytes(str.c_str(), str.length());
|
||||
-
|
||||
- unsigned int message_digest[5];
|
||||
sha.get_digest(message_digest);
|
||||
- return to_hex(message_digest, 5);
|
||||
+ return digest_to_hex(message_digest, len);
|
||||
}
|
||||
|
||||
extern const string version;
|
|
@ -1,9 +1,11 @@
|
|||
# Template file for 'ledger'
|
||||
pkgname=ledger
|
||||
version=3.3.2
|
||||
revision=1
|
||||
revision=2
|
||||
build_style=cmake
|
||||
makedepends="boost-devel gmp-devel mpfr-devel gettext-devel libedit-devel"
|
||||
makedepends="boost-devel-minimal libboost_filesystem libboost_date_time
|
||||
libboost_iostreams libboost_unit_test_framework libboost_nowide
|
||||
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>"
|
||||
license="BSD-3-Clause"
|
||||
|
|
Loading…
Add table
Reference in a new issue