[arch-commits] Commit in gtk2hs-buildtools/repos (8 files)

Sergej Pupykin spupykin at nymeria.archlinux.org
Sun Mar 10 20:14:17 UTC 2013


    Date: Sunday, March 10, 2013 @ 21:14:17
  Author: spupykin
Revision: 85986

archrelease: copy trunk to community-i686, community-x86_64

Added:
  gtk2hs-buildtools/repos/community-i686/0001-fix-for-ghc-7.6.1-changes.patch
    (from rev 85985, gtk2hs-buildtools/trunk/0001-fix-for-ghc-7.6.1-changes.patch)
  gtk2hs-buildtools/repos/community-i686/PKGBUILD
    (from rev 85985, gtk2hs-buildtools/trunk/PKGBUILD)
  gtk2hs-buildtools/repos/community-x86_64/0001-fix-for-ghc-7.6.1-changes.patch
    (from rev 85985, gtk2hs-buildtools/trunk/0001-fix-for-ghc-7.6.1-changes.patch)
  gtk2hs-buildtools/repos/community-x86_64/PKGBUILD
    (from rev 85985, gtk2hs-buildtools/trunk/PKGBUILD)
Deleted:
  gtk2hs-buildtools/repos/community-i686/0001-fix-for-ghc-7.6.1-changes.patch
  gtk2hs-buildtools/repos/community-i686/PKGBUILD
  gtk2hs-buildtools/repos/community-x86_64/0001-fix-for-ghc-7.6.1-changes.patch
  gtk2hs-buildtools/repos/community-x86_64/PKGBUILD

-------------------------------------------------------+
 community-i686/0001-fix-for-ghc-7.6.1-changes.patch   |  138 ++++++++--------
 community-i686/PKGBUILD                               |   59 +++---
 community-x86_64/0001-fix-for-ghc-7.6.1-changes.patch |  138 ++++++++--------
 community-x86_64/PKGBUILD                             |   59 +++---
 4 files changed, 192 insertions(+), 202 deletions(-)

Deleted: community-i686/0001-fix-for-ghc-7.6.1-changes.patch
===================================================================
--- community-i686/0001-fix-for-ghc-7.6.1-changes.patch	2013-03-10 20:14:01 UTC (rev 85985)
+++ community-i686/0001-fix-for-ghc-7.6.1-changes.patch	2013-03-10 20:14:17 UTC (rev 85986)
@@ -1,69 +0,0 @@
-From 7d94bcd36eb1d5a2feae182fcb74f9d6ca439a80 Mon Sep 17 00:00:00 2001
-From: Thomas Dziedzic <gostrc at 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
-

Copied: gtk2hs-buildtools/repos/community-i686/0001-fix-for-ghc-7.6.1-changes.patch (from rev 85985, gtk2hs-buildtools/trunk/0001-fix-for-ghc-7.6.1-changes.patch)
===================================================================
--- community-i686/0001-fix-for-ghc-7.6.1-changes.patch	                        (rev 0)
+++ community-i686/0001-fix-for-ghc-7.6.1-changes.patch	2013-03-10 20:14:17 UTC (rev 85986)
@@ -0,0 +1,69 @@
+From 7d94bcd36eb1d5a2feae182fcb74f9d6ca439a80 Mon Sep 17 00:00:00 2001
+From: Thomas Dziedzic <gostrc at 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
+

Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD	2013-03-10 20:14:01 UTC (rev 85985)
+++ community-i686/PKGBUILD	2013-03-10 20:14:17 UTC (rev 85986)
@@ -1,32 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-
-pkgname=gtk2hs-buildtools
-pkgver=0.12.3.1
-pkgrel=4
-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')
-depends=('gmp')
-options=('strip')
-provides=('haskell-gtk2hs-buildtools')
-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
-}
-
-package() {
-    cd ${srcdir}/gtk2hs-buildtools-$pkgver
-    runhaskell Setup copy --destdir=${pkgdir}
-}

