Mon Apr 29 00:34:20 PDT 2013

2 files changed, 5 insertions, 64 deletions

diff --git a/community/haskell-glib/0001-compatibility-with-ghc-7.6.1.patch b/community/haskell-glib/0001-compatibility-with-ghc-7.6.1.patch
deleted file mode 100644
index 845beb2bd..000000000
--- a/community/haskell-glib/0001-compatibility-with-ghc-7.6.1.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 7e677b1c633d2b426fc956fcfa084a82ef6df861 Mon Sep 17 00:00:00 2001
-From: Thomas Dziedzic <gostrc@gmail.com>
-Date: Thu, 27 Sep 2012 04:48:10 -0700
-Subject: [PATCH] compatibility with ghc 7.6.1
-
----
- System/Glib/GObject.chs  | 4 +---
- System/Glib/MainLoop.chs | 4 ++--
- 2 files changed, 3 insertions(+), 5 deletions(-)
-
-diff --git a/System/Glib/GObject.chs b/System/Glib/GObject.chs
-index 5f0fe5c..9925d2c 100644
---- a/System/Glib/GObject.chs
-+++ b/System/Glib/GObject.chs
-@@ -127,8 +127,6 @@ makeNewGObject (constr, objectUnref) generator = do
- 
- {#pointer GDestroyNotify as DestroyNotify#}
- 
--foreign import ccall "wrapper" mkDestroyNotifyPtr :: IO () -> IO DestroyNotify
--
- -- | This function wraps any newly created objects that derives from
- -- GInitiallyUnowned also known as objects with
- -- \"floating-references\". The object will be refSink (for glib
-@@ -225,4 +223,4 @@ isA obj gType =
- -- at this point we would normally implement the notify signal handler;
- -- I've moved this definition into the Object class of the gtk package
- -- since there's a quite a bit of machinery missing here (generated signal
---- register functions and the problem of recursive modules)
-\ No newline at end of file
-+-- register functions and the problem of recursive modules)
-diff --git a/System/Glib/MainLoop.chs b/System/Glib/MainLoop.chs
-index 72fecb6..feb4c77 100644
---- a/System/Glib/MainLoop.chs
-+++ b/System/Glib/MainLoop.chs
-@@ -71,7 +71,7 @@ import System.Glib.GObject	(DestroyNotify, destroyFunPtr)
- 
- {#pointer SourceFunc#}
- 
--foreign import ccall "wrapper" mkSourceFunc :: IO {#type gint#} -> IO SourceFunc
-+foreign import ccall "wrapper" mkSourceFunc :: (Ptr () -> IO {#type gint#}) -> IO SourceFunc
- 
- type HandlerId = {#type guint#}
- 
-@@ -79,7 +79,7 @@ type HandlerId = {#type guint#}
- --
- makeCallback :: IO {#type gint#} -> IO (SourceFunc, DestroyNotify)
- makeCallback fun = do
--  funPtr <- mkSourceFunc fun
-+  funPtr <- mkSourceFunc (const fun)
-   return (funPtr, destroyFunPtr)
- 
- -- | Sets a function to be called at regular intervals, with the default
--- 
-1.7.12.1
-
diff --git a/community/haskell-glib/PKGBUILD b/community/haskell-glib/PKGBUILD
index 7f7a34efe..6d73d2e55 100644
--- a/community/haskell-glib/PKGBUILD
+++ b/community/haskell-glib/PKGBUILD
@@ -1,13 +1,14 @@
-# $Id: PKGBUILD 83999 2013-02-08 04:15:32Z td123 $
+# $Id: PKGBUILD 89302 2013-04-28 16:52:23Z td123 $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=haskell-glib
 pkgver=0.12.4
-pkgrel=2
+pkgrel=4
 pkgdesc="Binding to the GLIB library for Gtk2Hs."
 url="http://hackage.haskell.org/package/glib"
 license=('LGPL2.1')
 arch=('i686' 'x86_64')
+# deps adjusted to specific versions in package()
 depends=('ghc' 'glib2')
 makedepends=("gtk2hs-buildtools")
 options=('strip')
@@ -15,16 +16,11 @@ install=gtk2hs-glib.install
 provides=('gtk2hs-glib')
 replaces=('gtk2hs-glib')
 conflicts=('gtk2hs-glib')
-source=(http://hackage.haskell.org/packages/archive/glib/$pkgver/glib-$pkgver.tar.gz
-        '0001-compatibility-with-ghc-7.6.1.patch')
-md5sums=('3172907258183466f1e604a435285c51'
-         'b00660b7102542942b0b9d84b59d1f3c')
+source=(http://hackage.haskell.org/packages/archive/glib/$pkgver/glib-$pkgver.tar.gz)
+md5sums=('3172907258183466f1e604a435285c51')
 
 build() {
     cd glib-$pkgver
-
-#    patch -Np1 -i ${srcdir}/0001-compatibility-with-ghc-7.6.1.patch
-
     runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
       --prefix=/usr --docdir=/usr/share/doc/haskell-glib \
       --libsubdir=\$compiler/site-local/\$pkgid