osc copypac from project:devel:languages:haskell:ghc-8.10.x package:git-annex revision:26, using keep-link
OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/git-annex?expand=0&rev=5
This commit is contained in:
Peter Simons
Git OBS Bridge
parent
798aa5f2a5
commit
4361e532a4
42
0001-fix-build-with-dlist-1.0.patch
Normal file
42
0001-fix-build-with-dlist-1.0.patch
Normal file
@ -0,0 +1,42 @@
|
||||
From 798fdad6608016301f7e74be73dbedeb87596d0b Mon Sep 17 00:00:00 2001
|
||||
From: Joey Hess <joeyh@joeyh.name>
|
||||
Date: Tue, 21 Jul 2020 12:58:51 -0400
|
||||
Subject: [PATCH] fix build with dlist-1.0
|
||||
|
||||
That removed the list function. This new implementation appears to
|
||||
actually be more efficient anyway, since it avoids toList.
|
||||
---
|
||||
CHANGELOG | 6 ++++++
|
||||
Utility/TList.hs | 2 +-
|
||||
2 files changed, 7 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/CHANGELOG b/CHANGELOG
|
||||
index ff72a9895..edbb3195f 100644
|
||||
--- a/CHANGELOG
|
||||
+++ b/CHANGELOG
|
||||
@@ -1,3 +1,9 @@
|
||||
+git-annex (8.20200720.2) UNRELEASED; urgency=medium
|
||||
+
|
||||
+ * Support building with dlist-1.0
|
||||
+
|
||||
+ -- Joey Hess <id@joeyh.name> Tue, 21 Jul 2020 12:58:30 -0400
|
||||
+
|
||||
git-annex (8.20200720.1) upstream; urgency=medium
|
||||
|
||||
* Fix a bug in find --batch in the previous version.
|
||||
diff --git a/Utility/TList.hs b/Utility/TList.hs
|
||||
index 08def4890..2168a1c4a 100644
|
||||
--- a/Utility/TList.hs
|
||||
+++ b/Utility/TList.hs
|
||||
@@ -86,7 +86,7 @@ modifyTList tlist a = do
|
||||
putTMVar tlist dl'
|
||||
|
||||
emptyDList :: D.DList a -> Bool
|
||||
-emptyDList = D.list True (\_ _ -> False)
|
||||
+emptyDList = null . D.toList
|
||||
|
||||
consTList :: TList a -> a -> STM ()
|
||||
consTList tlist v = modifyTList tlist $ \dl -> D.cons v dl
|
||||
--
|
||||
2.26.2
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:26664720206d3f3c22e8f0e170fcac4a5135f27196274728a24ca5d665b785ca
|
||||
size 8174004
|
||||
3
git-annex-8.20200720.1.tar.gz
Normal file
3
git-annex-8.20200720.1.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:1529eff23f5693161591197abd8c45b9d3051cc53e210339b397e6dbd5acc5b2
|
||||
size 8254688
|
||||
@ -1,3 +1,56 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Jul 21 08:29:13 UTC 2020 - psimons@suse.com
|
||||
|
||||
- Update git-annex to version 8.20200720.1.
|
||||
git-annex (8.20200720.1) upstream; urgency=medium
|
||||
|
||||
* Fix a bug in find --batch in the previous version.
|
||||
|
||||
-- Joey Hess <id@joeyh.name> Mon, 20 Jul 2020 19:39:11 -0400
|
||||
|
||||
git-annex (8.20200720) upstream; urgency=medium
|
||||
|
||||
* import: Added --no-content option, which avoids downloading files
|
||||
from a special remote. Currently only supported by the directory
|
||||
special remote.
|
||||
* Honor annex.largefiles when importing a tree from a special remote.
|
||||
(Except for when --no-content is used.)
|
||||
* Fix a deadlock that could occur after git-annex got an unlocked
|
||||
file, causing the command to hang indefinitely. Known to happen on
|
||||
vfat filesystems, possibly others.
|
||||
* Build with the http-client-restricted and git-lfs libraries when
|
||||
available, otherwise use the vendored copy as before.
|
||||
* testremote: Fix over-allocation of resources and bad caching,
|
||||
including starting up a large number of external special remote processes.
|
||||
(Regression introduced in version 8.20200501)
|
||||
* test: Fix some test cases that assumed git's default branch name.
|
||||
* importfeed: Added some additional --template variables:
|
||||
itempubyear, itempubmonth, itempubday, itempubhour,
|
||||
itempubminute, itempubsecond.
|
||||
* Made several special remotes support locking content on them,
|
||||
which allows dropping from other special remotes in some situations
|
||||
where it was not possible before. Supported special remotes:
|
||||
S3 (with versioning=yes), git-lfs, tahoe
|
||||
* Fix reversion that broke passing annex.* and remote.*.annex-*
|
||||
git configs with -c. (Since version 8.20200330.)
|
||||
* Bring back git-annex branch read cache. This speeds up some operations,
|
||||
eg git-annex sync --content --all gets 20% faster.
|
||||
* Fix a recently introduced bug that could cause a "fork: resource exhausted"
|
||||
after getting several thousand files.
|
||||
* Sped up the --all option by 2x to 16x by using git cat-file --buffer.
|
||||
Thanks to Lukey for finding this optimisation.
|
||||
* Sped up seeking for annexed files to operate on by a factor of nearly 2x.
|
||||
* Sped up sync --content by 2x and other commands like fsck --fast and
|
||||
whereis by around 50%, by using git cat-file --buffer.
|
||||
* importfeed: Made checking known urls step around 15% faster.
|
||||
* fsck: Detect if WORM keys contain a carriage return, and recommend
|
||||
upgrading the key. (git-annex could have maybe created such keys back
|
||||
in 2013).
|
||||
* When on an adjust --hide-missing branch, fix handling of files that
|
||||
have been deleted but the deletion is not yet staged.
|
||||
|
||||
-- Joey Hess <id@joeyh.name> Mon, 20 Jul 2020 14:40:51 -0400
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jun 18 02:00:26 UTC 2020 - psimons@suse.com
|
||||
|
||||
|
||||
@ -17,12 +17,13 @@
|
||||
|
||||
|
||||
Name: git-annex
|
||||
Version: 8.20200617
|
||||
Version: 8.20200720.1
|
||||
Release: 0
|
||||
Summary: Manage files with git, without checking their contents into git
|
||||
License: AGPL-3.0-or-later AND GPL-3.0-or-later AND BSD-2-Clause AND MIT AND GPL-2.0-only
|
||||
URL: https://hackage.haskell.org/package/%{name}
|
||||
Source0: https://github.com/peti/git-annex/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
|
||||
Patch01: 0001-fix-build-with-dlist-1.0.patch
|
||||
BuildRequires: bash-completion
|
||||
BuildRequires: chrpath
|
||||
BuildRequires: curl
|
||||
@ -60,9 +61,11 @@ BuildRequires: ghc-feed-devel
|
||||
BuildRequires: ghc-filepath-bytestring-devel
|
||||
BuildRequires: ghc-filepath-devel
|
||||
BuildRequires: ghc-free-devel
|
||||
BuildRequires: ghc-git-lfs-devel
|
||||
BuildRequires: ghc-hinotify-devel
|
||||
BuildRequires: ghc-hslogger-devel
|
||||
BuildRequires: ghc-http-client-devel
|
||||
BuildRequires: ghc-http-client-restricted-devel
|
||||
BuildRequires: ghc-http-client-tls-devel
|
||||
BuildRequires: ghc-http-conduit-devel
|
||||
BuildRequires: ghc-http-types-devel
|
||||
@ -167,6 +170,7 @@ Optional dependency offering bash completion for git-annex
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch01 -p1
|
||||
|
||||
%build
|
||||
%define cabal_configure_options -ftestsuite
|
||||
|
||||
Loading…
Reference in New Issue
Block a user