pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Remove Boost patches: Upstream issue has been closed



Module Name:	pkgsrc-wip
Committed By:	atomicules <base%atomicules.co.uk@localhost>
Pushed By:	atomicules
Date:		Sun Dec 7 21:45:14 2025 +0000
Changeset:	f025de4b9d026ccc2d44c4ba78d5da20355ca954

Removed Files:
	ledger/patches/patch-src_filters.cc
	ledger/patches/patch-src_system.hh.in
	ledger/patches/patch-src_utils.h

Log Message:
Remove Boost patches: Upstream issue has been closed

References: https://github.com/ledger/ledger/issues/2378

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=f025de4b9d026ccc2d44c4ba78d5da20355ca954

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 ledger/patches/patch-src_filters.cc   | 25 -----------------------
 ledger/patches/patch-src_system.hh.in | 14 -------------
 ledger/patches/patch-src_utils.h      | 38 -----------------------------------
 3 files changed, 77 deletions(-)

diffs:
diff --git a/ledger/patches/patch-src_filters.cc b/ledger/patches/patch-src_filters.cc
deleted file mode 100644
index e0fbbc57b2..0000000000
--- a/ledger/patches/patch-src_filters.cc
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-src_filters.cc,v 1.1 2024/11/26 22:59:34 riastradh Exp $
-
-Fix build with boost>=1.86, which broke API compatibility.
-https://github.com/ledger/ledger/issues/2378
-
---- src/filters.cc.orig	2023-03-30 07:40:48.000000000 +0000
-+++ src/filters.cc
-@@ -238,7 +238,7 @@ void anonymize_posts::render_commodity(a
- void anonymize_posts::operator()(post_t& post)
- {
- 	boost::uuids::detail::sha1  sha;
--  unsigned int message_digest[5];
-+  unsigned char message_digest[20];
-   bool         copy_xact_details = false;
- 
-   if (last_xact != post.xact) {
-@@ -1268,7 +1268,7 @@ void budget_posts::report_budget_items(c
-     foreach (pending_posts_list::iterator& i, posts_to_erase)
-       pending_posts.erase(i);
-   }
--  
-+
-   if (pending_posts.size() == 0)
-     return;
- 
diff --git a/ledger/patches/patch-src_system.hh.in b/ledger/patches/patch-src_system.hh.in
deleted file mode 100644
index bbceedc722..0000000000
--- a/ledger/patches/patch-src_system.hh.in
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-src_system.hh.in,v 1.3 2024/04/18 17:42:17 adam Exp $
-
-Fix build with newer boost.
-
---- src/system.hh.in.orig	2024-04-18 17:33:59.959388333 +0000
-+++ src/system.hh.in
-@@ -144,7 +144,6 @@
- #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/exception.hpp>
- #include <boost/filesystem/fstream.hpp>
- #include <boost/filesystem/operations.hpp>
diff --git a/ledger/patches/patch-src_utils.h b/ledger/patches/patch-src_utils.h
deleted file mode 100644
index fef0a285a0..0000000000
--- a/ledger/patches/patch-src_utils.h
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD: patch-src_utils.h,v 1.3 2024/11/26 22:59:34 riastradh Exp $
-
-Fix build with boost>=1.86, which broke API compatibility.
-https://github.com/ledger/ledger/issues/2378
-
---- src/utils.h.orig	2023-03-30 07:40:48.000000000 +0000
-+++ src/utils.h
-@@ -607,14 +607,14 @@ inline int peek_next_nonws(std::istream&
-     *_p = '\0';                                         \
-   }
- 
--inline string to_hex(unsigned int * message_digest, const int len = 1)
-+inline string to_hex(unsigned char * message_digest, const int len = 4)
- {
-   std::ostringstream buf;
- 
--  for(int i = 0; i < 5 ; i++) {
--    buf.width(8);
-+  for(int i = 0; i < 20 ; i++) {
-+    buf.width(2);
-     buf.fill('0');
--    buf << std::hex << message_digest[i];
-+    buf << std::hex << (int)message_digest[i];
-     if (i + 1 >= len)
-       break;                    // only output the first LEN dwords
-   }
-@@ -627,9 +627,9 @@ inline string sha1sum(const string& str)
- 
-   sha.process_bytes(str.c_str(), str.length());
- 
--  unsigned int message_digest[5];
-+  unsigned char message_digest[20];
-   sha.get_digest(message_digest);
--  return to_hex(message_digest, 5);
-+  return to_hex(message_digest, 20);
- }
- 
- extern const string version;


Home | Main Index | Thread Index | Old Index