diff options
| author | root <root@rshg054.dnsready.net> | 2012-06-15 00:01:47 +0000 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2012-06-15 00:01:47 +0000 |
| commit | 63a600a5f9102d817332db9fb746a4153ed62b51 (patch) | |
| tree | d4219aa8c6331cc37c98b943b1f9db68306bd81d /community/haskell-gtk | |
| parent | 35c30674b2b901077a809a6f1d8e5a0115098c8b (diff) | |
Fri Jun 15 00:01:47 UTC 2012
Diffstat (limited to 'community/haskell-gtk')
| -rw-r--r-- | community/haskell-gtk/PKGBUILD | 22 | ||||
| -rw-r--r-- | community/haskell-gtk/gtk-gthread.h-include.patch | 15 |
2 files changed, 30 insertions, 7 deletions
diff --git a/community/haskell-gtk/PKGBUILD b/community/haskell-gtk/PKGBUILD index 060c24cd4..9b1e2ba62 100644 --- a/community/haskell-gtk/PKGBUILD +++ b/community/haskell-gtk/PKGBUILD @@ -1,25 +1,33 @@ -# $Id: PKGBUILD 67620 2012-03-13 14:23:58Z spupykin $ +# $Id: PKGBUILD 72389 2012-06-13 13:46:24Z tdziedzic $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=haskell-gtk pkgver=0.12.3 -pkgrel=1 +pkgrel=2 pkgdesc="Binding to the gtk library for Gtk2Hs." url="http://hackage.haskell.org/package/gtk" license=('LGPL2.1') arch=('i686' 'x86_64') -depends=('ghc' 'gtk2' "haskell-pango=$pkgver" 'haskell-mtl=2.0.1.0') +depends=('ghc' 'gtk2' "haskell-pango=0.12.3-2" 'haskell-mtl=2.1.1-1') makedepends=("gtk2hs-buildtools") provides=('gtk2hs-gtk') replaces=('gtk2hs-gtk') conflicts=('gtk2hs-gtk') options=('strip') install=gtk2hs-gtk.install -source=(http://hackage.haskell.org/packages/archive/gtk/$pkgver/gtk-$pkgver.tar.gz) -md5sums=('65a65b5cc1e1db0fbf722779a7044ded') +source=(http://hackage.haskell.org/packages/archive/gtk/$pkgver/gtk-$pkgver.tar.gz + 'gtk-gthread.h-include.patch') +md5sums=('65a65b5cc1e1db0fbf722779a7044ded' + '5277990f8ca28d2b12e77dac97c10354') build() { cd ${srcdir}/gtk-${pkgver} + + # fix compile error with latest glib2 >= 2.32 + # http://hackage.haskell.org/trac/gtk2hs/ticket/1253 + # got the patch from fedora + patch -Np1 -i ${srcdir}/gtk-gthread.h-include.patch + runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ --prefix=/usr --docdir=/usr/share/doc/haskell-gtk \ --libsubdir=\$compiler/site-local/\$pkgid @@ -31,8 +39,8 @@ build() { } package() { - _ghcver=`pacman -Q ghc | cut -f2 -d\ | cut -f1 -d-` - depends=("ghc=${_ghcver}" 'gtk2' "haskell-pango=$pkgver" 'haskell-mtl=2.0.1.0') + #_ghcver=`pacman -Q ghc | cut -f2 -d\ | cut -f1 -d-` + #depends=("ghc=${_ghcver}" 'gtk2' "haskell-pango=$pkgver" 'haskell-mtl=2.0.1.0') cd ${srcdir}/gtk-${pkgver} install -D -m744 register.sh ${pkgdir}/usr/share/haskell/gtk2hs-gtk/register.sh diff --git a/community/haskell-gtk/gtk-gthread.h-include.patch b/community/haskell-gtk/gtk-gthread.h-include.patch new file mode 100644 index 000000000..fc600d6be --- /dev/null +++ b/community/haskell-gtk/gtk-gthread.h-include.patch @@ -0,0 +1,15 @@ +diff -u gtk-0.12.2/Graphics/UI/Gtk/General/hsgthread.c\~ gtk-0.12.2/Graphics/UI/Gtk/General/hsgthread.c +--- gtk-0.12.2/Graphics/UI/Gtk/General/hsgthread.c~ 2011-11-14 07:15:41.000000000 +0900 ++++ gtk-0.12.2/Graphics/UI/Gtk/General/hsgthread.c 2012-01-08 14:58:45.849209318 +0900 +@@ -26,7 +26,8 @@ + */ + + #include <glib.h> +-#include <glib/gthread.h> ++/* f17 gives Error "Only <glib.h> can be included directly." ++ #include <glib/gthread.h> */ + #include <gdk/gdk.h> + #include "hsgthread.h" + + +Diff finished. Sun Jan 8 14:58:54 2012 |