Thu Oct 4 01:23:34 PDT 2012

2 files changed, 79 insertions, 5 deletions

diff --git a/community-testing/gtk2hs-buildtools/0001-fix-for-ghc-7.6.1-changes.patch b/community-testing/gtk2hs-buildtools/0001-fix-for-ghc-7.6.1-changes.patch
new file mode 100644
index 000000000..1c6a7dd65
--- /dev/null
+++ b/community-testing/gtk2hs-buildtools/0001-fix-for-ghc-7.6.1-changes.patch
@@ -0,0 +1,69 @@
+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-testing/gtk2hs-buildtools/PKGBUILD b/community-testing/gtk2hs-buildtools/PKGBUILD
index f01a2162c..ada8cb54f 100644
--- a/community-testing/gtk2hs-buildtools/PKGBUILD
+++ b/community-testing/gtk2hs-buildtools/PKGBUILD
@@ -1,22 +1,27 @@
-# $Id: PKGBUILD 72293 2012-06-11 17:24:36Z tdziedzic $
+# $Id: PKGBUILD 77006 2012-10-03 15:23:27Z tdziedzic $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=gtk2hs-buildtools
 pkgver=0.12.3.1
-pkgrel=1
+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')
+makedepends=('ghc=7.6.1-1' 'alex=3.0.2-2' 'happy=1.18.9-6' 'haskell-random=1.0.1.1-3')
 depends=('gmp')
 options=('strip')
 provides=('haskell-gtk2hs-buildtools')
-source=(http://hackage.haskell.org/packages/archive/gtk2hs-buildtools/$pkgver/gtk2hs-buildtools-$pkgver.tar.gz)
-md5sums=('612611d831635024c953d2817b124e29')
+source=(http://hackage.haskell.org/packages/archive/gtk2hs-buildtools/$pkgver/gtk2hs-buildtools-$pkgver.tar.gz
+        '0001-fix-for-ghc-7.6.1-changes.patch')
+md5sums=('612611d831635024c953d2817b124e29'
+         'b6551d8085c97bc2c6600ab397833101')
 
 build() {
     cd ${srcdir}/gtk2hs-buildtools-$pkgver
+
+    patch -Np1 -i ${srcdir}/0001-fix-for-ghc-7.6.1-changes.patch
+
     runhaskell Setup configure --prefix=/usr --docdir=/usr/share/doc/${pkgname}
     runhaskell Setup build
 }