osc copypac from project:devel:languages:haskell:ghc-9.4.x package:git-annex revision:19, using keep-link

OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/git-annex?expand=0&rev=70

0001-Adapt-code-to-optparse-applicative-0.18.1-and-later.patch

@@ -0,0 +1,42 @@
+From e2c69174088403e41fd4988082509f7bc2bc39dd Mon Sep 17 00:00:00 2001
+From: Peter Simons <simons@cryp.to>
+Date: Wed, 21 Jun 2023 16:46:54 +0200
+Subject: [PATCH] Adapt code to optparse-applicative 0.18.1 and later.
+
+optparse-applicative switched to the 'prettyprinter' library in its latest
+release, which means the 'H.text' function has disappeared. Instead, 'H.pretty'
+can be used to convert all 'Pretty a' types into a renderable document.
+---
+ CmdLine.hs      | 2 +-
+ git-annex.cabal | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/CmdLine.hs b/CmdLine.hs
+index a170434107..004198c40a 100644
+--- a/CmdLine.hs
++++ b/CmdLine.hs
+@@ -116,7 +116,7 @@ parseCmd progname progdesc allargs allcmds getparser =
+ 		<*> getparser c
+ 		<*> parserAnnexOptions (cmdannexoptions c)
+ 	synopsis n d = n ++ " - " ++ d
+-	intro = mconcat $ concatMap (\l -> [H.text l, H.line])
++	intro = mconcat $ concatMap (\l -> [H.pretty l, H.line])
+ 		(synopsis progname progdesc : commandList allcmds)
+ 
+ {- Selects the Command that matches the subcommand name.
+diff --git a/git-annex.cabal b/git-annex.cabal
+index 53270e572a..4abbc7b686 100644
+--- a/git-annex.cabal
++++ b/git-annex.cabal
+@@ -311,7 +311,7 @@ Executable git-annex
+   Build-Depends:
+    base (>= 4.11.1.0 && < 5.0),
+    network-uri (>= 2.6),
+-   optparse-applicative (>= 0.14.1),
++   optparse-applicative (>= 0.18.1),
+    containers (>= 0.5.8),
+    exceptions (>= 0.6),
+    stm (>= 2.3),
+-- 
+2.40.1
+

git-annex.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Jun 21 14:52:10 UTC 2023 - Peter Simons <psimons@suse.com>
+
+- Apply "0001-Adapt-code-to-optparse-applicative-0.18.1-and-later.patch"
+  to allow git-annex to build with the latest release of the
+  optparse-applicative library.
+
 -------------------------------------------------------------------
 Fri Apr  7 17:37:48 UTC 2023 - Peter Simons <psimons@suse.com>
 
@@ -1358,4 +1365,3 @@ Thu Jun 18 02:00:26 UTC 2020 - psimons@suse.com
 Tue Jun  9 09:26:18 UTC 2020 - psimons@suse.com
 
 - Add git-annex at version 8.20200522.
-

git-annex.spec

@@ -24,6 +24,7 @@ License:        AGPL-3.0-or-later AND GPL-3.0-or-later AND BSD-2-Clause AND MIT
 URL:            https://hackage.haskell.org/package/%{name}
 Source0:        https://github.com/opensuse-haskell/git-annex/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
 Patch0:         0001-persistent-2.12.0.1-include-the-code-from-persistent.patch
+Patch1:         0001-Adapt-code-to-optparse-applicative-0.18.1-and-later.patch
 BuildRequires:  bash-completion
 BuildRequires:  chrpath
 BuildRequires:  curl