Date: Sunday, November 21, 2021 @ 13:16:10 Author: felixonmars Revision: 1052967
upgpkg: haskell-hopenpgp 2.9.5-194: rebuild with hashable 1.3.4.0 Added: haskell-hopenpgp/trunk/hashable-1.3.4.patch Modified: haskell-hopenpgp/trunk/PKGBUILD ----------------------+ PKGBUILD | 9 ++++++--- hashable-1.3.4.patch | 23 +++++++++++++++++++++++ 2 files changed, 29 insertions(+), 3 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2021-11-21 13:15:16 UTC (rev 1052966) +++ PKGBUILD 2021-11-21 13:16:10 UTC (rev 1052967) @@ -3,7 +3,7 @@ _hkgname=hOpenPGP pkgname=haskell-hopenpgp pkgver=2.9.5 -pkgrel=193 +pkgrel=194 pkgdesc="Native Haskell implementation of OpenPGP (RFC4880)" url="http://floss.scru.org/hOpenPGP/"; license=('MIT') @@ -19,12 +19,15 @@ 'haskell-zlib') makedepends=('ghc') source=(https://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz - ghc9.patch) + ghc9.patch + hashable-1.3.4.patch) sha512sums=('7e0ecc73054c5315093e7f64f92bc7c62a7f9ff1b2c985595db427a063460b3fc692343079676631987c9a651212d1d739289f9b1e2ecb1c086b2c9bd5a4ba0e' - '9a1cf92845c1120b006b39f31496af5badfc42eb460794d3bcf8ba393eb63e7989c1c3934179fd96b9b0a23d87b078412662ebbba0d7278240eba7fe0d48ce8e') + '9a1cf92845c1120b006b39f31496af5badfc42eb460794d3bcf8ba393eb63e7989c1c3934179fd96b9b0a23d87b078412662ebbba0d7278240eba7fe0d48ce8e' + '71a712dc52d7d26896da4869a499e2eb6d2943f3848c374047f57241dbe200765a8cef809854f7b66bbf948f6f89839793ded3a8aa827b40920c818ba09d70bb') prepare() { patch -d $_hkgname-$pkgver -p1 < ghc9.patch + patch -d $_hkgname-$pkgver -p1 < hashable-1.3.4.patch } build() { Added: hashable-1.3.4.patch =================================================================== --- hashable-1.3.4.patch (rev 0) +++ hashable-1.3.4.patch 2021-11-21 13:16:10 UTC (rev 1052967) @@ -0,0 +1,23 @@ +diff --git a/Codec/Encryption/OpenPGP/Types/Internal/Base.hs b/Codec/Encryption/OpenPGP/Types/Internal/Base.hs +index f3dcc4a..e72b5a2 100644 +--- a/Codec/Encryption/OpenPGP/Types/Internal/Base.hs ++++ b/Codec/Encryption/OpenPGP/Types/Internal/Base.hs +@@ -2,6 +2,7 @@ + -- Copyright © 2012-2018 Clint Adams + -- This software is released under the terms of the Expat license. + -- (See the LICENSE file). ++{-# LANGUAGE CPP #-} + {-# LANGUAGE DataKinds #-} + {-# LANGUAGE DeriveDataTypeable #-} + {-# LANGUAGE DeriveGeneric #-} +@@ -671,8 +672,10 @@ instance FutureFlag FeatureFlag where + + instance Hashable FeatureFlag + ++#if !MIN_VERSION_hashable(1,3,4) + instance Hashable a => Hashable (Set a) where + hashWithSalt salt = hashWithSalt salt . Set.toList ++#endif + + instance Pretty FeatureFlag where + pretty ModificationDetection = pretty "modification-detection"