Copied: gtk2hs-buildtools/repos/community-i686/PKGBUILD (from rev 85985, gtk2hs-buildtools/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD	                        (rev 0)
+++ community-i686/PKGBUILD	2013-03-10 20:14:17 UTC (rev 85986)
@@ -0,0 +1,27 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+
+pkgname=gtk2hs-buildtools
+pkgver=0.12.4
+pkgrel=1
+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')
+depends=('gmp')
+options=('strip')
+provides=('haskell-gtk2hs-buildtools')
+source=(http://hackage.haskell.org/packages/archive/gtk2hs-buildtools/$pkgver/gtk2hs-buildtools-$pkgver.tar.gz)
+md5sums=('ad3d78bf7c25fdb4c713c3528d137a81')
+
+build() {
+    cd ${srcdir}/gtk2hs-buildtools-$pkgver
+    runhaskell Setup configure --prefix=/usr --docdir=/usr/share/doc/${pkgname}
+    runhaskell Setup build
+}
+
+package() {
+    cd ${srcdir}/gtk2hs-buildtools-$pkgver
+    runhaskell Setup copy --destdir=${pkgdir}
+}

Deleted: community-x86_64/0001-fix-for-ghc-7.6.1-changes.patch
===================================================================
--- community-x86_64/0001-fix-for-ghc-7.6.1-changes.patch	2013-03-10 20:14:01 UTC (rev 85985)
+++ community-x86_64/0001-fix-for-ghc-7.6.1-changes.patch	2013-03-10 20:14:17 UTC (rev 85986)
@@ -1,69 +0,0 @@
-From 7d94bcd36eb1d5a2feae182fcb74f9d6ca439a80 Mon Sep 17 00:00:00 2001
-From: Thomas Dziedzic <gostrc at 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
-

Copied: gtk2hs-buildtools/repos/community-x86_64/0001-fix-for-ghc-7.6.1-changes.patch (from rev 85985, gtk2hs-buildtools/trunk/0001-fix-for-ghc-7.6.1-changes.patch)
===================================================================
--- community-x86_64/0001-fix-for-ghc-7.6.1-changes.patch	                        (rev 0)
+++ community-x86_64/0001-fix-for-ghc-7.6.1-changes.patch	2013-03-10 20:14:17 UTC (rev 85986)
@@ -0,0 +1,69 @@
+From 7d94bcd36eb1d5a2feae182fcb74f9d6ca439a80 Mon Sep 17 00:00:00 2001
+From: Thomas Dziedzic <gostrc at 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
+

Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD	2013-03-10 20:14:01 UTC (rev 85985)
+++ community-x86_64/PKGBUILD	2013-03-10 20:14:17 UTC (rev 85986)
@@ -1,32 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-
-pkgname=gtk2hs-buildtools
-pkgver=0.12.3.1
-pkgrel=4
-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')
-depends=('gmp')
-options=('strip')
-provides=('haskell-gtk2hs-buildtools')
-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
-}
-
-package() {
-    cd ${srcdir}/gtk2hs-buildtools-$pkgver
-    runhaskell Setup copy --destdir=${pkgdir}
-}

Copied: gtk2hs-buildtools/repos/community-x86_64/PKGBUILD (from rev 85985, gtk2hs-buildtools/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2013-03-10 20:14:17 UTC (rev 85986)
@@ -0,0 +1,27 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+
+pkgname=gtk2hs-buildtools
+pkgver=0.12.4
+pkgrel=1
+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')
+depends=('gmp')
+options=('strip')
+provides=('haskell-gtk2hs-buildtools')
+source=(http://hackage.haskell.org/packages/archive/gtk2hs-buildtools/$pkgver/gtk2hs-buildtools-$pkgver.tar.gz)
+md5sums=('ad3d78bf7c25fdb4c713c3528d137a81')
+
+build() {
+    cd ${srcdir}/gtk2hs-buildtools-$pkgver
+    runhaskell Setup configure --prefix=/usr --docdir=/usr/share/doc/${pkgname}
+    runhaskell Setup build
+}
+
+package() {
+    cd ${srcdir}/gtk2hs-buildtools-$pkgver
+    runhaskell Setup copy --destdir=${pkgdir}
+}




More information about the arch-commits mailing list