Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package hledger for openSUSE:Factory checked in at 2024-03-20 21:14:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hledger (Old) and /work/SRC/openSUSE:Factory/.hledger.new.1905 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hledger" Wed Mar 20 21:14:35 2024 rev:26 rq:1157278 version:1.32.3 Changes: -------- --- /work/SRC/openSUSE:Factory/hledger/hledger.changes 2024-02-06 16:35:21.052789918 +0100 +++ /work/SRC/openSUSE:Factory/.hledger.new.1905/hledger.changes 2024-03-20 21:16:45.307348715 +0100 @@ -1,0 +2,7 @@ +Wed Feb 28 15:29:58 UTC 2024 - Peter Simons <[email protected]> + +- Add "fix-build-with-ghc-9.8.x.patch" to fix the build with + ghc-9.8.x. The change is based on upstream commit + https://github.com/simonmichael/hledger/commit/034d37c3bef9ba99a1db7344127e814a9219047a.patch. + +------------------------------------------------------------------- New: ---- fix-build-with-ghc-9.8.x.patch BETA DEBUG BEGIN: New: - Add "fix-build-with-ghc-9.8.x.patch" to fix the build with ghc-9.8.x. The change is based on upstream commit BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hledger.spec ++++++ --- /var/tmp/diff_new_pack.ADiald/_old 2024-03-20 21:16:45.899370903 +0100 +++ /var/tmp/diff_new_pack.ADiald/_new 2024-03-20 21:16:45.899370903 +0100 @@ -26,6 +26,7 @@ License: GPL-3.0-or-later URL: https://hackage.haskell.org/package/%{name} Source0: https://hackage.haskell.org/package/%{name}-%{version}/%{name}-%{version}.tar.gz +Patch1: fix-build-with-ghc-9.8.x.patch BuildRequires: chrpath BuildRequires: ghc-Cabal-devel BuildRequires: ghc-Decimal-devel @@ -153,7 +154,8 @@ This package provides the Haskell %{pkg_name} profiling library. %prep -%autosetup +%autosetup -p1 +cabal-tweak-dep-ver base "<4.19" "< 5" %build %ghc_lib_build ++++++ fix-build-with-ghc-9.8.x.patch ++++++ >From 034d37c3bef9ba99a1db7344127e814a9219047a Mon Sep 17 00:00:00 2001 From: Simon Michael <[email protected]> Date: Thu, 4 Jan 2024 16:53:24 -1000 Subject: [PATCH] fix:imp:stack: build with ghc 9.8, latest stackage nightly (part 2) Fix the build with GHC < 9.8. This reapplies commit 87600e5dd, this time with the correct description. --- hledger/Hledger/Cli/Script.hs | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) Index: hledger-1.32.3/Hledger/Cli/Script.hs =================================================================== --- hledger-1.32.3.orig/Hledger/Cli/Script.hs 2024-01-28 10:05:20.000000000 +0000 +++ hledger-1.32.3/Hledger/Cli/Script.hs 2024-02-28 15:28:33.604355754 +0000 @@ -3,6 +3,7 @@ A convenient module to import in hledger aiming to provide the most useful imports and reduce boilerplate. |-} +{-# LANGUAGE CPP #-} {-# LANGUAGE PackageImports #-} module Hledger.Cli.Script @@ -15,7 +16,13 @@ import Control.Concurrent as M import Control.Monad as M import Data.Char as M import Data.Either as M + import Data.Functor as M +#if MIN_VERSION_base(4,19,0) + hiding (unzip) +#endif +-- import Data.Functor as M (Functor, fmap, (<$), ($>), (<$>), (<&>)) -- or without CPP ? redundant import warning + import Data.List as M import Data.Maybe as M import Data.Ord as M
