diff options
| author | root <root@rshg054.dnsready.net> | 2013-04-29 00:34:23 -0700 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2013-04-29 00:34:23 -0700 |
| commit | bab69e0f720c6f189c4486b7b945079be23f0a4b (patch) | |
| tree | 381ff8864fb51d2d7510c6cb1dc2bc8972b8de47 | |
| parent | f38edbff3878008c8b2ae1ca8a496c349763017b (diff) | |
Mon Apr 29 00:34:20 PDT 2013
110 files changed, 1353 insertions, 618 deletions
diff --git a/community/alex/PKGBUILD b/community/alex/PKGBUILD index 93ca55e24..25345ec7e 100644 --- a/community/alex/PKGBUILD +++ b/community/alex/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 88642 2013-04-20 22:36:02Z arodseth $ +# $Id: PKGBUILD 89285 2013-04-28 16:52:06Z td123 $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Vesa Kaihlavirta <vegai@iki.fi> @@ -6,13 +6,13 @@ pkgname=alex pkgver=3.0.5 -pkgrel=1 +pkgrel=2 pkgdesc='Lexical analyser generator for Haskell' arch=('x86_64' 'i686') url='http://hackage.haskell.org/package/alex' license=('custom:BSD3') depends=('gmp') -makedepends=('ghc=7.6.2-1' 'haskell-quickcheck>=2') +makedepends=('ghc=7.6.3-1' 'haskell-quickcheck>=2') source=("http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz") sha256sums=('c3326417a0538e355e5ad1871ab931b9c8145391e8b2ff79668eb643d9b99659') diff --git a/community/emerillon/PKGBUILD b/community/emerillon/PKGBUILD index fa2e49680..2e690f13d 100644 --- a/community/emerillon/PKGBUILD +++ b/community/emerillon/PKGBUILD @@ -2,7 +2,7 @@ pkgname=emerillon pkgver=0.1.90 -pkgrel=3 +pkgrel=4 pkgdesc="Map viewer for OpenStreetMap" arch=('i686' 'x86_64') url="http://projects.gnome.org/emerillon/" diff --git a/community/gtk2hs-buildtools/PKGBUILD b/community/gtk2hs-buildtools/PKGBUILD index be7cbc78a..82ca841b7 100644 --- a/community/gtk2hs-buildtools/PKGBUILD +++ b/community/gtk2hs-buildtools/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 85986 2013-03-10 20:14:17Z spupykin $ +# $Id: PKGBUILD 89286 2013-04-28 16:52:07Z td123 $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=gtk2hs-buildtools pkgver=0.12.4 -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') diff --git a/community/haddock/PKGBUILD b/community/haddock/PKGBUILD index ceba4311f..a2924af8b 100644 --- a/community/haddock/PKGBUILD +++ b/community/haddock/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 86893 2013-03-23 23:32:12Z arodseth $ +# $Id: PKGBUILD 89287 2013-04-28 16:52:08Z td123 $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Vesa Kaihlavirta <vesa@archlinux.org> # Contributor: Arch Haskell Team <arch-haskell@haskell.org> pkgname=haddock pkgver=2.13.1 -pkgrel=3 +pkgrel=4 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=7.6.2-1' 'haskell-xhtml=3000.2.1' 'haskell-ghc-paths') +depends=('ghc=7.6.3-1' 'haskell-xhtml=3000.2.1' 'haskell-ghc-paths') install=$pkgname.install source=("http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz") sha256sums=('6e5e2295cd191e43a046c12544f2f4e8b4260cfda8282d48b15a7a35d8a24e7f') diff --git a/community/happy/PKGBUILD b/community/happy/PKGBUILD index e906df7ec..5f63b6e6a 100644 --- a/community/happy/PKGBUILD +++ b/community/happy/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 83993 2013-02-08 04:15:25Z td123 $ +# $Id: PKGBUILD 89288 2013-04-28 16:52:09Z td123 $ # Maintainer: Thomas Dziedzic <gostrc@gmail.com> # Contributor: simo <simo@archlinux.org> # Contributor: Vesa Kaihlavirta <vegai@iki.fi> pkgname=happy pkgver=1.18.10 -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.6.2-1' 'haskell-mtl=2.1.2-2') +makedepends=('ghc=7.6.3-1' 'haskell-mtl=2.1.2-3') source=("http://hackage.haskell.org/packages/archive/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz") md5sums=('a1638e89434427e57f68ef311761dc30') diff --git a/community/haskell-base64-bytestring/PKGBUILD b/community/haskell-base64-bytestring/PKGBUILD index 88c840a5f..f74265df9 100644 --- a/community/haskell-base64-bytestring/PKGBUILD +++ b/community/haskell-base64-bytestring/PKGBUILD @@ -5,14 +5,13 @@ _hkgname=base64-bytestring pkgname=haskell-base64-bytestring pkgver=1.0.0.1 -pkgrel=1 +pkgrel=2 pkgdesc="Fast base64 encoding and deconding for ByteStrings" url="https://github.com/bos/base64-bytestring" license=(custom:BSD3) arch=('i686' 'x86_64') makedepends=('ghc') depends=('haskell-bytestring') -options=('strip') source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz") install="$pkgname.install" sha256sums=('ab25abf4b00a2f52b270bc3ed43f1d59f16c8eec9d7dffb14df1e9265b233b50') diff --git a/community/haskell-blaze-builder/PKGBUILD b/community/haskell-blaze-builder/PKGBUILD index c7267423b..03ca1928d 100644 --- a/community/haskell-blaze-builder/PKGBUILD +++ b/community/haskell-blaze-builder/PKGBUILD @@ -5,14 +5,13 @@ pkgname=haskell-blaze-builder _hkgname=blaze-builder pkgver=0.3.1.1 -pkgrel=1 +pkgrel=2 pkgdesc="Efficient buffered output." url="http://github.com/meiersi/blaze-builder" license=(custom:BSD3) arch=('i686' 'x86_64') makedepends=('ghc') depends=('haskell-bytestring' 'haskell-text') -options=('strip') source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz") install="$pkgname.install" sha256sums=('a12506f8afd650e4ed90e1e2379750035f8e83032a2d260eacc3757fe52cdcde') diff --git a/community/haskell-blaze-html/PKGBUILD b/community/haskell-blaze-html/PKGBUILD index 6fbe14cf7..28b88312c 100644 --- a/community/haskell-blaze-html/PKGBUILD +++ b/community/haskell-blaze-html/PKGBUILD @@ -3,14 +3,13 @@ _hkgname=blaze-html pkgname=haskell-blaze-html pkgver=0.6.1.1 -pkgrel=1 +pkgrel=2 pkgdesc="A blazingly fast HTML combinator library for Haskell" url="http://hackage.haskell.org/package/${_hkgname}" license=('custom:BSD3') arch=('i686' 'x86_64') makedepends=() depends=('ghc' 'haskell-blaze-builder<0.4' 'haskell-blaze-markup<0.6' 'haskell-bytestring-show' 'haskell-text>=0.11.0.5') -options=('strip') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) install=$pkgname.install md5sums=('f9eda0a990cda190538b9e6ff73b05f3') diff --git a/community/haskell-blaze-markup/PKGBUILD b/community/haskell-blaze-markup/PKGBUILD index f4e5d1352..6c0d5e4a9 100644 --- a/community/haskell-blaze-markup/PKGBUILD +++ b/community/haskell-blaze-markup/PKGBUILD @@ -4,7 +4,7 @@ _hkgname=blaze-markup pkgname=haskell-blaze-markup pkgver=0.5.1.5 -pkgrel=1 +pkgrel=2 pkgdesc="Core modules of a blazingly fast markup combinator library for the Haskell programming language" url="http://hackage.haskell.org/package/${_hkgname}" license=(custom:BSD3) diff --git a/community/haskell-bytestring-show/PKGBUILD b/community/haskell-bytestring-show/PKGBUILD index 61a752e91..99fd4ebb6 100644 --- a/community/haskell-bytestring-show/PKGBUILD +++ b/community/haskell-bytestring-show/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 83994 2013-02-08 04:15:26Z td123 $ +# $Id: PKGBUILD 89293 2013-04-28 16:52:14Z td123 $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=haskell-bytestring-show pkgver=0.3.5.4 -pkgrel=3 +pkgrel=4 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 92bb5dff3..eb6a48ed4 100644 --- a/community/haskell-cairo/PKGBUILD +++ b/community/haskell-cairo/PKGBUILD @@ -1,13 +1,14 @@ -# $Id: PKGBUILD 83995 2013-02-08 04:15:27Z td123 $ +# $Id: PKGBUILD 89294 2013-04-28 16:52:15Z td123 $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=haskell-cairo pkgver=0.12.4 -pkgrel=2 +pkgrel=4 pkgdesc="Binding to the cairo library for Gtk2Hs." url="http://hackage.haskell.org/package/cairo" license=('LGPL2.1') arch=('i686' 'x86_64') +# deps adjusted to specific versions in package() depends=('ghc' 'cairo' 'haskell-mtl') makedepends=("gtk2hs-buildtools") options=('strip') @@ -31,7 +32,9 @@ build() { } package() { - depends=("ghc=`pacman -Q ghc | cut -f2 -d\ |cut -f1 -d-`" 'cairo' "haskell-mtl=`pacman -Q haskell-mtl | cut -f2 -d\ |cut -f1 -d-`") + _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=${_hglibver}") cd ${srcdir}/cairo-${pkgver} install -D -m744 register.sh ${pkgdir}/usr/share/haskell/gtk2hs-cairo/register.sh diff --git a/community/haskell-citeproc-hs/PKGBUILD b/community/haskell-citeproc-hs/PKGBUILD index 935e0dccd..9e3bfdcf3 100644 --- a/community/haskell-citeproc-hs/PKGBUILD +++ b/community/haskell-citeproc-hs/PKGBUILD @@ -5,7 +5,7 @@ _hkgname=citeproc-hs pkgname=haskell-citeproc-hs pkgver=0.3.8 -pkgrel=1 +pkgrel=2 pkgdesc="A Citation Style Language implementation in Haskell" url="http://gorgias.mine.nu/repos/citeproc-hs/" license=('custom:BSD3') @@ -14,7 +14,6 @@ makedepends=('ghc') depends=(haskell-http haskell-bytestring haskell-containers haskell-directory haskell-filepath haskell-json haskell-mtl haskell-old-locale haskell-pandoc-types haskell-parsec haskell-syb haskell-time haskell-utf8-string haskell-xml) -options=('strip') source=("http://hackage.haskell.org/packages/archive/$_hkgname/$pkgver/${_hkgname}-${pkgver}.tar.gz") install=$pkgname.install sha256sums=('e873673b2960d0eebbcede9d8c18e2acea0e4fed295552fa635814f4bae48e72') diff --git a/community/haskell-data-default-class/PKGBUILD b/community/haskell-data-default-class/PKGBUILD new file mode 100644 index 000000000..e2950265b --- /dev/null +++ b/community/haskell-data-default-class/PKGBUILD @@ -0,0 +1,35 @@ +# Maintainer: Jelle van der Waa <jelle@vdwaa.nl> +_hkgname=data-default-class +pkgname=haskell-data-default-class +pkgver=0.0.1 +pkgrel=1 +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.6.3') +options=('strip') +source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) +install=${pkgname}.install +md5sums=('abfd756bcc6d92e47436992c80ccdb80') +build() { + cd ${srcdir}/${_hkgname}-${pkgver} + runhaskell Setup configure -O ${PKGBUILD_HASKELL_ENABLE_PROFILING:+-p } --enable-split-objs --enable-shared \ + --prefix=/usr --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid + runhaskell Setup build + runhaskell Setup haddock + runhaskell Setup register --gen-script + runhaskell Setup unregister --gen-script + sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh +} +package() { + cd ${srcdir}/${_hkgname}-${pkgver} + install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh + install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh + install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries + ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} + runhaskell Setup copy --destdir=${pkgdir} + install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE +} diff --git a/community/haskell-data-default-class/haskell-data-default-class.install b/community/haskell-data-default-class/haskell-data-default-class.install new file mode 100644 index 000000000..037788be4 --- /dev/null +++ b/community/haskell-data-default-class/haskell-data-default-class.install @@ -0,0 +1,18 @@ +HS_DIR=usr/share/haskell/haskell-data-default-class +post_install() { + ${HS_DIR}/register.sh + (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) +} +pre_upgrade() { + ${HS_DIR}/unregister.sh +} +post_upgrade() { + ${HS_DIR}/register.sh + (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) +} +pre_remove() { + ${HS_DIR}/unregister.sh +} +post_remove() { + (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) +} diff --git a/community/haskell-data-default-instances-base/PKGBUILD b/community/haskell-data-default-instances-base/PKGBUILD new file mode 100644 index 000000000..f433e99e1 --- /dev/null +++ b/community/haskell-data-default-instances-base/PKGBUILD @@ -0,0 +1,35 @@ +# Maintainer: Jelle van der Waa <jelle@vdwaa.nl> +_hkgname=data-default-instances-base +pkgname=haskell-data-default-instances-base +pkgver=0.0.1 +pkgrel=1 +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.6.3' 'haskell-data-default-class') +options=('strip') +source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) +install=${pkgname}.install +md5sums=('37fc6531e0227bcf9cfbbf85f04e759d') +build() { + cd ${srcdir}/${_hkgname}-${pkgver} + runhaskell Setup configure -O ${PKGBUILD_HASKELL_ENABLE_PROFILING:+-p } --enable-split-objs --enable-shared \ + --prefix=/usr --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid + runhaskell Setup build + runhaskell Setup haddock + runhaskell Setup register --gen-script + runhaskell Setup unregister --gen-script + sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh +} +package() { + cd ${srcdir}/${_hkgname}-${pkgver} + install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh + install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh + install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries + ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} + runhaskell Setup copy --destdir=${pkgdir} + install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE +} diff --git a/community/haskell-data-default-instances-base/haskell-data-default-instances-base.install b/community/haskell-data-default-instances-base/haskell-data-default-instances-base.install new file mode 100644 index 000000000..3d9e5d1e0 --- /dev/null +++ b/community/haskell-data-default-instances-base/haskell-data-default-instances-base.install @@ -0,0 +1,18 @@ +HS_DIR=usr/share/haskell/haskell-data-default-instances-base +post_install() { + ${HS_DIR}/register.sh + (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) +} +pre_upgrade() { + ${HS_DIR}/unregister.sh +} +post_upgrade() { + ${HS_DIR}/register.sh + (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) +} +pre_remove() { + ${HS_DIR}/unregister.sh +} +post_remove() { + (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) +} diff --git a/community/haskell-data-default-instances-containers/PKGBUILD b/community/haskell-data-default-instances-containers/PKGBUILD new file mode 100644 index 000000000..5a77dca00 --- /dev/null +++ b/community/haskell-data-default-instances-containers/PKGBUILD @@ -0,0 +1,35 @@ +# Maintainer: Jelle van der Waa <jelle@vdwaa.nl> +_hkgname=data-default-instances-containers +pkgname=haskell-data-default-instances-containers +pkgver=0.0.1 +pkgrel=1 +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.6.3' 'haskell-containers=0.5.0.0' '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 +md5sums=('1c574d87bf9bc69d4748e3236d575a3c') +build() { + cd ${srcdir}/${_hkgname}-${pkgver} + runhaskell Setup configure -O ${PKGBUILD_HASKELL_ENABLE_PROFILING:+-p } --enable-split-objs --enable-shared \ + --prefix=/usr --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid + runhaskell Setup build + runhaskell Setup haddock + runhaskell Setup register --gen-script + runhaskell Setup unregister --gen-script + sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh +} +package() { + cd ${srcdir}/${_hkgname}-${pkgver} + install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh + install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh + install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries + ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} + runhaskell Setup copy --destdir=${pkgdir} + install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE +} diff --git a/community/haskell-data-default-instances-containers/haskell-data-default-instances-containers.install b/community/haskell-data-default-instances-containers/haskell-data-default-instances-containers.install new file mode 100644 index 000000000..7d5535739 --- /dev/null +++ b/community/haskell-data-default-instances-containers/haskell-data-default-instances-containers.install @@ -0,0 +1,18 @@ +HS_DIR=usr/share/haskell/haskell-data-default-instances-containers +post_install() { + ${HS_DIR}/register.sh + (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) +} +pre_upgrade() { + ${HS_DIR}/unregister.sh +} +post_upgrade() { + ${HS_DIR}/register.sh + (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) +} +pre_remove() { + ${HS_DIR}/unregister.sh +} +post_remove() { + (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) +} diff --git a/community/haskell-data-default-instances-dlist/PKGBUILD b/community/haskell-data-default-instances-dlist/PKGBUILD new file mode 100644 index 000000000..6bd021546 --- /dev/null +++ b/community/haskell-data-default-instances-dlist/PKGBUILD @@ -0,0 +1,35 @@ +# Maintainer: Jelle van der Waa <jelle@vdwaa.nl> +_hkgname=data-default-instances-dlist +pkgname=haskell-data-default-instances-dlist +pkgver=0.0.1 +pkgrel=1 +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.6.3' 'haskell-data-default-class=0.0.1' 'haskell-dlist=0.5-24') +options=('strip') +source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) +install=${pkgname}.install +md5sums=('6683d943ab70b7077ff6837fce75b4de') +build() { + cd ${srcdir}/${_hkgname}-${pkgver} + runhaskell Setup configure -O ${PKGBUILD_HASKELL_ENABLE_PROFILING:+-p } --enable-split-objs --enable-shared \ + --prefix=/usr --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid + runhaskell Setup build + runhaskell Setup haddock + runhaskell Setup register --gen-script + runhaskell Setup unregister --gen-script + sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh +} +package() { + cd ${srcdir}/${_hkgname}-${pkgver} + install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh + install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh + install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries + ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} + runhaskell Setup copy --destdir=${pkgdir} + install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE +} diff --git a/community/haskell-data-default-instances-dlist/haskell-data-default-instances-dlist.install b/community/haskell-data-default-instances-dlist/haskell-data-default-instances-dlist.install new file mode 100644 index 000000000..8e6e1563c --- /dev/null +++ b/community/haskell-data-default-instances-dlist/haskell-data-default-instances-dlist.install @@ -0,0 +1,18 @@ +HS_DIR=usr/share/haskell/haskell-data-default-instances-dlist +post_install() { + ${HS_DIR}/register.sh + (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) +} +pre_upgrade() { + ${HS_DIR}/unregister.sh +} +post_upgrade() { + ${HS_DIR}/register.sh + (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) +} +pre_remove() { + ${HS_DIR}/unregister.sh +} +post_remove() { + (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) +} diff --git a/community/haskell-data-default-instances-old-locale/PKGBUILD b/community/haskell-data-default-instances-old-locale/PKGBUILD new file mode 100644 index 000000000..fbfe9959b --- /dev/null +++ b/community/haskell-data-default-instances-old-locale/PKGBUILD @@ -0,0 +1,35 @@ +# Maintainer: Jelle van der Waa <jelle@vdwaa.nl> +_hkgname=data-default-instances-old-locale +pkgname=haskell-data-default-instances-old-locale +pkgver=0.0.1 +pkgrel=1 +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.6.3' 'haskell-data-default-class' 'haskell-old-locale=1.0.0.5') +options=('strip') +source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) +install=${pkgname}.install +md5sums=('43bd868049d870ee722eda6bdd89fc28') +build() { + cd ${srcdir}/${_hkgname}-${pkgver} + runhaskell Setup configure -O ${PKGBUILD_HASKELL_ENABLE_PROFILING:+-p } --enable-split-objs --enable-shared \ + --prefix=/usr --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid + runhaskell Setup build + runhaskell Setup haddock + runhaskell Setup register --gen-script + runhaskell Setup unregister --gen-script + sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh +} +package() { + cd ${srcdir}/${_hkgname}-${pkgver} + install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh + install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh + install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries + ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} + runhaskell Setup copy --destdir=${pkgdir} + install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE +} diff --git a/community/haskell-data-default-instances-old-locale/haskell-data-default-instances-old-locale.install b/community/haskell-data-default-instances-old-locale/haskell-data-default-instances-old-locale.install new file mode 100644 index 000000000..b6f986d6d --- /dev/null +++ b/community/haskell-data-default-instances-old-locale/haskell-data-default-instances-old-locale.install @@ -0,0 +1,18 @@ +HS_DIR=usr/share/haskell/haskell-data-default-instances-old-locale +post_install() { + ${HS_DIR}/register.sh + (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) +} +pre_upgrade() { + ${HS_DIR}/unregister.sh +} +post_upgrade() { + ${HS_DIR}/register.sh + (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) +} +pre_remove() { + ${HS_DIR}/unregister.sh +} +post_remove() { + (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) +} diff --git a/community/haskell-data-default/PKGBUILD b/community/haskell-data-default/PKGBUILD index a67fb8d44..819635eaf 100644 --- a/community/haskell-data-default/PKGBUILD +++ b/community/haskell-data-default/PKGBUILD @@ -1,37 +1,28 @@ -# Contributor: Lex Black <autumn-wind at web dot de> -# Contributor: Don Stewart <dons@galois.com> - -pkgname=haskell-data-default +# Maintainer: Jelle van der Waa <jelle@vdwaa.nl> _hkgname=data-default -_licensefile=LICENSE -pkgver=0.5.1 -pkgrel=2 +pkgname=haskell-data-default +pkgver=0.5.3 +pkgrel=1 pkgdesc="A class for types with a default value" url="http://hackage.haskell.org/package/${_hkgname}" -license=('BSD') +license=('custom:BSD3') arch=('i686' 'x86_64') -makedepends=('ghc') -depends=('haskell-containers' 'haskell-dlist' 'haskell-old-locale') +makedepends=() +depends=('ghc=7.6.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") -sha256sums=('fb56f34f820379df4881bcccbcb065389200e20778321e2d6e8c92dad94af717') -install="${pkgname}.install" - +source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) +install=${pkgname}.install +md5sums=('03a98d999273ad20d5bc0c711bf1c533') build() { cd ${srcdir}/${_hkgname}-${pkgver} - - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid - #runhaskell Setup configure -O ${PKGBUILD_HASKELL_ENABLE_PROFILING:+-p } --enable-split-objs --enable-shared \ - # --prefix=/usr --docdir=/usr/share/doc/${pkgname} \ - # --libsubdir=\$compiler/site-local/\$pkgid + runhaskell Setup configure -O ${PKGBUILD_HASKELL_ENABLE_PROFILING:+-p } --enable-split-objs --enable-shared \ + --prefix=/usr --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid runhaskell Setup build runhaskell Setup haddock - runhaskell Setup register --gen-script + runhaskell Setup register --gen-script runhaskell Setup unregister --gen-script sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh } - package() { cd ${srcdir}/${_hkgname}-${pkgver} install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh diff --git a/community/haskell-data-default/haskell-data-default.install b/community/haskell-data-default/haskell-data-default.install index d6fa72e16..0b0a72558 100644 --- a/community/haskell-data-default/haskell-data-default.install +++ b/community/haskell-data-default/haskell-data-default.install @@ -1,26 +1,18 @@ -# custom variables -pkgname=haskell-data-default -HS_DIR=/usr/share/haskell/${pkgname} - -# functions +HS_DIR=usr/share/haskell/haskell-data-default post_install() { - ${HS_DIR}/register.sh - (cd /usr/share/doc/ghc/html/libraries; ./gen_contents_index) + ${HS_DIR}/register.sh + (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) } - pre_upgrade() { - ${HS_DIR}/unregister.sh + ${HS_DIR}/unregister.sh } - post_upgrade() { - ${HS_DIR}/register.sh - (cd /usr/share/doc/ghc/html/libraries; ./gen_contents_index) + ${HS_DIR}/register.sh + (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) } - pre_remove() { - ${HS_DIR}/unregister.sh + ${HS_DIR}/unregister.sh } - post_remove() { - (cd /usr/share/doc/ghc/html/libraries; ./gen_contents_index) + (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) } diff --git a/community/haskell-dataenc/PKGBUILD b/community/haskell-dataenc/PKGBUILD index bf4bcf9f8..0232eb2c1 100644 --- a/community/haskell-dataenc/PKGBUILD +++ b/community/haskell-dataenc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 83996 2013-02-08 04:15:28Z td123 $ +# $Id: PKGBUILD 89297 2013-04-28 16:52:18Z td123 $ # Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> # Contributor: Arch Haskell Team <arch-haskell@haskell.org> # Package generated by cabal2arch 0.7.5 @@ -6,12 +6,12 @@ _hkgname=dataenc pkgname=haskell-dataenc pkgver=0.14.0.5 -pkgrel=1 +pkgrel=2 pkgdesc="Data encoding library" url="http://hackage.haskell.org/package/dataenc" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=('ghc=7.6.2-1' sh) +depends=('ghc=7.6.3-1' sh) source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz '0001-update-build-deps-for-ghc-7.6.1.patch') install=${pkgname}.install diff --git a/community/haskell-digest/PKGBUILD b/community/haskell-digest/PKGBUILD index 29374ef30..3293c8322 100644 --- a/community/haskell-digest/PKGBUILD +++ b/community/haskell-digest/PKGBUILD @@ -4,17 +4,16 @@ _hkgname=digest pkgname=haskell-digest -pkgver=0.0.1.1 -pkgrel=2 +pkgver=0.0.1.2 +pkgrel=1 pkgdesc='Various cryptographic hashes for bytestrings; CRC32 and Adler32 for now.' url="http://hackage.haskell.org/package/$_hkgname" license=(custom:BSD3) arch=('i686' 'x86_64') -makedepends=('ghc') -depends=('haskell-bytestring') +depends=('ghc' 'zlib') source=("http://hackage.haskell.org/packages/archive/$_hkgname/$pkgver/$_hkgname-${pkgver}.tar.gz") install=$pkgname.install -sha256sums=('7bb8b85959cfb3c6539aa2f2104c14aec9758a3a5d6039aba975299fdcd704d4') +sha256sums=('641717eb16392abf8965986a9e8dc21eebf1d97775bbb6923c7b7f8fee17fe11') build() { cd "$srcdir/$_hkgname-$pkgver" diff --git a/community/haskell-dlist/PKGBUILD b/community/haskell-dlist/PKGBUILD index 90c9573d3..d43156f40 100644 --- a/community/haskell-dlist/PKGBUILD +++ b/community/haskell-dlist/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 88875 2013-04-24 14:23:10Z jelle $ +# $Id: PKGBUILD 89299 2013-04-28 16:52:20Z td123 $ # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> # Contributor: Don Stewart <dons@galois.com> # Contributor: Lex Black <autumn-wind at web dot de> @@ -7,13 +7,13 @@ pkgname=haskell-dlist pkgver=0.5 _hkgname=dlist _licensefile=LICENSE -pkgrel=23 +pkgrel=24 pkgdesc="Differences lists" url="http://code.haskell.org/~dons/code/dlist/" license=("BSD3") arch=('i686' 'x86_64') -makedepends=('ghc=7.6.2') -depends=('ghc=7.6.2') +makedepends=('ghc=7.6.3-1') +depends=('ghc=7.6.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 2a0606832..784b9ebba 100644 --- a/community/haskell-extensible-exceptions/PKGBUILD +++ b/community/haskell-extensible-exceptions/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 83997 2013-02-08 04:15:30Z td123 $ +# $Id: PKGBUILD 89300 2013-04-28 16:52:21Z td123 $ # Maintainer: Jelle van der Waa <jelle@vdwaa.nl> _hkgname=extensible-exceptions pkgname=haskell-${_hkgname} pkgver=0.1.1.4 -pkgrel=4 +pkgrel=5 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.6.2-1' sh) +depends=('ghc=7.6.3-1' sh) source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) install=$pkgname.install md5sums=('fa1cadd15c1c7aa362618d41c6e17d8b') diff --git a/community/haskell-ghc-paths/PKGBUILD b/community/haskell-ghc-paths/PKGBUILD index a764c18e8..ffea0e7d4 100644 --- a/community/haskell-ghc-paths/PKGBUILD +++ b/community/haskell-ghc-paths/PKGBUILD @@ -4,12 +4,12 @@ pkgname=haskell-ghc-paths pkgver=0.1.0.9 -pkgrel=1 +pkgrel=2 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.6.2-1') +depends=('ghc=7.6.3-1') source=("http://hackage.haskell.org/packages/archive/ghc-paths/$pkgver/ghc-paths-$pkgver.tar.gz") install="$pkgname.install" sha256sums=('afa68fb86123004c37c1dc354286af2d87a9dcfb12ddcb80e8bd0cd55bc87945') 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 diff --git a/community/haskell-gtk/PKGBUILD b/community/haskell-gtk/PKGBUILD index 8322b0120..c7b150561 100644 --- a/community/haskell-gtk/PKGBUILD +++ b/community/haskell-gtk/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 84000 2013-02-08 04:15:33Z td123 $ +# $Id: PKGBUILD 89303 2013-04-28 16:52:24Z td123 $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=haskell-gtk pkgver=0.12.4 -pkgrel=3 +pkgrel=4 pkgdesc="Binding to the gtk library for Gtk2Hs." url="http://hackage.haskell.org/package/gtk" license=('LGPL2.1') diff --git a/community/haskell-haskeline/PKGBUILD b/community/haskell-haskeline/PKGBUILD index 61f61bc22..7cd9ccb27 100644 --- a/community/haskell-haskeline/PKGBUILD +++ b/community/haskell-haskeline/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 84001 2013-02-08 04:15:34Z td123 $ +# $Id: PKGBUILD 89304 2013-04-28 16:52:25Z td123 $ # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: Arch Haskell Team <arch-haskell@haskell.org> # Package generated by cabal2arch 0.7.6 @@ -6,12 +6,12 @@ _hkgname=haskeline pkgname=haskell-haskeline pkgver=0.7.0.3 -pkgrel=2 +pkgrel=3 pkgdesc="A command-line interface for user input, written in Haskell." url="http://hackage.haskell.org/package/haskeline" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=('ghc=7.6.2-1' 'sh' 'haskell-utf8-string=0.3.7-4' 'haskell-mtl=2.1.2-2' 'haskell-terminfo=0.3.2.5-2') +depends=('ghc=7.6.3-1' 'sh' 'haskell-utf8-string=0.3.7-5' 'haskell-mtl=2.1.2-3' 'haskell-terminfo=0.3.2.5-3') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) install=${pkgname}.install md5sums=('3a78043dc80b5510202e71e77c0a9923') diff --git a/community/haskell-highlighting-kate/PKGBUILD b/community/haskell-highlighting-kate/PKGBUILD index fc7a8dd0e..b4050abd1 100644 --- a/community/haskell-highlighting-kate/PKGBUILD +++ b/community/haskell-highlighting-kate/PKGBUILD @@ -5,7 +5,7 @@ _hkgname=highlighting-kate pkgname=haskell-highlighting-kate pkgver=0.5.3.8 -pkgrel=1 +pkgrel=2 pkgdesc="Syntax highlighting" url="http://hackage.haskell.org/package/$_hkgname" license=('GPL') diff --git a/community/haskell-hslogger/PKGBUILD b/community/haskell-hslogger/PKGBUILD index f5e3a55cb..0dfb8703e 100644 --- a/community/haskell-hslogger/PKGBUILD +++ b/community/haskell-hslogger/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 84002 2013-02-08 04:15:35Z td123 $ +# $Id: PKGBUILD 89306 2013-04-28 16:52:27Z td123 $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Arch Haskell Team <arch-haskell@haskell.org> pkgname=haskell-hslogger pkgver=1.2.1 -pkgrel=3 +pkgrel=4 pkgdesc="Versatile logging framework" url="http://hackage.haskell.org/package/hslogger" license=('LGPL') diff --git a/community/haskell-html/PKGBUILD b/community/haskell-html/PKGBUILD index ffc2455e6..05cd89c76 100644 --- a/community/haskell-html/PKGBUILD +++ b/community/haskell-html/PKGBUILD @@ -6,12 +6,12 @@ _hkgname=html pkgname=haskell-html pkgver=1.0.1.2 -pkgrel=14 +pkgrel=15 pkgdesc="HTML combinator library" url="http://hackage.haskell.org/package/html" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=('ghc=7.6.2-1' 'sh') +depends=('ghc=7.6.3-1' 'sh') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) install=${pkgname}.install md5sums=('2a7de5a2af9a2f80d39825d6a95ee445') diff --git a/community/haskell-json/PKGBUILD b/community/haskell-json/PKGBUILD index 4677e1f77..b1ed11582 100644 --- a/community/haskell-json/PKGBUILD +++ b/community/haskell-json/PKGBUILD @@ -3,7 +3,7 @@ _hkgname=json pkgname=haskell-json pkgver=0.7 -pkgrel=4 +pkgrel=5 pkgdesc="Support for serialising Haskell to and from JSON" url="http://hackage.haskell.org/package/${_hkgname}" license=(custom:BSD3) diff --git a/community/haskell-json/haskell-json.install b/community/haskell-json/haskell-json.install index a57cdb69e..5be36b5cc 100644 --- a/community/haskell-json/haskell-json.install +++ b/community/haskell-json/haskell-json.install @@ -1,6 +1,5 @@ HS_DIR=usr/share/haskell/haskell-json -# functions post_install() { $HS_DIR/register.sh (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) diff --git a/community/haskell-pandoc-types/PKGBUILD b/community/haskell-pandoc-types/PKGBUILD index dccee9b44..b7c7a47c3 100644 --- a/community/haskell-pandoc-types/PKGBUILD +++ b/community/haskell-pandoc-types/PKGBUILD @@ -5,7 +5,7 @@ _hkgname=pandoc-types pkgname=haskell-pandoc-types pkgver=1.10 -pkgrel=1 +pkgrel=2 pkgdesc="Types for representing a structured document" url="http://johnmacfarlane.net/pandoc" license=("GPL") diff --git a/community/haskell-pandoc/PKGBUILD b/community/haskell-pandoc/PKGBUILD index d4c54b3fe..31f7f6a59 100644 --- a/community/haskell-pandoc/PKGBUILD +++ b/community/haskell-pandoc/PKGBUILD @@ -5,7 +5,7 @@ _hkgname=pandoc pkgname=haskell-pandoc pkgver=1.11.1 -pkgrel=1 +pkgrel=2 pkgdesc="Conversion between markup formats" url="http://hackage.haskell.org/package/${_hkgname}" license=('GPL') diff --git a/community/haskell-pango/PKGBUILD b/community/haskell-pango/PKGBUILD index b3b66793c..2d52b6be3 100644 --- a/community/haskell-pango/PKGBUILD +++ b/community/haskell-pango/PKGBUILD @@ -1,13 +1,14 @@ -# $Id: PKGBUILD 84004 2013-02-08 04:15:36Z td123 $ +# $Id: PKGBUILD 89311 2013-04-28 16:52:32Z td123 $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=haskell-pango pkgver=0.12.4 -pkgrel=2 +pkgrel=4 pkgdesc="Binding to the pango library for Gtk2Hs." url="http://hackage.haskell.org/package/pango" license=('LGPL2.1') arch=('i686' 'x86_64') +# deps adjusted to specific versions in package() depends=('ghc' 'pango' 'haskell-glib' 'haskell-cairo') makedepends=("gtk2hs-buildtools") provides=('gtk2hs-pango') diff --git a/community/haskell-pcre-light/PKGBUILD b/community/haskell-pcre-light/PKGBUILD index 9e6b83de1..bbd9e0173 100644 --- a/community/haskell-pcre-light/PKGBUILD +++ b/community/haskell-pcre-light/PKGBUILD @@ -3,7 +3,7 @@ _hkgname=pcre-light pkgname=haskell-pcre-light pkgver=0.4 -pkgrel=21 +pkgrel=22 pkgdesc="A small, efficient and portable regex library for Perl 5 compatible regular expressions" url="http://code.haskell.org/~dons/code/pcre-light" license=(custom:BSD3) diff --git a/community/haskell-primitive/PKGBUILD b/community/haskell-primitive/PKGBUILD index 7fa6e2ccb..088f5e029 100644 --- a/community/haskell-primitive/PKGBUILD +++ b/community/haskell-primitive/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 84005 2013-02-08 04:15:37Z td123 $ +# $Id: PKGBUILD 89313 2013-04-28 16:52:35Z td123 $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=haskell-primitive pkgver=0.5.0.1 -pkgrel=3 +pkgrel=4 pkgdesc="Wrappers for primitive operations" url="http://hackage.haskell.org/package/primitive" license=("custom:BSD3") diff --git a/community/haskell-quickcheck/PKGBUILD b/community/haskell-quickcheck/PKGBUILD index d4bbbde31..937d26326 100644 --- a/community/haskell-quickcheck/PKGBUILD +++ b/community/haskell-quickcheck/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 86643 2013-03-20 21:30:38Z arodseth $ +# $Id: PKGBUILD 89314 2013-04-28 16:52:36Z td123 $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Vesa Kaihlavirta <vesa@archlinux.org> # Contributor: Arch Haskell Team <arch-haskell@haskell.org> @@ -6,12 +6,12 @@ _hkgname=QuickCheck pkgname=haskell-quickcheck pkgver=2.6 -pkgrel=1 +pkgrel=2 pkgdesc='Automatic testing of Haskell programs' url='http://hackage.haskell.org/package/QuickCheck' license=('custom:BSD3') arch=('x86_64' 'i686') -depends=('ghc=7.6.2-1' 'haskell-random=1.0.1.1-4' 'sh') +depends=('ghc=7.6.3-1' 'haskell-random=1.0.1.1-5' 'sh') source=("http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz") install=${pkgname}.install sha256sums=('8001c00a1892714d914e5007ba72cdd428c1ea4c6b8418c6cb5e7809753d970d') diff --git a/community/haskell-regex-base/PKGBUILD b/community/haskell-regex-base/PKGBUILD index 92ace4b31..c966e3963 100644 --- a/community/haskell-regex-base/PKGBUILD +++ b/community/haskell-regex-base/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 85230 2013-02-27 20:01:23Z andrea $ +# $Id: PKGBUILD 89315 2013-04-28 16:52:37Z td123 $ # Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> # Contributor: Arch Haskell Team <arch-haskell@haskell.org> # Contributor: Alexander Rødseth <rodseth@gmail.com> @@ -6,12 +6,12 @@ _hkgname=regex-base pkgname=haskell-regex-base pkgver=0.93.2 -pkgrel=12 +pkgrel=13 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.6.2-1' 'sh' 'haskell-mtl=2.1.2') +depends=('ghc=7.6.3-1' 'sh' 'haskell-mtl=2.1.2') source=("http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz") install=$pkgname.install sha256sums=('20dc5713a16f3d5e2e6d056b4beb9cfdc4368cd09fd56f47414c847705243278') diff --git a/community/haskell-regex-compat/PKGBUILD b/community/haskell-regex-compat/PKGBUILD index 62c4e99e3..fc0738ada 100644 --- a/community/haskell-regex-compat/PKGBUILD +++ b/community/haskell-regex-compat/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 84008 2013-02-08 04:15:40Z td123 $ +# $Id: PKGBUILD 89316 2013-04-28 16:52:38Z td123 $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Vesa Kaihlavirta <vesa@archlinux.org> # Contributor: Arch Haskell Team <arch-haskell@haskell.org> @@ -6,12 +6,12 @@ _hkgname=regex-compat pkgname=haskell-regex-compat pkgver=0.95.1 -pkgrel=4 +pkgrel=5 pkgdesc='Replaces and enhances Text.Regex' url="http://hackage.haskell.org/package/${_hkgname}" license=('custom:BSD3') arch=('x86_64' 'i686') -depends=('ghc=7.6.2-1' 'sh' 'haskell-regex-base=0.93.2' 'haskell-regex-posix=0.95.2') +depends=('ghc=7.6.3-1' 'sh' 'haskell-regex-base=0.93.2' 'haskell-regex-posix=0.95.2') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) install=${pkgname}.install sha256sums=('d57cb1a5a4d66753b18eaa37a1621246f660472243b001894f970037548d953b') diff --git a/community/haskell-regex-posix/PKGBUILD b/community/haskell-regex-posix/PKGBUILD index 374044a61..45597f8d6 100644 --- a/community/haskell-regex-posix/PKGBUILD +++ b/community/haskell-regex-posix/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 84009 2013-02-08 04:15:40Z td123 $ +# $Id: PKGBUILD 89317 2013-04-28 16:52:39Z td123 $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> # Contributor: Arch Haskell Team <arch-haskell@haskell.org> @@ -6,12 +6,12 @@ _hkgname=regex-posix pkgname=haskell-regex-posix pkgver=0.95.2 -pkgrel=3 +pkgrel=4 pkgdesc='The posix regex backend for regex-base' url="http://hackage.haskell.org/package/${_hkgname}" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=('ghc=7.6.2-1' 'sh' 'haskell-regex-base=0.93.2') +depends=('ghc=7.6.3-1' 'sh' 'haskell-regex-base=0.93.2') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) install=${pkgname}.install sha256sums=('56019921cd4a4c9682b81ec614236fea816ba8ed8785a1640cd66d8b24fc703e') diff --git a/community/haskell-stm/PKGBUILD b/community/haskell-stm/PKGBUILD index 83f07905e..0fa5c7670 100644 --- a/community/haskell-stm/PKGBUILD +++ b/community/haskell-stm/PKGBUILD @@ -4,19 +4,19 @@ _hkgname=stm pkgname=haskell-stm pkgver=2.4.2 -pkgrel=1 +pkgrel=2 pkgdesc="A modular composable concurrency abstraction." url="http://hackage.haskell.org/package/stm" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=('ghc=7.6.2-1' 'sh') +depends=('ghc=7.6.3-1' 'sh') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz) install=${pkgname}.install md5sums=('a0008fce2e12a18ab230516132d4117e') build() { cd ${srcdir}/${_hkgname}-$pkgver - runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \ + runhaskell Setup configure -O --enable-split-objs --enable-shared --prefix=/usr \ --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid runhaskell Setup build runhaskell Setup haddock diff --git a/community/haskell-syb/PKGBUILD b/community/haskell-syb/PKGBUILD index d1c237978..dee27a3c4 100644 --- a/community/haskell-syb/PKGBUILD +++ b/community/haskell-syb/PKGBUILD @@ -3,12 +3,12 @@ _hkgname=syb pkgname=haskell-syb pkgver=0.4.0 -pkgrel=1 +pkgrel=2 pkgdesc="A library for client-side HTTP" url="http://hackage.haskell.org/package/${_hkgname}" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=('ghc=7.6.2-1' sh) +depends=('ghc=7.6.3-1' sh) options=('strip') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) install=${pkgname}.install diff --git a/community/haskell-tagsoup/PKGBUILD b/community/haskell-tagsoup/PKGBUILD index f8a7e1d5d..5f7712866 100644 --- a/community/haskell-tagsoup/PKGBUILD +++ b/community/haskell-tagsoup/PKGBUILD @@ -2,7 +2,7 @@ _hkgname=tagsoup pkgname=haskell-tagsoup pkgver=0.12.8 -pkgrel=2 +pkgrel=3 pkgdesc="Parsing and extracting information from (possibly malformed) HTML/XML documents" url="http://community.haskell.org/~ndm/tagsoup/" license=(custom:BSD3) diff --git a/community/haskell-tar/PKGBUILD b/community/haskell-tar/PKGBUILD index 6e5a3e60f..968bcb1cd 100644 --- a/community/haskell-tar/PKGBUILD +++ b/community/haskell-tar/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 84186 2013-02-13 13:14:46Z arodseth $ +# $Id: PKGBUILD 89321 2013-04-28 16:52:43Z td123 $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Arch Haskell Team <arch-haskell@haskell.org> pkgname=haskell-tar pkgver=0.4.0.1 -pkgrel=4 +pkgrel=5 pkgdesc='Reading, writing and manipulating tar archive files' url='http://hackage.haskell.org/package/tar' license=('custom:BSD3') arch=('x86_64' 'i686') -depends=('ghc=7.6.2-1') +depends=('ghc=7.6.3-1') source=("http://hackage.haskell.org/packages/archive/tar/$pkgver/tar-$pkgver.tar.gz") install=haskell-tar.install sha256sums=('a408274d8325f4e3144c5aa154d72f1ee7b0a7342570fd6805e3be3fe0d97a6d') diff --git a/community/haskell-temporary/PKGBUILD b/community/haskell-temporary/PKGBUILD index eff2bcf57..af3453656 100644 --- a/community/haskell-temporary/PKGBUILD +++ b/community/haskell-temporary/PKGBUILD @@ -2,14 +2,13 @@ _hkgname=temporary pkgname=haskell-temporary pkgver=1.1.2.4 -pkgrel=2 +pkgrel=3 pkgdesc="Portable temporary file and directory support for Windows and Unix, based on code from Cabal" url="http://hackage.haskell.org/package/${_hkgname}" license=('custom:BSD3') arch=('i686' 'x86_64') makedepends=() depends=('ghc' 'haskell-directory' 'haskell-filepath' 'haskell-unix') -options=('strip') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) install=$pkgname.install sha1sums=('310b6d07014064b2ecafb794393c1bba76286a33') diff --git a/community/haskell-terminfo/PKGBUILD b/community/haskell-terminfo/PKGBUILD index 9323ddc46..e35f7da1a 100644 --- a/community/haskell-terminfo/PKGBUILD +++ b/community/haskell-terminfo/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 84013 2013-02-08 04:15:44Z td123 $ +# $Id: PKGBUILD 89323 2013-04-28 16:52:45Z td123 $ # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: Arch Haskell Team <arch-haskell@haskell.org> _hkgname=terminfo pkgname=haskell-terminfo pkgver=0.3.2.5 -pkgrel=2 +pkgrel=3 pkgdesc="Haskell bindings to the terminfo library." url="http://hackage.haskell.org/package/${_hkgname}" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=('ghc=7.6.2-1' 'sh') +depends=('ghc=7.6.3-1' 'sh') source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz") install=${pkgname}.install md5sums=('7ef09acfac9f6fc499ed3bb804ae2ab3') diff --git a/community/haskell-texmath/PKGBUILD b/community/haskell-texmath/PKGBUILD index 7be6b094c..50d844037 100644 --- a/community/haskell-texmath/PKGBUILD +++ b/community/haskell-texmath/PKGBUILD @@ -5,7 +5,7 @@ pkgname=haskell-texmath _hkgname=texmath pkgver=0.6.1.3 -pkgrel=1 +pkgrel=2 pkgdesc="Conversion of LaTeX math formulas to MathML." url="https://github.com/jgm/texmath" license=("GPL") diff --git a/community/haskell-utf8-string/PKGBUILD b/community/haskell-utf8-string/PKGBUILD index ffaf3272e..cbe6930f6 100644 --- a/community/haskell-utf8-string/PKGBUILD +++ b/community/haskell-utf8-string/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 84014 2013-02-08 04:15:45Z td123 $ +# $Id: PKGBUILD 89325 2013-04-28 16:52:49Z td123 $ # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: Arch Haskell Team <arch-haskell@haskell.org> # Package generated by cabal2arch 0.7.6 _hkgname=utf8-string pkgname=haskell-utf8-string pkgver=0.3.7 -pkgrel=4 +pkgrel=5 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.6.2-1' 'sh') +depends=('ghc=7.6.3-1' 'sh') install=${pkgname}.install source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) md5sums=('50e5c395713e716e0e4a56da73f87ccd') diff --git a/community/haskell-vector/PKGBUILD b/community/haskell-vector/PKGBUILD index 25bbbf5fb..bbd867873 100644 --- a/community/haskell-vector/PKGBUILD +++ b/community/haskell-vector/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 84015 2013-02-08 04:15:45Z td123 $ +# $Id: PKGBUILD 89326 2013-04-28 16:52:52Z td123 $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=haskell-vector pkgver=0.10.0.1 -pkgrel=2 +pkgrel=4 pkgdesc="Efficient Arrays" url="http://code.haskell.org/vector" license=("custom:BSD3") arch=('i686' 'x86_64') makedepends=() -depends=("ghc" "haskell-primitive") +depends=("ghc=7.6.3" "haskell-primitive") options=('strip') 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 3bb202d51..a2ef0e0f2 100644 --- a/community/haskell-x11-xft/PKGBUILD +++ b/community/haskell-x11-xft/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 87100 2013-03-27 07:08:13Z jelle $ +# $Id: PKGBUILD 89328 2013-04-28 16:52:54Z td123 $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> _hkgname=X11-xft pkgname=haskell-x11-xft pkgver=0.3.1 -pkgrel=8 +pkgrel=9 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.6.2-1' 'haskell-x11=1.6.1.1-2' 'haskell-utf8-string=0.3.7-4' 'libxft') +depends=('ghc=7.6.3-1' 'haskell-x11=1.6.1.1-3' '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) @@ -17,7 +17,7 @@ md5sums=('ad885150a59f63de328e73abe5ffc79e') build() { cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ + runhaskell Setup configure -O --enable-split-objs --enable-shared \ --prefix=/usr --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid runhaskell Setup build runhaskell Setup haddock diff --git a/community/haskell-x11/PKGBUILD b/community/haskell-x11/PKGBUILD index 46d68bf10..5e93dc6b1 100644 --- a/community/haskell-x11/PKGBUILD +++ b/community/haskell-x11/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 87099 2013-03-27 07:08:12Z jelle $ +# $Id: PKGBUILD 89327 2013-04-28 16:52:53Z td123 $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: shild <sxp@bk.ru> # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> @@ -6,13 +6,13 @@ _hkgname=X11 pkgname=haskell-x11 pkgver=1.6.1.1 -pkgrel=2 +pkgrel=3 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.6.2-1" "libx11" "libxinerama" "libxrandr" "haskell-data-default") +depends=("ghc=7.6.3-1" "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) @@ -20,7 +20,7 @@ md5sums=('80638b99238f72d4cc351b4fbd7274fc') build() { cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ + runhaskell Setup configure -O --enable-split-objs --enable-shared \ --prefix=/usr --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid runhaskell Setup build runhaskell Setup haddock diff --git a/community/haskell-xhtml/PKGBUILD b/community/haskell-xhtml/PKGBUILD index 7104a7869..67ee0ad24 100644 --- a/community/haskell-xhtml/PKGBUILD +++ b/community/haskell-xhtml/PKGBUILD @@ -6,12 +6,12 @@ _hkgname=xhtml pkgname=haskell-xhtml pkgver=3000.2.1 -pkgrel=3 +pkgrel=4 pkgdesc='Combinators for producing XHTML 1.0' url='http://hackage.haskell.org/package/xhtml' license=('custom:BSD3') arch=('x86_64' 'i686') -depends=('ghc=7.6.2-1' 'sh') +depends=('ghc=7.6.3-1' 'sh') source=("http://hackage.haskell.org/packages/archive/$_hkgname/$pkgver/$_hkgname-$pkgver.tar.gz") install=$pkgname.install sha256sums=('33020782170c1c083bc59fc3bfcb72cec2db223e02d1181c07ae23b9fa7fdcd8') diff --git a/community/haskell-xml/PKGBUILD b/community/haskell-xml/PKGBUILD index 64a08da12..1dbd9f84a 100644 --- a/community/haskell-xml/PKGBUILD +++ b/community/haskell-xml/PKGBUILD @@ -5,7 +5,7 @@ _hkgname=xml pkgname=haskell-xml pkgver=1.3.13 -pkgrel=1 +pkgrel=2 pkgdesc="A simple XML library." url="http://code.galois.com" license=(custom:BSD3) diff --git a/community/haskell-zip-archive/PKGBUILD b/community/haskell-zip-archive/PKGBUILD index 8b81e9fd4..af589729e 100644 --- a/community/haskell-zip-archive/PKGBUILD +++ b/community/haskell-zip-archive/PKGBUILD @@ -5,7 +5,7 @@ pkgname=haskell-zip-archive _hkgname=zip-archive pkgver=0.1.3.4 -pkgrel=2 +pkgrel=3 pkgdesc="Library for creating and modifying zip archives." url="http://github.com/jgm/zip-archive" license=(custom:BSD3) diff --git a/community/hedgewars/PKGBUILD b/community/hedgewars/PKGBUILD index 295d2e7e4..fa36f4b76 100644 --- a/community/hedgewars/PKGBUILD +++ b/community/hedgewars/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 85357 2013-03-01 10:32:49Z andrea $ +# $Id: PKGBUILD 89332 2013-04-28 16:53:03Z td123 $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=hedgewars pkgver=0.9.18 -pkgrel=6 +pkgrel=7 pkgdesc="Free Worms-like turn based strategy game" arch=('i686' 'x86_64') url="http://hedgewars.org" @@ -11,13 +11,13 @@ license=('GPL' 'custom') depends=('qt4' 'sdl' 'sdl_mixer' 'sdl_image' 'sdl_net' 'sdl_ttf' 'lua51') makedepends=('fpc' 'cmake' # haskell specific - 'ghc=7.6.2-1' - 'haskell-network=2.4.1.0-1' - 'haskell-bytestring-show=0.3.5.4-3' - 'haskell-utf8-string=0.3.7-4' - 'haskell-dataenc=0.14.0.5-1' - 'haskell-hslogger=1.2.1-3' - 'haskell-vector=0.10.0.1-2') + 'ghc=7.6.3-1' + 'haskell-network=2.4.1.2-1' + 'haskell-bytestring-show=0.3.5.4-4' + 'haskell-utf8-string=0.3.7-5' + 'haskell-dataenc=0.14.0.5-2' + 'haskell-hslogger=1.2.1-4' + 'haskell-vector=0.10.0.1-4') source=(http://download.gna.org/hedgewars/hedgewars-src-$pkgver-3.tar.bz2 hedgewars.desktop hedgewars.png) diff --git a/community/python-pyzmq/PKGBUILD b/community/python-pyzmq/PKGBUILD index 87512ebb3..3037f3b60 100644 --- a/community/python-pyzmq/PKGBUILD +++ b/community/python-pyzmq/PKGBUILD @@ -1,17 +1,18 @@ -# $Id: PKGBUILD 80562 2012-11-25 15:29:31Z kkeen $ +# $Id: PKGBUILD 89207 2013-04-28 02:59:53Z kkeen $ # Maintainer: Kyle Keen <keenerd at gmail dot com> pkgbase=python-pyzmq pkgname=(python2-pyzmq python-pyzmq) -pkgver=2.2.0.1 -pkgrel=3 -pkgdesc="Python3 bindings for zeromq, written in Cython" +pkgver=13.0.2 +pkgrel=1 +pkgdesc="Python bindings for zeromq, written in Cython" arch=(i686 x86_64) url="http://www.zeromq.org/bindings:python" license=('LGPL') depends=(zeromq python) makedepends=(python python2 zeromq) -source=(https://github.com/zeromq/pyzmq/downloads/pyzmq-$pkgver.tar.gz) -md5sums=('f2f80709e84c8ac72d6671eee645d804') +#source=(https://github.com/zeromq/pyzmq/downloads/pyzmq-$pkgver.tar.gz) +source=(https://pypi.python.org/packages/source/p/pyzmq/pyzmq-$pkgver.tar.gz) +md5sums=('49b1a8b858693522730225e3dc2a0910') build() { cd "$srcdir" @@ -25,12 +26,14 @@ build() { } package_python2-pyzmq() { + pkgdesc="Python2 bindings for zeromq, written in Cython" depends=(zeromq python2) cd "$srcdir/py2zmq-$pkgver" python2 setup.py install --root="$pkgdir" --optimize=0 } package_python-pyzmq() { + pkgdesc="Python3 bindings for zeromq, written in Cython" depends=(zeromq python) cd "$srcdir/pyzmq-$pkgver" python3 setup.py install --root="$pkgdir" --optimize=0 diff --git a/community/ruby-iconv/PKGBUILD b/community/ruby-iconv/PKGBUILD new file mode 100755 index 000000000..d2b60d9ac --- /dev/null +++ b/community/ruby-iconv/PKGBUILD @@ -0,0 +1,24 @@ +# $Id: PKGBUILD 89242 2013-04-28 10:01:07Z alucryd $ +# Maintainer: Alucryd <alucryd at gmail dot com> + +pkgname=ruby-iconv +pkgver=1.0.3 +pkgrel=2 +pkgdesc="Wrapper library for iconv" +arch=('i686' 'x86_64') +url="https://github.com/nurse/iconv" +license=('GPL3') +depends=('ruby') +makedepends=('rubygems') +options=('!emptydirs') +source=("https://rubygems.org/downloads/${pkgname#*-}-${pkgver}.gem") +sha256sums=('94a9b62a56c96226b62b787cd45fdc48c03f4517f1e36e64db113b010fb012da') + +package() { + cd "${srcdir}" + + local _gemdir="$(ruby -rubygems -e 'puts Gem.default_dir')" + gem install --no-user-install --ignore-dependencies -i "${pkgdir}"${_gemdir} ${pkgname#*-}-${pkgver}.gem +} + +# vim: ts=2 sw=2 et: diff --git a/community/seahorse-nautilus/PKGBUILD b/community/seahorse-nautilus/PKGBUILD index 302086b15..8609d920c 100644 --- a/community/seahorse-nautilus/PKGBUILD +++ b/community/seahorse-nautilus/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 87367 2013-03-30 11:14:30Z bgyorgy $ +# $Id: PKGBUILD 89362 2013-04-28 20:39:50Z bgyorgy $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> pkgname=seahorse-nautilus pkgver=3.8.0 -pkgrel=1 +pkgrel=2 pkgdesc="PGP encryption and signing for nautilus" arch=('i686' 'x86_64') url="http://git.gnome.org/browse/seahorse-nautilus/" @@ -12,12 +12,17 @@ depends=('libcryptui' 'gcr' 'nautilus') makedepends=('intltool') options=('!libtool') install=$pkgname.install -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('8173ef08a700ff254fb5637a7f2138ba7625b19ed2102a82fd69f1ecb8072863') +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz + glib236.patch) +sha256sums=('8173ef08a700ff254fb5637a7f2138ba7625b19ed2102a82fd69f1ecb8072863' + '0cefa14a45784c82871815e9bdcebbb96dea50a8e43316475e6a36d5dc47ade5') build() { cd "$srcdir/$pkgname-$pkgver" + # Fix compatibility with glib 2.36 + patch -Np1 -i "$srcdir/glib236.patch" + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --disable-static --disable-schemas-compile make diff --git a/community/seahorse-nautilus/glib236.patch b/community/seahorse-nautilus/glib236.patch new file mode 100644 index 000000000..d0ab03046 --- /dev/null +++ b/community/seahorse-nautilus/glib236.patch @@ -0,0 +1,12 @@ +diff -Naur seahorse-nautilus-3.8.0.orig/tool/seahorse-tool-progress.c seahorse-nautilus-3.8.0/tool/seahorse-tool-progress.c +--- seahorse-nautilus-3.8.0.orig/tool/seahorse-tool-progress.c 2011-10-24 09:25:37.000000000 +0200 ++++ seahorse-nautilus-3.8.0/tool/seahorse-tool-progress.c 2013-04-28 22:26:54.483276592 +0200 +@@ -226,8 +226,6 @@ + progress_fd = -1; + return; + } +- +- g_child_watch_add (progress_pid, progress_cancel, NULL); + } + + void diff --git a/community/sensors-applet/PKGBUILD b/community/sensors-applet/PKGBUILD index 3c9da15c1..1a62c5692 100644 --- a/community/sensors-applet/PKGBUILD +++ b/community/sensors-applet/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 68359 2012-03-23 01:09:57Z bgyorgy $ +# $Id: PKGBUILD 89360 2013-04-28 20:21:26Z bgyorgy $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> pkgname=sensors-applet pkgver=3.0.0 -pkgrel=2 +pkgrel=3 pkgdesc="Applet for GNOME Panel to display readings from hardware sensors, including CPU temperature, fan speeds and voltage readings" arch=('i686' 'x86_64') url="http://sensors-applet.sourceforge.net/" @@ -14,12 +14,20 @@ optdepends=('hddtemp: get HDD temperatures' 'udisks: get HDD temperatures') options=('!libtool') install=$pkgname.install -source=(http://downloads.sourceforge.net/sensors-applet/$pkgname-$pkgver.tar.gz) -md5sums=('425078fc1ff5a98af1547e039002a73f') +source=(http://downloads.sourceforge.net/sensors-applet/$pkgname-$pkgver.tar.gz + gtk38.patch) +md5sums=('425078fc1ff5a98af1547e039002a73f' + '7289cb0acd5c05daf824df6a90967240') build() { cd "$srcdir/$pkgname-$pkgver" + # Enable reprecations + sed -i '/CFLAGS+=/d' configure{,.ac} + + # Fix compatibility with GTK+ 3.8 + patch -Np1 -i "$srcdir/gtk38.patch" + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \ --disable-static --disable-scrollkeeper --with-nvidia=no make diff --git a/community/sensors-applet/gtk38.patch b/community/sensors-applet/gtk38.patch new file mode 100644 index 000000000..530d756a3 --- /dev/null +++ b/community/sensors-applet/gtk38.patch @@ -0,0 +1,127 @@ +diff -Naur sensors-applet-3.0.0.orig/sensors-applet/sensors-applet.c sensors-applet-3.0.0/sensors-applet/sensors-applet.c +--- sensors-applet-3.0.0.orig/sensors-applet/sensors-applet.c 2011-11-03 12:33:36.000000000 +0100 ++++ sensors-applet-3.0.0/sensors-applet/sensors-applet.c 2013-04-28 20:08:31.002620583 +0200 +@@ -641,122 +641,8 @@ + /* get the first active sensor */ + first_sensor = (ActiveSensor *)sensors_applet->active_sensors->data; + +- switch (display_mode) { +- case DISPLAY_VALUE: +- gtk_widget_size_request(GTK_WIDGET(first_sensor->value), +- &req); +- value_width = req.width + COLUMN_SPACING; +- value_height = req.height + ROW_SPACING; ++ num_sensors_per_group = 1; + +- /* make sure all widths and heights are non zero, +- * otherwise will get a divide by zero exception below +- * - is a non critical error since can happen when +- * elements first added to list, so simply return - is +- * not a programming error */ +- if (value_width == 0 && value_height == 0) { +- return; +- } +- +- num_sensors_per_group = (sensors_applet->size / +- (horizontal ? value_height : +- value_width)); +- break; +- +- case DISPLAY_LABEL_WITH_VALUE: +- /* even though we end up packing the event boxes into the +- * panel, these dont give back request sizes, so need to ask +- * widgets directly */ +- gtk_widget_size_request(GTK_WIDGET(first_sensor->value), +- &req); +- value_width = req.width + COLUMN_SPACING; +- value_height = req.height + ROW_SPACING; +- +- gtk_widget_size_request(GTK_WIDGET(first_sensor->label), +- &req); +- label_width = req.width + COLUMN_SPACING; +- label_height = req.height + ROW_SPACING; +- +- /* make sure all widths and heights are non zero, otherwise +- * will get a divide by zero exception below +- * - is a non critical error since can happen when +- * elements first added to list, so simply return - is +- * not a programming error */ +- if (!(label_width && label_height && +- value_width && value_height)) { +- return; +- } +- +- switch (layout_mode) { +- case VALUE_BESIDE_LABEL: +- num_sensors_per_group = (sensors_applet->size / +- (horizontal ? MAX(label_height, value_height) : +- (label_width + value_width))); +- break; +- case VALUE_BELOW_LABEL: +- num_sensors_per_group = (sensors_applet->size / +- (horizontal ? (label_height + value_height) : +- MAX(label_width, value_width))); +- +- +- break; +- } +- break; +- +- case DISPLAY_ICON_WITH_VALUE: +- gtk_widget_size_request(GTK_WIDGET(first_sensor->value), +- &req); +- value_width = req.width + COLUMN_SPACING; +- value_height = req.height + ROW_SPACING; +- +- gtk_widget_size_request(GTK_WIDGET(first_sensor->icon), +- &req); +- icon_width = req.width + COLUMN_SPACING; +- icon_height = req.height + ROW_SPACING; +- +- //watch out if num_sensors_per_group is correctly computed +- //while icon_height is 0 +- if (!(icon_width && +- value_width && value_height)) { +- return; +- } +- +- +- switch (layout_mode) { +- case VALUE_BESIDE_LABEL: +- num_sensors_per_group = (sensors_applet->size / +- (horizontal ? MAX(icon_height, value_height) : +- (icon_width + value_width))); +- break; +- case VALUE_BELOW_LABEL: +- num_sensors_per_group = (sensors_applet->size / +- (horizontal ? (icon_height + value_height) : +- MAX(icon_width, value_width))); +- +- +- break; +- } +- break; +- +- case DISPLAY_ICON: +- gtk_widget_size_request(GTK_WIDGET(first_sensor->icon), +- &req); +- icon_width = req.width + COLUMN_SPACING; +- icon_height = req.height + ROW_SPACING; +- if (!(icon_width && icon_height)) { +- return; +- } +- +- num_sensors_per_group = (sensors_applet->size / +- (horizontal ? icon_height : +- icon_width)); +- break; +- +- case DISPLAY_GRAPH: +- /* only show graphs in a line like System Monitor +- * applet */ +- num_sensors_per_group = 1; +- break; +- } + /* ensure always atleast 1 sensor per group */ + if (num_sensors_per_group < 1) { + /* force a better layout */ diff --git a/community/texmaker/PKGBUILD b/community/texmaker/PKGBUILD index cf0ce245c..8ba258d91 100644 --- a/community/texmaker/PKGBUILD +++ b/community/texmaker/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 86310 2013-03-15 05:07:25Z cinelli $ +# $Id: PKGBUILD 89278 2013-04-28 12:14:49Z cinelli $ #Maintainer: Federico Cinelli <cinelli@aur.archlinux.org> pkgname=texmaker -pkgver=4.0 +pkgver=4.0.1 pkgrel=1 pkgdesc='Free cross-platform LaTeX editor' arch=('i686' 'x86_64') @@ -10,15 +10,15 @@ url="http://www.xm1math.net/texmaker/index.html" license=('GPL') depends=('poppler-qt' 'qtwebkit') optdepends=('ghostscript: LaTeX to HTML conversion command' - 'ibus-qt: accented characters support' + 'ibus-qt: accented characters support'bu 'poppler: PDF rendering support') install="$pkgname.install" source=("http://www.xm1math.net/$pkgname/$pkgname-$pkgver.tar.bz2") -md5sums=('3599fd142d8d3596b7bd14724fc1888e') +md5sums=('62f87f7b44e92ca68817663d3d5aeca4') build() { cd "$pkgname-$pkgver" - qmake PREFIX=/usr texmaker.pro + qmake-qt4 PREFIX=/usr texmaker.pro make } package() { diff --git a/community/virtualbox-modules/PKGBUILD b/community/virtualbox-modules/PKGBUILD index 7d2e3f867..08ca3d9d2 100644 --- a/community/virtualbox-modules/PKGBUILD +++ b/community/virtualbox-modules/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 88763 2013-04-22 09:42:07Z tpowa $ +# $Id: PKGBUILD 89225 2013-04-28 06:44:11Z tpowa $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Maintainer: Sébastien Luttringer pkgbase=virtualbox-modules pkgname=('virtualbox-host-modules' 'virtualbox-guest-modules') pkgver=4.2.12 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') diff --git a/community/xe-guest-utilities/PKGBUILD b/community/xe-guest-utilities/PKGBUILD new file mode 100644 index 000000000..feafca99b --- /dev/null +++ b/community/xe-guest-utilities/PKGBUILD @@ -0,0 +1,77 @@ +# $Id: PKGBUILD 89210 2013-04-28 05:04:55Z dwallace $ +# Maintainer: Daniel Wallace <danielwallace at code gtmanfred com> +# Contributor: Phillip Smith <fukawi2@NO-SPAM.gmail.com> +# Contributor: Krzysztof Raczkowski <raczkow@gnu-tech.pl> + +pkgbase=xe-guest-utilities +pkgname=('xe-guest-utilities' 'xenstore') +pkgver=6.1.0 +pkgrel=4 +pkgdesc="Citrix XenServer Tools" +arch=('i686' 'x86_64') +url="http://citrix.com/English/ps2/products/product.asp?contentID=683148&ntref=hp_nav_US" +license=('GPL' 'LGPL') +makedepends=(python2) +optdepends=('linux: DomU kernel for x86_64' + 'linux-xen: DomU kernel for i686' + 'kernel-lts-xen: DomU kernel for i686') +source=("ftp://ftp.archlinux.org/other/community/$pkgbase/${pkgbase}_${pkgver}-1033.tar.gz" + 'ip_address.patch' + 'xe-linux-distribution.service' + 'xe-daemon.service' + 'proc-xen.mount' + 'tmpfile') +md5sums=('26fd52ffc5ddeb7d3e510e6f272c2860' + '9bd39e95384056069f7faa870a28413a' + 'abf49bd0925142e51ce2875cd5e5ad45' + '43264c6954c9c036b260521653ade41f' + '3252fa21362fd55246f9d8b923070151' + 'cadad1eb5b1fa6d5fe463a1a0fd82fff') + +prepare(){ + patch -d $srcdir/$pkgname-$pkgver -Np1 -i $srcdir/ip_address.patch + bsdtar xf "$srcdir/$pkgname-$pkgver/xenstore-sources.tar.bz2" +} + +build() { + export CC=gcc + CFLAGS='-Wall -Wstrict-prototypes -Wno-unused-local-typedefs -Wno-sizeof-pointer-memaccess' + export CFLAGS + export PYTHON=python2 + cd "$srcdir/uclibc-sources" + make -C tools/include + make -C tools/libxc + make -C tools/xenstore +} + +package_xenstore() { + depends=(bzip2 lzo2 zlib xz) + export CFLAGS+='-Wall -Wstrict-prototypes -Wno-unused-local-typedefs -Wno-sizeof-pointer-memaccess' + if [[ $CARCH == x86_64 ]]; then + export LIBLEAFDIR_x86_64=lib + fi + for f in include libxc xenstore; do + [[ ! -d "$srcdir"/uclibc-sources/tools/$f ]] && continue + make -C ""$srcdir"/uclibc-sources/tools/$f" DESTDIR="$pkgdir" install + done + cd "$srcdir/$pkgbase-$pkgver" + install -Dm644 "COPYING.LGPL" "$pkgdir/usr/share/licenses/$pkgname/COPYING.LGPL" + install -Dm644 "COPYING" "$pkgdir/usr/share/licenses/$pkgname/COPYING" + install -Dm644 $srcdir/proc-xen.mount "$pkgdir/usr/lib/systemd/system/proc-xen.mount" + install -Dm644 $srcdir/tmpfile "$pkgdir/usr/lib/tmpfiles.d/30-xenstored.conf" + rm -r "$pkgdir"/var +} + +package_xe-guest-utilities(){ + cd "$srcdir/$pkgname-$pkgver" + depends=('xenstore' 'bash') + install -Dm755 xe-linux-distribution "$pkgdir/usr/sbin/xe-linux-distribution" + install -Dm755 xe-update-guest-attrs "$pkgdir/usr/sbin/xe-update-guest-attrs" + install -Dm755 xe-daemon "$pkgdir/usr/sbin/xe-daemon" + install -Dm644 xen-vcpu-hotplug.rules "$pkgdir/usr/lib/udev/rules.d/10-xen-vcpu-hotplug.rules" + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" + install -Dm644 $srcdir/xe-daemon.service "$pkgdir/usr/lib/systemd/system/xe-daemon.service" + install -Dm644 $srcdir/xe-linux-distribution.service "$pkgdir/usr/lib/systemd/system/" +} + +# vim:set ts=2 sw=2 et: diff --git a/community/xe-guest-utilities/ip_address.patch b/community/xe-guest-utilities/ip_address.patch new file mode 100644 index 000000000..3142c3d6b --- /dev/null +++ b/community/xe-guest-utilities/ip_address.patch @@ -0,0 +1,16 @@ +diff -uNr a/xe-update-guest-attrs b/xe-update-guest-attrs +--- a/xe-update-guest-attrs 2012-09-25 12:45:14.000000000 +0200 ++++ b/xe-update-guest-attrs 2012-11-21 16:46:35.000000000 +0100 +@@ -177,9 +177,9 @@ + # collisions:0 txqueuelen:0 + # RX bytes:3604609 (3.4 MiB) TX bytes:3604609 (3.4 MiB) + +-ifs=`/sbin/ifconfig | sed -n -e 's/^\([a-z0-9]\+\).*/name \1/p' \ +- -e 's/.*inet addr:\('$IPADDR_RE'\) .*/ipv4 \1/p' \ +- -e 's+.*inet6 addr: \('$IPADDR6_RE'\)/.*+ipv6 \1+p' | \ ++ifs=`ip addr show | sed -n -e 's/^[[:digit:]]*: \([a-z0-9]*\): .*/name \1 /gp;' \ ++ -e 's/^[[:space:]]\{4\}inet \('${IPADDR_RE}'\)\/.*/ipv4 \1 /gp;' \ ++ -e 's/^[[:space:]]\{4\}inet6 \('${IPADDR6_RE}'\)\/.*/ipv6 \1 /gp;' | \ + while read tag value; do + case "${tag}" in + name) diff --git a/community/xe-guest-utilities/proc-xen.mount b/community/xe-guest-utilities/proc-xen.mount new file mode 100644 index 000000000..0eaa59c5f --- /dev/null +++ b/community/xe-guest-utilities/proc-xen.mount @@ -0,0 +1,9 @@ +[Unit] +Description=Mount /proc/xen files +ConditionPathExists=/proc/xen +RefuseManualStop=true + +[Mount] +What=xenfs +Where=/proc/xen +Type=xenfs diff --git a/community/xe-guest-utilities/tmpfile b/community/xe-guest-utilities/tmpfile new file mode 100644 index 000000000..44337cf44 --- /dev/null +++ b/community/xe-guest-utilities/tmpfile @@ -0,0 +1 @@ +d /run/xenstored 0755 - - - diff --git a/community/xe-guest-utilities/xe-daemon.service b/community/xe-guest-utilities/xe-daemon.service new file mode 100644 index 000000000..5245c702d --- /dev/null +++ b/community/xe-guest-utilities/xe-daemon.service @@ -0,0 +1,12 @@ +[Unit] +Description=xen daemon file +After=xe-linux-distribution.service +Requires=proc-xen.mount + +[Service] +PIDFile=/run/xe-daemon.pid +ExecStart=/usr/sbin/xe-daemon -p /run/xe-daemon.pid +ExecStop=/bin/pkill -TERM -F /run/xe-daemon.pid + +[Install] +WantedBy=multi-user.target diff --git a/community/xe-guest-utilities/xe-linux-distribution.service b/community/xe-guest-utilities/xe-linux-distribution.service new file mode 100644 index 000000000..5f3f91cc0 --- /dev/null +++ b/community/xe-guest-utilities/xe-linux-distribution.service @@ -0,0 +1,11 @@ +[Unit] +Description=xen linux distribution service +Before=xend.service + +[Service] +Type=simple +RemainAfterExit=yes +ExecStart=/usr/sbin/xe-linux-distribution /var/cache/xe-linux-distribution + +[Install] +WantedBy=multi-user.target diff --git a/community/xmobar/PKGBUILD b/community/xmobar/PKGBUILD index bfb91d0b9..1164f39ad 100644 --- a/community/xmobar/PKGBUILD +++ b/community/xmobar/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 84020 2013-02-08 04:15:49Z td123 $ +# $Id: PKGBUILD 89333 2013-04-28 16:53:04Z td123 $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Arch Haskell Team <arch-haskell@haskell.org> pkgname=xmobar pkgver=0.16 -pkgrel=5 +pkgrel=6 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.6.2-1' 'haskell-x11=1.6.0.2-2' 'haskell-x11-xft=0.3.1-6' 'haskell-utf8-string=0.3.7-4' - 'haskell-stm=2.4.2-1' 'haskell-parsec=3.1.3-2' 'haskell-mtl=2.1.2-2') +makedepends=('ghc=7.6.3-1' 'haskell-x11=1.6.1.1-3' 'haskell-x11-xft=0.3.1-9' 'haskell-utf8-string=0.3.7-5' + 'haskell-stm=2.4.2-2' 'haskell-parsec=3.1.3-3' 'haskell-mtl=2.1.2-3') options=('strip') source=(http://hackage.haskell.org/packages/archive/xmobar/$pkgver/xmobar-$pkgver.tar.gz) md5sums=('4742f1556a8e9b292f18df1176dcd378') diff --git a/community/xmonad-contrib/PKGBUILD b/community/xmonad-contrib/PKGBUILD index 62e077b8f..30b913ea4 100644 --- a/community/xmonad-contrib/PKGBUILD +++ b/community/xmonad-contrib/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 87102 2013-03-27 07:08:16Z jelle $ +# $Id: PKGBUILD 89335 2013-04-28 16:53:08Z td123 $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: orbisvicis <gmail.com> pkgname=xmonad-contrib pkgver=0.11 -pkgrel=6 +pkgrel=7 pkgdesc="Add-ons for xmonad" arch=('i686' 'x86_64') url="http://xmonad.org/" license=('BSD') -depends=('ghc=7.6.2-1' 'xmonad=0.11-5' 'sh' 'haskell-x11=1.6.1.1-2' 'haskell-x11-xft=0.3.1' 'haskell-utf8-string=0.3.7-4' 'haskell-random=1.0.1.1-4') +depends=('ghc=7.6.3-1' 'xmonad=0.11-6' 'sh' 'haskell-x11=1.6.1.1-3' 'haskell-x11-xft=0.3.1-9' 'haskell-utf8-string=0.3.7-5' 'haskell-random=1.0.1.1-5') install='xmonad-contrib.install' source=(http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz xmonad-contrib-remove-getatomname.patch) diff --git a/community/xmonad/PKGBUILD b/community/xmonad/PKGBUILD index 357b8a5e9..658c18cbd 100644 --- a/community/xmonad/PKGBUILD +++ b/community/xmonad/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 87101 2013-03-27 07:08:15Z jelle $ +# $Id: PKGBUILD 89334 2013-04-28 16:53:06Z td123 $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: shild <shildv@gmail.com> pkgname=xmonad pkgver=0.11 -pkgrel=5 +pkgrel=6 pkgdesc="Lightweight X11 tiled window manager written in Haskell" arch=('i686' 'x86_64') url="http://xmonad.org/" license=('BSD') -depends=('ghc=7.6.2-1' 'gmp' 'haskell-x11=1.6.1.1-2' 'sh' 'haskell-mtl=2.1.2-2' 'haskell-utf8-string=0.3.7-4' 'haskell-extensible-exceptions=0.1.1.4-4') +depends=('ghc=7.6.3-1' 'gmp' 'haskell-x11=1.6.1.1-3' 'sh' 'haskell-mtl=2.1.2-3' 'haskell-utf8-string=0.3.7-5' 'haskell-extensible-exceptions=0.1.1.4-5') makedepends=('gendesk') optdepends=('xorg-xmessage: for displaying visual error messages') install='xmonad.install' diff --git a/core/less/PKGBUILD b/core/less/PKGBUILD index 36a8ebf50..5a9b09245 100644 --- a/core/less/PKGBUILD +++ b/core/less/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 166324 2012-09-06 11:47:33Z allan $ +# $Id: PKGBUILD 183839 2013-04-28 10:03:22Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=less -pkgver=451 +pkgver=458 pkgrel=1 pkgdesc="A terminal based program for viewing text files" license=('GPL3') @@ -12,18 +12,16 @@ url="http://www.greenwoodsoftware.com/less" groups=('base') depends=('ncurses' 'pcre') source=(http://www.greenwoodsoftware.com/$pkgname/$pkgname-$pkgver.tar.gz{,.sig}) -md5sums=('765f082658002b2b46b86af4a0da1842' - 'a5493f4598ba7c9f81782683f3c27119') +md5sums=('935b38aa2e73c888c210dedf8fd94f49' + 'SKIP') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - + cd ${srcdir}/${pkgname}-${pkgver} ./configure --prefix=/usr --sysconfdir=/etc --with-regex=pcre make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make prefix="${pkgdir}"/usr install + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install } diff --git a/extra/cabal-install/PKGBUILD b/extra/cabal-install/PKGBUILD index a79a7af4d..11149a80e 100644 --- a/extra/cabal-install/PKGBUILD +++ b/extra/cabal-install/PKGBUILD @@ -4,12 +4,12 @@ pkgname=cabal-install pkgver=1.16.0.2 -pkgrel=2 +pkgrel=3 pkgdesc="The command-line interface for Cabal and Hackage." url="http://hackage.haskell.org/package/cabal-install" license=('custom:BSD3') arch=('i686' 'x86_64') -makedepends=('haskell-http=4000.2.7-1' 'haskell-zlib=0.5.4.0-1' 'haskell-mtl=2.1.2-2' 'haskell-network=2.4.1.0-1' 'haskell-random=1.0.1.1-4') +makedepends=('haskell-http=4000.2.8-1' 'haskell-zlib=0.5.4.1-1' 'haskell-mtl=2.1.2-3' 'haskell-network=2.4.1.2-1' 'haskell-random=1.0.1.1-5') depends=('ghc' 'gmp' 'zlib') source=("http://hackage.haskell.org/packages/archive/cabal-install/${pkgver}/cabal-install-${pkgver}.tar.gz") md5sums=('18e07d5b431d19d94cc5279a5e6fbfee') diff --git a/extra/ghc/PKGBUILD b/extra/ghc/PKGBUILD index 5b3c07416..3f5ba7f7c 100644 --- a/extra/ghc/PKGBUILD +++ b/extra/ghc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 177606 2013-02-08 04:14:31Z td123 $ +# $Id: PKGBUILD 183848 2013-04-28 16:50:01Z td123 $ # Maintainer: Thomas Dziedzic <gostrc@gmail.com> # Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> # Special note for devs looking to upgrade this package: @@ -7,7 +7,7 @@ # This implies that all libraries need to be rebuilt when ghc is rebuilt. pkgname=ghc -pkgver=7.6.2 +pkgver=7.6.3 pkgrel=1 pkgdesc='The Glasgow Haskell Compiler' arch=('i686' 'x86_64') @@ -72,8 +72,8 @@ replaces=('haskell-array<0.4.0.1' source=("http://www.haskell.org/ghc/dist/${pkgver}/ghc-${pkgver}-src.tar.bz2" "http://www.haskell.org/ghc/dist/${pkgver}/ghc-${pkgver}-testsuite.tar.bz2" 'build.mk') -md5sums=('2585d83e7d8daece2fe0949c6bc42a2c' - '8454aaeb4e226ddb66c237c15874a47f' +md5sums=('986d1f90ca30d60f7b2820d75c6b8ea7' + '66aa6177a31cc4b9d7eeb55cb1514918' 'c367ef26300648ee9b8aca3dee5c9669') build() { diff --git a/extra/gtk-qt-engine/PKGBUILD b/extra/gtk-qt-engine/PKGBUILD deleted file mode 100644 index 247195fa4..000000000 --- a/extra/gtk-qt-engine/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 143698 2011-11-28 13:17:55Z giovanni $ -# Maintainer: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: Jake VanderKolk <jakevanderkolk@gmail.com> - -pkgname=gtk-qt-engine -pkgver=1.1 -pkgrel=3 -pkgdesc="A GTK engine which makes your GTK2 Apps match your QT theme" -arch=('i686' 'x86_64') -license=('GPL') -url="http://code.google.com/p/gtk-qt-engine/" -depends=('libbonoboui' 'kdelibs') -makedepends=('cmake' 'automoc4' 'pkgconfig') -source=("http://gtk-qt-engine.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2") -md5sums=('de8048baef7dfe6c97cd97c463d66152') - -build() { - cd "${srcdir}/${pkgname}" - - cmake . -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_{SHARED,MODULE,EXE}_LINKER_FLAGS='-Wl,--no-undefined -Wl,--as-needed' \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}" - - make DESTDIR="${pkgdir}" install -} diff --git a/extra/haskell-http/PKGBUILD b/extra/haskell-http/PKGBUILD index c9f55ff80..621e10490 100644 --- a/extra/haskell-http/PKGBUILD +++ b/extra/haskell-http/PKGBUILD @@ -1,40 +1,49 @@ # Maintainer: Thomas Dziedzic <gostrc@gmail.com> -# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> -# Package generated by cabal2arch 0.7.6 _hkgname=HTTP pkgname=haskell-http -pkgver=4000.2.7 +pkgver=4000.2.8 pkgrel=1 pkgdesc="A library for client-side HTTP" url="http://hackage.haskell.org/package/${_hkgname}" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=('ghc=7.6.2-1' 'sh' 'haskell-network=2.4.1.0-1' 'haskell-parsec=3.1.3-2' 'haskell-mtl=2.1.2-2') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) +depends=('ghc=7.6.3-1' 'sh' 'haskell-network=2.4.1.2-1' 'haskell-parsec=3.1.3-3' 'haskell-mtl=2.1.2-3') +source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz") install=${pkgname}.install -md5sums=('a9b6fbce9f0a1247b1f523c87987757d') +md5sums=('94be05278da4e9324aaef6e012e751e2') build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/${pkgname} \ - --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh + cd ${_hkgname}-${pkgver} + + runhaskell Setup configure -O -p \ + --enable-split-objs \ + --enable-shared \ + --prefix=/usr \ + --docdir=/usr/share/doc/${pkgname} \ + --libsubdir=\$compiler/site-local/\$pkgid + + runhaskell Setup build + + runhaskell Setup haddock + + runhaskell Setup register --gen-script + runhaskell Setup unregister --gen-script + sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh } package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE + cd ${_hkgname}-${pkgver} + + install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh + install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh + + install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries + ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} + + runhaskell Setup copy --destdir=${pkgdir} + + install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE } + diff --git a/extra/haskell-http/haskell-http.install b/extra/haskell-http/haskell-http.install index fdebb1cb8..0593ec4e2 100644 --- a/extra/haskell-http/haskell-http.install +++ b/extra/haskell-http/haskell-http.install @@ -1,18 +1,35 @@ -HS_DIR=usr/share/haskell/haskell-http -post_install() { - ${HS_DIR}/register.sh +pkgname=haskell-http + +_register() { + usr/share/haskell/${pkgname}/register.sh +} + +_unregister() { + usr/share/haskell/${pkgname}/unregister.sh +} + +_gen_contents() { (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) } + +post_install() { + _register + _gen_contents +} + pre_upgrade() { - ${HS_DIR}/unregister.sh + _unregister } + post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) + _register + _gen_contents } + pre_remove() { - ${HS_DIR}/unregister.sh + _unregister } + post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) + _gen_contents } diff --git a/extra/haskell-mtl/PKGBUILD b/extra/haskell-mtl/PKGBUILD index 5ce02ba17..c755c10a8 100644 --- a/extra/haskell-mtl/PKGBUILD +++ b/extra/haskell-mtl/PKGBUILD @@ -1,38 +1,49 @@ # Maintainer: Thomas Dziedzic <gostrc@gmail.com> -# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> _hkgname=mtl pkgname=haskell-mtl pkgver=2.1.2 -pkgrel=2 -pkgdesc="Monad transformer library" +pkgrel=3 +pkgdesc="Monad classes, using functional dependencies" url="http://hackage.haskell.org/package/${_hkgname}" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=('ghc=7.6.2-1' 'sh' 'haskell-transformers=0.3.0.0-3') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz) +depends=('ghc=7.6.3-1' 'sh' 'haskell-transformers=0.3.0.0-4') +source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz") install=${pkgname}.install md5sums=('943c110524d96126bfa0e61f7df1ebcd') build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \ - --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh + cd ${_hkgname}-${pkgver} + + runhaskell Setup configure -O -p \ + --enable-split-objs \ + --enable-shared \ + --prefix=/usr \ + --docdir=/usr/share/doc/${pkgname} \ + --libsubdir=\$compiler/site-local/\$pkgid + + runhaskell Setup build + + runhaskell Setup haddock + + runhaskell Setup register --gen-script + runhaskell Setup unregister --gen-script + sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh } package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE + cd ${_hkgname}-${pkgver} + + install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh + install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh + + install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries + ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} + + runhaskell Setup copy --destdir=${pkgdir} + + install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE } + diff --git a/extra/haskell-mtl/haskell-mtl.install b/extra/haskell-mtl/haskell-mtl.install index 9325811e8..17c40da11 100644 --- a/extra/haskell-mtl/haskell-mtl.install +++ b/extra/haskell-mtl/haskell-mtl.install @@ -1,18 +1,35 @@ -HS_DIR=usr/share/haskell/haskell-mtl -post_install() { - ${HS_DIR}/register.sh +pkgname=haskell-mtl + +_register() { + usr/share/haskell/${pkgname}/register.sh +} + +_unregister() { + usr/share/haskell/${pkgname}/unregister.sh +} + +_gen_contents() { (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) } + +post_install() { + _register + _gen_contents +} + pre_upgrade() { - ${HS_DIR}/unregister.sh + _unregister } + post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) + _register + _gen_contents } + pre_remove() { - ${HS_DIR}/unregister.sh + _unregister } + post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) + _gen_contents } diff --git a/extra/haskell-network/PKGBUILD b/extra/haskell-network/PKGBUILD index 40816956a..70bbb8aa9 100644 --- a/extra/haskell-network/PKGBUILD +++ b/extra/haskell-network/PKGBUILD @@ -1,40 +1,49 @@ # Maintainer: Thomas Dziedzic <gostrc@gmail.com> -# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> -# Package generated by cabal2arch 0.7.6 _hkgname=network pkgname=haskell-network -pkgver=2.4.1.0 +pkgver=2.4.1.2 pkgrel=1 -pkgdesc="Networking-related facilities" -url="http://hackage.haskell.org/package/network" +pkgdesc="Low-level networking interface" +url="http://hackage.haskell.org/package/${_hkgname}" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=('ghc=7.6.2-1' 'sh' 'haskell-parsec=3.1.3-2') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) +depends=('ghc=7.6.3-1' 'sh' 'haskell-parsec=3.1.3-3') +source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz") install=${pkgname}.install -md5sums=('45255ad17b04bb2d43c411ab41b727d5') +md5sums=('032075c35dea5d23923af3928f9a5511') build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/${pkgname} \ - --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh + cd ${_hkgname}-${pkgver} + + runhaskell Setup configure -O -p \ + --enable-split-objs \ + --enable-shared \ + --prefix=/usr \ + --docdir=/usr/share/doc/${pkgname} \ + --libsubdir=\$compiler/site-local/\$pkgid + + runhaskell Setup build + + runhaskell Setup haddock + + runhaskell Setup register --gen-script + runhaskell Setup unregister --gen-script + sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh } package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE + cd ${_hkgname}-${pkgver} + + install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh + install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh + + install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries + ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} + + runhaskell Setup copy --destdir=${pkgdir} + + install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE } + diff --git a/extra/haskell-network/haskell-network.install b/extra/haskell-network/haskell-network.install index a56c31d0a..e6177f643 100644 --- a/extra/haskell-network/haskell-network.install +++ b/extra/haskell-network/haskell-network.install @@ -1,18 +1,35 @@ -HS_DIR=usr/share/haskell/haskell-network -post_install() { - ${HS_DIR}/register.sh +pkgname=haskell-network + +_register() { + usr/share/haskell/${pkgname}/register.sh +} + +_unregister() { + usr/share/haskell/${pkgname}/unregister.sh +} + +_gen_contents() { (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) } + +post_install() { + _register + _gen_contents +} + pre_upgrade() { - ${HS_DIR}/unregister.sh + _unregister } + post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) + _register + _gen_contents } + pre_remove() { - ${HS_DIR}/unregister.sh + _unregister } + post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) + _gen_contents } diff --git a/extra/haskell-parsec/PKGBUILD b/extra/haskell-parsec/PKGBUILD index 854f31b08..02ae2aa0e 100644 --- a/extra/haskell-parsec/PKGBUILD +++ b/extra/haskell-parsec/PKGBUILD @@ -1,39 +1,49 @@ # Maintainer: Thomas Dziedzic <gostrc@gmail.com> -# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> -# As generated by cabal2arch 0.7.6 _hkgname=parsec pkgname=haskell-parsec pkgver=3.1.3 -pkgrel=2 +pkgrel=3 pkgdesc="Monadic parser combinators" url="http://hackage.haskell.org/package/${_hkgname}" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=('ghc=7.6.2-1' 'sh' 'haskell-mtl=2.1.2-2' 'haskell-text=0.11.2.3-2') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) +depends=('ghc=7.6.3-1' 'sh' 'haskell-mtl=2.1.2-3' 'haskell-text=0.11.2.3-3') +source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz") install=${pkgname}.install md5sums=('d72fc94b81153132c61125a1ec52a4a5') build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \ - --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh + cd ${_hkgname}-${pkgver} + + runhaskell Setup configure -O -p \ + --enable-split-objs \ + --enable-shared \ + --prefix=/usr \ + --docdir=/usr/share/doc/${pkgname} \ + --libsubdir=\$compiler/site-local/\$pkgid + + runhaskell Setup build + + runhaskell Setup haddock + + runhaskell Setup register --gen-script + runhaskell Setup unregister --gen-script + sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh } package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE + cd ${_hkgname}-${pkgver} + + install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh + install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh + + install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries + ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} + + runhaskell Setup copy --destdir=${pkgdir} + + install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE } + diff --git a/extra/haskell-parsec/haskell-parsec.install b/extra/haskell-parsec/haskell-parsec.install index dfa0701b9..25f4e6e9b 100644 --- a/extra/haskell-parsec/haskell-parsec.install +++ b/extra/haskell-parsec/haskell-parsec.install @@ -1,18 +1,35 @@ -HS_DIR=usr/share/haskell/haskell-parsec -post_install() { - ${HS_DIR}/register.sh +pkgname=haskell-parsec + +_register() { + usr/share/haskell/${pkgname}/register.sh +} + +_unregister() { + usr/share/haskell/${pkgname}/unregister.sh +} + +_gen_contents() { (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) } + +post_install() { + _register + _gen_contents +} + pre_upgrade() { - ${HS_DIR}/unregister.sh + _unregister } + post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) + _register + _gen_contents } + pre_remove() { - ${HS_DIR}/unregister.sh + _unregister } + post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) + _gen_contents } diff --git a/extra/haskell-random/PKGBUILD b/extra/haskell-random/PKGBUILD index 4bb275bec..649d2bd84 100644 --- a/extra/haskell-random/PKGBUILD +++ b/extra/haskell-random/PKGBUILD @@ -3,35 +3,47 @@ _hkgname=random pkgname=haskell-random pkgver=1.0.1.1 -pkgrel=4 -pkgdesc="A basic random number generation library" +pkgrel=5 +pkgdesc="random number library" url="http://hackage.haskell.org/package/${_hkgname}" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=('ghc=7.6.2-1' 'sh') +depends=('ghc=7.6.3-1' 'sh') source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz") install=${pkgname}.install md5sums=('9a249cfa7ff6793cbf2be06e9fcd7538') build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \ - --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh + cd ${_hkgname}-${pkgver} + + runhaskell Setup configure -O -p \ + --enable-split-objs \ + --enable-shared \ + --prefix=/usr \ + --docdir=/usr/share/doc/${pkgname} \ + --libsubdir=\$compiler/site-local/\$pkgid + + runhaskell Setup build + + runhaskell Setup haddock + + runhaskell Setup register --gen-script + runhaskell Setup unregister --gen-script + sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh } package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE + cd ${_hkgname}-${pkgver} + + install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh + install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh + + install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries + ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} + + runhaskell Setup copy --destdir=${pkgdir} + + install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE } diff --git a/extra/haskell-random/haskell-random.install b/extra/haskell-random/haskell-random.install index b6d807e1a..0dc80227b 100644 --- a/extra/haskell-random/haskell-random.install +++ b/extra/haskell-random/haskell-random.install @@ -1,18 +1,35 @@ -HS_DIR=usr/share/haskell/haskell-random -post_install() { - ${HS_DIR}/register.sh +pkgname=haskell-random + +_register() { + usr/share/haskell/${pkgname}/register.sh +} + +_unregister() { + usr/share/haskell/${pkgname}/unregister.sh +} + +_gen_contents() { (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) } + +post_install() { + _register + _gen_contents +} + pre_upgrade() { - ${HS_DIR}/unregister.sh + _unregister } + post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) + _register + _gen_contents } + pre_remove() { - ${HS_DIR}/unregister.sh + _unregister } + post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) + _gen_contents } diff --git a/extra/haskell-text/PKGBUILD b/extra/haskell-text/PKGBUILD index 8b6c78d9c..b50b41af4 100644 --- a/extra/haskell-text/PKGBUILD +++ b/extra/haskell-text/PKGBUILD @@ -1,38 +1,49 @@ # Maintainer: Thomas Dziedzic <gostrc@gmail.com> -# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> _hkgname=text pkgname=haskell-text pkgver=0.11.2.3 -pkgrel=2 +pkgrel=3 pkgdesc="An efficient packed Unicode text type." url="http://hackage.haskell.org/package/${_hkgname}" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=('ghc=7.6.2-1' 'sh') +depends=('ghc=7.6.3-1' 'sh') source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz") install=${pkgname}.install md5sums=('7a469d49a7576fb3a18785cb64d4ee6c') build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \ - --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh + cd ${_hkgname}-${pkgver} + + runhaskell Setup configure -O -p \ + --enable-split-objs \ + --enable-shared \ + --prefix=/usr \ + --docdir=/usr/share/doc/${pkgname} \ + --libsubdir=\$compiler/site-local/\$pkgid + + runhaskell Setup build + + runhaskell Setup haddock + + runhaskell Setup register --gen-script + runhaskell Setup unregister --gen-script + sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh } package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE + cd ${_hkgname}-${pkgver} + + install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh + install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh + + install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries + ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} + + runhaskell Setup copy --destdir=${pkgdir} + + install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE } + diff --git a/extra/haskell-text/haskell-text.install b/extra/haskell-text/haskell-text.install index 620db3921..44ef4244a 100644 --- a/extra/haskell-text/haskell-text.install +++ b/extra/haskell-text/haskell-text.install @@ -1,18 +1,35 @@ -HS_DIR=usr/share/haskell/haskell-text -post_install() { - ${HS_DIR}/register.sh +pkgname=haskell-text + +_register() { + usr/share/haskell/${pkgname}/register.sh +} + +_unregister() { + usr/share/haskell/${pkgname}/unregister.sh +} + +_gen_contents() { (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) } + +post_install() { + _register + _gen_contents +} + pre_upgrade() { - ${HS_DIR}/unregister.sh + _unregister } + post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) + _register + _gen_contents } + pre_remove() { - ${HS_DIR}/unregister.sh + _unregister } + post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) + _gen_contents } diff --git a/extra/haskell-transformers/PKGBUILD b/extra/haskell-transformers/PKGBUILD index d490b01bc..94006ab2d 100644 --- a/extra/haskell-transformers/PKGBUILD +++ b/extra/haskell-transformers/PKGBUILD @@ -1,39 +1,49 @@ -# $Id: PKGBUILD 177613 2013-02-08 04:14:37Z td123 $ - # Maintainer: Thomas Dziedzic <gostrc@gmail.com> -# Contributor: Rémy Oudompheng <remy@archlinux.org> _hkgname=transformers pkgname=haskell-transformers pkgver=0.3.0.0 -pkgrel=3 +pkgrel=4 pkgdesc="Concrete functor and monad transformers" url="http://hackage.haskell.org/package/${_hkgname}" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=('ghc=7.6.2-1' 'sh') -source=("http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz") +depends=('ghc=7.6.3-1' 'sh') +source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz") install=${pkgname}.install md5sums=('852dc0b79cc2bcb39136287d3dd385e5') build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \ - --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh + cd ${_hkgname}-${pkgver} + + runhaskell Setup configure -O -p \ + --enable-split-objs \ + --enable-shared \ + --prefix=/usr \ + --docdir=/usr/share/doc/${pkgname} \ + --libsubdir=\$compiler/site-local/\$pkgid + + runhaskell Setup build + + runhaskell Setup haddock + + runhaskell Setup register --gen-script + runhaskell Setup unregister --gen-script + sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh } package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE + cd ${_hkgname}-${pkgver} + + install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh + install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh + + install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries + ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} + + runhaskell Setup copy --destdir=${pkgdir} + + install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE } + diff --git a/extra/haskell-transformers/haskell-transformers.install b/extra/haskell-transformers/haskell-transformers.install index eec2af6e1..a59cd9850 100644 --- a/extra/haskell-transformers/haskell-transformers.install +++ b/extra/haskell-transformers/haskell-transformers.install @@ -1,18 +1,35 @@ -HS_DIR=usr/share/haskell/haskell-transformers -post_install() { - ${HS_DIR}/register.sh +pkgname=haskell-transformers + +_register() { + usr/share/haskell/${pkgname}/register.sh +} + +_unregister() { + usr/share/haskell/${pkgname}/unregister.sh +} + +_gen_contents() { (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) } + +post_install() { + _register + _gen_contents +} + pre_upgrade() { - ${HS_DIR}/unregister.sh + _unregister } + post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) + _register + _gen_contents } + pre_remove() { - ${HS_DIR}/unregister.sh + _unregister } + post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) + _gen_contents } diff --git a/extra/haskell-zlib/PKGBUILD b/extra/haskell-zlib/PKGBUILD index bcc1e7396..2c541b5f3 100644 --- a/extra/haskell-zlib/PKGBUILD +++ b/extra/haskell-zlib/PKGBUILD @@ -1,44 +1,49 @@ # Maintainer: Thomas Dziedzic <gostrc@gmail.com> -# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> -# Package originally generated by cabal2arch 0.7.6 _hkgname=zlib pkgname=haskell-zlib -pkgver=0.5.4.0 +pkgver=0.5.4.1 pkgrel=1 pkgdesc="Compression and decompression in the gzip and zlib formats" -url="http://hackage.haskell.org/package/zlib" +url="http://hackage.haskell.org/package/${_hkgname}" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=('ghc=7.6.2-1' 'zlib' 'sh') +depends=('ghc=7.6.3-1' 'sh' 'zlib') source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz") install=${pkgname}.install -md5sums=('eb5984b936a7c37a0cdaa357149176b2') +md5sums=('d0d10786d2bbd1d401a8b28a83e88475') build() { - cd ${srcdir}/${_hkgname}-${pkgver} - - # ghc 7.6 includes bytestring 0.10 - sed 's/bytestring == 0.9.*/bytestring == 0.10.*/' -i zlib.cabal - - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/${pkgname} \ - --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh + cd ${_hkgname}-${pkgver} + + runhaskell Setup configure -O -p \ + --enable-split-objs \ + --enable-shared \ + --prefix=/usr \ + --docdir=/usr/share/doc/${pkgname} \ + --libsubdir=\$compiler/site-local/\$pkgid + + runhaskell Setup build + + runhaskell Setup haddock + + runhaskell Setup register --gen-script + runhaskell Setup unregister --gen-script + sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh } package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE + cd ${_hkgname}-${pkgver} + + install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh + install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh + + install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries + ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} + + runhaskell Setup copy --destdir=${pkgdir} + + install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE } + diff --git a/extra/haskell-zlib/haskell-zlib.install b/extra/haskell-zlib/haskell-zlib.install index d387b7b65..a2bb66224 100644 --- a/extra/haskell-zlib/haskell-zlib.install +++ b/extra/haskell-zlib/haskell-zlib.install @@ -1,18 +1,35 @@ -HS_DIR=usr/share/haskell/haskell-zlib -post_install() { - ${HS_DIR}/register.sh +pkgname=haskell-zlib + +_register() { + usr/share/haskell/${pkgname}/register.sh +} + +_unregister() { + usr/share/haskell/${pkgname}/unregister.sh +} + +_gen_contents() { (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) } + +post_install() { + _register + _gen_contents +} + pre_upgrade() { - ${HS_DIR}/unregister.sh + _unregister } + post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) + _register + _gen_contents } + pre_remove() { - ${HS_DIR}/unregister.sh + _unregister } + post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) + _gen_contents } diff --git a/extra/libzip/PKGBUILD b/extra/libzip/PKGBUILD index cc5a7c773..86d2b8d43 100644 --- a/extra/libzip/PKGBUILD +++ b/extra/libzip/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 181869 2013-04-05 03:45:55Z eric $ +# $Id: PKGBUILD 183834 2013-04-28 07:37:57Z eric $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname=libzip -pkgver=0.11 +pkgver=0.11.1 pkgrel=1 pkgdesc="A C library for reading, creating, and modifying zip archives" url="http://www.nih.at/libzip/index.html" @@ -13,20 +13,23 @@ depends=('zlib') options=('!libtool') source=("http://www.nih.at/${pkgname}/${pkgname}-${pkgver}.tar.xz" 'fix-headers.patch') -md5sums=('9fb13212011721983fe7119393565533' +md5sums=('87d5ec3629f6ad2a4b01ad961e7f0c19' '249395bd3a426c4c4e993e9d4753e1dd') -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - +prepare() { + cd ${pkgname}-${pkgver} patch -p1 -i "${srcdir}/fix-headers.patch" +} + +build() { + cd ${pkgname}-${pkgver} autoreconf -i ./configure --prefix=/usr make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD index 391a66fa4..5381a9b54 100644 --- a/extra/live-media/PKGBUILD +++ b/extra/live-media/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183536 2013-04-22 16:39:02Z giovanni $ +# $Id: PKGBUILD 183838 2013-04-28 08:37:59Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Gilles CHAUVIN <gcnweb@gmail.com> pkgname=live-media -pkgver=2013.04.22 +pkgver=2013.04.23 pkgrel=1 pkgdesc="A set of C++ libraries for multimedia streaming" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ license=('LGPL') url="http://live555.com/liveMedia" depends=('gcc-libs') source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz") -md5sums=('83362b57ecfa0ed07a1f1bd93bb4cdfb') +md5sums=('1440933d015689ca400d2a27884aee6f') build() { cd ${srcdir}/live diff --git a/kernels/linux-libre-pae/PKGBUILD b/kernels/linux-libre-pae/PKGBUILD index c5b27882b..292be2408 100644 --- a/kernels/linux-libre-pae/PKGBUILD +++ b/kernels/linux-libre-pae/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 183078 2013-04-17 12:08:12Z tpowa $ +# $Id: PKGBUILD 183701 2013-04-27 10:47:26Z tpowa $ # Contributor: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Thomas Baechler <thomas@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -6,7 +6,7 @@ pkgbase=linux-libre-pae # Build stock -LIBRE-PAE kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.8 -pkgver=${_basekernel}.8 +pkgver=${_basekernel}.10 pkgrel=1 arch=('i686') url="http://linux-libre.fsfla.org/" @@ -22,7 +22,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'boot-logo.patch' 'change-default-console-loglevel.patch') md5sums=('84c2a77910932ffc7d958744ac9cf2f5' - 'cc93810441658cdf40a4bc051f8f4774' + 'fd9713a31ee671a9dec8ad0e65996c84' '6294513cfa9830d48ad1915ff7053a98' 'f302c931bd85309da9d9792b4cc96467' '04b21c79df0a952c22d681dd4f4562df' diff --git a/kernels/linux-libre-pae/linux-libre-pae.install b/kernels/linux-libre-pae/linux-libre-pae.install index 69d8bc984..a4f59e9b3 100644 --- a/kernels/linux-libre-pae/linux-libre-pae.install +++ b/kernels/linux-libre-pae/linux-libre-pae.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-pae -KERNEL_VERSION=3.8.8-1-LIBRE-PAE +KERNEL_VERSION=3.8.10-1-LIBRE-PAE # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/kernels/linux-libre-xen/PKGBUILD b/kernels/linux-libre-xen/PKGBUILD index e34f4919e..19e0233a8 100644 --- a/kernels/linux-libre-xen/PKGBUILD +++ b/kernels/linux-libre-xen/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 183078 2013-04-17 12:08:12Z tpowa $ +# $Id: PKGBUILD 183701 2013-04-27 10:47:26Z tpowa $ # Contributor: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Thomas Baechler <thomas@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -6,7 +6,7 @@ pkgbase=linux-libre-xen # Build stock -LIBRE-XEN kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.8 -pkgver=${_basekernel}.8 +pkgver=${_basekernel}.10 pkgrel=1 arch=('i686') url="http://linux-libre.fsfla.org/" @@ -22,7 +22,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'boot-logo.patch' 'change-default-console-loglevel.patch') md5sums=('84c2a77910932ffc7d958744ac9cf2f5' - 'cc93810441658cdf40a4bc051f8f4774' + 'fd9713a31ee671a9dec8ad0e65996c84' '2708b6f03f827e2c94ecbd050df4286d' 'b7c2805bb287a644c0a303bf7721e534' '04b21c79df0a952c22d681dd4f4562df' diff --git a/kernels/linux-libre-xen/linux-libre-xen.install b/kernels/linux-libre-xen/linux-libre-xen.install index c385956af..905244477 100644 --- a/kernels/linux-libre-xen/linux-libre-xen.install +++ b/kernels/linux-libre-xen/linux-libre-xen.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-xen -KERNEL_VERSION=3.8.8-1-LIBRE-XEN +KERNEL_VERSION=3.8.10-1-LIBRE-XEN # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/kernels/xen/PKGBUILD b/kernels/xen/PKGBUILD index 42ff5aaa5..df4b2dbe8 100644 --- a/kernels/xen/PKGBUILD +++ b/kernels/xen/PKGBUILD @@ -1,12 +1,13 @@ -# Maintainer: Limao Luo <luolimao+AUR@gmail.com> +# Contributor: Shanmu Thiagaraja <sthiagaraja+AUR@prshanmu.com> +# Contributor: Limao Luo # Contributor: Luceo # Contributor: Revellion # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> pkgname=xen pkgver=4.2.1 -pkgrel=4 -pkgdesc="Xen Hypervisor & Tools" +pkgrel=6 +pkgdesc="Xen Hypervisor & Tools (Parabola rebranded)" arch=(i686 x86_64) url=http://www.xen.org/ license=(GPL2) @@ -20,9 +21,11 @@ options=(!buildflags !strip) install=$pkgname.install source=(http://bits.xensource.com/oss-xen/release/$pkgver/$pkgname-$pkgver.tar.gz 09_xen + gcc-4.8-typedefs.patch gdbsx-glibc-2.17.patch texi2html.patch timer-add-lrt-lm.patch + qemu-makefile.patch proc-xen.mount var-lib-xenstored.mount xenconsoled.service @@ -31,46 +34,27 @@ source=(http://bits.xensource.com/oss-xen/release/$pkgver/$pkgname-$pkgver.tar.g xenstored.service tmpfiles.d-$pkgname.conf $pkgname.conf) -sha256sums=('fb8df5827ce3e2d2d3b078d9e5afde502beb5e7ab9442e51a94087061bd450c6' - 'cee994b4c788808c0148caeb5f798cc98b9268bb9f04448ff7c3ed479bfb7821' - 'f78593f1b3b4d6201644ecce77c6dd5bb7378dc53eff7cc940a80e3cd1bf72f4' - '08e5bf65c833a608470ad118ce369e32f9c267e1787f2900c06708af321225e6' - '4d55132a8e47fbfe415bf3c88824b6dcf48e4da1fff86d2b07e0c2c9e42c0a63' - '139eed988bfaf8edc8ccdfd0b668382bd63db48ce17be91776182a7e28e9d88c' - 'c19146931c6ab8e53092bd9b2ebbfda5c76fd22ad3b1d42dcda3dd1b61f123ff' - 'ba8f1c10b3f3df1f9fda0782a691fed67661e36f49be74471c86850639fee3ba' - '0bd45d9de6456c4f9adf32e726f2db3a3cd0423c1d161b442e8a1666d2e68e3f' - '1862a14607582d14247b74435dfb16411fd68904aa19e2a93c5e6ac301169d3c' - 'a0ad5a7d9262c2d22a8875a47cff2c821885ddb65c0c9eb7518befb0f42fcce7' - '6bddcea43922f72a1c8ab556c3f20067d7f817220bcd9c1c61d18f3a58dfaa9d' - '50a9b7fd19e8beb1dea09755f07318f36be0b7ec53d3c9e74f3266a63e682c0c') -sha512sums=('fe27a965e2b34035bd025482eda9fc4d4e82523c929323fd30813367d5ffbe2fa1ed3d7d4479f2632e8b5625972448b7bd6a7768e8dc1dcd1b6747d281cc1a9e' - '9f8f53ffbf19dbd56fcc56e994385b99fff537a3e295756c1e9d886f7a5f454577ec20bbd7c26516e4f80f1cf24e6d5af7dae251e32470872128eb52f6e1866f' - 'fb7dbd3d9ca610c0b476cf7202e4bd051d85de2de8e92c0c3ac59dc327bc47820eddfa67a8dc01fde21d1a3209f83b6f8533bdc7ecd0634ff503f2fac61fee6d' - '562f12e723116c705fc9d0fd4a2afd382a93465be7f616d1e20e87daf39c11029fbc57ec46e38d3ff61c482fdc9ac4df9e07600a77515867d9da6f0faf3da7f9' - 'a0baec71e9240fa9a72aa67e0783fe1200afb2ff61c625f5e96e536a8839213ada9908e776ed243a866065084f61a06d286ae2488c158730c1dd2d424cf4b0dc' - '6afdf16e32bb837faf6333334f86855a746f1f46fee9673a4fddc62eecf41f9856bc34397807203c6f5071f0b1ce74532214084042154585c0d39514450db25c' - '00e340f4d3635e3850ca24baea1da08467523c17815feb74161e18397b607fef904db2165fd9bf4632a6e8a6e37aeddad4e56965e1c99b5213c98b3f9afc6aad' - '27d7289a8bf6e15bddcb360287001429205b57ee4d791b0337328879ffd76b8e375e3c1dd0de0ab57dd4bd1e2a2bc1748c44cc05b2528632a3e6af60f626de9d' - 'f00034f8b826b828659a0177f0a6454113c625e69a817dfe32e461767f6643e0288bfc2a22d23358504240df627af6e3b8f5ffa0077e241e590b33d3f252e74c' - '31fefc739f0f0e568df03dcf9aa02e0265ff4fbf77e7ae62d6a318fcc34e87a0ffd3fc4b84ff8c9cc95511e2e74b7b61e6b5471cd0b3cd47ee0da86b1ea90268' - 'd93509c53a3f80ab266f75a54633bba070a7ef48f629168f074c7c37d36ee9c98d2d30703bed41b1c163d960f2a3ac9f435b335db6e7b8a6e9c97044ede8b76e' - '97fb10771fad1c59c1168ede6e4a37710937821c0a053e77df7907b0a33137a190731b0130fb1d373c196a04450360a9cd3202617a77b1726613c523613cd194' - 'ccaa2ff82e4203b11e5dec9aeccac2e165721d8067e0094603ecaa7a70b78c9eb9e2287a32687883d26b6ceae6f8d2ad7636ddf949eb658637b3ceaa6999711b') - -build() { - cd "$srcdir"/$pkgname-$pkgver/ +prepare() { + cd $pkgname-$pkgver/ + patch -Np1 -i ../gcc-4.8-typedefs.patch patch -Np1 -i ../gdbsx-glibc-2.17.patch patch -Np1 -i ../texi2html.patch patch -Np1 -i ../timer-add-lrt-lm.patch + patch -Np1 -i ../qemu-makefile.patch + sed -i '203i\\t\t--disable-docs \\' tools/Makefile # disable qemu doc generation b/c of an error +} +build() { + export CFLAGS+='-Wall -Wstrict-prototypes -Wno-unused-local-typedefs -Wno-sizeof-pointer-memaccess' + cd $pkgname-$pkgver/ ./autogen.sh ./configure PYTHON=/usr/bin/python2 + unset CFLAGS } package() { - cd "$srcdir"/$pkgname-$pkgver/ + cd $pkgname-$pkgver/ make DESTDIR="$pkgdir" LANG=C PYTHON=python2 install-{xen,tools,stubdom} @@ -129,3 +113,33 @@ package() { rmdir usr/local/etc etc/xen/auto var/xen/dump var/lock/subsys usr/share/doc var/lib/xen/xenpaging var/run/xend/boot var/log/xen } +sha256sums=('fb8df5827ce3e2d2d3b078d9e5afde502beb5e7ab9442e51a94087061bd450c6' + 'cee994b4c788808c0148caeb5f798cc98b9268bb9f04448ff7c3ed479bfb7821' + 'e7c77f5fe5b6f4bd5cb3e077d44a2219252592e09e3350316ba4505575f04039' + 'f78593f1b3b4d6201644ecce77c6dd5bb7378dc53eff7cc940a80e3cd1bf72f4' + '08e5bf65c833a608470ad118ce369e32f9c267e1787f2900c06708af321225e6' + '4d55132a8e47fbfe415bf3c88824b6dcf48e4da1fff86d2b07e0c2c9e42c0a63' + '247fbfacf3212c26b673e1d7c3cc29eb0d1e903c217f16ef9dab5ed667ee139d' + '139eed988bfaf8edc8ccdfd0b668382bd63db48ce17be91776182a7e28e9d88c' + 'c19146931c6ab8e53092bd9b2ebbfda5c76fd22ad3b1d42dcda3dd1b61f123ff' + 'ba8f1c10b3f3df1f9fda0782a691fed67661e36f49be74471c86850639fee3ba' + '0bd45d9de6456c4f9adf32e726f2db3a3cd0423c1d161b442e8a1666d2e68e3f' + '1862a14607582d14247b74435dfb16411fd68904aa19e2a93c5e6ac301169d3c' + 'a0ad5a7d9262c2d22a8875a47cff2c821885ddb65c0c9eb7518befb0f42fcce7' + '6bddcea43922f72a1c8ab556c3f20067d7f817220bcd9c1c61d18f3a58dfaa9d' + '50a9b7fd19e8beb1dea09755f07318f36be0b7ec53d3c9e74f3266a63e682c0c') +sha512sums=('fe27a965e2b34035bd025482eda9fc4d4e82523c929323fd30813367d5ffbe2fa1ed3d7d4479f2632e8b5625972448b7bd6a7768e8dc1dcd1b6747d281cc1a9e' + '9f8f53ffbf19dbd56fcc56e994385b99fff537a3e295756c1e9d886f7a5f454577ec20bbd7c26516e4f80f1cf24e6d5af7dae251e32470872128eb52f6e1866f' + '88fa8b499aabd1baee5537cbdc6b8f150badb81e40b77f8e19e5b38c70803a953a2a72725065b74bb228ee242ccbcda57428af349cf17272613f7deb1afcb75c' + 'fb7dbd3d9ca610c0b476cf7202e4bd051d85de2de8e92c0c3ac59dc327bc47820eddfa67a8dc01fde21d1a3209f83b6f8533bdc7ecd0634ff503f2fac61fee6d' + '562f12e723116c705fc9d0fd4a2afd382a93465be7f616d1e20e87daf39c11029fbc57ec46e38d3ff61c482fdc9ac4df9e07600a77515867d9da6f0faf3da7f9' + 'a0baec71e9240fa9a72aa67e0783fe1200afb2ff61c625f5e96e536a8839213ada9908e776ed243a866065084f61a06d286ae2488c158730c1dd2d424cf4b0dc' + '738bfe72ab6c03d6b84c8f594fb8a63adc148edc4f9eb7beb279aa06002171fd957dbcee3b850bfbb5672f3d740047f41f59b5fdea0970a2de1a24b178fd5972' + '6afdf16e32bb837faf6333334f86855a746f1f46fee9673a4fddc62eecf41f9856bc34397807203c6f5071f0b1ce74532214084042154585c0d39514450db25c' + '00e340f4d3635e3850ca24baea1da08467523c17815feb74161e18397b607fef904db2165fd9bf4632a6e8a6e37aeddad4e56965e1c99b5213c98b3f9afc6aad' + '27d7289a8bf6e15bddcb360287001429205b57ee4d791b0337328879ffd76b8e375e3c1dd0de0ab57dd4bd1e2a2bc1748c44cc05b2528632a3e6af60f626de9d' + 'f00034f8b826b828659a0177f0a6454113c625e69a817dfe32e461767f6643e0288bfc2a22d23358504240df627af6e3b8f5ffa0077e241e590b33d3f252e74c' + '31fefc739f0f0e568df03dcf9aa02e0265ff4fbf77e7ae62d6a318fcc34e87a0ffd3fc4b84ff8c9cc95511e2e74b7b61e6b5471cd0b3cd47ee0da86b1ea90268' + 'd93509c53a3f80ab266f75a54633bba070a7ef48f629168f074c7c37d36ee9c98d2d30703bed41b1c163d960f2a3ac9f435b335db6e7b8a6e9c97044ede8b76e' + '97fb10771fad1c59c1168ede6e4a37710937821c0a053e77df7907b0a33137a190731b0130fb1d373c196a04450360a9cd3202617a77b1726613c523613cd194' + 'ccaa2ff82e4203b11e5dec9aeccac2e165721d8067e0094603ecaa7a70b78c9eb9e2287a32687883d26b6ceae6f8d2ad7636ddf949eb658637b3ceaa6999711b') diff --git a/kernels/xen/gcc-4.8-typedefs.patch b/kernels/xen/gcc-4.8-typedefs.patch new file mode 100644 index 000000000..6cda7cb80 --- /dev/null +++ b/kernels/xen/gcc-4.8-typedefs.patch @@ -0,0 +1,12 @@ +--- a/Config.mk 2012-12-17 09:59:58.000000000 -0500 ++++ b/Config.mk 2013-04-12 17:32:44.673277553 -0400 +@@ -166,6 +166,9 @@ + $(call cc-option-add,HOSTCFLAGS,HOSTCC,-Wdeclaration-after-statement) + $(call cc-option-add,CFLAGS,CC,-Wdeclaration-after-statement) + $(call cc-option-add,CFLAGS,CC,-Wno-unused-but-set-variable) ++$(call cc-option-add,CFLAGS,CC,-Wno-unused-local-typedefs) ++$(call cc-option-add,CFLAGS,CC,-Wno-sizeof-pointer-memaccess) ++$(call cc-option-add,CFLAGS,CC,-Wformat) + + LDFLAGS += $(foreach i, $(EXTRA_LIB), -L$(i)) + CFLAGS += $(foreach i, $(EXTRA_INCLUDES), -I$(i)) diff --git a/kernels/xen/qemu-makefile.patch b/kernels/xen/qemu-makefile.patch new file mode 100644 index 000000000..d66cf043f --- /dev/null +++ b/kernels/xen/qemu-makefile.patch @@ -0,0 +1,10 @@ +--- a/tools/qemu-xen/Makefile.target 2013-04-05 23:39:54.000000000 +0000 ++++ b/tools/qemu-xen/Makefile.target 2013-04-25 13:54:59.360000000 +0000 +@@ -206,6 +206,7 @@ + obj-$(CONFIG_NO_KVM) += kvm-stub.o + obj-y += memory.o + LIBS+=-lz ++LIBS+=-lrt + + QEMU_CFLAGS += $(VNC_TLS_CFLAGS) + QEMU_CFLAGS += $(VNC_SASL_CFLAGS) diff --git a/libre/bumblebee-libre/PKGBUILD b/libre/bumblebee-libre/PKGBUILD index 4ac8c524d..a7b9ad140 100644 --- a/libre/bumblebee-libre/PKGBUILD +++ b/libre/bumblebee-libre/PKGBUILD @@ -28,17 +28,18 @@ backup=('etc/bumblebee/bumblebee.conf' source=("http://www.bumblebee-project.org/${_pkgname}-${pkgver}.tar.gz" 'libre.patch') md5sums=('30974e677bb13e8a3825fd6f3e7d3b24' - 'f8b6044310039911236f53a625c611a6') + '1daed1e00f74538add6c435dfa0569d1') prepare() { cd "${srcdir}/${_pkgname}-${pkgver}" # Remove nonfree references to nonfree nvidia driver and unnecessaries files rm -rv "README.markdown" - rm -rv "conf/"{99-remove-nvidia-dev.rules,xorg.conf.nvidia} + rm -rv "conf/"{99-bumblebee-nvidia-dev.rules,xorg.conf.nvidia} rm -rv "doc" rm -rv "scripts/bumblebee-bugreport.in" patch -Np1 -i "${srcdir}/libre.patch" +} build() { cd "${srcdir}/${_pkgname}-${pkgver}" diff --git a/libre/bumblebee-libre/libre.patch b/libre/bumblebee-libre/libre.patch index 0952b1d11..81d49ca33 100644 --- a/libre/bumblebee-libre/libre.patch +++ b/libre/bumblebee-libre/libre.patch @@ -1,27 +1,31 @@ -diff -Nur bumblebee-3.1.orig/Makefile.am bumblebee-3.1/Makefile.am ---- bumblebee-3.1.orig/Makefile.am 2013-02-24 21:29:35.055167554 -0200 -+++ bumblebee-3.1/Makefile.am 2013-04-06 07:25:37.798457580 -0300 +diff -Nur bumblebee-3.2.1.orig/Makefile.am bumblebee-3.2.1/Makefile.am +--- bumblebee-3.2.1.orig/Makefile.am 2013-04-26 12:49:03.022174178 -0300 ++++ bumblebee-3.2.1/Makefile.am 2013-04-28 17:08:11.719589284 -0300 @@ -1,7 +1,6 @@ # -*- Makefile -*- GITVERSION = $(shell "$(top_srcdir)/version.sh" "$(top_srcdir)") --relnotes = doc/RELEASE_NOTES_3_1 +-relnotes = doc/RELEASE_NOTES_3_2_1 bumblebeedconfdir=$(sysconfdir)/bumblebee -@@ -19,19 +18,12 @@ +@@ -20,23 +19,16 @@ noinst_SCRIPTS += scripts/sysvinit/bumblebeed endif -bin_SCRIPTS = scripts/bumblebee-bugreport - + xconfddir = $(bumblebeedconfdir)/xorg.conf.d + xconfd_DATA = conf/xorg.conf.d/10-dummy.conf + CLEANFILES = $(noinst_SCRIPTS) conf/bumblebee.conf $(bin_SCRIPTS) EXTRA_DIST = scripts/systemd/bumblebeed.service.in \ scripts/upstart/bumblebeed.conf.in \ -- conf/99-remove-nvidia-dev.rules \ +- conf/99-bumblebee-nvidia-dev.rules \ conf/bumblebee.conf.in \ - conf/xorg.conf.nvidia \ conf/xorg.conf.nouveau \ + $(xconfd_DATA) \ - README.markdown \ scripts/bash_completion/bumblebee \ - scripts/bumblebee-bugreport.in \ @@ -29,7 +33,7 @@ diff -Nur bumblebee-3.1.orig/Makefile.am bumblebee-3.1/Makefile.am version.sh # for laziness include all headers found EXTRA_DIST += src/*.h src/*/switching.h -@@ -52,8 +44,7 @@ +@@ -57,17 +49,11 @@ src/driver.c src/bumblebeed.c bin_bumblebeed_LDADD = ${x11_LIBS} ${libbsd_LIBS} ${glib_LIBS} -lrt @@ -39,7 +43,16 @@ diff -Nur bumblebee-3.1.orig/Makefile.am bumblebee-3.1/Makefile.am completiondir = $(sysconfdir)/bash_completion.d completion_DATA = scripts/bash_completion/bumblebee -@@ -91,10 +82,6 @@ + +-if WITH_UDEV_RULES +-udevrulesdir = $(UDEV_RULES_DIR) +-udevrules_DATA = conf/99-bumblebee-nvidia-dev.rules +-endif +- + do_subst = sed -e 's|[@]GITVERSION[@]|$(GITVERSION)|g' \ + -e 's|[@]CONF_XDISP[@]|$(CONF_XDISP)|g' \ + -e 's|[@]CONF_SOCKPATH[@]|$(CONF_SOCKPATH)|g' \ +@@ -97,10 +83,6 @@ mkdir -p scripts/systemd $(do_subst) < $< > $@ @@ -50,38 +63,49 @@ diff -Nur bumblebee-3.1.orig/Makefile.am bumblebee-3.1/Makefile.am if WITH_PIDFILE scripts/sysvinit/bumblebeed: $(srcdir)/scripts/sysvinit/bumblebeed.in mkdir -p scripts/sysvinit -diff -Nur bumblebee-3.1.orig/Makefile.in bumblebee-3.1/Makefile.in ---- bumblebee-3.1.orig/Makefile.in 2013-02-24 21:34:57.103561881 -0200 -+++ bumblebee-3.1/Makefile.in 2013-04-06 07:23:01.600417658 -0300 -@@ -315,7 +315,6 @@ +diff -Nur bumblebee-3.2.1.orig/Makefile.in bumblebee-3.2.1/Makefile.in +--- bumblebee-3.2.1.orig/Makefile.in 2013-04-26 12:49:11.306174579 -0300 ++++ bumblebee-3.2.1/Makefile.in 2013-04-28 17:21:38.698898621 -0300 +@@ -220,7 +220,6 @@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ +-UDEV_RULES_DIR = @UDEV_RULES_DIR@ + VERSION = @VERSION@ + abs_builddir = @abs_builddir@ + abs_srcdir = @abs_srcdir@ +@@ -273,7 +272,6 @@ x11_CFLAGS = @x11_CFLAGS@ x11_LIBS = @x11_LIBS@ GITVERSION = $(shell "$(top_srcdir)/version.sh" "$(top_srcdir)") --relnotes = doc/RELEASE_NOTES_3_1 +-relnotes = doc/RELEASE_NOTES_3_2_1 bumblebeedconfdir = $(sysconfdir)/bumblebee AM_CPPFLAGS = ${regular_CPPFLAGS} \ -DCONFIG_FILE='"$(bumblebeedconfdir)/bumblebee.conf"' \ -@@ -327,16 +326,15 @@ +@@ -286,7 +284,6 @@ noinst_SCRIPTS = scripts/systemd/bumblebeed.service \ scripts/upstart/bumblebeed.conf $(am__append_1) -bin_SCRIPTS = scripts/bumblebee-bugreport + xconfddir = $(bumblebeedconfdir)/xorg.conf.d + xconfd_DATA = conf/xorg.conf.d/10-dummy.conf CLEANFILES = $(noinst_SCRIPTS) conf/bumblebee.conf $(bin_SCRIPTS) \ - $(am__append_3) +@@ -294,10 +291,10 @@ # for laziness include all headers found EXTRA_DIST = scripts/systemd/bumblebeed.service.in \ scripts/upstart/bumblebeed.conf.in \ -- conf/99-remove-nvidia-dev.rules conf/bumblebee.conf.in \ -- conf/xorg.conf.nvidia conf/xorg.conf.nouveau README.markdown \ -+ conf/bumblebee.conf.in \ -+ conf/xorg.conf.nouveau \ - scripts/bash_completion/bumblebee \ +- conf/99-bumblebee-nvidia-dev.rules conf/bumblebee.conf.in \ +- conf/xorg.conf.nvidia conf/xorg.conf.nouveau $(xconfd_DATA) \ +- README.markdown scripts/bash_completion/bumblebee \ - scripts/bumblebee-bugreport.in $(relnotes) version.sh src/*.h \ -+ scripts/bumblebee-bugreport.in version.sh src/*.h \ ++ conf/bumblebee.conf.in \ ++ conf/xorg.conf.nouveau $(xconfd_DATA) \ ++ scripts/bash_completion/bumblebee \ ++ version.sh src/*.h \ src/*/switching.h $(am__append_2) bin_optirun_SOURCES = src/module.c src/bbconfig.c src/bblogger.c src/bbrun.c \ src/bbsocket.c src/driver.c src/optirun.c src/bbsocketclient.c -@@ -348,12 +346,9 @@ +@@ -309,12 +306,9 @@ src/driver.c src/bumblebeed.c bin_bumblebeed_LDADD = ${x11_LIBS} ${libbsd_LIBS} ${glib_LIBS} -lrt @@ -91,7 +115,7 @@ diff -Nur bumblebee-3.1.orig/Makefile.in bumblebee-3.1/Makefile.in completiondir = $(sysconfdir)/bash_completion.d completion_DATA = scripts/bash_completion/bumblebee -@WITH_UDEV_RULES_TRUE@udevrulesdir = $(UDEV_RULES_DIR) --@WITH_UDEV_RULES_TRUE@udevrules_DATA = conf/99-remove-nvidia-dev.rules +-@WITH_UDEV_RULES_TRUE@udevrules_DATA = conf/99-bumblebee-nvidia-dev.rules do_subst = sed -e 's|[@]GITVERSION[@]|$(GITVERSION)|g' \ -e 's|[@]CONF_XDISP[@]|$(CONF_XDISP)|g' \ -e 's|[@]CONF_SOCKPATH[@]|$(CONF_SOCKPATH)|g' \ |