[arch-commits] Commit in git-repair/trunk (PKGBUILD ghc-8.4.patch)

[Felix Yan]

    Date: Friday, January 3, 2020 @ 14:58:13
  Author: felixonmars
Revision: 547617

upgpkg: git-repair 1.20200102-1

Modified:
  git-repair/trunk/PKGBUILD
Deleted:
  git-repair/trunk/ghc-8.4.patch

---------------+
 PKGBUILD      |   32 ++++++++++++--------------------
 ghc-8.4.patch |   29 -----------------------------
 2 files changed, 12 insertions(+), 49 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-01-03 14:57:10 UTC (rev 547616)
+++ PKGBUILD	2020-01-03 14:58:13 UTC (rev 547617)
@@ -1,33 +1,25 @@
 # Maintainer: Felix Yan <felixonmars at archlinux.org>
 
 pkgname=git-repair
-pkgver=1.20170626
-pkgrel=90
+pkgver=1.20200102
+pkgrel=1
 pkgdesc="Repairs a damaged git repository"
 url="https://git-repair.branchable.com/"
-license=("GPL")
+license=("AGPL3")
 arch=('x86_64')
-depends=('git' 'ghc-libs' 'haskell-async' 'haskell-data-default' 'haskell-exceptions'
-         'haskell-hslogger' 'haskell-ifelse' 'haskell-network' 'haskell-network-uri'
-         'haskell-optparse-applicative' 'haskell-quickcheck' 'haskell-split'
-         'haskell-unix-compat' 'haskell-utf8-string')
+depends=('git' 'ghc-libs' 'haskell-async' 'haskell-attoparsec' 'haskell-data-default'
+         'haskell-exceptions' 'haskell-filepath-bytestring' '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"
-        ghc-8.4.patch)
-sha512sums=('SKIP'
-            '7aefb60b5857252bb5b9212865ecc6da0727ec24422fa75fd7442108483e63560bb71d5782c580735ac640d9ec1131cda68882d097ebbd5e2681a9fab4ccebd2')
+source=("$pkgname::git://git-repair.branchable.com/#tag=$pkgver")
+sha512sums=('SKIP')
 
-prepare() {
+build() {
   cd git-repair
-  patch -p1 -i ../ghc-8.4.patch
-}
 
-build() {
-  cd git-repair
-  
   runhaskell Setup configure -O --prefix=/usr --enable-executable-dynamic --disable-library-vanilla \
-    --docdir="/usr/share/doc/$pkgname" \
-      -fnetwork-uri --ghc-option='-pie'
+    --docdir="/usr/share/doc/$pkgname" --ghc-option='-pie'
   runhaskell Setup build
 }
 
@@ -36,6 +28,6 @@
   runhaskell Setup copy --destdir="$pkgdir"
   install -Dm644 git-repair.1 "$pkgdir"/usr/share/man/man1/git-repair.1
 
-  rm "$pkgdir"/usr/share/doc/git-repair/GPL
+  rm "$pkgdir"/usr/share/doc/git-repair/COPYRIGHT
   rmdir "$pkgdir"/usr/share/doc/git-repair "$pkgdir"/usr/share/doc
 }

Deleted: ghc-8.4.patch
===================================================================
--- ghc-8.4.patch	2020-01-03 14:57:10 UTC (rev 547616)
+++ ghc-8.4.patch	2020-01-03 14:58:13 UTC (rev 547617)
@@ -1,29 +0,0 @@
-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