CVS commit: pkgsrc/finance/ledger32

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Jun 28 19:59:00 UTC 2026

Modified Files:
        pkgsrc/finance/ledger32: Makefile distinfo options.mk
        pkgsrc/finance/ledger32/patches: patch-src_expr.cc
Added Files:
        pkgsrc/finance/ledger32/patches: patch-src_format.h

Log Message:
ledger32: fix build with latest boost

Put BROKEN marker into the python option, where it belongs.
If you don't need the Python .so file, the package now builds fine.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 pkgsrc/finance/ledger32/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/finance/ledger32/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/finance/ledger32/options.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/finance/ledger32/patches/patch-src_expr.cc
cvs rdiff -u -r0 -r1.1 pkgsrc/finance/ledger32/patches/patch-src_format.h

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

Modified files:

Index: pkgsrc/finance/ledger32/Makefile
diff -u pkgsrc/finance/ledger32/Makefile:1.14 pkgsrc/finance/ledger32/Makefile:1.15
--- pkgsrc/finance/ledger32/Makefile:1.14       Sun Jun 28 15:41:18 2026
+++ pkgsrc/finance/ledger32/Makefile    Sun Jun 28 19:59:00 2026
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2026/06/28 15:41:18 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2026/06/28 19:59:00 wiz Exp $
 
 DISTNAME=      ledger-3.2.1
-PKGREVISION=   7
+PKGREVISION=   8
 PKGNAME=       ${DISTNAME:C/^ledger-/ledger32-/}
 CATEGORIES=    finance
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=ledger/}
@@ -22,11 +22,6 @@ TEST_TARGET= check
 TEST_ENV+=     LD_LIBRARY_PATH=${WRKSRC:Q}/${CMAKE_BUILD_DIR:Q}
 TEST_ENV+=     DYLD_LIBRARY_PATH=${WRKSRC:Q}/${CMAKE_BUILD_DIR:Q}
 
-BROKEN=                "does not support Python > 3.11 but py-numpy does not support < 3.12"
-
-# https://github.com/ledger/ledger/issues/2332
-PYTHON_VERSIONS_ACCEPTED=      311 # PyUnicode_GET_SIZE
-
 CMAKE_CONFIGURE_ARGS+= -DPython_EXECUTABLE:STRING=${TOOL_PYTHONBIN:Q}
 CMAKE_CONFIGURE_ARGS+= -DCMAKE_POLICY_VERSION_MINIMUM=3.5
 

Index: pkgsrc/finance/ledger32/distinfo
diff -u pkgsrc/finance/ledger32/distinfo:1.5 pkgsrc/finance/ledger32/distinfo:1.6
--- pkgsrc/finance/ledger32/distinfo:1.5        Fri Oct 17 08:52:36 2025
+++ pkgsrc/finance/ledger32/distinfo    Sun Jun 28 19:59:00 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2025/10/17 08:52:36 wiz Exp $
+$NetBSD: distinfo,v 1.6 2026/06/28 19:59:00 wiz Exp $
 
 BLAKE2s (ledger-3.2.1.tar.gz) = c07ef3f13ef6fa24c3a0d4e1ef91e02c39673f143aa910810d64f00751ab76ff
 SHA512 (ledger-3.2.1.tar.gz) = 526c60cee354c9d2ead38cef3b89b349467e41fa3ec0927b51e7246a3352f19f0f81574211f20ba9bac5915590b870b9f9478a103ab661d3d9a10f41c52f4512
@@ -6,9 +6,10 @@ Size (ledger-3.2.1.tar.gz) = 790959 byte
 SHA1 (patch-CMakeLists.txt) = 4fb7640331ffbe7dc7f84dd9a962c3d656d01e29
 SHA1 (patch-src_CMakeLists.txt) = 8d6a16523554c98c8559702db681af6fb4f413aa
 SHA1 (patch-src_amount.cc) = 63baa56b38c5f773e66d4e9cde1fe99b3686339f
-SHA1 (patch-src_expr.cc) = e707cbcba58a31534072ed490c9ba95f8dc4005d
+SHA1 (patch-src_expr.cc) = a90e7e72c77613d2c869d83ae2465f294e5ed8cc
 SHA1 (patch-src_filters.cc) = be5a1f382006ae014cea0c028d774f68d4e58ca8
 SHA1 (patch-src_format.cc) = c7fe4821bc86a9126978235fa44859f84ea92989
