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

[Felix Yan]

    Date: Sunday, May 20, 2018 @ 13:03:59
  Author: felixonmars
Revision: 325258

upgpkg: hopenpgp-tools 0.21-1

Added:
  hopenpgp-tools/trunk/ghc-8.4.patch
Modified:
  hopenpgp-tools/trunk/PKGBUILD

---------------+
 PKGBUILD      |   31 +++++++++++++++++++------------
 ghc-8.4.patch |   17 +++++++++++++++++
 2 files changed, 36 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-05-20 13:03:45 UTC (rev 325257)
+++ PKGBUILD	2018-05-20 13:03:59 UTC (rev 325258)
@@ -3,24 +3,31 @@
 # Contributor: Arch Haskell Team <arch-haskell at haskell.org>
 
 pkgname=hopenpgp-tools
-pkgver=0.19.5
-pkgrel=125
+pkgver=0.21
+pkgrel=1
 pkgdesc="hOpenPGP-based command-line tools"
 url="http://floss.scru.org/hopenpgp-tools"
 license=("AGPL3")
 arch=('x86_64')
-depends=('ghc-libs' "haskell-aeson" "haskell-ansi-wl-pprint" "haskell-attoparsec"
-         "haskell-base16-bytestring" "haskell-binary-conduit" "haskell-conduit"
-         "haskell-conduit-extra" "haskell-crypto-pubkey" "haskell-cryptohash" "haskell-errors"
-         "haskell-fgl" "haskell-graphviz" "haskell-hopenpgp" "haskell-http-client"
-         "haskell-http-client-tls" "haskell-http-types" "haskell-ixset-typed" "haskell-lens"
-         "haskell-monad-loops" "haskell-openpgp-asciiarmor" "haskell-optparse-applicative"
-         "haskell-resourcet" "haskell-text" "haskell-time-locale-compat" "haskell-wl-pprint-extras"
-         "haskell-wl-pprint-terminfo" "haskell-yaml")
+depends=('ghc-libs' 'haskell-aeson' 'haskell-ansi-wl-pprint' 'haskell-attoparsec'
+         'haskell-base16-bytestring' 'haskell-binary-conduit' 'haskell-conduit'
+         'haskell-conduit-extra' 'haskell-crypto-pubkey' 'haskell-cryptohash' 'haskell-errors'
+         'haskell-fgl' 'haskell-graphviz' 'haskell-hopenpgp' 'haskell-http-client'
+         'haskell-http-client-tls' 'haskell-http-types' 'haskell-ixset-typed' 'haskell-lens'
+         'haskell-monad-loops' 'haskell-openpgp-asciiarmor' 'haskell-optparse-applicative'
+         'haskell-prettyprinter' 'haskell-prettyprinter-ansi-terminal' 'haskell-resourcet'
+         'haskell-time-locale-compat' 'haskell-yaml')
 makedepends=('alex' 'happy' 'ghc')
-source=(https://hackage.haskell.org/packages/archive/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz)
-sha512sums=('0ecba903607ef27f14c43bf1f6a2383a740c44802dcecf6ac093f41f8d754d77ef6f14e8200316cd2d7e56b8c63934299c521b6693baf1ca219b65485fd6d52a')
+source=(https://hackage.haskell.org/packages/archive/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz
+        ghc-8.4.patch)
+sha512sums=('bfea3b24fbf61ddf0da0b87728448d191921c662eead7f0de0383fc1c653d4a77a7c3babbfc55a5cb1ea7ef4215499654182622d7be98617c0b2f1d9d079f751'
+            '94810a884eef875fc61f8235e4fad6c1e67d267fe3edaad4968f52110ea732b8c911068cc324b92bbdb045bf7f527eb866485f7737bd876277fc3c1ce20db8f1')
 
+prepare() {
+    cd $pkgname-$pkgver
+    patch -p1 -i ../ghc-8.4.patch
+}
+
 build() {
     cd "${srcdir}/${pkgname}-${pkgver}"
 

Added: ghc-8.4.patch
===================================================================
--- ghc-8.4.patch	                        (rev 0)
+++ ghc-8.4.patch	2018-05-20 13:03:59 UTC (rev 325258)
@@ -0,0 +1,17 @@
+diff --git a/hokey.hs.orig b/hokey.hs
+index a78d5a2..b951fe1 100644
+--- a/hokey.hs.orig
++++ b/hokey.hs
+@@ -153,9 +153,11 @@ instance A.ToJSON b => A.ToJSON (FakeMap Text b) where
+     toJSON = A.toJSON . Map.fromList . unFakeMap
+ instance A.ToJSON RevocationStatus
+ 
++instance Semigroup UIDReport where
++    (<>) (UIDReport a b c d e) (UIDReport a' b' c' d' e') = UIDReport (a <> a') (b <> b') (c <> c') (d <> d') (e <> e')
++
+ instance Monoid UIDReport where
+     mempty = UIDReport [] [] [] [] []
+-    mappend (UIDReport a b c d e) (UIDReport a' b' c' d' e') = UIDReport (a <> a') (b <> b') (c <> c') (d <> d') (e <> e')
+ 
+ checkKey :: Maybe POSIXTime -> TK -> KeyReport
+ checkKey mpt key = (\x -> x { keyBestOf = populateBestOf x, keyHasEncryptionCapableSubkey = hasEncryptionCapableSubkey (concatMap skUsageFlags (keySubkeys x)) }) KeyReport {