[arch-commits] Commit in haskell-gtk2hs-buildtools/trunk (PKGBUILD base-4.12.patch)

[Felix Yan]

    Date: Wednesday, January 30, 2019 @ 11:39:34
  Author: felixonmars
Revision: 428597

upgpkg: haskell-gtk2hs-buildtools 0.13.5.0-1

rebuild with gtk2hs-buildtools 0.13.5.0

Modified:
  haskell-gtk2hs-buildtools/trunk/PKGBUILD
Deleted:
  haskell-gtk2hs-buildtools/trunk/base-4.12.patch

-----------------+
 PKGBUILD        |   15 ++++-----------
 base-4.12.patch |   44 --------------------------------------------
 2 files changed, 4 insertions(+), 55 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-01-30 11:39:23 UTC (rev 428596)
+++ PKGBUILD	2019-01-30 11:39:34 UTC (rev 428597)
@@ -1,8 +1,8 @@
 # Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
 
 pkgname=haskell-gtk2hs-buildtools
-pkgver=0.13.4.0
-pkgrel=11
+pkgver=0.13.5.0
+pkgrel=1
 pkgdesc="Tools to build the Gtk2Hs suite of User Interface libraries."
 url="https://hackage.haskell.org/package/gtk2hs-buildtools"
 license=('GPL2')
@@ -12,16 +12,9 @@
 provides=('gtk2hs-buildtools')
 conflicts=('gtk2hs-buildtools')
 replaces=('gtk2hs-buildtools')
-source=("https://hackage.haskell.org/packages/archive/gtk2hs-buildtools/${pkgver}/gtk2hs-buildtools-${pkgver}.tar.gz"
-        base-4.12.patch)
-sha512sums=('ac7bfd5a1abffefc5eddd97c2e5030a86f413fac1449dca93302cf54abf7def83ab49498cb471aa284f28612d7399116fc5f3d02a0d5108fb9b3eded9248f750'
-            '67f515a9985e3188ba3ae4923027a4fd4a5d88acd5881431d9a3073e45924fa3eff46ab1ece3b7591cb5743391f4e090d4ce91b91845ba7b450bf65d097118f7')
+source=("https://hackage.haskell.org/packages/archive/gtk2hs-buildtools/${pkgver}/gtk2hs-buildtools-${pkgver}.tar.gz")
+sha512sums=('8affee1469d9eeb72c07ac2b99ac9100450ad9f089c2d44a35dd9ef16b351d26a2fa62d305aba13c88f389684600ed1454a2118a0e736d12e7ff9c70d5be68ee')
 
-prepare() {
-    cd gtk2hs-buildtools-$pkgver
-    patch -p2 -i ../base-4.12.patch
-}
-
 build() {
     cd "${srcdir}/gtk2hs-buildtools-${pkgver}"
 

Deleted: base-4.12.patch
===================================================================
--- base-4.12.patch	2019-01-30 11:39:23 UTC (rev 428596)
+++ base-4.12.patch	2019-01-30 11:39:34 UTC (rev 428597)
@@ -1,44 +0,0 @@
-diff --git a/tools/c2hs/base/state/StateBase.hs b/tools/c2hs/base/state/StateBase.hs
-index aebd885b..c07d29fc 100644
---- a/tools/c2hs/base/state/StateBase.hs
-+++ b/tools/c2hs/base/state/StateBase.hs
-@@ -58,6 +58,7 @@ where
- 
- import Control.Applicative (Applicative(..))
- import Control.Monad (liftM, ap)
-+import Control.Monad.Fail (MonadFail (..))
- 
- import Position   (Position)
- import UNames     (NameSupply)
-@@ -110,6 +111,8 @@ instance Monad (PreCST e s) where
-   (>>=)  = (+>=)
-   (>>)   = (+>)
- 
-+instance MonadFail (PreCST e s) where
-+  fail = error
- 
- -- unwrapper coercion function (EXPORTED)
- --
-diff --git a/tools/c2hs/c/CParserMonad.hs b/tools/c2hs/c/CParserMonad.hs
-index 12c4ffa6..ef720b93 100644
---- a/tools/c2hs/c/CParserMonad.hs
-+++ b/tools/c2hs/c/CParserMonad.hs
-@@ -63,6 +63,7 @@ import Idents    (Ident, lexemeToIdent, identToLexeme)
- 
- import Control.Applicative (Applicative(..))
- import Control.Monad (liftM, ap)
-+import Control.Monad.Fail (MonadFail (..))
- import Data.Set  (Set)
- import qualified Data.Set as Set (fromList, insert, member, delete)
- 
-@@ -83,6 +84,9 @@ data PState = PState {
- 
- newtype P a = P { unP :: PState -> ParseResult a }
- 
-+instance MonadFail P where
-+  fail m = getPos >>= \pos -> failP pos [m]
-+
- instance Functor P where
-   fmap = liftM
- 
-