From 29c4d88cb6f67caf6164909e0fe2185d46fc5093 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20Reynolds?= Date: Sun, 20 Jul 2014 04:21:08 +0000 Subject: Sun Jul 20 04:10:18 UTC 2014 --- community/alex/PKGBUILD | 6 +- community/exfat-utils/PKGBUILD | 12 ++-- community/fio/PKGBUILD | 6 +- community/fuse-exfat/PKGBUILD | 12 ++-- community/gtk2hs-buildtools/PKGBUILD | 6 +- community/haddock/PKGBUILD | 8 +-- community/happy/PKGBUILD | 6 +- community/haskell-bytestring-show/PKGBUILD | 4 +- community/haskell-cairo/PKGBUILD | 18 ++++-- community/haskell-data-default-class/PKGBUILD | 4 +- .../haskell-data-default-instances-base/PKGBUILD | 4 +- .../PKGBUILD | 4 +- .../haskell-data-default-instances-dlist/PKGBUILD | 4 +- .../PKGBUILD | 4 +- community/haskell-data-default/PKGBUILD | 4 +- .../0001-update-build-deps-for-ghc-7.8.2.patch | 2 +- community/haskell-dataenc/PKGBUILD | 8 +-- community/haskell-dlist/PKGBUILD | 7 +-- community/haskell-extensible-exceptions/PKGBUILD | 6 +- community/haskell-ghc-paths/PKGBUILD | 6 +- community/haskell-glib/PKGBUILD | 16 +++-- community/haskell-gtk/PKGBUILD | 19 ++++-- community/haskell-hashable/PKGBUILD | 6 +- community/haskell-hashtables/PKGBUILD | 4 +- community/haskell-hslogger/PKGBUILD | 4 +- community/haskell-mtl/PKGBUILD | 4 +- community/haskell-network/PKGBUILD | 4 +- community/haskell-pango/PKGBUILD | 20 +++++-- community/haskell-parsec/PKGBUILD | 4 +- community/haskell-primitive/PKGBUILD | 6 +- community/haskell-quickcheck/PKGBUILD | 4 +- community/haskell-random/PKGBUILD | 4 +- community/haskell-regex-base/PKGBUILD | 6 +- community/haskell-regex-compat/PKGBUILD | 4 +- community/haskell-regex-posix/PKGBUILD | 4 +- community/haskell-stm/PKGBUILD | 4 +- community/haskell-text/PKGBUILD | 8 +-- community/haskell-tf-random/PKGBUILD | 4 +- community/haskell-utf8-string/PKGBUILD | 6 +- community/haskell-vector/PKGBUILD | 6 +- community/haskell-x11-xft/PKGBUILD | 6 +- community/haskell-x11/PKGBUILD | 10 ++-- community/hedgewars/PKGBUILD | 17 +++--- community/nodejs/PKGBUILD | 32 ++++++++-- community/xmobar/PKGBUILD | 8 +-- community/xmonad-contrib/PKGBUILD | 6 +- community/xmonad/PKGBUILD | 6 +- extra/cabal-install/PKGBUILD | 2 +- extra/ghc/PKGBUILD | 69 ++++++++++++---------- extra/ghc/print-provides-replaces.sh | 5 -- 50 files changed, 243 insertions(+), 186 deletions(-) diff --git a/community/alex/PKGBUILD b/community/alex/PKGBUILD index befe89d13..e316ce956 100644 --- a/community/alex/PKGBUILD +++ b/community/alex/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 110605 2014-05-04 13:54:45Z td123 $ +# $Id: PKGBUILD 115962 2014-07-19 16:04:46Z td123 $ # Maintainer: Alexander Rødseth # Contributor: Sergej Pupykin # Contributor: Vesa Kaihlavirta @@ -6,13 +6,13 @@ pkgname=alex pkgver=3.1.3 -pkgrel=2 +pkgrel=3 pkgdesc='Lexical analyser generator for Haskell' arch=('x86_64' 'i686') url='http://hackage.haskell.org/package/alex' license=('custom:BSD3') depends=('gmp' 'libffi') -makedepends=('ghc=7.8.2' 'haskell-quickcheck' 'happy' 'libffi') +makedepends=('ghc=7.8.3' 'haskell-quickcheck' 'happy' 'libffi') source=("http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz") sha256sums=('8d41a6e72a016155f00c846f7146ab4b27fe9640668a4b592d6a9b856f970a92') diff --git a/community/exfat-utils/PKGBUILD b/community/exfat-utils/PKGBUILD index 620f0dce3..e44d3c8e7 100644 --- a/community/exfat-utils/PKGBUILD +++ b/community/exfat-utils/PKGBUILD @@ -1,23 +1,23 @@ -# $Id: PKGBUILD 114951 2014-07-05 02:24:49Z fyan $ +# $Id: PKGBUILD 115957 2014-07-19 13:06:22Z giovanni $ # Maintainer: Giovanni Scafora # Contributor: Alex pkgname=exfat-utils -pkgver=1.0.1 -pkgrel=2 +pkgver=1.1.0 +pkgrel=1 pkgdesc="Utilities for exFAT file system" arch=('i686' 'x86_64') url="http://code.google.com/p/exfat/" license=('GPL3') depends=('glibc') makedepends=('scons') -source=("http://exfat.googlecode.com/files/${pkgname}-${pkgver}.tar.gz") -md5sums=('e592130829d0bf61fa5e3cd1c759d329') +source=("http://pkgbuild.com/~giovanni/exfat/${pkgname}-${pkgver}.tar.gz") +md5sums=('bb592bd31dc49cca5831bad53756bd84') package() { cd "${srcdir}/${pkgname}-${pkgver}" - scons CCFLAGS="${CFLAGS}" LINKFLAGS="${LDFLAGS} " install DESTDIR="${pkgdir}/usr/bin" + scons CCFLAGS="${CFLAGS} -std=c99" LINKFLAGS="${LDFLAGS} " install DESTDIR="${pkgdir}/usr/bin" # Install man pages install -Dm444 dump/dumpexfat.8 "${pkgdir}/usr/share/man/man8/dumpexfat.8" diff --git a/community/fio/PKGBUILD b/community/fio/PKGBUILD index 799ba9f92..3a634a2db 100644 --- a/community/fio/PKGBUILD +++ b/community/fio/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 112995 2014-06-11 06:35:27Z anatolik $ +# $Id: PKGBUILD 115945 2014-07-19 00:55:27Z anatolik $ # Maintainer: Anatol Pomozov # Contributor: Mariusz Libera # Contributor: John Williams pkgname=fio -pkgver=2.1.10 +pkgver=2.1.11 pkgrel=1 pkgdesc='Scriptable I/O tool for storage benchmarks and drive testing' arch=(i686 x86_64) @@ -17,7 +17,7 @@ optdepends=( 'gnuplot: generating plots using fio_generate_plots' ) source=(http://brick.kernel.dk/snaps/fio-$pkgver.tar.bz2) -sha256sums=('4dd98cfe7da343b82ce351dd2a12f9ea456f9a54efc80a380786956a68c4edfc') +sha256sums=('aba2d8bac1997277cb9bb5a0abab345248298d4c0c712d484c3d2fab0674dbb1') prepare() { cd fio-$pkgver diff --git a/community/fuse-exfat/PKGBUILD b/community/fuse-exfat/PKGBUILD index ec0f1334f..9a0dc5b7a 100644 --- a/community/fuse-exfat/PKGBUILD +++ b/community/fuse-exfat/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 114953 2014-07-05 02:25:24Z fyan $ +# $Id: PKGBUILD 115959 2014-07-19 13:14:14Z giovanni $ # Maintainer: Giovanni Scafora # Contributor: GaoShichao pkgname=fuse-exfat -pkgver=1.0.1 -pkgrel=2 +pkgver=1.1.0 +pkgrel=1 pkgdesc="Free exFAT file system implementation" arch=('i686' 'x86_64') url="http://code.google.com/p/exfat/" @@ -13,13 +13,13 @@ depends=('fuse') makedepends=('scons') optdepends=('exfat-utils: utilities for exFAT file system' 'util-linux: to mount exFAT volumes automatically') -source=("http://exfat.googlecode.com/files/${pkgname}-${pkgver}.tar.gz") -md5sums=('7988a5111841593231f20af22153362d') +source=("http://pkgbuild.com/~giovanni/exfat/${pkgname}-${pkgver}.tar.gz") +md5sums=('b2a23c032661cb1c1da4514e7af33916') package() { cd "${srcdir}/${pkgname}-${pkgver}" - scons CCFLAGS="${CFLAGS}" LINKFLAGS="${LDFLAGS} " install DESTDIR="${pkgdir}/usr/bin" + scons CCFLAGS="${CFLAGS} -std=c99" LINKFLAGS="${LDFLAGS} " install DESTDIR="${pkgdir}/usr/bin" # Install man page install -Dm444 fuse/mount.exfat-fuse.8 "${pkgdir}/usr/share/man/man8/mount.exfat-fuse.8" diff --git a/community/gtk2hs-buildtools/PKGBUILD b/community/gtk2hs-buildtools/PKGBUILD index 132968c78..8bfbd34c6 100644 --- a/community/gtk2hs-buildtools/PKGBUILD +++ b/community/gtk2hs-buildtools/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 110606 2014-05-04 13:54:46Z td123 $ +# $Id: PKGBUILD 115963 2014-07-19 16:04:47Z td123 $ # Maintainer: Sergej Pupykin pkgname=gtk2hs-buildtools pkgver=0.12.5.2 -pkgrel=2 +pkgrel=3 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') options=('staticlibs') -makedepends=('ghc=7.8.2-2' 'alex' 'happy' 'haskell-random' 'haskell-hashtables') +makedepends=('ghc' 'alex' 'happy' 'haskell-random' 'haskell-hashtables') depends=('gmp') provides=('haskell-gtk2hs-buildtools') source=("http://hackage.haskell.org/packages/archive/gtk2hs-buildtools/$pkgver/gtk2hs-buildtools-$pkgver.tar.gz") diff --git a/community/haddock/PKGBUILD b/community/haddock/PKGBUILD index e8ad82a65..b897d77b6 100644 --- a/community/haddock/PKGBUILD +++ b/community/haddock/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 110607 2014-05-04 13:54:47Z td123 $ +# $Id: PKGBUILD 115964 2014-07-19 16:04:48Z td123 $ # Maintainer: Alexander Rødseth # Contributor: Vesa Kaihlavirta # Contributor: Arch Haskell Team pkgname=haddock -pkgver=2.14.2 +pkgver=2.14.3 pkgrel=1 pkgdesc='Tool for generating documentation for Haskell libraries' url='http://hackage.haskell.org/package/haddock/' license=('custom:BSD3') arch=('x86_64' 'i686') makedepends=('alex' 'happy') -depends=('ghc' 'haskell-xhtml' 'haskell-ghc-paths') +depends=('ghc=7.8.3-2' 'haskell-ghc-paths') install="$pkgname.install" source=("http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz") -sha256sums=('33df230cd8baeed87caa31fc13257a921778b6b700c78bd9237024e08d942641') +sha256sums=('d454f64ed0ea79ec9a94d4d79c8635be74d752d028b737dbe3b5deb9749e310c') options=('staticlibs') build() { diff --git a/community/happy/PKGBUILD b/community/happy/PKGBUILD index 734c48086..7fc5c214c 100644 --- a/community/happy/PKGBUILD +++ b/community/happy/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 110608 2014-05-04 13:54:48Z td123 $ +# $Id: PKGBUILD 115965 2014-07-19 16:04:49Z td123 $ # Maintainer: Thomas Dziedzic # Contributor: simo # Contributor: Vesa Kaihlavirta pkgname=happy pkgver=1.19.3 -pkgrel=2 +pkgrel=3 pkgdesc="The Parser Generator for Haskell" url="http://hackage.haskell.org/package/happy" arch=('i686' 'x86_64') license=("custom:BSD3") depends=('gmp') -makedepends=('ghc=7.8.2-2' 'haskell-mtl=2.1.3.1-2') +makedepends=('ghc=7.8.3-1' 'haskell-mtl=2.1.3.1-3') source=("http://hackage.haskell.org/packages/archive/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz") md5sums=('fb9f4aec9d9e3b92be95a8abc43704b4') diff --git a/community/haskell-bytestring-show/PKGBUILD b/community/haskell-bytestring-show/PKGBUILD index 1ef6b78a2..74dc54cef 100644 --- a/community/haskell-bytestring-show/PKGBUILD +++ b/community/haskell-bytestring-show/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 110609 2014-05-04 13:54:49Z td123 $ +# $Id: PKGBUILD 115966 2014-07-19 16:04:50Z td123 $ # Maintainer: Sergej Pupykin pkgname=haskell-bytestring-show pkgver=0.3.5.6 -pkgrel=1 +pkgrel=2 pkgdesc="Efficient conversion of values into readable byte strings." url="http://hackage.haskell.org/package/bytestring-show" license=("BSD3") diff --git a/community/haskell-cairo/PKGBUILD b/community/haskell-cairo/PKGBUILD index 70a16fb52..694b15389 100644 --- a/community/haskell-cairo/PKGBUILD +++ b/community/haskell-cairo/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 110610 2014-05-04 13:54:50Z td123 $ +# $Id: PKGBUILD 115967 2014-07-19 16:04:51Z td123 $ # Maintainer: Sergej Pupykin pkgname=haskell-cairo pkgver=0.12.5.3 -pkgrel=2 +pkgrel=3 pkgdesc="Binding to the cairo library for Gtk2Hs." url="http://hackage.haskell.org/package/cairo" license=('LGPL2.1') @@ -31,10 +31,18 @@ build() { sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh } +_update_deps() { + _ver=`pacman -Q $1 | cut -f2 -d\ | cut -f1 -d-` + for i in `seq 0 $(expr ${#depends[@]} - 1)`; do + if [ ${depends[$i]} == $1 ]; then + depends[$i]="$1=${_ver}" + fi + done +} + package() { - _ghcver=`pacman -Q ghc | cut -f2 -d\ | cut -f1 -d-` - _hmtlver=`pacman -Q haskell-mtl | cut -f2 -d\ | cut -f1 -d-` - depends=("ghc=${_ghcver}" "cairo" "haskell-mtl=${_hmtlver}" 'haskell-utf8-string') + _update_deps ghc + _update_deps haskell-mtl cd ${srcdir}/cairo-${pkgver} install -D -m744 register.sh ${pkgdir}/usr/share/haskell/gtk2hs-cairo/register.sh diff --git a/community/haskell-data-default-class/PKGBUILD b/community/haskell-data-default-class/PKGBUILD index 1f1362233..1453a8d65 100644 --- a/community/haskell-data-default-class/PKGBUILD +++ b/community/haskell-data-default-class/PKGBUILD @@ -2,13 +2,13 @@ _hkgname=data-default-class pkgname=haskell-data-default-class pkgver=0.0.1 -pkgrel=3 +pkgrel=4 pkgdesc="A class for types with a default value" url="http://hackage.haskell.org/package/${_hkgname}" license=('custom:BSD3') arch=('i686' 'x86_64') makedepends=() -depends=('ghc=7.8.2-2') +depends=('ghc=7.8.3-1') options=('strip') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) install=${pkgname}.install diff --git a/community/haskell-data-default-instances-base/PKGBUILD b/community/haskell-data-default-instances-base/PKGBUILD index 163b42e00..c9378e536 100644 --- a/community/haskell-data-default-instances-base/PKGBUILD +++ b/community/haskell-data-default-instances-base/PKGBUILD @@ -2,13 +2,13 @@ _hkgname=data-default-instances-base pkgname=haskell-data-default-instances-base pkgver=0.0.1 -pkgrel=5 +pkgrel=6 pkgdesc="Default instances for types in base" url="http://hackage.haskell.org/package/${_hkgname}" license=('custom:BSD3') arch=('i686' 'x86_64') makedepends=() -depends=('ghc=7.8.2' 'haskell-data-default-class') +depends=('ghc=7.8.3' 'haskell-data-default-class') options=('strip') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) install=${pkgname}.install diff --git a/community/haskell-data-default-instances-containers/PKGBUILD b/community/haskell-data-default-instances-containers/PKGBUILD index 979d10e67..62aecb244 100644 --- a/community/haskell-data-default-instances-containers/PKGBUILD +++ b/community/haskell-data-default-instances-containers/PKGBUILD @@ -2,13 +2,13 @@ _hkgname=data-default-instances-containers pkgname=haskell-data-default-instances-containers pkgver=0.0.1 -pkgrel=3 +pkgrel=4 pkgdesc="Default instances for types in containers" url="http://hackage.haskell.org/package/${_hkgname}" license=('custom:BSD3') arch=('i686' 'x86_64') makedepends=() -depends=('ghc=7.8.2' 'haskell-containers=0.5.5.1' 'haskell-data-default-class=0.0.1') +depends=('ghc=7.8.3' 'haskell-containers=0.5.5.1' 'haskell-data-default-class=0.0.1') options=('strip') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) install=${pkgname}.install diff --git a/community/haskell-data-default-instances-dlist/PKGBUILD b/community/haskell-data-default-instances-dlist/PKGBUILD index 03973e23c..ee61ec01e 100644 --- a/community/haskell-data-default-instances-dlist/PKGBUILD +++ b/community/haskell-data-default-instances-dlist/PKGBUILD @@ -2,13 +2,13 @@ _hkgname=data-default-instances-dlist pkgname=haskell-data-default-instances-dlist pkgver=0.0.1 -pkgrel=4 +pkgrel=5 pkgdesc="Default instances for types in dlist" url="http://hackage.haskell.org/package/${_hkgname}" license=('custom:BSD3') arch=('i686' 'x86_64') makedepends=() -depends=('ghc=7.8.2' 'haskell-data-default-class=0.0.1' 'haskell-dlist=0.5-26') +depends=('ghc=7.8.3' 'haskell-data-default-class=0.0.1' 'haskell-dlist=0.5-27') options=('strip') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) install=${pkgname}.install diff --git a/community/haskell-data-default-instances-old-locale/PKGBUILD b/community/haskell-data-default-instances-old-locale/PKGBUILD index 6950f27ec..d94dbd1a7 100644 --- a/community/haskell-data-default-instances-old-locale/PKGBUILD +++ b/community/haskell-data-default-instances-old-locale/PKGBUILD @@ -2,13 +2,13 @@ _hkgname=data-default-instances-old-locale pkgname=haskell-data-default-instances-old-locale pkgver=0.0.1 -pkgrel=3 +pkgrel=4 pkgdesc="Default instances for types in old-locale" url="http://hackage.haskell.org/package/${_hkgname}" license=('custom:BSD3') arch=('i686' 'x86_64') makedepends=() -depends=('ghc=7.8.2' 'haskell-data-default-class' 'haskell-old-locale=1.0.0.6') +depends=('ghc=7.8.3' 'haskell-data-default-class' 'haskell-old-locale=1.0.0.6') options=('strip') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) install=${pkgname}.install diff --git a/community/haskell-data-default/PKGBUILD b/community/haskell-data-default/PKGBUILD index e334b5d33..1304511e4 100644 --- a/community/haskell-data-default/PKGBUILD +++ b/community/haskell-data-default/PKGBUILD @@ -2,13 +2,13 @@ _hkgname=data-default pkgname=haskell-data-default pkgver=0.5.3 -pkgrel=3 +pkgrel=4 pkgdesc="A class for types with a default value" url="http://hackage.haskell.org/package/${_hkgname}" license=('custom:BSD3') arch=('i686' 'x86_64') makedepends=() -depends=('ghc=7.8.2' 'haskell-data-default-class' 'haskell-data-default-instances-base' 'haskell-data-default-instances-containers' 'haskell-data-default-instances-dlist' 'haskell-data-default-instances-old-locale') +depends=('ghc=7.8.3' 'haskell-data-default-class' 'haskell-data-default-instances-base' 'haskell-data-default-instances-containers' 'haskell-data-default-instances-dlist' 'haskell-data-default-instances-old-locale') options=('strip') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) install=${pkgname}.install diff --git a/community/haskell-dataenc/0001-update-build-deps-for-ghc-7.8.2.patch b/community/haskell-dataenc/0001-update-build-deps-for-ghc-7.8.2.patch index 23bcc21ae..1f03e3e15 100644 --- a/community/haskell-dataenc/0001-update-build-deps-for-ghc-7.8.2.patch +++ b/community/haskell-dataenc/0001-update-build-deps-for-ghc-7.8.2.patch @@ -6,7 +6,7 @@ diff -aur dataenc-0.14.0.5/dataenc.cabal dataenc-0.14.0.5-new/dataenc.cabal library hs-source-dirs: src - build-depends: array >= 0.1.0 && < 0.5, base >= 3.0.0 && < 4.7, containers >= 0.1.0 && < 0.6 -+ build-depends: array >= 0.1.0 && <= 0.5.0.0, base >= 3.0.0 && <= 4.7.0.0, containers >= 0.1.0 && < 0.6 ++ build-depends: array >= 0.1.0 && <= 0.5.0.0, base >= 3.0.0 && <= 4.7.0.1, containers >= 0.1.0 && < 0.6 exposed-modules: Codec.Binary.Base16 Codec.Binary.Base32 diff --git a/community/haskell-dataenc/PKGBUILD b/community/haskell-dataenc/PKGBUILD index d00ad725a..de6e2b08e 100644 --- a/community/haskell-dataenc/PKGBUILD +++ b/community/haskell-dataenc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 110617 2014-05-04 13:54:56Z td123 $ +# $Id: PKGBUILD 115974 2014-07-19 16:05:00Z td123 $ # Maintainer: Vesa Kaihlavirta # Contributor: Arch Haskell Team # Package generated by cabal2arch 0.7.5 @@ -6,18 +6,18 @@ _hkgname=dataenc pkgname=haskell-dataenc pkgver=0.14.0.5 -pkgrel=3 +pkgrel=4 pkgdesc="Data encoding library" url="http://hackage.haskell.org/package/dataenc" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=('ghc=7.8.2-2' sh) +depends=('ghc=7.8.3' 'sh') install=${pkgname}.install options=('staticlibs') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz '0001-update-build-deps-for-ghc-7.8.2.patch') md5sums=('4da812ca7a1640a5fdcc676009ab160c' - '9fead0d2676158c60290d85ca7899718') + 'f951ffad1cc32bec019003a5364a963b') prepare() { cd ${srcdir}/${_hkgname}-${pkgver} diff --git a/community/haskell-dlist/PKGBUILD b/community/haskell-dlist/PKGBUILD index 32211ab6e..1fbb858c1 100644 --- a/community/haskell-dlist/PKGBUILD +++ b/community/haskell-dlist/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 110618 2014-05-04 13:54:57Z td123 $ +# $Id: PKGBUILD 115975 2014-07-19 16:05:01Z td123 $ # Maintainer: Daniel Wallace # Contributor: Don Stewart # Contributor: Lex Black @@ -7,13 +7,12 @@ pkgname=haskell-dlist pkgver=0.5 _hkgname=dlist _licensefile=LICENSE -pkgrel=26 +pkgrel=27 pkgdesc="Differences lists" url="http://code.haskell.org/~dons/code/dlist/" license=("BSD3") arch=('i686' 'x86_64') -makedepends=('ghc=7.8.2-2') -depends=('ghc=7.8.2-2') +depends=('ghc=7.8.3-1') options=('strip') source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz") sha256sums=('4780e5409eff55bbfdd7470ef802a087a04048c9cd5efe0482c82878292f19ea') diff --git a/community/haskell-extensible-exceptions/PKGBUILD b/community/haskell-extensible-exceptions/PKGBUILD index 873fb06ad..86832f335 100644 --- a/community/haskell-extensible-exceptions/PKGBUILD +++ b/community/haskell-extensible-exceptions/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 110619 2014-05-04 13:54:58Z td123 $ +# $Id: PKGBUILD 115976 2014-07-19 16:05:02Z td123 $ # Maintainer: Jelle van der Waa _hkgname=extensible-exceptions pkgname=haskell-${_hkgname} pkgver=0.1.1.4 -pkgrel=6 +pkgrel=7 pkgdesc="extensible exceptions for both new and old versions of GHC" url="http://hackage.haskell.org/package/extensible-exceptions" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=('ghc=7.8.2' sh) +depends=('ghc=7.8.3-1' 'sh') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) install=$pkgname.install options=('staticlibs') diff --git a/community/haskell-ghc-paths/PKGBUILD b/community/haskell-ghc-paths/PKGBUILD index f6d483a8c..700c1ce5f 100644 --- a/community/haskell-ghc-paths/PKGBUILD +++ b/community/haskell-ghc-paths/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 110620 2014-05-04 13:54:59Z td123 $ +# $Id: PKGBUILD 115977 2014-07-19 16:05:03Z td123 $ # Maintainer: Alexander Rødseth # Contributor: Arch Haskell Team pkgname=haskell-ghc-paths pkgver=0.1.0.9 -pkgrel=5 +pkgrel=6 pkgdesc="Knowledge of GHC's installation directories" url='http://hackage.haskell.org/package/ghc-paths' license=('custom:BSD3') arch=('x86_64' 'i686') -depends=('ghc=7.8.2') +depends=('ghc=7.8.3-1') source=("http://hackage.haskell.org/packages/archive/ghc-paths/$pkgver/ghc-paths-$pkgver.tar.gz") install="$pkgname.install" options=('staticlibs') diff --git a/community/haskell-glib/PKGBUILD b/community/haskell-glib/PKGBUILD index 4861e4134..dbc105339 100644 --- a/community/haskell-glib/PKGBUILD +++ b/community/haskell-glib/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 110621 2014-05-04 13:55:00Z td123 $ +# $Id: PKGBUILD 115978 2014-07-19 16:05:05Z td123 $ # Maintainer: Sergej Pupykin pkgname=haskell-glib pkgver=0.12.5.4 -pkgrel=1 +pkgrel=2 pkgdesc="Binding to the GLIB library for Gtk2Hs." url="http://hackage.haskell.org/package/glib" license=('LGPL2.1') @@ -31,9 +31,17 @@ build() { sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh } +_update_deps() { + _ver=`pacman -Q $1 | cut -f2 -d\ | cut -f1 -d-` + for i in `seq 0 $(expr ${#depends[@]} - 1)`; do + if [ ${depends[$i]} == $1 ]; then + depends[$i]="$1=${_ver}" + fi + done +} + package() { - _ghcver=`pacman -Q ghc | cut -f2 -d\ | cut -f1 -d-` - depends=("ghc=${_ghcver}" "glib2" 'haskell-utf8-string') + _update_deps ghc cd ${srcdir}/glib-${pkgver} install -D -m744 register.sh ${pkgdir}/usr/share/haskell/gtk2hs-glib/register.sh diff --git a/community/haskell-gtk/PKGBUILD b/community/haskell-gtk/PKGBUILD index b0dd2cf5d..3e8988bd4 100644 --- a/community/haskell-gtk/PKGBUILD +++ b/community/haskell-gtk/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 110622 2014-05-04 13:55:01Z td123 $ +# $Id: PKGBUILD 115979 2014-07-19 16:05:06Z td123 $ # Maintainer: Sergej Pupykin pkgname=haskell-gtk pkgver=0.12.5.7 -pkgrel=1 +pkgrel=2 pkgdesc="Binding to the gtk library for Gtk2Hs." url="http://hackage.haskell.org/package/gtk" license=('LGPL2.1') @@ -30,10 +30,19 @@ build() { sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh } +_update_deps() { + _ver=`pacman -Q $1 | cut -f2 -d\ | cut -f1 -d-` + for i in `seq 0 $(expr ${#depends[@]} - 1)`; do + if [ ${depends[$i]} == $1 ]; then + depends[$i]="$1=${_ver}" + fi + done +} + package() { - _hmtlver=`pacman -Q haskell-mtl | cut -f2 -d\ | cut -f1 -d-` - _hpangover=`pacman -Q haskell-pango | cut -f2 -d\ | cut -f1 -d-` - depends=("ghc" "gtk2" "haskell-pango=${_hpangover}" "haskell-mtl=${_hmtlver}") + _update_deps ghc + _update_deps haskell-mtl + _update_deps haskell-pango cd ${srcdir}/gtk-${pkgver} install -D -m744 register.sh ${pkgdir}/usr/share/haskell/gtk2hs-gtk/register.sh diff --git a/community/haskell-hashable/PKGBUILD b/community/haskell-hashable/PKGBUILD index 2c54d01f3..93dd8c288 100644 --- a/community/haskell-hashable/PKGBUILD +++ b/community/haskell-hashable/PKGBUILD @@ -1,16 +1,16 @@ _hkgname=hashable pkgname=haskell-hashable -pkgver=1.2.1.0 +pkgver=1.2.2.0 pkgrel=1 pkgdesc="Mutable hash tables in the ST monad" url="http://hackage.haskell.org/package/${_hkgname}" license=('custom:BSD3') arch=('i686' 'x86_64') options=('staticlibs') -depends=('ghc=7.8.2-2' 'sh' 'haskell-text') +depends=('ghc=7.8.3' 'sh' 'haskell-text') source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz") install=${pkgname}.install -md5sums=('74f7cadb836e63f4d4b1a24be401228d') +md5sums=('74981d48572ef7a97fd70df54be29aae') build() { cd ${_hkgname}-${pkgver} diff --git a/community/haskell-hashtables/PKGBUILD b/community/haskell-hashtables/PKGBUILD index 255501137..1a13ae577 100644 --- a/community/haskell-hashtables/PKGBUILD +++ b/community/haskell-hashtables/PKGBUILD @@ -1,13 +1,13 @@ _hkgname=hashtables pkgname=haskell-hashtables pkgver=1.1.2.1 -pkgrel=1 +pkgrel=2 pkgdesc="Mutable hash tables in the ST monad" url="http://hackage.haskell.org/package/${_hkgname}" license=('custom:BSD3') arch=('i686' 'x86_64') options=('staticlibs') -depends=('ghc=7.8.2-2' 'sh' 'haskell-hashable' 'haskell-primitive' 'haskell-vector') +depends=('ghc=7.8.3' 'sh' 'haskell-hashable' 'haskell-primitive' 'haskell-vector') source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz") install=${pkgname}.install md5sums=('e8880201938b78ba26ef33370912aeff') diff --git a/community/haskell-hslogger/PKGBUILD b/community/haskell-hslogger/PKGBUILD index 310d1dd54..e17906def 100644 --- a/community/haskell-hslogger/PKGBUILD +++ b/community/haskell-hslogger/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 110624 2014-05-04 13:55:03Z td123 $ +# $Id: PKGBUILD 115982 2014-07-19 16:05:11Z td123 $ # Maintainer: Sergej Pupykin # Maintainer: Arch Haskell Team pkgname=haskell-hslogger pkgver=1.2.3 -pkgrel=2 +pkgrel=3 pkgdesc="Versatile logging framework" url="http://hackage.haskell.org/package/hslogger" license=('LGPL') diff --git a/community/haskell-mtl/PKGBUILD b/community/haskell-mtl/PKGBUILD index fb3c0f4d0..3dc028d5f 100644 --- a/community/haskell-mtl/PKGBUILD +++ b/community/haskell-mtl/PKGBUILD @@ -3,13 +3,13 @@ _hkgname=mtl pkgname=haskell-mtl pkgver=2.1.3.1 -pkgrel=2 +pkgrel=3 pkgdesc="Monad classes, using functional dependencies" url="http://hackage.haskell.org/package/${_hkgname}" license=('custom:BSD3') arch=('i686' 'x86_64') options=('staticlibs') -depends=('ghc=7.8.2-2' 'sh') +depends=('ghc=7.8.3-1' 'sh') source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz") install=${pkgname}.install md5sums=('8f3927677bf3e0efb6fcce08b1be2eac') diff --git a/community/haskell-network/PKGBUILD b/community/haskell-network/PKGBUILD index 76cd99463..75b1fb074 100644 --- a/community/haskell-network/PKGBUILD +++ b/community/haskell-network/PKGBUILD @@ -3,13 +3,13 @@ _hkgname=network pkgname=haskell-network pkgver=2.5.0.0 -pkgrel=1 +pkgrel=2 pkgdesc="Low-level networking interface" url="http://hackage.haskell.org/package/${_hkgname}" license=('custom:BSD3') arch=('i686' 'x86_64') options=('staticlibs') -depends=('ghc=7.8.2-2' 'sh' 'haskell-parsec=3.1.5-2') +depends=('ghc=7.8.3-1' 'sh' 'haskell-parsec=3.1.5-3') source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz") install=${pkgname}.install md5sums=('ce4a584d3c04905b88275a156273dac6') diff --git a/community/haskell-pango/PKGBUILD b/community/haskell-pango/PKGBUILD index f5a94b19a..a968b112a 100644 --- a/community/haskell-pango/PKGBUILD +++ b/community/haskell-pango/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 110626 2014-05-04 13:55:04Z td123 $ +# $Id: PKGBUILD 115985 2014-07-19 16:05:15Z td123 $ # Maintainer: Sergej Pupykin pkgname=haskell-pango pkgver=0.12.5.3 -pkgrel=2 +pkgrel=3 pkgdesc="Binding to the pango library for Gtk2Hs." url="http://hackage.haskell.org/package/pango" license=('LGPL2.1') @@ -32,11 +32,19 @@ build() { sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh } +_update_deps() { + _ver=`pacman -Q $1 | cut -f2 -d\ | cut -f1 -d-` + for i in `seq 0 $(expr ${#depends[@]} - 1)`; do + if [ ${depends[$i]} == $1 ]; then + depends[$i]="$1=${_ver}" + fi + done +} + package() { - _ghcver=`pacman -Q ghc | cut -f2 -d\ | cut -f1 -d-` - _hglibver=`pacman -Q haskell-glib | cut -f2 -d\ | cut -f1 -d-` - _hcairover=`pacman -Q haskell-cairo | cut -f2 -d\ | cut -f1 -d-` - depends=("ghc=${_ghcver}" "pango" "haskell-glib=${_hglibver}" "haskell-cairo=${_hcairover}") + _update_deps ghc + _update_deps haskell-glib + _update_deps haskell-cairo cd ${srcdir}/pango-${pkgver} install -D -m744 register.sh ${pkgdir}/usr/share/haskell/gtk2hs-pango/register.sh diff --git a/community/haskell-parsec/PKGBUILD b/community/haskell-parsec/PKGBUILD index c8556e11e..a9ee9946b 100644 --- a/community/haskell-parsec/PKGBUILD +++ b/community/haskell-parsec/PKGBUILD @@ -3,13 +3,13 @@ _hkgname=parsec pkgname=haskell-parsec pkgver=3.1.5 -pkgrel=2 +pkgrel=3 pkgdesc="Monadic parser combinators" url="http://hackage.haskell.org/package/${_hkgname}" license=('custom:BSD3') arch=('i686' 'x86_64') options=('staticlibs') -depends=('ghc=7.8.2-2' 'sh' 'haskell-mtl=2.1.3.1-2' 'haskell-text=1.1.0.1-2') +depends=('ghc=7.8.3-1' 'sh' 'haskell-mtl=2.1.3.1-3' 'haskell-text=1.1.1.3-1') source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz") install=${pkgname}.install md5sums=('00e822decff17a034a68c462d2a3e099') diff --git a/community/haskell-primitive/PKGBUILD b/community/haskell-primitive/PKGBUILD index 229c15578..0909ce1ca 100644 --- a/community/haskell-primitive/PKGBUILD +++ b/community/haskell-primitive/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 110627 2014-05-04 13:55:05Z td123 $ +# $Id: PKGBUILD 115987 2014-07-19 16:05:17Z td123 $ # Maintainer: Sergej Pupykin pkgname=haskell-primitive pkgver=0.5.2.1 -pkgrel=4 +pkgrel=5 pkgdesc="Wrappers for primitive operations" url="http://hackage.haskell.org/package/primitive" license=("custom:BSD3") arch=('i686' 'x86_64') makedepends=() -depends=("ghc") +depends=("ghc=7.8.3-1") options=('strip' 'staticlibs') install="${pkgname}.install" source=("http://hackage.haskell.org/packages/archive/primitive/${pkgver}/primitive-${pkgver}.tar.gz") diff --git a/community/haskell-quickcheck/PKGBUILD b/community/haskell-quickcheck/PKGBUILD index dc634aae5..9e7bf0110 100644 --- a/community/haskell-quickcheck/PKGBUILD +++ b/community/haskell-quickcheck/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 110628 2014-05-04 13:55:06Z td123 $ +# $Id: PKGBUILD 115988 2014-07-19 16:05:19Z td123 $ # Maintainer: Alexander Rødseth # Contributor: Vesa Kaihlavirta # Contributor: Arch Haskell Team @@ -6,7 +6,7 @@ _hkgname=QuickCheck pkgname=haskell-quickcheck pkgver=2.7.3 -pkgrel=2 +pkgrel=3 pkgdesc='Automatic testing of Haskell programs' url='http://hackage.haskell.org/package/QuickCheck' license=('custom:BSD3') diff --git a/community/haskell-random/PKGBUILD b/community/haskell-random/PKGBUILD index ca36486f4..a7fef4db3 100644 --- a/community/haskell-random/PKGBUILD +++ b/community/haskell-random/PKGBUILD @@ -3,13 +3,13 @@ _hkgname=random pkgname=haskell-random pkgver=1.0.1.1 -pkgrel=7 +pkgrel=8 pkgdesc="random number library" url="http://hackage.haskell.org/package/${_hkgname}" license=('custom:BSD3') arch=('i686' 'x86_64') options=('staticlibs') -depends=('ghc=7.8.2-2' 'sh') +depends=('ghc=7.8.3-1' 'sh') source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz") install=${pkgname}.install md5sums=('9a249cfa7ff6793cbf2be06e9fcd7538') diff --git a/community/haskell-regex-base/PKGBUILD b/community/haskell-regex-base/PKGBUILD index 2f1910042..a0f603dd4 100644 --- a/community/haskell-regex-base/PKGBUILD +++ b/community/haskell-regex-base/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 110629 2014-05-04 13:55:08Z td123 $ +# $Id: PKGBUILD 115990 2014-07-19 16:05:21Z td123 $ # Maintainer: Vesa Kaihlavirta # Contributor: Arch Haskell Team # Contributor: Alexander Rødseth @@ -6,12 +6,12 @@ _hkgname=regex-base pkgname=haskell-regex-base pkgver=0.93.2 -pkgrel=18 +pkgrel=19 pkgdesc='Interface API for regex-posix,pcre,parsec,tdfa,dfa' url='http://hackage.haskell.org/cgi-bin/hackage-scripts/package/regex-base' license=('custom:BSD3') arch=('x86_64' 'i686') -depends=('ghc=7.8.2-2' 'haskell-mtl') +depends=('ghc=7.8.3-1' 'haskell-mtl') source=("http://hackage.haskell.org/packages/archive/$_hkgname/$pkgver/$_hkgname-$pkgver.tar.gz") install="$pkgname.install" options=('staticlibs') diff --git a/community/haskell-regex-compat/PKGBUILD b/community/haskell-regex-compat/PKGBUILD index 02d03f584..4aa2d32c9 100644 --- a/community/haskell-regex-compat/PKGBUILD +++ b/community/haskell-regex-compat/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 110630 2014-05-04 13:55:09Z td123 $ +# $Id: PKGBUILD 115991 2014-07-19 16:05:22Z td123 $ # Maintainer: Alexander Rødseth # Contributor: Vesa Kaihlavirta # Contributor: Arch Haskell Team @@ -6,7 +6,7 @@ _hkgname=regex-compat pkgname=haskell-regex-compat pkgver=0.95.1 -pkgrel=8 +pkgrel=9 pkgdesc='Replaces and enhances Text.Regex' url="http://hackage.haskell.org/package/${_hkgname}" license=('custom:BSD3') diff --git a/community/haskell-regex-posix/PKGBUILD b/community/haskell-regex-posix/PKGBUILD index b6aedeb54..438533307 100644 --- a/community/haskell-regex-posix/PKGBUILD +++ b/community/haskell-regex-posix/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 110631 2014-05-04 13:55:10Z td123 $ +# $Id: PKGBUILD 115992 2014-07-19 16:05:23Z td123 $ # Maintainer: Alexander Rødseth # Maintainer: Vesa Kaihlavirta # Contributor: Arch Haskell Team @@ -6,7 +6,7 @@ _hkgname=regex-posix pkgname=haskell-regex-posix pkgver=0.95.2 -pkgrel=7 +pkgrel=8 pkgdesc='The posix regex backend for regex-base' url="http://hackage.haskell.org/package/$_hkgname" license=('custom:BSD3') diff --git a/community/haskell-stm/PKGBUILD b/community/haskell-stm/PKGBUILD index 6c656b70c..fa12e239f 100644 --- a/community/haskell-stm/PKGBUILD +++ b/community/haskell-stm/PKGBUILD @@ -4,12 +4,12 @@ _hkgname=stm pkgname=haskell-stm pkgver=2.4.3 -pkgrel=2 +pkgrel=3 pkgdesc="A modular composable concurrency abstraction." url="http://hackage.haskell.org/package/stm" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=('ghc=7.8.2' 'sh') +depends=('ghc=7.8.3-1' 'sh') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz) install=${pkgname}.install options=('staticlibs') diff --git a/community/haskell-text/PKGBUILD b/community/haskell-text/PKGBUILD index 823622967..21636bb93 100644 --- a/community/haskell-text/PKGBUILD +++ b/community/haskell-text/PKGBUILD @@ -2,17 +2,17 @@ _hkgname=text pkgname=haskell-text -pkgver=1.1.0.1 -pkgrel=2 +pkgver=1.1.1.3 +pkgrel=1 pkgdesc="An efficient packed Unicode text type." url="http://hackage.haskell.org/package/${_hkgname}" license=('custom:BSD3') arch=('i686' 'x86_64') options=('staticlibs') -depends=('ghc=7.8.2-2' 'sh') +depends=('ghc=7.8.3' 'sh') source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz") install=${pkgname}.install -md5sums=('e8e1017ed0f0fef2a872569d8f31883e') +md5sums=('9cc52915c12489e667b54bc9602cd442') build() { cd ${_hkgname}-${pkgver} diff --git a/community/haskell-tf-random/PKGBUILD b/community/haskell-tf-random/PKGBUILD index f88885b69..839305b78 100644 --- a/community/haskell-tf-random/PKGBUILD +++ b/community/haskell-tf-random/PKGBUILD @@ -4,12 +4,12 @@ _hkgname=tf-random pkgname=haskell-tf-random pkgver=0.4 -pkgrel=2 +pkgrel=3 pkgdesc='High-quality splittable pseudorandom number generator' url="http://hackage.haskell.org/package/${_hkgname}" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=('ghc' 'haskell-random' 'haskell-primitive') +depends=('ghc=7.8.3-1' 'haskell-random' 'haskell-primitive') source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz") install=$pkgname.install options=('staticlibs') diff --git a/community/haskell-utf8-string/PKGBUILD b/community/haskell-utf8-string/PKGBUILD index b6655f1eb..d3124f77d 100644 --- a/community/haskell-utf8-string/PKGBUILD +++ b/community/haskell-utf8-string/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 110636 2014-05-04 13:55:15Z td123 $ +# $Id: PKGBUILD 115996 2014-07-19 16:05:27Z td123 $ # Maintainer: Vesa Kaihlavirta # Contributor: Arch Haskell Team # Package generated by cabal2arch 0.7.6 _hkgname=utf8-string pkgname=haskell-utf8-string pkgver=0.3.7 -pkgrel=7 +pkgrel=8 pkgdesc="Support for reading and writing UTF8 Strings" url="http://hackage.haskell.org/package/${_hkgname}" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=('ghc=7.8.2-2' 'sh') +depends=('ghc=7.8.3-1' 'sh') install=${pkgname}.install source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) options=('staticlibs') diff --git a/community/haskell-vector/PKGBUILD b/community/haskell-vector/PKGBUILD index 24f95ea36..9c2b16141 100644 --- a/community/haskell-vector/PKGBUILD +++ b/community/haskell-vector/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 110637 2014-05-04 13:55:16Z td123 $ +# $Id: PKGBUILD 115997 2014-07-19 16:05:28Z td123 $ # Maintainer: Sergej Pupykin pkgname=haskell-vector pkgver=0.10.9.1 -pkgrel=3 +pkgrel=4 pkgdesc="Efficient Arrays" url="http://code.haskell.org/vector" license=("custom:BSD3") arch=('i686' 'x86_64') makedepends=() # deps adjusted to specific versions in package() -depends=("ghc" "haskell-primitive") +depends=("ghc=7.8.3-1" "haskell-primitive") options=('strip' 'staticlibs') install="${pkgname}.install" source=("http://hackage.haskell.org/packages/archive/vector/${pkgver}/vector-${pkgver}.tar.gz") diff --git a/community/haskell-x11-xft/PKGBUILD b/community/haskell-x11-xft/PKGBUILD index 8f7988771..1286dc883 100644 --- a/community/haskell-x11-xft/PKGBUILD +++ b/community/haskell-x11-xft/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 110639 2014-05-04 13:55:18Z td123 $ +# $Id: PKGBUILD 115999 2014-07-19 16:05:31Z td123 $ # Maintainer: Sergej Pupykin _hkgname=X11-xft pkgname=haskell-x11-xft pkgver=0.3.1 -pkgrel=10 +pkgrel=11 pkgdesc="Bindings to the Xft, X Free Type interface library, and some Xrender parts" url="http://hackage.haskell.org/package/${_hkgname}" license=('LGPL') arch=('i686' 'x86_64') -depends=('ghc=7.8.2' 'haskell-x11=1.6.1.1' 'haskell-utf8-string=0.3.7' 'libxft') +depends=('ghc=7.8.3' 'haskell-x11=1.6.1.2' 'haskell-utf8-string=0.3.7' 'libxft') options=('strip') install=haskell-x11-xft.install source=(http://hackage.haskell.org/packages/archive/X11-xft/$pkgver/X11-xft-$pkgver.tar.gz) diff --git a/community/haskell-x11/PKGBUILD b/community/haskell-x11/PKGBUILD index 0b27cb27b..918cb63a2 100644 --- a/community/haskell-x11/PKGBUILD +++ b/community/haskell-x11/PKGBUILD @@ -1,23 +1,23 @@ -# $Id: PKGBUILD 110638 2014-05-04 13:55:17Z td123 $ +# $Id: PKGBUILD 115998 2014-07-19 16:05:30Z td123 $ # Maintainer: Sergej Pupykin # Contributor: shild # Maintainer: Vesa Kaihlavirta _hkgname=X11 pkgname=haskell-x11 -pkgver=1.6.1.1 -pkgrel=5 +pkgver=1.6.1.2 +pkgrel=1 pkgdesc="A Haskell binding to the X11 graphics library." arch=(i686 x86_64) url="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/X11" license=('custom:BSD3') options=('strip') -depends=("ghc=7.8.2" "libx11" "libxinerama" "libxrandr" "haskell-data-default=0.5.3") +depends=("ghc=7.8.3" "libx11" "libxinerama" "libxrandr" "haskell-data-default=0.5.3") conflicts=(haskell-x11-extras) install=hsmod.install source=(http://hackage.haskell.org/packages/archive/X11/$pkgver/X11-$pkgver.tar.gz) options=('staticlibs') -md5sums=('80638b99238f72d4cc351b4fbd7274fc') +md5sums=('d7c94a65ce4b140e97cce835e8682ac3') build() { cd ${srcdir}/${_hkgname}-${pkgver} diff --git a/community/hedgewars/PKGBUILD b/community/hedgewars/PKGBUILD index 4afe87d68..83cf0c316 100644 --- a/community/hedgewars/PKGBUILD +++ b/community/hedgewars/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 110641 2014-05-04 13:55:20Z td123 $ +# $Id: PKGBUILD 116000 2014-07-19 16:05:32Z td123 $ # Maintainer: Sergej Pupykin pkgname=hedgewars pkgver=0.9.20.5 -pkgrel=2 +pkgrel=3 pkgdesc="turn based strategy, artillery, action and comedy game, featuring the antics of pink hedgehogs with attitude as they battle from the depths of hell to the depths of space." @@ -28,25 +28,28 @@ md5sums=('c61eb01466e86da656e1e74ad70a3217' 'eeb14d50df39063549ac5eca9dbc65d1' '84a85365cbbf7a1aabe4d0f37bd5f03f') -build() { +prepare() { cd $pkgname-src-* - patch -Np1 -i ${srcdir}/fix-ghc-7.8-build-failure.diff + sed -i 's|\[ ! -a Hedgewars.app \]|\\[ ! -a Hedgewars.app \\]|' tools/CMakeLists.txt +} +build() { + cd $pkgname-src-* + mkdir -p $srcdir/bin + ln -sf /usr/bin/lrelease-qt4 $srcdir/bin/Qt4::lrelease + export PATH=$srcdir/bin:$PATH cmake \ -DCMAKE_BUILD_TYPE="Release" \ -DCMAKE_INSTALL_PREFIX=/usr \ -DDATA_INSTALL_DIR=/usr/share/hedgewars \ -DNOSERVER=0 . - make } package() { cd $pkgname-src-* - make DESTDIR=$pkgdir install - install -D -m644 Fonts_LICENSE.txt $pkgdir/usr/share/licenses/$pkgname/Fonts_LICENSE.txt install -D -m644 $srcdir/hedgewars.png $pkgdir/usr/share/pixmaps/hedgewars.png install -D -m644 share/hedgewars/Data/misc/hedgewars.desktop $pkgdir/usr/share/applications/hedgewars.desktop diff --git a/community/nodejs/PKGBUILD b/community/nodejs/PKGBUILD index e32698b4e..7439c1d2a 100644 --- a/community/nodejs/PKGBUILD +++ b/community/nodejs/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 112949 2014-06-10 05:04:01Z fyan $ +# $Id: PKGBUILD 115955 2014-07-19 11:41:52Z fyan $ # Maintainer: Felix Yan # Contributor Bartłomiej Piotrowski # Contributor: Thomas Dziedzic < gostrc at gmail > @@ -10,23 +10,31 @@ pkgname=nodejs pkgver=0.10.29 -pkgrel=1 +_npmver=1.4.21 +pkgrel=3 pkgdesc='Evented I/O for V8 javascript' arch=('i686' 'x86_64') url='http://nodejs.org/' license=('MIT') depends=('openssl') provides=('nodejs-node-gyp') -makedepends=('python2') +makedepends=('python2' 'git' 'procps-ng') optdepends=('python2: for node-gyp') checkdepends=('curl') options=('!emptydirs') -source=(http://nodejs.org/dist/v$pkgver/node-v$pkgver.tar.gz) -sha256sums=('47379d01f765f87c1a1498b4e65de30e45201de50334954860d7375a8258b15d') +source=("http://nodejs.org/dist/v$pkgver/node-v$pkgver.tar.gz" + git+https://github.com/npm/npm.git#tag=v$_npmver) +sha256sums=('47379d01f765f87c1a1498b4e65de30e45201de50334954860d7375a8258b15d' + 'SKIP') prepare() { cd node-v$pkgver + # We need new version of npm to fix bugs + rm -r deps/npm + ln -s "$srcdir/npm" deps + rm -r "$srcdir/npm/.git" + msg 'Fixing for python2 name' find -type f -exec sed \ -e 's_^#!/usr/bin/env python$_&2_' \ @@ -45,6 +53,11 @@ build() { --shared-openssl make + + cd ../npm + ../node-v$pkgver/node cli.js install ronn marked + PATH="$srcdir/node-v$pkgver:$PATH" make + ../node-v$pkgver/node cli.js uninstall ronn marked } check() { @@ -65,7 +78,14 @@ package() { install -D -m644 LICENSE \ "$pkgdir"/usr/share/licenses/nodejs/LICENSE - # Why the hell wasn't this installed?! FS#40221 + install -d "$pkgdir"/usr/share/man/{man1,man3,man5,man7} + for _dir in man1 man3 man5 man7; do + cd "$pkgdir"/usr/lib/node_modules/npm/man/$_dir + for _file in *; do + ln -s /usr/lib/node_modules/npm/man/$_dir/$_file "$pkgdir"/usr/share/man/$_dir/ + done + done + ln -s /usr/lib/node_modules/npm/node_modules/node-gyp/bin/node-gyp.js "$pkgdir"/usr/bin/node-gyp } diff --git a/community/xmobar/PKGBUILD b/community/xmobar/PKGBUILD index 92c7ccdc9..b23f86a5f 100644 --- a/community/xmobar/PKGBUILD +++ b/community/xmobar/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 114922 2014-07-04 16:08:23Z jelle $ +# $Id: PKGBUILD 116001 2014-07-19 16:05:33Z td123 $ # Maintainer: Sergej Pupykin # Contributor: Arch Haskell Team pkgname=xmobar pkgver=0.21 -pkgrel=1 +pkgrel=2 pkgdesc="A Minimalistic Text Based Status Bar" url="http://hackage.haskell.org/package/xmobar" license=('custom:BSD3') arch=('i686' 'x86_64') depends=('gmp' 'libxft' 'libxinerama' 'wireless_tools' 'libxrandr') -makedepends=('ghc=7.8.2-4' 'haskell-x11=1.6.1.1' 'haskell-x11-xft=0.3.1' 'haskell-utf8-string=0.3.7' - 'haskell-stm=2.4.3' 'haskell-parsec=3.1.5' 'haskell-mtl=2.1.3.1' 'haskell-regex-base' 'haskell-regex-compat haskell-http') +makedepends=('ghc=7.8.3-1' 'haskell-x11=1.6.1.2' 'haskell-x11-xft=0.3.1' 'haskell-utf8-string=0.3.7' + 'haskell-stm=2.4.3' 'haskell-parsec=3.1.5' 'haskell-mtl=2.1.3.1' 'haskell-regex-base' 'haskell-regex-compat') options=('strip') source=(http://hackage.haskell.org/packages/archive/xmobar/$pkgver/xmobar-$pkgver.tar.gz) md5sums=('8d4442d3772ad9f475d96b955fda220d') diff --git a/community/xmonad-contrib/PKGBUILD b/community/xmonad-contrib/PKGBUILD index d71bd397c..205da2aba 100644 --- a/community/xmonad-contrib/PKGBUILD +++ b/community/xmonad-contrib/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 110644 2014-05-04 13:55:23Z td123 $ +# $Id: PKGBUILD 116003 2014-07-19 16:05:38Z td123 $ # Maintainer: Sergej Pupykin # Maintainer: Vesa Kaihlavirta # Contributor: orbisvicis pkgname=xmonad-contrib pkgver=0.11.2 -pkgrel=3 +pkgrel=4 pkgdesc="Add-ons for xmonad" arch=('i686' 'x86_64') url="http://xmonad.org/" license=('BSD') -depends=('ghc=7.8.2-2' 'xmonad=0.11-8' 'sh' 'haskell-x11=1.6.1.1' 'haskell-x11-xft=0.3.1' 'haskell-utf8-string=0.3.7' 'haskell-random=1.0.1.1') +depends=('ghc=7.8.3-1' 'xmonad=0.11-9' 'sh' 'haskell-x11=1.6.1.2' 'haskell-x11-xft=0.3.1' 'haskell-utf8-string=0.3.7' 'haskell-random=1.0.1.1') install='xmonad-contrib.install' options=('staticlibs') source=(http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz 'remove_unnecessary_contexts.patch') diff --git a/community/xmonad/PKGBUILD b/community/xmonad/PKGBUILD index 3b49b1d81..50a2eddae 100644 --- a/community/xmonad/PKGBUILD +++ b/community/xmonad/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 110643 2014-05-04 13:55:22Z td123 $ +# $Id: PKGBUILD 116002 2014-07-19 16:05:35Z td123 $ # Maintainer: Sergej Pupykin # Maintainer: Vesa Kaihlavirta # Contributor: shild pkgname=xmonad pkgver=0.11 -pkgrel=8 +pkgrel=9 pkgdesc="Lightweight X11 tiled window manager written in Haskell" arch=('i686' 'x86_64') url="http://xmonad.org/" license=('BSD') -depends=('ghc=7.8.2' 'gmp' 'haskell-x11=1.6.1.1' 'sh' 'haskell-mtl=2.1.3.1' 'haskell-utf8-string=0.3.7' 'haskell-extensible-exceptions=0.1.1.4') +depends=('ghc=7.8.3' 'gmp' 'haskell-x11=1.6.1.2' 'sh' 'haskell-mtl=2.1.3.1' 'haskell-utf8-string=0.3.7' 'haskell-extensible-exceptions=0.1.1.4') makedepends=('gendesk') optdepends=('xorg-xmessage: for displaying visual error messages') install='xmonad.install' diff --git a/extra/cabal-install/PKGBUILD b/extra/cabal-install/PKGBUILD index 7eddb7596..7014a6fd0 100644 --- a/extra/cabal-install/PKGBUILD +++ b/extra/cabal-install/PKGBUILD @@ -4,7 +4,7 @@ pkgname=cabal-install pkgver=1.20.0.3 -pkgrel=1 +pkgrel=2 pkgdesc="The command-line interface for Cabal and Hackage." url="http://hackage.haskell.org/package/cabal-install" license=('custom:BSD3') diff --git a/extra/ghc/PKGBUILD b/extra/ghc/PKGBUILD index f449f1785..183b99a45 100644 --- a/extra/ghc/PKGBUILD +++ b/extra/ghc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 212771 2014-05-15 04:27:19Z td123 $ +# $Id: PKGBUILD 217481 2014-07-19 16:03:47Z td123 $ # Maintainer: Thomas Dziedzic # Maintainer: Vesa Kaihlavirta # Special note for devs looking to upgrade this package: @@ -10,8 +10,8 @@ # grep -r ghc /var/abs/ | awk -F '/' '{ print $5; }' | sort -u pkgname=ghc -pkgver=7.8.2 -pkgrel=4 +pkgver=7.8.3 +pkgrel=2 pkgdesc='The Glasgow Haskell Compiler' arch=('i686' 'x86_64') url='http://www.haskell.org/ghc/' @@ -22,7 +22,7 @@ checkdepends=('python2') install='ghc.install' options=('staticlibs') provides=('haskell-array=0.5.0.0' - 'haskell-base=4.7.0.0' + 'haskell-base=4.7.0.1' 'haskell-binary=0.7.1.0' 'haskell-bin-package-db=0.0.0.0' 'haskell-bytestring=0.10.4.0' @@ -45,38 +45,45 @@ provides=('haskell-array=0.5.0.0' 'haskell-transformers=0.3.0.0' 'haskell-unix=2.7.0.1' 'haskell-cabal=1.18.1.3' + 'ghc=7.8.3-1' + 'haskell-haskeline=0.7.1.2' + 'haskell-terminfo=0.4.0.0' + 'haskell-xhtml=3000.2.1' ) -replaces=('haskell-array<0.5.0.0' - 'haskell-base<4.7.0.0' - 'haskell-binary<0.7.1.0' - 'haskell-bin-package-db<0.0.0.0' - 'haskell-bytestring<0.10.4.0' - 'haskell-containers<0.5.5.1' - 'haskell-deepseq<1.3.0.2' - 'haskell-directory<1.2.1.0' - 'haskell-filepath<1.3.0.2' - 'haskell-ghc-prim<0.3.1.0' - 'haskell-haskell2010<1.1.2.0' - 'haskell-haskell98<2.0.0.3' - 'haskell-hoopl<3.10.0.1' - 'haskell-hpc<0.6.0.1' - 'haskell-integer-gmp<0.5.1.0' - 'haskell-old-locale<1.0.0.6' - 'haskell-old-time<1.1.0.2' - 'haskell-pretty<1.1.1.1' - 'haskell-process<1.2.0.0' - 'haskell-template-haskell<2.9.0.0' - 'haskell-time<1.4.2' +replaces=('haskell-array' + 'haskell-base' + 'haskell-binary' + 'haskell-bin-package-db' + 'haskell-bytestring' + 'haskell-containers' + 'haskell-deepseq' + 'haskell-directory' + 'haskell-filepath' + 'haskell-ghc-prim' + 'haskell-haskell2010' + 'haskell-haskell98' + 'haskell-hoopl' + 'haskell-hpc' + 'haskell-integer-gmp' + 'haskell-old-locale' + 'haskell-old-time' + 'haskell-pretty' + 'haskell-process' + 'haskell-template-haskell' + 'haskell-time' 'haskell-transformers' - 'haskell-unix<2.7.0.1' - 'haskell-cabal<1.18.1.3' + 'haskell-unix' + 'haskell-cabal' + 'haskell-haskeline' + 'haskell-terminfo' + 'haskell-xhtml' ) source=("http://www.haskell.org/ghc/dist/${pkgver}/ghc-${pkgver}-src.tar.xz" "http://www.haskell.org/ghc/dist/${pkgver}/ghc-${pkgver}-testsuite.tar.xz" 'build.mk' 'ghc') -md5sums=('97578e0c27574a99e0d5071a7f35d136' - 'ac54f7fa453010149a573740705ecbfb' +md5sums=('5e34b2a29564596c9ed83fb8667b47d4' + '7ca72a039d44ca2586c02863392b5dce' 'c367ef26300648ee9b8aca3dee5c9669' 'c1d46d86752c50dd85e7143b029fa07f') @@ -88,7 +95,7 @@ build() { ./configure \ --prefix=/usr \ --with-system-libffi \ - --with-ffi-includes=/usr/lib/libffi-3.0.13/include + --with-ffi-includes=/usr/lib/libffi-3.1/include make } @@ -135,7 +142,7 @@ package() { ${pkgdir}/usr/share/licenses/ghc # provide non vanilla bash completion since ghc currently doesn't ship with any: - # https://ghc.haskell.org/trac/ghc/ticket/9006 + # https://ghc.haskell.org/trac/ghc/ticket/9005 install -d ${pkgdir}/usr/share/bash-completion/completions install -m644 ${srcdir}/ghc \ ${pkgdir}/usr/share/bash-completion/completions diff --git a/extra/ghc/print-provides-replaces.sh b/extra/ghc/print-provides-replaces.sh index a81a439e7..2f4557bf8 100755 --- a/extra/ghc/print-provides-replaces.sh +++ b/extra/ghc/print-provides-replaces.sh @@ -12,11 +12,6 @@ declare -A exclude exclude['Win32']=1 # no integer-simple because we use integer-gmp exclude['integer-simple']=1 -# the rest are installed as dependencies of ghc and some shouldn't even be installed! -# https://ghc.haskell.org/trac/ghc/ticket/8919 -exclude['haskeline']=1 -exclude['terminfo']=1 -exclude['xhtml']=1 # extract excluded libraries from ghc.mk for exclude_pkg in $(sed 's/PKGS_THAT_ARE_INTREE_ONLY := //p' -n src/ghc-${pkgver}/ghc.mk); do exclude[${exclude_pkg}]=1 -- cgit v1.2.2