[arch-commits] Commit in haskell-bytestring-show/trunk (PKGBUILD ghc9.patch)

[Felix Yan]

    Date: Thursday, June 17, 2021 @ 10:31:00
  Author: felixonmars
Revision: 964579

upgpkg: haskell-bytestring-show 0.3.5.6-29: rebuild with ghc 9.0.1

Added:
  haskell-bytestring-show/trunk/ghc9.patch
Modified:
  haskell-bytestring-show/trunk/PKGBUILD

------------+
 PKGBUILD   |   14 ++++++++------
 ghc9.patch |   26 ++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-06-17 10:30:52 UTC (rev 964578)
+++ PKGBUILD	2021-06-17 10:31:00 UTC (rev 964579)
@@ -2,20 +2,22 @@
 
 pkgname=haskell-bytestring-show
 pkgver=0.3.5.6
-pkgrel=28
+pkgrel=29
 pkgdesc="Efficient conversion of values into readable byte strings."
 url="https://hackage.haskell.org/package/bytestring-show"
 license=('BSD')
 arch=('x86_64')
 depends=('ghc-libs')
-makedepends=('ghc')
-source=("https://hackage.haskell.org/packages/archive/bytestring-show/${pkgver}/bytestring-show-${pkgver}.tar.gz")
-sha512sums=('f59a041e30ec3b3eb9f971968606685ba5968dafc44d92ed50c9f7f124b891f48fc6612fdfc1a57f702e76e41f70c647e81c1919ab7fee194db9d97ddd73dd10')
+makedepends=('ghc' 'uusi')
+source=("https://hackage.haskell.org/packages/archive/bytestring-show/${pkgver}/bytestring-show-${pkgver}.tar.gz"
+        ghc9.patch)
+sha512sums=('f59a041e30ec3b3eb9f971968606685ba5968dafc44d92ed50c9f7f124b891f48fc6612fdfc1a57f702e76e41f70c647e81c1919ab7fee194db9d97ddd73dd10'
+            'cb78ab44527773ddc20565fff66bad6e7453a554cf39b1ab82d24e44699a22087867ad51c6cb64b6d6979323bc46779e6dfc92f8ba7aa6f31b4b44d0923d7b92')
 
 prepare() {
     cd bytestring-show-$pkgver
-    sed -e 's/< *0.8/<1/g' -e 's/< *0.6/<1/g' -i bytestring-show.cabal
-    echo -e "import Distribution.Simple\nmain = defaultMain" > Setup.hs
+    patch -p1 -i ../ghc9.patch
+    gen-setup
 }
 
 build() {

Added: ghc9.patch
===================================================================
--- ghc9.patch	                        (rev 0)
+++ ghc9.patch	2021-06-17 10:31:00 UTC (rev 964579)
@@ -0,0 +1,26 @@
+diff --git a/Text/Show/ByteString/Integer.hs b/Text/Show/ByteString/Integer.hs
+index e1a30cd..46d5115 100644
+--- a/Text/Show/ByteString/Integer.hs
++++ b/Text/Show/ByteString/Integer.hs
+@@ -19,7 +19,7 @@ import GHC.Base
+ #if   __GLASGOW_HASKELL__ && __GLASGOW_HASKELL__ <  611 && INTEGER_GMP
+ import GHC.Integer.Internals
+ #elif __GLASGOW_HASKELL__ && __GLASGOW_HASKELL__ >= 611 && INTEGER_GMP
+-import GHC.Integer.GMP.Internals
++import GHC.Integer.GMP.Internals hiding (quotRemInteger)
+ #elif __GLASGOW_HASKELL__ && INTEGER_SIMPLE
+ import GHC.Integer.Simple.Internals
+ #endif
+diff --git a/bytestring-show.cabal b/bytestring-show.cabal
+index 0da6800..f37c649 100644
+--- a/bytestring-show.cabal
++++ b/bytestring-show.cabal
+@@ -16,7 +16,7 @@ flag integer-simple
+         description: use with integer-simple build of GHC
+ 
+ library
+-    build-depends: base < 5, binary < 0.8, bytestring >= 0.9 && <= 1, array < 0.6, containers < 0.6
++    build-depends: base < 5, binary < 0.9, bytestring >= 0.9 && <= 1, array < 0.6, containers < 0.7
+ 
+     exposed-modules:
+         Text.Show.ByteString