CVS commit: pkgsrc/finance/hledger-lib

["Masatake Daimon" <pho%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   pho
Date:           Sat Feb  1 11:47:19 UTC 2025

Modified Files:
        pkgsrc/finance/hledger-lib: Makefile buildlink3.mk distinfo
Added Files:
        pkgsrc/finance/hledger-lib/patches: patch-Hledger_Utils_IO.hs

Log Message:
finance/hledger-lib: Fix build of finance/hledger on C locale


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 pkgsrc/finance/hledger-lib/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/finance/hledger-lib/buildlink3.mk
cvs rdiff -u -r1.8 -r1.9 pkgsrc/finance/hledger-lib/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/finance/hledger-lib/patches/patch-Hledger_Utils_IO.hs

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

Modified files:

Index: pkgsrc/finance/hledger-lib/Makefile
diff -u pkgsrc/finance/hledger-lib/Makefile:1.21 pkgsrc/finance/hledger-lib/Makefile:1.22
--- pkgsrc/finance/hledger-lib/Makefile:1.21    Sat Feb  1 10:28:58 2025
+++ pkgsrc/finance/hledger-lib/Makefile Sat Feb  1 11:47:18 2025
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2025/02/01 10:28:58 pho Exp $
+# $NetBSD: Makefile,v 1.22 2025/02/01 11:47:18 pho Exp $
 
 DISTNAME=      hledger-lib-1.41
 PKGNAME=       ${DISTNAME}
+PKGREVISION=   1
 CATEGORIES=    finance
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/finance/hledger-lib/buildlink3.mk
diff -u pkgsrc/finance/hledger-lib/buildlink3.mk:1.19 pkgsrc/finance/hledger-lib/buildlink3.mk:1.20
--- pkgsrc/finance/hledger-lib/buildlink3.mk:1.19       Sat Feb  1 10:28:58 2025
+++ pkgsrc/finance/hledger-lib/buildlink3.mk    Sat Feb  1 11:47:18 2025
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.19 2025/02/01 10:28:58 pho Exp $
+# $NetBSD: buildlink3.mk,v 1.20 2025/02/01 11:47:18 pho Exp $
 
 BUILDLINK_TREE+=       hledger-lib
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        hledger-lib
 HLEDGER_LIB_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.hledger-lib+=    hledger-lib>=1.41
-BUILDLINK_ABI_DEPENDS.hledger-lib+=    hledger-lib>=1.41
+BUILDLINK_ABI_DEPENDS.hledger-lib+=    hledger-lib>=1.41nb1
 BUILDLINK_PKGSRCDIR.hledger-lib?=      ../../finance/hledger-lib
 
 .include "../../finance/hs-Decimal/buildlink3.mk"

Index: pkgsrc/finance/hledger-lib/distinfo
diff -u pkgsrc/finance/hledger-lib/distinfo:1.8 pkgsrc/finance/hledger-lib/distinfo:1.9
--- pkgsrc/finance/hledger-lib/distinfo:1.8     Sat Feb  1 10:28:58 2025
+++ pkgsrc/finance/hledger-lib/distinfo Sat Feb  1 11:47:18 2025
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.8 2025/02/01 10:28:58 pho Exp $
+$NetBSD: distinfo,v 1.9 2025/02/01 11:47:18 pho Exp $
 
 BLAKE2s (hledger-lib-1.41.tar.gz) = 8c8f96820ff409e224873a15505c13c2bb16db4eeb8af041b99cdb2ae413bea3
 SHA512 (hledger-lib-1.41.tar.gz) = c6090ebdad52b4e143bcf9281582523bfb10ca6204cbc97873f96b54ce0f3bc443dd3ddead8b6f6fb64efea9de1ba69e42095ada9932bc6931e0dd79afece620
 Size (hledger-lib-1.41.tar.gz) = 341256 bytes
+SHA1 (patch-Hledger_Utils_IO.hs) = e61602364cf63b5b0c6b75106900dada63545e23

Added files:

Index: pkgsrc/finance/hledger-lib/patches/patch-Hledger_Utils_IO.hs
diff -u /dev/null pkgsrc/finance/hledger-lib/patches/patch-Hledger_Utils_IO.hs:1.1
--- /dev/null   Sat Feb  1 11:47:19 2025
+++ pkgsrc/finance/hledger-lib/patches/patch-Hledger_Utils_IO.hs        Sat Feb  1 11:47:18 2025
@@ -0,0 +1,39 @@
+$NetBSD: patch-Hledger_Utils_IO.hs,v 1.1 2025/02/01 11:47:18 pho Exp $
+
+Fix a build failure that occurs when the current locale is not *.UTF-8. It
+can fail because the file to be embedded may contain non-ASCII characters.
+
+TODO: Upstream this
+
+--- Hledger/Utils/IO.hs.orig   2024-12-06 09:10:33.000000000 +0000
++++ Hledger/Utils/IO.hs
+@@ -106,6 +106,7 @@ where
+ import           Control.Concurrent (forkIO)
+ import           Control.Exception (catch, evaluate, throwIO)
+ import           Control.Monad (when, forM, guard, void)
++import           Control.Monad.IO.Class (liftIO)
+ import           Data.Char (toLower)
+ import           Data.Colour.RGBSpace (RGB(RGB))
+ import           Data.Colour.RGBSpace.HSL (lightness)
+@@ -124,6 +125,7 @@ import           Data.Time.LocalTime (Lo
+ import           Data.Word (Word16)
+ import           Debug.Trace (trace)
+ import           Foreign.C.Error (Errno(..), ePIPE)
++import           GHC.IO.Encoding (getLocaleEncoding, setLocaleEncoding, utf8)
+ import           GHC.IO.Exception (IOException(..), IOErrorType (ResourceVanished))
+ import           Language.Haskell.TH.Syntax (Q, Exp)
+ import           Safe (headMay, maximumDef)
+@@ -278,7 +280,12 @@ readHandlePortably h = do
+ 
+ -- | Like embedFile, but takes a path relative to the package directory.
+ embedFileRelative :: FilePath -> Q Exp
+-embedFileRelative f = makeRelativeToProject f >>= embedStringFile
++embedFileRelative f = do
++  savedL <- liftIO getLocaleEncoding
++  liftIO $ setLocaleEncoding utf8
++  qexp   <- makeRelativeToProject f >>= embedStringFile
++  liftIO $ setLocaleEncoding savedL
++  pure qexp
+ 
+ -- -- | Like hereFile, but takes a path relative to the package directory.
+ -- -- Similar to embedFileRelative ?