[arch-commits] Commit in haskell-cipher-aes128/trunk (PKGBUILD cabal-2.4.patch)

2018-11-15 Thread Felix Yan via arch-commits 
Date: Thursday, November 15, 2018 @ 19:07:31
  Author: felixonmars
Revision: 407745

upgpkg: haskell-cipher-aes128 0.7.0.4-1

rebuild with cipher-aes128 0.7.0.4

Modified:
  haskell-cipher-aes128/trunk/PKGBUILD
Deleted:
  haskell-cipher-aes128/trunk/cabal-2.4.patch

-+
 PKGBUILD|   15 ---
 cabal-2.4.patch |   26 --
 2 files changed, 4 insertions(+), 37 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-11-15 19:05:02 UTC (rev 407744)
+++ PKGBUILD2018-11-15 19:07:31 UTC (rev 407745)
@@ -2,8 +2,8 @@
 
 _hkgname=cipher-aes128
 pkgname=haskell-cipher-aes128
-pkgver=0.7.0.3
-pkgrel=10
+pkgver=0.7.0.4
+pkgrel=1
 pkgdesc="AES and common modes using AES-NI when available."
 url="https://github.com/TomMD/cipher-aes128;
 license=('custom:BSD3')
@@ -10,16 +10,9 @@
 arch=('x86_64')
 depends=('ghc-libs' 'haskell-crypto-api' 'haskell-tagged' 'haskell-cereal')
 makedepends=('ghc')
-source=(https://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz
-cabal-2.4.patch)
-sha512sums=('72bd1cca4ccd31be08096a53dffa9fa855b24b226904327a417f797b8b8a799d368ef00f75f9a81234a12c659b63d595d58f263cc3a4d544942be7edada413b7'
-
'f17b6a4b79192a678164a8b5f489aee1854e37be2deb30ecc404461ec1c00038e3f01fbcae26227cc7337ef5fc8577f9608194c55f122a459f76ccfad42c082b')
+source=(https://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
+sha512sums=('3a33c8f4c064ece06e16174243e90ddf2103bfba991835c0312ad97706b6754d04248e9aebb40455992f7e7f71b08672a76ab89b57d31481b9a807c4b3ce127f')
 
-prepare() {
-cd $_hkgname-$pkgver
-patch -p1 -i ../cabal-2.4.patch
-}
-
 build() {
 cd $_hkgname-$pkgver
 

Deleted: cabal-2.4.patch
===
--- cabal-2.4.patch 2018-11-15 19:05:02 UTC (rev 407744)
+++ cabal-2.4.patch 2018-11-15 19:07:31 UTC (rev 407745)
@@ -1,26 +0,0 @@
-commit 3fcc30f8af64b7eaadeed007301954bd69a23d38
-Author: Felix Yan 
-Date:   Mon Oct 15 07:06:14 2018 +0800
-
-Fix compatibility with Cabal 2.4
-
-Fixes build with GHC 8.6
-
-diff --git a/Setup.hs b/Setup.hs
-index 98dbe34..3fe4081 100644
 a/Setup.hs
-+++ b/Setup.hs
-@@ -13,8 +13,13 @@ main :: IO ()
- main = defaultMainWithHooks hk
-  where
-  hk = simpleUserHooks { buildHook = \pd lbi uh bf -> do
-+#if MIN_VERSION_Cabal(2,4,0)
-+let ccProg = Program "gcc" undefined 
undefined undefined undefined
-+hcProg = Program "ghc" undefined 
undefined undefined undefined
-+#else
- let ccProg = Program "gcc" undefined 
undefined undefined
- hcProg = Program "ghc" undefined 
undefined undefined
-+#endif
- mConf  = lookupProgram ccProg 
(withPrograms lbi)
- hcConf = lookupProgram hcProg 
(withPrograms lbi)
- err = error "Could not determine 
C compiler"

[arch-commits] Commit in haskell-cipher-aes128/trunk (PKGBUILD cabal-2.4.patch)

2018-10-14 Thread Felix Yan via arch-commits 
Date: Sunday, October 14, 2018 @ 23:08:42
  Author: felixonmars
Revision: 393910

use a proper patch

Added:
  haskell-cipher-aes128/trunk/cabal-2.4.patch
Modified:
  haskell-cipher-aes128/trunk/PKGBUILD

-+
 PKGBUILD|8 +---
 cabal-2.4.patch |   26 ++
 2 files changed, 31 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-10-14 23:08:38 UTC (rev 393909)
+++ PKGBUILD2018-10-14 23:08:42 UTC (rev 393910)
@@ -10,12 +10,14 @@
 arch=('x86_64')
 depends=('ghc-libs' 'haskell-crypto-api' 'haskell-tagged' 'haskell-cereal')
 makedepends=('ghc')
-source=(https://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-sha512sums=('72bd1cca4ccd31be08096a53dffa9fa855b24b226904327a417f797b8b8a799d368ef00f75f9a81234a12c659b63d595d58f263cc3a4d544942be7edada413b7')
+source=(https://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz
+cabal-2.4.patch)
+sha512sums=('72bd1cca4ccd31be08096a53dffa9fa855b24b226904327a417f797b8b8a799d368ef00f75f9a81234a12c659b63d595d58f263cc3a4d544942be7edada413b7'
+
'f17b6a4b79192a678164a8b5f489aee1854e37be2deb30ecc404461ec1c00038e3f01fbcae26227cc7337ef5fc8577f9608194c55f122a459f76ccfad42c082b')
 
 prepare() {
 cd $_hkgname-$pkgver
-sed -i 's/undefined undefined undefined/undefined undefined undefined 
undefined/' Setup.hs
+patch -p1 -i ../cabal-2.4.patch
 }
 
 build() {

Added: cabal-2.4.patch
===
--- cabal-2.4.patch (rev 0)
+++ cabal-2.4.patch 2018-10-14 23:08:42 UTC (rev 393910)
@@ -0,0 +1,26 @@
+commit 3fcc30f8af64b7eaadeed007301954bd69a23d38
+Author: Felix Yan 
+Date:   Mon Oct 15 07:06:14 2018 +0800
+
+Fix compatibility with Cabal 2.4
+
+Fixes build with GHC 8.6
+
+diff --git a/Setup.hs b/Setup.hs
+index 98dbe34..3fe4081 100644
+--- a/Setup.hs
 b/Setup.hs
+@@ -13,8 +13,13 @@ main :: IO ()
+ main = defaultMainWithHooks hk
+  where
+  hk = simpleUserHooks { buildHook = \pd lbi uh bf -> do
++#if MIN_VERSION_Cabal(2,4,0)
++let ccProg = Program "gcc" undefined 
undefined undefined undefined
++hcProg = Program "ghc" undefined 
undefined undefined undefined
++#else
+ let ccProg = Program "gcc" undefined 
undefined undefined
+ hcProg = Program "ghc" undefined 
undefined undefined
++#endif
+ mConf  = lookupProgram ccProg 
(withPrograms lbi)
+ hcConf = lookupProgram hcProg 
(withPrograms lbi)
+ err = error "Could not determine 
C compiler"