Mon May 5 03:56:02 UTC 2014

2 files changed, 7 insertions, 76 deletions

diff --git a/community/gtk2hs-buildtools/0001-fix-for-ghc-7.6.1-changes.patch b/community/gtk2hs-buildtools/0001-fix-for-ghc-7.6.1-changes.patch
deleted file mode 100644
index 1c6a7dd65..000000000
--- a/community/gtk2hs-buildtools/0001-fix-for-ghc-7.6.1-changes.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 7d94bcd36eb1d5a2feae182fcb74f9d6ca439a80 Mon Sep 17 00:00:00 2001
-From: Thomas Dziedzic <gostrc@gmail.com>
-Date: Wed, 12 Sep 2012 03:29:46 -0700
-Subject: [PATCH] fix for ghc 7.6.1 changes
-
----
- c2hs/base/general/FileOps.hs  | 3 ++-
- c2hs/base/state/StateTrans.hs | 3 ++-
- c2hs/toplevel/C2HSConfig.hs   | 2 +-
- 3 files changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/c2hs/base/general/FileOps.hs b/c2hs/base/general/FileOps.hs
-index 83ac70c..4914c4b 100644
---- a/c2hs/base/general/FileOps.hs
-+++ b/c2hs/base/general/FileOps.hs
-@@ -39,6 +39,7 @@ import Control.Monad	 (liftM)
- import System.Random    (newStdGen, randomRs)
- 
- import FNameOps  (dirname, stripDirname, addPath)
-+import System.IO.Error (catchIOError)
- 
- 
- -- search for the given file in the given list of directories (EXPORTED)
-@@ -89,7 +90,7 @@ mktemp pre post =
- 			     in do
- 			       h <- openFile fname ReadWriteMode
- 			       return (h, fname)
--			     `catch` \_ -> createLoop (attempts - 1) rs'
-+			     `catchIOError` \_ -> createLoop (attempts - 1) rs'
-     --
-     sixChars :: [Int] -> ([Int], String)
-     sixChars is = 
-diff --git a/c2hs/base/state/StateTrans.hs b/c2hs/base/state/StateTrans.hs
-index ada62f4..2ab0ad1 100644
---- a/c2hs/base/state/StateTrans.hs
-+++ b/c2hs/base/state/StateTrans.hs
-@@ -84,6 +84,7 @@ import System.IO  (fixIO)
- import Data.IORef (IORef, newIORef, readIORef, writeIORef)
- 
- import Errors (interr)
-+import System.IO.Error (catchIOError)
- 
- infixr 1 +>=, +>
- 
-@@ -337,7 +338,7 @@ fatalsHandledBy m handler  =
- 				  ioError err
- 	      Right a          -> return state
- 	    )
--	    `catch` (\err -> let
-+	    `catchIOError` (\err -> let
- 			       STB handler' = handler err
- 			     in
- 			     handler' bs gs)
-diff --git a/c2hs/toplevel/C2HSConfig.hs b/c2hs/toplevel/C2HSConfig.hs
-index e8deddf..af32886 100644
---- a/c2hs/toplevel/C2HSConfig.hs
-+++ b/c2hs/toplevel/C2HSConfig.hs
-@@ -46,7 +46,7 @@ import Data.Array (Array, array)
- 
- import Foreign (Ptr, FunPtr)
- import Foreign  (Storable(sizeOf, alignment), toBool)
--import Foreign.C (CInt)
-+import Foreign.C (CInt(..))
- import System.Info (os)
- 
- -- program settings
--- 
-1.7.12
-
diff --git a/community/gtk2hs-buildtools/PKGBUILD b/community/gtk2hs-buildtools/PKGBUILD
index 86fc34f32..132968c78 100644
--- a/community/gtk2hs-buildtools/PKGBUILD
+++ b/community/gtk2hs-buildtools/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 102051 2013-12-04 14:18:24Z spupykin $
+# $Id: PKGBUILD 110606 2014-05-04 13:54:46Z td123 $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=gtk2hs-buildtools
-pkgver=0.12.5.1
-pkgrel=1
+pkgver=0.12.5.2
+pkgrel=2
 pkgdesc="Tools to build the Gtk2Hs suite of User Interface libraries."
 url="http://hackage.haskell.org/package/gtk2hs-buildtools"
 license=('GPL2')
 arch=('i686' 'x86_64')
-makedepends=('ghc' 'alex' 'happy' 'haskell-random')
+options=('staticlibs')
+makedepends=('ghc=7.8.2-2' 'alex' 'happy' 'haskell-random' 'haskell-hashtables')
 depends=('gmp')
-options=('strip')
 provides=('haskell-gtk2hs-buildtools')
-source=(http://hackage.haskell.org/packages/archive/gtk2hs-buildtools/$pkgver/gtk2hs-buildtools-$pkgver.tar.gz)
-md5sums=('2f8f761559185c7375b0b31354d791c8')
+source=("http://hackage.haskell.org/packages/archive/gtk2hs-buildtools/$pkgver/gtk2hs-buildtools-$pkgver.tar.gz")
+md5sums=('dd39243ae579ab32236fbc17dbeec107')
 
 build() {
     cd ${srcdir}/gtk2hs-buildtools-$pkgver