+SHA1 (patch-src_format.h) = e4da361b3049fdeef35565c3ff126676bdc8b4cf
 SHA1 (patch-src_item.cc) = 5e97a09824a04092161d8a0ca956a43ef084a03d
 SHA1 (patch-src_lookup.cc) = 0140f88386a6a9bbfa82e48fca4f3555f40a03aa
 SHA1 (patch-src_main.cc) = d887e39e2a68fe594c93819e95eed9a4f469844d

Index: pkgsrc/finance/ledger32/options.mk
diff -u pkgsrc/finance/ledger32/options.mk:1.3 pkgsrc/finance/ledger32/options.mk:1.4
--- pkgsrc/finance/ledger32/options.mk:1.3      Tue May  6 12:07:31 2025
+++ pkgsrc/finance/ledger32/options.mk  Sun Jun 28 19:59:00 2026
@@ -1,14 +1,19 @@
-# $NetBSD: options.mk,v 1.3 2025/05/06 12:07:31 wiz Exp $
+# $NetBSD: options.mk,v 1.4 2026/06/28 19:59:00 wiz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.ledger
 PKG_SUPPORTED_OPTIONS+=        python
-PKG_SUGGESTED_OPTIONS+=        python
+PKG_SUGGESTED_OPTIONS+=
 
 PLIST_VARS+=           python
 
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mpython)
+BROKEN=                "does not support Python > 3.11 but py-numpy does not support < 3.12"
+
+# https://github.com/ledger/ledger/issues/2332
+PYTHON_VERSIONS_ACCEPTED=      311 # PyUnicode_GET_SIZE
+
 CMAKE_CONFIGURE_ARGS+=         -DUSE_PYTHON:BOOL=TRUE
 PLIST.python=          yes
 PLIST_SUBST+=          PYSITELIB=${PYSITELIB:Q}

Index: pkgsrc/finance/ledger32/patches/patch-src_expr.cc
diff -u pkgsrc/finance/ledger32/patches/patch-src_expr.cc:1.1 pkgsrc/finance/ledger32/patches/patch-src_expr.cc:1.2
--- pkgsrc/finance/ledger32/patches/patch-src_expr.cc:1.1       Thu May  2 12:22:13 2024
+++ pkgsrc/finance/ledger32/patches/patch-src_expr.cc   Sun Jun 28 19:59:00 2026
@@ -1,11 +1,21 @@
-$NetBSD: patch-src_expr.cc,v 1.1 2024/05/02 12:22:13 riastradh Exp $
+$NetBSD: patch-src_expr.cc,v 1.2 2026/06/28 19:59:00 wiz Exp $
+
+Fix build with latest boost.
 
 Fix ctype abuse.
 https://github.com/ledger/ledger/pull/2341
 
---- src/expr.cc.orig   2023-03-30 07:40:48.000000000 +0000
+--- src/expr.cc.orig   2020-05-18 05:30:10.000000000 +0000
 +++ src/expr.cc
-@@ -222,7 +222,7 @@ bool merged_expr_t::check_for_single_ide
+@@ -31,6 +31,7 @@
+ 
+ #include <system.hh>
+ 
++#include <boost/scoped_ptr.hpp>
+ #include "expr.h"
+ #include "parser.h"
+ #include "scope.h"
+@@ -220,7 +221,7 @@ bool merged_expr_t::check_for_single_identifier(const 
  {
    bool single_identifier = true;
    for (const char * p = expr.c_str(); *p; ++p)

Added files:

Index: pkgsrc/finance/ledger32/patches/patch-src_format.h
diff -u /dev/null pkgsrc/finance/ledger32/patches/patch-src_format.h:1.1
--- /dev/null   Sun Jun 28 19:59:00 2026
+++ pkgsrc/finance/ledger32/patches/patch-src_format.h  Sun Jun 28 19:59:00 2026
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_format.h,v 1.1 2026/06/28 19:59:00 wiz Exp $
+
+Fix build with latest boost.
+
+--- src/format.h.orig  2026-06-28 19:48:23.492168946 +0000
++++ src/format.h
+@@ -42,6 +42,7 @@
+ #ifndef _FORMAT_H
+ #define _FORMAT_H
+ 
++#include <boost/scoped_ptr.hpp>
+ #include "expr.h"
+ #include "unistring.h"
+