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
This commit is contained in:
Peter Simons
Git OBS Bridge
parent
83bb8d6c71
commit
81df58b1b4
@ -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
|
||||
|
||||
@ -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>
|
||||
|
||||
@ -71,7 +78,7 @@ Wed Mar 29 20:09:41 UTC 2023 - Peter Simons <psimons@suse.com>
|
||||
so git-annex can be built again without yesod etc installed.
|
||||
* Improve error message when unable to read a sqlite database due to
|
||||
permissions problem.
|
||||
* sync: Fix a bug that caused files to be removed from an
|
||||
* sync: Fix a bug that caused files to be removed from an
|
||||
importtree=yes exporttree=yes special remote when the remote's
|
||||
annex-tracking-branch was not the currently checked out branch.
|
||||
* S3: Support a region= configuration useful for some non-Amazon S3
|
||||
@ -829,7 +836,7 @@ Tue Apr 6 08:36:35 UTC 2021 - Ondřej Súkup <mimi.vx@gmail.com>
|
||||
-------------------------------------------------------------------
|
||||
Wed Mar 31 14:32:42 UTC 2021 - Ondřej Súkup <mimi.vx@gmail.com>
|
||||
|
||||
- drop atto.patch
|
||||
- drop atto.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Mar 31 14:28:17 UTC 2021 - psimons@suse.com
|
||||
@ -876,7 +883,7 @@ Wed Mar 31 14:28:17 UTC 2021 - psimons@suse.com
|
||||
-------------------------------------------------------------------
|
||||
Thu Mar 25 09:47:23 UTC 2021 - Ondřej Súkup <mimi.vx@gmail.com>
|
||||
|
||||
- add atto.patch fixing build with attoparsec-0.14+
|
||||
- add atto.patch fixing build with attoparsec-0.14+
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Mar 11 08:23:16 UTC 2021 - psimons@suse.com
|
||||
@ -1050,9 +1057,9 @@ Tue Dec 29 21:16:10 UTC 2020 - psimons@suse.com
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Dec 17 12:20:00 UTC 2020 - Ondřej Súkup <mimi.vx@gmail.com>
|
||||
|
||||
|
||||
- disable %{ix86} build
|
||||
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Nov 29 15:48:14 UTC 2020 - psimons@suse.com
|
||||
|
||||
@ -1113,7 +1120,7 @@ Mon Nov 16 21:55:38 UTC 2020 - psimons@suse.com
|
||||
-------------------------------------------------------------------
|
||||
Sat Nov 7 22:15:09 UTC 2020 - Ondřej Súkup <mimi.vx@gmail.com>
|
||||
|
||||
- add ./0001-enable-extensions-needed-by-new-version-of-persisten.patch
|
||||
- add ./0001-enable-extensions-needed-by-new-version-of-persisten.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Nov 7 15:34:35 UTC 2020 - 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.
|
||||
|
||||
|
||||
@ -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
|
||||
|
||||
Loading…
Reference in New Issue
Block a user