Date: Tuesday, May 22, 2018 @ 11:43:10 Author: felixonmars Revision: 326912
upgpkg: git-repair 1.20170626-23 Added: git-repair/trunk/ghc-8.4.patch Modified: git-repair/trunk/PKGBUILD ---------------+ PKGBUILD | 17 ++++++++++++----- ghc-8.4.patch | 29 +++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 5 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-05-22 11:43:02 UTC (rev 326911) +++ PKGBUILD 2018-05-22 11:43:10 UTC (rev 326912) @@ -3,19 +3,26 @@ pkgname=git-repair pkgver=1.20170626 -pkgrel=22 +pkgrel=23 pkgdesc="Repairs a damaged git repisitory" url="http://git-repair.branchable.com/"; license=("GPL") arch=('x86_64') depends=('git' 'ghc-libs' 'haskell-async' 'haskell-data-default' 'haskell-exceptions' - 'haskell-hslogger' 'haskell-ifelse' 'haskell-mtl' 'haskell-network' 'haskell-network-uri' - 'haskell-optparse-applicative' 'haskell-quickcheck' 'haskell-split' 'haskell-text' + 'haskell-hslogger' 'haskell-ifelse' 'haskell-network' 'haskell-network-uri' + 'haskell-optparse-applicative' 'haskell-quickcheck' 'haskell-split' 'haskell-unix-compat' 'haskell-utf8-string') makedepends=('ghc') -source=("$pkgname::git://git-repair.branchable.com/#tag=$pkgver") -sha512sums=('SKIP') +source=("$pkgname::git://git-repair.branchable.com/#tag=$pkgver" + ghc-8.4.patch) +sha512sums=('SKIP' + '7aefb60b5857252bb5b9212865ecc6da0727ec24422fa75fd7442108483e63560bb71d5782c580735ac640d9ec1131cda68882d097ebbd5e2681a9fab4ccebd2') +prepare() { + cd git-repair + patch -p1 -i ../ghc-8.4.patch +} + build() { cd git-repair Added: ghc-8.4.patch =================================================================== --- ghc-8.4.patch (rev 0) +++ ghc-8.4.patch 2018-05-22 11:43:10 UTC (rev 326912) @@ -0,0 +1,29 @@ +diff --git a/Git/Fsck.hs b/Git/Fsck.hs +index a716b56..e7061cb 100644 +--- a/Git/Fsck.hs ++++ b/Git/Fsck.hs +@@ -44,15 +44,17 @@ type MissingObjects = S.Set Sha + + type Truncated = Bool + ++instance Semigroup FsckOutput where ++ (<>) (FsckOutput s1 t1) (FsckOutput s2 t2) = FsckOutput (S.union s1 s2) (t1 || t2) ++ (<>) (FsckOutput s t) _ = FsckOutput s t ++ (<>) _ (FsckOutput s t) = FsckOutput s t ++ (<>) NoFsckOutput NoFsckOutput = NoFsckOutput ++ (<>) AllDuplicateEntriesWarning AllDuplicateEntriesWarning = AllDuplicateEntriesWarning ++ (<>) AllDuplicateEntriesWarning NoFsckOutput = AllDuplicateEntriesWarning ++ (<>) NoFsckOutput AllDuplicateEntriesWarning = AllDuplicateEntriesWarning ++ + instance Monoid FsckOutput where + mempty = NoFsckOutput +- mappend (FsckOutput s1 t1) (FsckOutput s2 t2) = FsckOutput (S.union s1 s2) (t1 || t2) +- mappend (FsckOutput s t) _ = FsckOutput s t +- mappend _ (FsckOutput s t) = FsckOutput s t +- mappend NoFsckOutput NoFsckOutput = NoFsckOutput +- mappend AllDuplicateEntriesWarning AllDuplicateEntriesWarning = AllDuplicateEntriesWarning +- mappend AllDuplicateEntriesWarning NoFsckOutput = AllDuplicateEntriesWarning +- mappend NoFsckOutput AllDuplicateEntriesWarning = AllDuplicateEntriesWarning + + {- Runs fsck to find some of the broken objects in the repository. + - May not find all broken objects, if fsck fails on bad data in some of
