[arch-commits] Commit in haskell-spdx/trunk (PKGBUILD cabal-3.4.patch)

[Felix Yan]

    Date: Monday, July 26, 2021 @ 20:50:46
  Author: felixonmars
Revision: 985908

upgpkg: haskell-spdx 1.0.0.2-98: rebuild with transformers-compat 0.7

Added:
  haskell-spdx/trunk/cabal-3.4.patch
Modified:
  haskell-spdx/trunk/PKGBUILD

-----------------+
 PKGBUILD        |   11 +++++++----
 cabal-3.4.patch |   38 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-07-26 20:46:23 UTC (rev 985907)
+++ PKGBUILD	2021-07-26 20:50:46 UTC (rev 985908)
@@ -4,7 +4,7 @@
 _hkgname=spdx
 pkgname=haskell-spdx
 pkgver=1.0.0.2
-pkgrel=97
+pkgrel=98
 pkgdesc="SPDX license expression language, Extras"
 url="https://github.com/phadej/spdx"
 license=("BSD")
@@ -11,12 +11,15 @@
 arch=('x86_64')
 depends=('ghc-libs')
 makedepends=('ghc' 'uusi' 'haskell-base-compat' 'haskell-tasty' 'haskell-tasty-quickcheck')
-source=("https://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
-sha512sums=('2fb48d204a0c85269d4dbd6bd98efefb0691adc3eb654228b90b244c0d062e0e2f23c42e5f7ef9ab27a2f988654485fec11c3bdc0642b9b17d35791dd80f1548')
+source=("https://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz"
+        cabal-3.4.patch)
+sha512sums=('2fb48d204a0c85269d4dbd6bd98efefb0691adc3eb654228b90b244c0d062e0e2f23c42e5f7ef9ab27a2f988654485fec11c3bdc0642b9b17d35791dd80f1548'
+            'edcd5676c3bdcc1f45bd41c8c465defb3b423e46330dbdf0037bf5d59658c4491c9979422077ba1fe598da12ca8b15a01d8f3d2de0a65d8bcc7f6e842a51d56e')
 
 prepare() {
     cd $_hkgname-$pkgver
-    uusi -u base -u base-compat -u Cabal -u tasty $_hkgname.cabal
+    patch -p1 -i ../cabal-3.4.patch
+    uusi -u base -u base-compat -u tasty $_hkgname.cabal
 }
 
 build() {

Added: cabal-3.4.patch
===================================================================
--- cabal-3.4.patch	                        (rev 0)
+++ cabal-3.4.patch	2021-07-26 20:50:46 UTC (rev 985908)
@@ -0,0 +1,38 @@
+From 8afaa090a5f52a9dbde057b79ccf9739bcef8812 Mon Sep 17 00:00:00 2001
+From: Oleg Grenrus <oleg.grenrus at iki.fi>
+Date: Sat, 6 Feb 2021 11:55:15 +0200
+Subject: [PATCH] Allow Cabal-3.4
+
+---
+ spdx.cabal          | 6 +++---
+ tests/Generators.hs | 4 +++-
+ 2 files changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/spdx.cabal b/spdx.cabal
+index a9ad636..4174b21 100644
+--- a/spdx.cabal
++++ b/spdx.cabal
+@@ -49,7 +49,7 @@ library
+   ghc-options:      -Wall
+   build-depends:
+     , base          >=4.3.0.0 && <4.15
+-    , Cabal         ^>=2.4.0.1 || ^>=3.0.0.0 || ^>=3.2.0.0
++    , Cabal         ^>=2.4.0.1 || ^>=3.0.0.0 || ^>=3.2.0.0 || ^>=3.4.0.0
+     , containers    >=0.5.0.0 && <0.7
+     , transformers  >=0.3     && <0.6
+ 
+diff --git a/tests/Generators.hs b/tests/Generators.hs
+index 90ef406..1a048d3 100644
+--- a/tests/Generators.hs
++++ b/tests/Generators.hs
+@@ -15,7 +15,9 @@ import           Distribution.SPDX
+ import           Distribution.SPDX.Extra.Internal (LatticeSyntax(..))
+ 
+ latestLicenseListVersion :: LicenseListVersion
+-#if MIN_VERSION_Cabal(3,0,0)
++#if MIN_VERSION_Cabal(3,4,0)
++latestLicenseListVersion = LicenseListVersion_3_9
++#elif MIN_VERSION_Cabal(3,0,0)
+ latestLicenseListVersion = LicenseListVersion_3_6
+ #else
+ latestLicenseListVersion = LicenseListVersion_3_2