From 68819da574a580405014b09c752566fc1ea7e68fd326fc10e587494d223c6b8f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 21 Apr 2024 14:36:12 +0000 Subject: [PATCH 1/4] osc copypac from project:devel:languages:haskell:ghc-9.8.x package:hledger-ui revision:9, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/hledger-ui?expand=0&rev=53 --- hledger-ui-1.32.3.tar.gz | 3 --- hledger-ui-1.33.tar.gz | 3 +++ hledger-ui.changes | 9 +++++++++ hledger-ui.spec | 7 +++---- 4 files changed, 15 insertions(+), 7 deletions(-) delete mode 100644 hledger-ui-1.32.3.tar.gz create mode 100644 hledger-ui-1.33.tar.gz diff --git a/hledger-ui-1.32.3.tar.gz b/hledger-ui-1.32.3.tar.gz deleted file mode 100644 index 4478387..0000000 --- a/hledger-ui-1.32.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:97608bd5e83de63965f84268e24a98f9d28d07cdc013db763134dc9e06600125 -size 80928 diff --git a/hledger-ui-1.33.tar.gz b/hledger-ui-1.33.tar.gz new file mode 100644 index 0000000..51aed61 --- /dev/null +++ b/hledger-ui-1.33.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:120f577639a5046c1a95744e538c536fab487eac0da4253bcde3591934d5befd +size 81471 diff --git a/hledger-ui.changes b/hledger-ui.changes index e6c4cf3..2af7f1f 100644 --- a/hledger-ui.changes +++ b/hledger-ui.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Thu Apr 18 23:38:07 UTC 2024 - Peter Simons + +- Update hledger-ui to version 1.33. + Upstream's change log file format is strange (too much unmodified + text at at the top). The automatic updater cannot extract the + relevant additions. You can find the file at: + http://hackage.haskell.org/package/hledger-ui-1.33/src/CHANGES.md + ------------------------------------------------------------------- Wed Feb 28 16:04:39 UTC 2024 - Peter Simons diff --git a/hledger-ui.spec b/hledger-ui.spec index 5b5b7a1..de7a783 100644 --- a/hledger-ui.spec +++ b/hledger-ui.spec @@ -19,13 +19,12 @@ %global pkg_name hledger-ui %global pkgver %{pkg_name}-%{version} Name: %{pkg_name} -Version: 1.32.3 +Version: 1.33 Release: 0 Summary: Terminal interface for the hledger accounting system 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: https://github.com/simonmichael/hledger/commit/de3209a2fbe50093236b95ec525eaea654e9dcb3.patch#/fix-build-with-ghc-9.8.x.patch BuildRequires: chrpath BuildRequires: ghc-Cabal-devel BuildRequires: ghc-ansi-terminal-devel @@ -133,8 +132,8 @@ Supplements: (ghc-%{pkg_name}-devel and ghc-prof) This package provides the Haskell %{pkg_name} profiling library. %prep -%autosetup -p2 -cabal-tweak-dep-ver base "<4.19" "< 5" +%autosetup +cabal-tweak-dep-ver process ">=1.6.19.0" ">=1.6.18.0" %build %ghc_lib_build From ba90577bd44ca3e49116f235887e0c189df57545f0506fa5381f3fa4cdb735e3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 3 May 2024 13:45:33 +0000 Subject: [PATCH 2/4] osc copypac from project:devel:languages:haskell:ghc-9.8.x package:hledger-ui revision:11, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/hledger-ui?expand=0&rev=54 --- hledger-ui-1.33.1.tar.gz | 3 +++ hledger-ui-1.33.tar.gz | 3 --- hledger-ui.changes | 9 +++++++++ hledger-ui.spec | 3 +-- 4 files changed, 13 insertions(+), 5 deletions(-) create mode 100644 hledger-ui-1.33.1.tar.gz delete mode 100644 hledger-ui-1.33.tar.gz diff --git a/hledger-ui-1.33.1.tar.gz b/hledger-ui-1.33.1.tar.gz new file mode 100644 index 0000000..dc18471 --- /dev/null +++ b/hledger-ui-1.33.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d1985e26e63325a2b6b2b723958b8e88bdc8d4f7aad50d9f652f2b656a9305f4 +size 81588 diff --git a/hledger-ui-1.33.tar.gz b/hledger-ui-1.33.tar.gz deleted file mode 100644 index 51aed61..0000000 --- a/hledger-ui-1.33.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:120f577639a5046c1a95744e538c536fab487eac0da4253bcde3591934d5befd -size 81471 diff --git a/hledger-ui.changes b/hledger-ui.changes index 2af7f1f..07d54db 100644 --- a/hledger-ui.changes +++ b/hledger-ui.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Thu May 2 11:03:20 UTC 2024 - Peter Simons + +- Update hledger-ui to version 1.33.1. + Upstream's change log file format is strange (too much unmodified + text at at the top). The automatic updater cannot extract the + relevant additions. You can find the file at: + http://hackage.haskell.org/package/hledger-ui-1.33.1/src/CHANGES.md + ------------------------------------------------------------------- Thu Apr 18 23:38:07 UTC 2024 - Peter Simons diff --git a/hledger-ui.spec b/hledger-ui.spec index de7a783..e5e32c4 100644 --- a/hledger-ui.spec +++ b/hledger-ui.spec @@ -19,7 +19,7 @@ %global pkg_name hledger-ui %global pkgver %{pkg_name}-%{version} Name: %{pkg_name} -Version: 1.33 +Version: 1.33.1 Release: 0 Summary: Terminal interface for the hledger accounting system License: GPL-3.0-or-later @@ -133,7 +133,6 @@ This package provides the Haskell %{pkg_name} profiling library. %prep %autosetup -cabal-tweak-dep-ver process ">=1.6.19.0" ">=1.6.18.0" %build %ghc_lib_build From 061ec860c58866f2c1817d2746627146e901e8367f760e9651f256857a428ad3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 3 May 2024 15:34:03 +0000 Subject: [PATCH 3/4] osc copypac from project:devel:languages:haskell:ghc-9.8.x package:hledger-ui revision:12, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/hledger-ui?expand=0&rev=55 --- hledger-ui.changes | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hledger-ui.changes b/hledger-ui.changes index 07d54db..c02e9c7 100644 --- a/hledger-ui.changes +++ b/hledger-ui.changes @@ -16,6 +16,8 @@ Thu Apr 18 23:38:07 UTC 2024 - Peter Simons relevant additions. You can find the file at: http://hackage.haskell.org/package/hledger-ui-1.33/src/CHANGES.md +- Drop obsolete "fix-build-with-ghc-9.8.x.patch". + ------------------------------------------------------------------- Wed Feb 28 16:04:39 UTC 2024 - Peter Simons From 6c27a4f0253fc108c53f7dd35e5dd4baa31bbfabf9f6ec557ae413c10651647b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 8 May 2024 14:56:11 +0000 Subject: [PATCH 4/4] osc copypac from project:devel:languages:haskell:ghc-9.8.x package:hledger-ui revision:13, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/hledger-ui?expand=0&rev=56 --- fix-build-with-ghc-9.8.x.patch | 50 ---------------------------------- 1 file changed, 50 deletions(-) delete mode 100644 fix-build-with-ghc-9.8.x.patch diff --git a/fix-build-with-ghc-9.8.x.patch b/fix-build-with-ghc-9.8.x.patch deleted file mode 100644 index 51ca423..0000000 --- a/fix-build-with-ghc-9.8.x.patch +++ /dev/null @@ -1,50 +0,0 @@ -From de3209a2fbe50093236b95ec525eaea654e9dcb3 Mon Sep 17 00:00:00 2001 -From: Vekhir <134215107+Vekhir@users.noreply.github.com> -Date: Sun, 18 Feb 2024 23:53:29 +0100 -Subject: [PATCH] fix: Hide ambiguous instance for (!?) - -base 4.19.0.0 introduces Data.List.!? which clashes with Data.Vector.!?, the latter of which is needed for vector operations. ---- - hledger-ui/Hledger/UI/AccountsScreen.hs | 5 +++++ - hledger-ui/Hledger/UI/RegisterScreen.hs | 4 ++++ - 2 files changed, 9 insertions(+) - -diff --git a/hledger-ui/Hledger/UI/AccountsScreen.hs b/hledger-ui/Hledger/UI/AccountsScreen.hs -index af5dd99bb9b..28361cce54e 100644 ---- a/hledger-ui/Hledger/UI/AccountsScreen.hs -+++ b/hledger-ui/Hledger/UI/AccountsScreen.hs -@@ -1,5 +1,6 @@ - -- The accounts screen, showing accounts and balances like the CLI balance command. - -+{-# LANGUAGE CPP #-} - {-# LANGUAGE OverloadedStrings #-} - {-# LANGUAGE RecordWildCards #-} - {-# LANGUAGE TupleSections #-} -@@ -23,7 +24,11 @@ import Brick.Widgets.List - import Brick.Widgets.Edit - import Control.Monad - import Control.Monad.IO.Class (liftIO) -+#if MIN_VERSION_base(4,19,0) -+import Data.List hiding (reverse, (!?)) -+#else - import Data.List hiding (reverse) -+#endif - import Data.Maybe - import qualified Data.Text as T - import Data.Time.Calendar (Day) -diff --git a/hledger-ui/Hledger/UI/RegisterScreen.hs b/hledger-ui/Hledger/UI/RegisterScreen.hs -index d55d22d8252..92c2d7caefa 100644 ---- a/hledger-ui/Hledger/UI/RegisterScreen.hs -+++ b/hledger-ui/Hledger/UI/RegisterScreen.hs -@@ -19,7 +19,11 @@ where - import Control.Monad - import Control.Monad.IO.Class (liftIO) - import Data.Bifunctor (bimap, Bifunctor (second)) -+#if MIN_VERSION_base(4,19,0) -+import Data.List hiding ((!?)) -+#else - import Data.List -+#endif - import Data.Maybe - import qualified Data.Text as T - import qualified Data.Vector as V