diff options
| author | root <root@rshg047.dnsready.net> | 2011-06-24 23:06:35 +0000 |
|---|---|---|
| committer | root <root@rshg047.dnsready.net> | 2011-06-24 23:06:35 +0000 |
| commit | 71f58605e914de11f3a9b7cc2f27b0c52fb8d4ba (patch) | |
| tree | 948002f901215fa91b99058ec3bfc4a51475018d | |
| parent | 7347bb994a41d021c83e97b503f577f2399302e7 (diff) | |
Fri Jun 24 23:06:35 UTC 2011
142 files changed, 2494 insertions, 486 deletions
diff --git a/community-testing/darcs/PKGBUILD b/community-testing/darcs/PKGBUILD new file mode 100644 index 000000000..d23e917a5 --- /dev/null +++ b/community-testing/darcs/PKGBUILD @@ -0,0 +1,37 @@ +# $Id: PKGBUILD 116991 2011-03-27 10:10:32Z remy $ +# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> +# Contributor: Simo Leone <neotuli@gmail.com> + +pkgname=darcs +pkgver=2.5.2 +pkgrel=1.1 +pkgdesc="Decentralized replacement for CVS with roots in quantum mechanics" +arch=(i686 x86_64) +url="http://darcs.net/" +license=('GPL') +depends=('curl' 'gmp' 'ncurses>=5.6-7') +makedepends=('ghc' 'haskell-tar<0.4' 'haskell-text<0.12' + 'haskell-hashed-storage<0.6' 'haskell-haskeline<0.7' + 'haskell-html<1.1' 'haskell-parsec<3.2' 'haskell-regex-compat<0.94') +source=("http://darcs.net/releases/$pkgname-$pkgver.tar.gz") +md5sums=('491b6ca01dec245a16112ad2c7e07dc1') + +build() { + cd $srcdir/$pkgname-$pkgver + runhaskell Setup.lhs configure --ghc -O --prefix=/usr \ + --disable-library-for-ghci --libsubdir=\$compiler/site-local/\$pkgid + runhaskell Setup.lhs build +} + +check() { + cd ${srcdir}/$pkgname-$pkgver + runhaskell Setup.lhs test +} + +package() { + cd $srcdir/$pkgname-$pkgver + runhaskell Setup.lhs copy --destdir=$pkgdir + rm -r $pkgdir/usr/lib/ + chmod 755 $pkgdir/usr/share/man/man1/$pkgname.1 +} + diff --git a/community-testing/haddock/PKGBUILD b/community-testing/haddock/PKGBUILD new file mode 100644 index 000000000..c52029b85 --- /dev/null +++ b/community-testing/haddock/PKGBUILD @@ -0,0 +1,40 @@ +# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> +# Contributor: Arch Haskell Team <arch-haskell@haskell.org> +# As generated by cabal2arch 0.7.6 +pkgname=haddock +pkgver=2.9.2 +pkgrel=2 +pkgdesc="Documentation-generation tool for Haskell libraries" +url="http://hackage.haskell.org/package/${pkgname}" +license=('custom:BSD3') +arch=('i686' 'x86_64') +makedepends=(alex happy) +depends=(ghc=7.0.3-2 sh 'haskell-mtl=2.0.1.0-3.1' 'haskell-xhtml=3000.2.0.1-7.1' 'haskell-ghc-paths=0.1.0.8-4.1') +options=('strip') +source=(http://hackage.haskell.org/packages/archive/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz) +install=${pkgname}.install + +build() { + cd ${srcdir}/${pkgname}-${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}/${pkgname}-${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/${pkgname} + runhaskell Setup copy --destdir=${pkgdir} + install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE + mv $pkgdir/usr/bin/haddock $pkgdir/usr/bin/haddock-cabal +} + +md5sums=('04928e132827a1da20ace52babb43e47') diff --git a/community-testing/haddock/haddock.install b/community-testing/haddock/haddock.install new file mode 100644 index 000000000..278da355e --- /dev/null +++ b/community-testing/haddock/haddock.install @@ -0,0 +1,18 @@ +HS_DIR=usr/share/haskell/haddock +post_install() { + ${HS_DIR}/register.sh &> /dev/null + (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) &> /dev/null +} +pre_upgrade() { + ${HS_DIR}/unregister.sh &> /dev/null +} +post_upgrade() { + ${HS_DIR}/register.sh &> /dev/null + (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) &> /dev/null +} +pre_remove() { + ${HS_DIR}/unregister.sh &> /dev/null +} +post_remove() { + (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) &> /dev/null +} diff --git a/community-testing/haskell-binary/PKGBUILD b/community-testing/haskell-binary/PKGBUILD new file mode 100644 index 000000000..f682bb59a --- /dev/null +++ b/community-testing/haskell-binary/PKGBUILD @@ -0,0 +1,39 @@ +# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> +# Contributor: Arch Haskell Team <arch-haskell@haskell.org> +# Package generated by cabal2arch 0.7.5 +_hkgname=binary +pkgname=haskell-binary +pkgver=0.5.0.2 +pkgrel=7.1 +pkgdesc="Binary serialisation for Haskell values using lazy ByteStrings" +url="http://hackage.haskell.org/package/binary" +license=('custom:BSD3') +arch=('i686' 'x86_64') +depends=(ghc=7.0.3-2 sh) +options=('strip') +source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) +install=${pkgname}.install +md5sums=('6bf8f3d1441602c9ab09a75e3bd6e926') + +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 +} + +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-testing/haskell-binary/haskell-binary.install b/community-testing/haskell-binary/haskell-binary.install new file mode 100644 index 000000000..0084ebef8 --- /dev/null +++ b/community-testing/haskell-binary/haskell-binary.install @@ -0,0 +1,18 @@ +HS_DIR=usr/share/haskell/haskell-binary +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-testing/haskell-dataenc/PKGBUILD b/community-testing/haskell-dataenc/PKGBUILD new file mode 100644 index 000000000..cd94ed17c --- /dev/null +++ b/community-testing/haskell-dataenc/PKGBUILD @@ -0,0 +1,39 @@ +# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> +# Contributor: Arch Haskell Team <arch-haskell@haskell.org> +# Package generated by cabal2arch 0.7.5 +_hkgname=dataenc +pkgname=haskell-dataenc +pkgver=0.13.0.4 +pkgrel=3.2 +pkgdesc="Data encoding library" +url="http://hackage.haskell.org/package/dataenc" +license=('custom:BSD3') +arch=('i686' 'x86_64') +depends=(ghc=7.0.3-2 sh) +options=('strip') +source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) +install=${pkgname}.install +md5sums=('4764fa7f75ed3ee95a759d67d1347d46') + +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 +} + +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-testing/haskell-dataenc/haskell-dataenc.install b/community-testing/haskell-dataenc/haskell-dataenc.install new file mode 100644 index 000000000..9c1bbff01 --- /dev/null +++ b/community-testing/haskell-dataenc/haskell-dataenc.install @@ -0,0 +1,18 @@ +HS_DIR=usr/share/haskell/haskell-dataenc +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-testing/haskell-ghc-paths/PKGBUILD b/community-testing/haskell-ghc-paths/PKGBUILD new file mode 100644 index 000000000..a7a4be130 --- /dev/null +++ b/community-testing/haskell-ghc-paths/PKGBUILD @@ -0,0 +1,35 @@ +# Maintainer: Arch Haskell Team <arch-haskell@haskell.org> +_hkgname=ghc-paths +pkgname=haskell-ghc-paths +pkgver=0.1.0.8 +pkgrel=4.1 +pkgdesc="Knowledge of GHC's installation directories" +url="http://hackage.haskell.org/package/${_hkgname}" +license=('custom:BSD3') +arch=('i686' 'x86_64') +makedepends=() +depends=(ghc=7.0.3-2) # cannot have stricter dep here due to haddock +options=('strip') +source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) +install=${pkgname}.install +md5sums=('d2b23dc563888e380588501d2ce1d82b') +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 +} +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-testing/haskell-ghc-paths/haskell-ghc-paths.install b/community-testing/haskell-ghc-paths/haskell-ghc-paths.install new file mode 100644 index 000000000..4fd2c6c56 --- /dev/null +++ b/community-testing/haskell-ghc-paths/haskell-ghc-paths.install @@ -0,0 +1,18 @@ +HS_DIR=usr/share/haskell/haskell-ghc-paths +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-testing/haskell-haskeline/PKGBUILD b/community-testing/haskell-haskeline/PKGBUILD new file mode 100644 index 000000000..5a6124fd3 --- /dev/null +++ b/community-testing/haskell-haskeline/PKGBUILD @@ -0,0 +1,39 @@ +# Maintainer: Vesa Kaihlavirta <vegai@iki.fi> +# Contributor: Arch Haskell Team <arch-haskell@haskell.org> +# Package generated by cabal2arch 0.7.6 +_hkgname=haskeline +pkgname=haskell-haskeline +pkgver=0.6.3.2 +pkgrel=2.2 +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.0.3-2' sh 'haskell-utf8-string=0.3.6-7.2' 'haskell-mtl=2.0.1.0-3.1' 'haskell-terminfo=0.3.1.3') +options=('strip') +source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) +install=${pkgname}.install +md5sums=('d75863f63a1cfb499d0198e4f28ac2af') + +build() { + cd ${srcdir}/${_hkgname}-${pkgver} + runhaskell Setup configure \ + -O -p --enable-split-objs --enable-shared -fterminfo --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-testing/haskell-haskeline/haskell-haskeline.install b/community-testing/haskell-haskeline/haskell-haskeline.install new file mode 100644 index 000000000..27cb4a093 --- /dev/null +++ b/community-testing/haskell-haskeline/haskell-haskeline.install @@ -0,0 +1,18 @@ +HS_DIR=usr/share/haskell/haskell-haskeline +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-testing/haskell-mmap/PKGBUILD b/community-testing/haskell-mmap/PKGBUILD new file mode 100644 index 000000000..b1002be46 --- /dev/null +++ b/community-testing/haskell-mmap/PKGBUILD @@ -0,0 +1,38 @@ +# Maintainer: Vesa Kaihlavirta <vegai@iki.fi> +# Contributor: Arch Haskell Team <arch-haskell@haskell.org> +_hkgname=mmap +pkgname=haskell-mmap +pkgver=0.5.7 +pkgrel=3.2 +pkgdesc="Memory mapped files for POSIX and Windows" +url="http://hackage.haskell.org/package/mmap" +license=('custom:BSD3') +arch=('i686' 'x86_64') +depends=('ghc=7.0.3-2' sh) +options=('strip') +source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) +install=${pkgname}.install +md5sums=('1f74b3f59617332b06e277f5212423c1') + +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 +} + +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-testing/haskell-mmap/haskell-mmap.install b/community-testing/haskell-mmap/haskell-mmap.install new file mode 100644 index 000000000..68fe74f4e --- /dev/null +++ b/community-testing/haskell-mmap/haskell-mmap.install @@ -0,0 +1,18 @@ +HS_DIR=usr/share/haskell/haskell-mmap +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-testing/haskell-tar/PKGBUILD b/community-testing/haskell-tar/PKGBUILD new file mode 100644 index 000000000..459f288bd --- /dev/null +++ b/community-testing/haskell-tar/PKGBUILD @@ -0,0 +1,37 @@ +# Contributor: Arch Haskell Team <arch-haskell@haskell.org> +_hkgname=tar +pkgname=haskell-tar +pkgver=0.3.1.0 +pkgrel=4.2 +pkgdesc="Reading, writing and manipulating \".tar\" archive files." +url="http://hackage.haskell.org/package/tar" +license=('custom:BSD3') +arch=('i686' 'x86_64') +depends=('ghc=7.0.3-2' sh) +options=('strip') +source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) +install=${pkgname}.install +md5sums=('10b54856495f9ef0a42aa270085c7d5e') + +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 +} + +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-testing/haskell-tar/haskell-tar.install b/community-testing/haskell-tar/haskell-tar.install new file mode 100644 index 000000000..e8c2f6293 --- /dev/null +++ b/community-testing/haskell-tar/haskell-tar.install @@ -0,0 +1,18 @@ +HS_DIR=usr/share/haskell/haskell-tar +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-testing/haskell-terminfo/PKGBUILD b/community-testing/haskell-terminfo/PKGBUILD new file mode 100644 index 000000000..51e968853 --- /dev/null +++ b/community-testing/haskell-terminfo/PKGBUILD @@ -0,0 +1,38 @@ +# Maintainer: Vesa Kaihlavirta <vegai@iki.fi> +# Contributor: Arch Haskell Team <arch-haskell@haskell.org> +_hkgname=terminfo +pkgname=haskell-terminfo +pkgver=0.3.1.3 +pkgrel=4.2 +pkgdesc="Haskell bindings to the terminfo library." +url="http://hackage.haskell.org/package/${_hkgname}" +license=('custom:BSD3') +arch=('i686' 'x86_64') +depends=('ghc=7.0.3-2' sh) +options=('strip') +source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) +install=${pkgname}.install +md5sums=('8c0e052340f628b76f5687fa23379628') + +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 +} + +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-testing/haskell-terminfo/haskell-terminfo.install b/community-testing/haskell-terminfo/haskell-terminfo.install new file mode 100644 index 000000000..40d39f42b --- /dev/null +++ b/community-testing/haskell-terminfo/haskell-terminfo.install @@ -0,0 +1,18 @@ +HS_DIR=usr/share/haskell/haskell-terminfo +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-testing/haskell-utf8-string/PKGBUILD b/community-testing/haskell-utf8-string/PKGBUILD new file mode 100644 index 000000000..e6d27dfad --- /dev/null +++ b/community-testing/haskell-utf8-string/PKGBUILD @@ -0,0 +1,39 @@ +# 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.6 +pkgrel=7.2 +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.0.3-2' sh) +options=('strip') +source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) +install=${pkgname}.install +md5sums=('be8c5ef52a0824babdc89d60c1e9b600') + +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 +} + +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-testing/haskell-utf8-string/haskell-utf8-string.install b/community-testing/haskell-utf8-string/haskell-utf8-string.install new file mode 100644 index 000000000..0f64366b2 --- /dev/null +++ b/community-testing/haskell-utf8-string/haskell-utf8-string.install @@ -0,0 +1,18 @@ +HS_DIR=usr/share/haskell/haskell-utf8-string +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-testing/haskell-x11-xft/PKGBUILD b/community-testing/haskell-x11-xft/PKGBUILD new file mode 100644 index 000000000..c8a9ae0f9 --- /dev/null +++ b/community-testing/haskell-x11-xft/PKGBUILD @@ -0,0 +1,37 @@ +# $Id: PKGBUILD 49962 2011-06-22 19:43:36Z vegai $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +_hkgname=X11-xft +pkgname=haskell-x11-xft +pkgver=0.3 +pkgrel=19.4 +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.0.3-2' 'haskell-x11=1.5.0.0-7.3' 'haskell-utf8-string=0.3.6-7.2' 'libxft') +options=('strip') +source=(http://hackage.haskell.org/packages/archive/X11-xft/$pkgver/X11-xft-$pkgver.tar.gz) +install=haskell-x11-xft.install +md5sums=('1b4a528a2a4fe5e9de715f6758ff9015') + +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 +} + +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-testing/haskell-x11-xft/haskell-x11-xft.install b/community-testing/haskell-x11-xft/haskell-x11-xft.install new file mode 100644 index 000000000..a0ff8dac8 --- /dev/null +++ b/community-testing/haskell-x11-xft/haskell-x11-xft.install @@ -0,0 +1,18 @@ +HS_DIR=/usr/share/haskell/haskell-x11-xft +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-testing/haskell-x11/PKGBUILD b/community-testing/haskell-x11/PKGBUILD new file mode 100644 index 000000000..417b6daab --- /dev/null +++ b/community-testing/haskell-x11/PKGBUILD @@ -0,0 +1,41 @@ +# $Id: PKGBUILD 49953 2011-06-22 19:21:47Z vegai $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: shild <sxp@bk.ru> +# Maintainer: Vesa Kaihlavirta <vegai@iki.fi> + +_hkgname=X11 +pkgname=haskell-x11 +pkgver=1.5.0.0 +pkgrel=7.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.0.3-2" "haskell-syb=0.3-2.1" 'libx11' 'libxinerama') +conflicts=(haskell-x11-extras) +install=hsmod.install +source=(http://hackage.haskell.org/packages/archive/X11/$pkgver/X11-$pkgver.tar.gz) +md5sums=('ec6670f5ce1812206903c8a0fd9df04c') + +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 +} + +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-testing/haskell-x11/hsmod.install b/community-testing/haskell-x11/hsmod.install new file mode 100644 index 000000000..45c23b979 --- /dev/null +++ b/community-testing/haskell-x11/hsmod.install @@ -0,0 +1,18 @@ +HS_DIR=usr/share/haskell/haskell-x11 +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-testing/xmonad-contrib/PKGBUILD b/community-testing/xmonad-contrib/PKGBUILD new file mode 100644 index 000000000..84455217a --- /dev/null +++ b/community-testing/xmonad-contrib/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 49972 2011-06-22 19:52:11Z vegai $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: Vesa Kaihlavirta <vegai@iki.fi> +# Contributor: orbisvicis <gmail.com> + +pkgname=xmonad-contrib +pkgver=0.9.2 +pkgrel=2.1 +pkgdesc="Add-ons for xmonad" +arch=('i686' 'x86_64') +url="http://xmonad.org/" +license=('BSD') +depends=('ghc=7.0.3-2' 'xmonad=0.9.2-2.1' 'sh' 'haskell-x11=1.5.0.0' + 'haskell-x11-xft=0.3' 'haskell-utf8-string=0.3.6') +install='xmonad-contrib.install' +source=(http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz) +md5sums=('616cbc632bbde5cd4cdb643ee47e74d2') + +build() { + cd $srcdir/$pkgname-$pkgver + runhaskell Setup.lhs configure --ghc --enable-shared --enable-split-objs --prefix=/usr -fuse_xft \ + --libsubdir=\$compiler/site-local/\$pkgid + runhaskell Setup build + runhaskell Setup register --gen-script + runhaskell Setup unregister --gen-script + sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh +} + +package() { + cd $srcdir/$pkgname-$pkgver + install -D -m744 register.sh $pkgdir/usr/share/haskell/$pkgname/register.sh + install -m744 unregister.sh $pkgdir/usr/share/haskell/$pkgname/unregister.sh + runhaskell Setup.lhs copy --destdir=$pkgdir + install -D LICENSE $pkgdir/usr/share/licenses/xmonad-contrib/LICENSE +} diff --git a/community-testing/xmonad-contrib/xmonad-contrib.install b/community-testing/xmonad-contrib/xmonad-contrib.install new file mode 100644 index 000000000..e9208c833 --- /dev/null +++ b/community-testing/xmonad-contrib/xmonad-contrib.install @@ -0,0 +1,17 @@ +HS_DIR=usr/share/haskell/xmonad-contrib + +post_install() { + ${HS_DIR}/register.sh +} + +pre_upgrade() { + ${HS_DIR}/unregister.sh +} + +post_upgrade() { + ${HS_DIR}/register.sh +} + +pre_remove() { + ${HS_DIR}/unregister.sh +} diff --git a/community-testing/xmonad/PKGBUILD b/community-testing/xmonad/PKGBUILD new file mode 100644 index 000000000..d669fc325 --- /dev/null +++ b/community-testing/xmonad/PKGBUILD @@ -0,0 +1,46 @@ +# $Id: PKGBUILD 49967 2011-06-22 19:45:42Z vegai $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: Vesa Kaihlavirta <vegai@iki.fi> +# Contributor: shild <shildv@gmail.com> + +pkgname=xmonad +pkgver=0.9.2 +pkgrel=2.1 +pkgdesc="A lightweight X11 tiled window manager written in Haskell" +arch=('i686' 'x86_64') +url="http://xmonad.org/" +license=('BSD') +depends=('ghc=7.0.3' 'gmp' 'haskell-x11=1.5.0.0' 'sh' 'haskell-mtl=2.0.1.0' 'haskell-utf8-string=0.3.6') +install='xmonad.install' +source=(http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz + xmonad.desktop xmonad.session xmonad.svg) + +build() { + cd $srcdir/$pkgname-$pkgver + runhaskell Setup.lhs configure --ghc --enable-shared --enable-split-objs --prefix=/usr \ + --libsubdir=\$compiler/site-local/\$pkgid + runhaskell Setup build + runhaskell Setup register --gen-script + runhaskell Setup unregister --gen-script + sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh +} + +package() { + cd $srcdir/$pkgname-$pkgver + install -D -m744 register.sh $pkgdir/usr/share/haskell/$pkgname/register.sh + install -m744 unregister.sh $pkgdir/usr/share/haskell/$pkgname/unregister.sh + runhaskell Setup.lhs copy --destdir=$pkgdir +# runhaskell util/GenerateManpage.hs + + install -D -m644 man/xmonad.1 $pkgdir/usr/share/man/man1/xmonad.1 + + install -D -m644 LICENSE $pkgdir/usr/share/licenses/xmonad/LICENSE + + install -D -m644 $srcdir/xmonad.desktop $pkgdir/usr/share/xsessions/xmonad.desktop + install -D -m644 $srcdir/xmonad.session $pkgdir/usr/share/gnome-session/sessions/xmonad.session + install -D -m644 $srcdir/xmonad.svg $pkgdir/usr/share/pixmaps/xmonad.svg +} +md5sums=('5a4117f798664d772d2a834ea6c90f1c' + 'f8e3d84a9f154d1b5d7fcffbc0a058c9' + '9d1bc84a7f32897d32f3fc71ef76228e' + '72bfa5e62e4e44fe7fa59b6a7593d993') diff --git a/community-testing/xmonad/xmonad.desktop b/community-testing/xmonad/xmonad.desktop new file mode 100644 index 000000000..0af0f2d9b --- /dev/null +++ b/community-testing/xmonad/xmonad.desktop @@ -0,0 +1,7 @@ +[Desktop Entry] +Name=Xmonad GNOME +Comment=Tiling window manager +TryExec=/usr/bin/gnome-session +Exec=gnome-session --session=xmonad +Type=XSession +Icon=/usr/share/pixmaps/xmonad.svg diff --git a/community-testing/xmonad/xmonad.install b/community-testing/xmonad/xmonad.install new file mode 100644 index 000000000..6659247db --- /dev/null +++ b/community-testing/xmonad/xmonad.install @@ -0,0 +1,22 @@ +HS_DIR=/usr/share/haskell/xmonad + +post_install() { + ${HS_DIR}/register.sh + echo "xmonad now has dynamic configuration via ~/.xmonad/xmonad.hs" + echo "See http://haskell.org/haskellwiki/Xmonad/Config_archive for examples" + echo + echo "If you would like to run xmonad as a window manager inside GNOME, please see" + echo "http://www.haskell.org/haskellwiki/Xmonad/Using_xmonad_in_Gnome#Setting_up_Gnome_to_use_Xmonad" +} + +pre_upgrade() { + ${HS_DIR}/unregister.sh +} + +post_upgrade() { + ${HS_DIR}/register.sh +} + +pre_remove() { + ${HS_DIR}/unregister.sh +} diff --git a/community-testing/xmonad/xmonad.png b/community-testing/xmonad/xmonad.png Binary files differnew file mode 100644 index 000000000..d957f62f8 --- /dev/null +++ b/community-testing/xmonad/xmonad.png diff --git a/community-testing/xmonad/xmonad.session b/community-testing/xmonad/xmonad.session new file mode 100644 index 000000000..c0bd16781 --- /dev/null +++ b/community-testing/xmonad/xmonad.session @@ -0,0 +1,6 @@ +[GNOME Session] +Name=Xmonad session +RequiredComponents=gnome-panel;gnome-settings-daemon; +RequiredProviders=windowmanager;notifications; +DefaultProvider-windowmanager=xmonad +DefaultProvider-notifications=notification-daemon diff --git a/community-testing/xmonad/xmonad.svg b/community-testing/xmonad/xmonad.svg new file mode 100644 index 000000000..5fc884213 --- /dev/null +++ b/community-testing/xmonad/xmonad.svg @@ -0,0 +1,77 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://web.resource.org/cc/" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + id="svg2211" + sodipodi:version="0.32" + inkscape:version="0.45.1" + width="47" + height="73" + version="1.0" + sodipodi:docbase="/home/sjanssen/xmonad-web/images" + sodipodi:docname="logo.svg" + inkscape:output_extension="org.inkscape.output.svg.inkscape" + inkscape:export-filename="/home/sjanssen/xmonad-web/images/logo.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"> + <metadata + id="metadata2216"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + </cc:Work> + </rdf:RDF> + </metadata> + <defs + id="defs2214" /> + <sodipodi:namedview + inkscape:window-height="778" + inkscape:window-width="1278" + inkscape:pageshadow="2" + inkscape:pageopacity="1" + guidetolerance="10.0" + gridtolerance="10.0" + objecttolerance="10.0" + borderopacity="1.0" + bordercolor="#666666" + pagecolor="#ffffff" + id="base" + inkscape:zoom="4" + inkscape:cx="23.5" + inkscape:cy="22.689137" + inkscape:window-x="0" + inkscape:window-y="20" + inkscape:current-layer="g3208" /> + <g + id="g3208" + transform="translate(-44.517797,4.0967298)"> + <g + id="g3212" + transform="matrix(1.0216109,0,0,1.0127041,45.533715,-4.3577662)"> + <path + style="font-size:73.7244339px;font-style:normal;font-weight:normal;fill:#aeaeae;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" + d="M 22.62043,20.307707 L 36.04778,0.32867349 L 43.859402,0.32867349 L 26.580238,26.139425 L 22.080456,31.215179 L 6.8531925,54.074074 L -0.9944279,54.074074 L 18.192644,25.383462" + id="text2220" + sodipodi:nodetypes="cccccccc" /> + <path + id="path3206" + d="M 1.4534537,0.32867349 L 9.2650758,0.32867349 L 45.011347,54.074074 L 37.199725,54.074074 L 22.080456,31.215179 L 6.8531925,54.074074 L -0.9944279,54.074074 L 18.192644,25.383462 L 1.4534537,0.32867349" + style="font-size:73.7244339px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" + sodipodi:nodetypes="ccccccccc" /> + </g> + <path + style="font-size:28.207407px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ee0a00;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans Mono" + d="M 44.517797,65.480602 L 55.836194,59.828049 L 44.517797,54.228655 L 44.517797,51.056847 L 58.809298,58.321883 L 58.809298,61.298776 L 44.517797,68.652411 M 44.517797,68.652411 L 44.517797,65.480602 M 73.929389,61.298776 L 59.637889,68.652411 L 59.637889,65.480602 L 70.956287,59.828049 L 59.637889,54.228655 L 59.637889,51.056847 L 73.929389,58.321883 L 73.929389,61.298776 z M 91.517797,57.382744 L 77.270452,57.382744 L 77.270452,54.405851 L 91.517797,54.405851 L 91.517797,57.382744 z M 91.517797,65.267967 L 77.270452,65.267967 L 77.270452,62.291073 L 91.517797,62.291073 L 91.517797,65.267967 z " + id="text3216" + sodipodi:nodetypes="ccccccccccccccccccccccccccc" /> + </g> +</svg> diff --git a/community/distcc/PKGBUILD b/community/distcc/PKGBUILD index bd278b623..8aeb60fd5 100644 --- a/community/distcc/PKGBUILD +++ b/community/distcc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 59085 2009-11-20 06:29:43Z giovanni $ +# $Id: PKGBUILD 50002 2011-06-23 09:01:13Z spupykin $ # Maintainer: Judd Vinet <jvinet@zeroflux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> @@ -22,12 +22,16 @@ md5sums=('a1a9d3853df7133669fffec2a9aab9f3' build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr \ + [ -f Makefile ] || ./configure --prefix=/usr \ --with-gtk \ --sysconfdir=/etc \ - --mandir=/usr/share/man || return 1 - make || return 1 - make DESTDIR="${pkgdir}/" install || return 1 + --mandir=/usr/share/man + make WERROR_CFLAGS= INCLUDESERVER_PYTHON=/usr/bin/python2 +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}/" INCLUDESERVER_PYTHON=/usr/bin/python2 install install -D -m644 ${srcdir}/distccd.conf.d ${pkgdir}/etc/conf.d/distccd install -D -m755 ${srcdir}/distccd ${pkgdir}/etc/rc.d/distccd diff --git a/community/freecol/PKGBUILD b/community/freecol/PKGBUILD index edff300d7..cfebf4ac5 100644 --- a/community/freecol/PKGBUILD +++ b/community/freecol/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 30919 2010-10-23 14:21:56Z svenstaro $ +# $Id: PKGBUILD 49898 2011-06-22 11:19:02Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: TDY <tdy@gmx.com> # Contributor: Nelson Menon <nelsonmenon@gmail.com insanatorium.wordpress.com> pkgname=freecol -pkgver=0.9.5 +pkgver=0.10.0 pkgrel=1 pkgdesc="A turn-based strategy game based on Colonization" arch=('i686' 'x86_64') url="http://www.freecol.org/" license=('GPL') depends=('java-runtime') -source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz +source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.zip fc.desktop fc.sh) -md5sums=('6d5cb3b18cede24196f360b225ff7ccc' +md5sums=('281c27b6222fa586823db7cad4a8ea3a' '55594d770904af3e3e3852d375085357' 'ae473cd1d86f8f764250ee00b6fda90b') diff --git a/community/hsolink/PKGBUILD b/community/hsolink/PKGBUILD index 260717406..0f496da75 100644 --- a/community/hsolink/PKGBUILD +++ b/community/hsolink/PKGBUILD @@ -1,21 +1,28 @@ +# $Id: PKGBUILD 50013 2011-06-23 12:34:22Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Geoffroy Carrier <geoffroy.carrier@aur.archlinux.org> pkgname=hsolink pkgver=1.0.118 -pkgrel=6 +pkgrel=7 pkgdesc="HSO command line connection utility" arch=('i686' 'x86_64') url="http://www.pharscape.org/hsolinkcontrol.html" license=('GPL2') -depends=('ozerocdoff') +depends=('ozerocdoff' 'net-tools') install=hsolink.install source=("http://www.pharscape.org/downloads1.html/$pkgname-$pkgver.tar.gz") md5sums=('8b5b179c487b7ad95112fe74dea7e302') build() { cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr || return 1 - make DESTDIR="$pkgdir/" install || return 1 + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install chgrp network "$pkgdir"/usr/bin/hsolinkcontrol chmod ug+s "$pkgdir"/usr/bin/hsolinkcontrol } diff --git a/community/libmicrohttpd/PKGBUILD b/community/libmicrohttpd/PKGBUILD index c942a6761..3e784e39e 100644 --- a/community/libmicrohttpd/PKGBUILD +++ b/community/libmicrohttpd/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 47393 2011-05-22 11:59:43Z jelle $ +# $Id: PKGBUILD 50018 2011-06-23 13:20:44Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Norberto Lopes <shelika@mail.telepac.pt> # Contributor: Kao Dome <kaodome@gmail.com> @@ -6,7 +6,7 @@ # Contributor: Mathias Rohnstock <linksoft@gmx.de> pkgname=libmicrohttpd -pkgver=0.9.11 +pkgver=0.9.12 pkgrel=1 pkgdesc="a small C library that is supposed to make it easy to run an HTTP server as part of another application." arch=('i686' 'x86_64') @@ -16,7 +16,7 @@ options=('!libtool') depends=('gnutls') install=libmicrohttpd.install source=(ftp://ftp.gnu.org/gnu/libmicrohttpd/$pkgname-$pkgver.tar.gz) -md5sums=('69b97b11437e53863e92d5f0221f339b') +md5sums=('35b000cd7d201ace2b071d53a02b2c0d') build() { cd ${pkgname}-${pkgver} diff --git a/community/lilypond/PKGBUILD b/community/lilypond/PKGBUILD index f6d6bd0b3..383fa7e12 100644 --- a/community/lilypond/PKGBUILD +++ b/community/lilypond/PKGBUILD @@ -1,24 +1,24 @@ -# $Id: PKGBUILD 28189 2010-10-03 15:28:38Z foutrelis $ +# $Id: PKGBUILD 50008 2011-06-23 09:20:14Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Geoffroy Carrier <geoffroy@archlinux.org> -# Contributor: Andrea `BaSh` Scarpino <bash.lnx@gmail.com> # Contributor: William Rea <sillywilly@gmail.com> # Contributor: Robert Emil Berge <filoktetes@linuxophic.org> pkgname=lilypond -pkgver=2.12.3 -pkgrel=7 +pkgver=2.14.1 +pkgrel=1 pkgdesc="An automated music engraving system" arch=('i686' 'x86_64') url="http://lilypond.org" license=('GPL') depends=('guile' 'python2' 'texlive-core' 'ghostscript' 'pango' 'fontconfig') -makedepends=('flex' 'bison' 'gettext' 'mftrace' 'texinfo' 'fontforge' 't1utils' 'gsfonts') +makedepends=('flex' 'bison' 'gettext' 'mftrace' 'texinfo' 'fontforge' 't1utils' + 'gsfonts' 'texi2html') options=('emptydirs') -source=(http://download.linuxaudio.org/lilypond/sources/v2.12/$pkgname-$pkgver.tar.gz - lilypond-gcc45.patch) -md5sums=('2303bf5f2ea8d4628f33a68f016f3866' - '023636ea13dc6eb2de379e5ef369b218') +source=(http://download.linuxaudio.org/lilypond/sources/v2.14/$pkgname-$pkgver.tar.gz + texlive-workaround.patch) +md5sums=('262cc7f92c907a7b479b55b3b37a9302' + 'ff32863f3eed67ac744e50bc4fc67a87') build() { cd "$srcdir/$pkgname-$pkgver" @@ -29,12 +29,14 @@ build() { sed -i 's_^#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file done -# libtoolize --force --copy -# aclocal -# autoconf -# automake - ./configure --prefix=/usr --disable-gui - patch -p1 <$srcdir/lilypond-gcc45.patch + rm -rf python/out/ + patch -p1 <$srcdir/texlive-workaround.patch + + PYTHON=/usr/bin/python2 ./configure --prefix=/usr make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install } diff --git a/community/lilypond/texlive-workaround.patch b/community/lilypond/texlive-workaround.patch new file mode 100644 index 000000000..1eb262863 --- /dev/null +++ b/community/lilypond/texlive-workaround.patch @@ -0,0 +1,88 @@ +diff --git a/mf/feta-autometric.mf b/mf/feta-autometric.mf +index d5cbb7f..b25c4bc 100644 +--- a/mf/feta-autometric.mf ++++ b/mf/feta-autometric.mf +@@ -149,7 +149,6 @@ def set_char_box (expr b_sharp, w_sharp, d_sharp, h_sharp) = + & to_bp (w) & " " + & to_bp (h); + special "% MF2PT1: font_size " & decimal designsize; +- special "% MF2PT1: font_slant " & decimal font_slant_; + + for fvar = "font_identifier", + "font_coding_scheme", +@@ -175,9 +174,6 @@ def set_char_box (expr b_sharp, w_sharp, d_sharp, h_sharp) = + fi; + endfor; + +- special "% MF2PT1: font_fixed_pitch " +- & (if font_fixed_pitch_: "1" else: "0" fi); +- + % this must come after the `font_size' special + special "% MF2PT1: charwd " & decimal charwd; + fi; +diff --git a/mf/mf2pt1.mp b/mf/mf2pt1.mp +index a8b45aa..c935628 100644 +--- a/mf/mf2pt1.mp ++++ b/mf/mf2pt1.mp +@@ -61,7 +61,6 @@ def beginchar(expr c,w_sharp,h_sharp,d_sharp) = + def to_bp (expr num) = decimal (ceiling (num*bp_per_pixel)) enddef; + special "% MF2PT1: glyph_dimensions 0 " & to_bp (-d) & " " & to_bp(w) & " " & to_bp(h); + special "% MF2PT1: font_size " & decimal designsize; +- special "% MF2PT1: font_slant " & decimal font_slant_; + special "% MF2PT1: charwd " & decimal charwd; % Must come after the |font_size| |special| + for fvar = "font_identifier", "font_coding_scheme", "font_version", + "font_comment", "font_family", "font_weight", "font_unique_id", +@@ -76,8 +75,6 @@ def beginchar(expr c,w_sharp,h_sharp,d_sharp) = + scantokens ("decimal " & fvar & "_"); + fi; + endfor; +- special "% MF2PT1: font_fixed_pitch " & +- (if font_fixed_pitch_: "1" else: "0" fi); + enddef; + + +@@ -91,19 +88,6 @@ enddef; + + + %% \begin{explaincode} +-%% Store the value of \mfcomment +-% |font_slant_|, so we can recall it at each |beginchar|. +-%% \end{explaincode} +- +-font_slant_ := 0; +- +-def font_slant expr x = +- font_slant_ := x; +- fontdimen 1: x +-enddef; +- +- +-%% \begin{explaincode} + %% Redefine \mfcomment + % |bpppix_|, the number of ``big'' points per pixel. \mfcomment + % This in turn redefines |mm|, |in|, |pt|, and other derived units. +@@ -141,11 +125,6 @@ forsuffixes fvar = font_underline_position, font_underline_thickness: + scantokens ("def " & str fvar & " expr x = " & str fvar & "_ := x enddef;"); + endfor; + +-boolean font_fixed_pitch_; +-font_fixed_pitch_ := false; +-def font_fixed_pitch expr x = font_fixed_pitch_ := x enddef; +- +- + %% \begin{explaincode} + %% We'd like to be able to use calligraphic pens. Normally, MetaPost's + %% output routine does all the work for us of converting these to filled +diff --git a/scripts/build/mf2pt1.pl b/scripts/build/mf2pt1.pl +index 95df0f8..20f410b 100644 +--- a/scripts/build/mf2pt1.pl ++++ b/scripts/build/mf2pt1.pl +@@ -427,7 +427,7 @@ ENDHEADER + sub get_bboxes ($) + { + execute_command 1, ("mpost", "-mem=mf2pt1", "-progname=mpost", +- "\\mode:=localfont; mag:=$mag; bpppix $bpppix; input $mffile"); ++ "\\mode:=localfont; mag:=$mag; bpppix:=$bpppix; input $mffile"); + opendir (CURDIR, ".") || die "${progname}: $! ($filedir)\n"; + @charfiles = sort + { ($a=~ /\.(\d+)$/)[0] <=> ($b=~ /\.(\d+)$/)[0] } diff --git a/community/lxtask/PKGBUILD b/community/lxtask/PKGBUILD index b933fc7c1..d88df457e 100644 --- a/community/lxtask/PKGBUILD +++ b/community/lxtask/PKGBUILD @@ -1,7 +1,7 @@ -# Maintainer: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> -# Maintainer: Geoffroy Carrier <geoffroy.carrier@koon.fr> +# Maintainer: Angel Velasquez <angvp@archlinux.org> +# Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr> pkgname=lxtask -pkgver=0.1.3 +pkgver=0.1.4 pkgrel=1 pkgdesc="Task manager of the LXDE Desktop" arch=('i686' 'x86_64') @@ -11,12 +11,15 @@ groups=('lxde') depends=('gtk2') makedepends=('pkgconfig' 'intltool') source=(http://downloads.sourceforge.net/sourceforge/lxde/${pkgname}-${pkgver}.tar.gz) -md5sums=('eccfb69ee1a209248b22a5f0a34a4734') +md5sums=('c4ab47d03d41a88696d64d3f1e78cf7f') build() { cd "$srcdir/$pkgname-$pkgver" - autoreconf || return 1 - ./configure --sysconfdir=/etc --prefix=/usr || return 1 - make || return 1 - make DESTDIR="$pkgdir" install || return 1 + autoreconf + ./configure --sysconfdir=/etc --prefix=/usr + make +} +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install } diff --git a/community/pari/PKGBUILD b/community/pari/PKGBUILD index e9b0334ac..ec9c6f80b 100644 --- a/community/pari/PKGBUILD +++ b/community/pari/PKGBUILD @@ -1,8 +1,8 @@ # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=pari -pkgver=2.3.5 -pkgrel=3 +pkgver=2.5.0 +pkgrel=1 pkgdesc='Computer algebra system designed for fast computations in number theory' arch=('i686' 'x86_64') url='http://pari.math.u-bordeaux.fr/' @@ -12,7 +12,7 @@ makedepends=('perl' 'texlive-core') optdepends=('perl: gphelp, tex2mail' 'libx11: high precision plots') source=("${url}pub/pari/unix/$pkgname-$pkgver.tar.gz") -sha1sums=('f211ccfe42a4b18dbcde832dfd1ece6f477f4966') +sha1sums=('d96250cd8b3e426f548a832f2f44fdfd30fd32b6') build() { cd "$srcdir/$pkgname-$pkgver" @@ -20,11 +20,14 @@ build() { make all } -package() { +check() { cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir/" install + make bench +} - install -m 644 -t "$pkgdir/usr/include/$pkgname/" Olinux-$CARCH/*.h +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install # symlink pointing to a symlink that is going to be moved by zipman rm "$pkgdir"/usr/share/man/man1/pari.1 diff --git a/community/pcsclite/PKGBUILD b/community/pcsclite/PKGBUILD index 14791d62b..55008944c 100644 --- a/community/pcsclite/PKGBUILD +++ b/community/pcsclite/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 48094 2011-05-28 15:09:58Z giovanni $ +# $Id: PKGBUILD 49923 2011-06-22 14:26:41Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Daniel Plaza <daniel.plaza.espi@gmail.com> pkgname=pcsclite -pkgver=1.7.2 -pkgrel=2 +pkgver=1.7.3 +pkgrel=1 pkgdesc="PC/SC Architecture smartcard middleware library" arch=('i686' 'x86_64') url="https://alioth.debian.org/projects/pcsclite/" @@ -12,9 +12,9 @@ license=('BSD') depends=('udev') makedepends=('pkgconfig') options=('!libtool' '!docs') -source=(https://alioth.debian.org/frs/download.php/3533/pcsc-lite-${pkgver}.tar.bz2 +source=(https://alioth.debian.org/frs/download.php/3591/pcsc-lite-${pkgver}.tar.bz2 pcscd) -md5sums=('47e7055cfc14399fdaa1b7a4aa06e5aa' +md5sums=('0dfc1639e4020fb3c04ab37425abbb12' '80d90388e4d2a551cb7aefe3bd5147bd') build() { diff --git a/community/qlandkartegt/PKGBUILD b/community/qlandkartegt/PKGBUILD index ff0b66901..a313aeb8c 100644 --- a/community/qlandkartegt/PKGBUILD +++ b/community/qlandkartegt/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 47374 2011-05-22 09:38:33Z jlichtblau $ +# $Id: PKGBUILD 50065 2011-06-23 20:33:39Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Matthias Maennich <arch@maennich.net> # Contributor: <boenki@gmx.de> pkgname=qlandkartegt -pkgver=1.1.2 +pkgver=1.2.0 pkgrel=1 pkgdesc="Use your GPS with Linux" arch=('i686' 'x86_64') @@ -17,7 +17,7 @@ install=$pkgname.install changelog=$pkgname.changelog source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz $pkgname-mimetypes.xml) -sha256sums=('8eedc414b4f89c9519e4b15c2ac7e5986b8e0834d237cde5fedc619c61ad0175' +sha256sums=('f28b37340a773e466434988e64929b6282e445dc43612fb6c1d991d2d5ff995f' 'e8d33948831f8a66edd752c71c653085d6c4d9f1969e70dd8c40b9c7ca37fba0') build() { diff --git a/community/qlandkartegt/qlandkartegt.changelog b/community/qlandkartegt/qlandkartegt.changelog index d7fb41e6f..f2cfbb448 100644 --- a/community/qlandkartegt/qlandkartegt.changelog +++ b/community/qlandkartegt/qlandkartegt.changelog @@ -1,3 +1,6 @@ +2011-06-22 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * qlandkartegt 1.2.0-1 + 2011-05-22 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * qlandkartegt 1.1.2-1 diff --git a/community/scrotwm/LICENSE b/community/scrotwm/LICENSE new file mode 100644 index 000000000..24c04f3a0 --- /dev/null +++ b/community/scrotwm/LICENSE @@ -0,0 +1,47 @@ +/* + * Copyright (c) 2009 Marco Peereboom <marco@peereboom.us> + * Copyright (c) 2009 Ryan McBride <mcbride@countersiege.com> + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ +/* + * Much code and ideas taken from dwm under the following license: + * MIT/X Consortium License + * + * 2006-2008 Anselm R Garbe <garbeam at gmail dot com> + * 2006-2007 Sander van Dijk <a dot h dot vandijk at gmail dot com> + * 2006-2007 Jukka Salmi <jukka at salmi dot ch> + * 2007 Premysl Hruby <dfenze at gmail dot com> + * 2007 Szabolcs Nagy <nszabolcs at gmail dot com> + * 2007 Christof Musik <christof at sendfax dot de> + * 2007-2008 Enno Gottox Boland <gottox at s01 dot de> + * 2007-2008 Peter Hartlich <sgkkr at hartlich dot com> + * 2008 Martin Hurton <martin dot hurton at gmail dot com> + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ diff --git a/community/scrotwm/PKGBUILD b/community/scrotwm/PKGBUILD new file mode 100644 index 000000000..3d1d7b6cc --- /dev/null +++ b/community/scrotwm/PKGBUILD @@ -0,0 +1,48 @@ +# Maintainer: Kyle Keen <keenerd@gmail.com> +# Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> + +pkgname=scrotwm +pkgver=0.9.32 +pkgrel=1 +pkgdesc="A minimalistic dynamic tiling window manager that tries to stay out of the way." +arch=('i686' 'x86_64') +url="http://www.scrotwm.org" +license=('custom:ISC') +depends=('dmenu' 'libxrandr' 'profont') +makedepends=('libxt') +optdepends=('scrot: screenshots' 'xlockmore: screenlocking' 'terminus-font: great font') +backup=(etc/scrotwm.conf) +source=(http://opensource.conformal.com/snapshots/$pkgname/$pkgname-$pkgver.tgz \ + LICENSE \ + baraction.sh) +md5sums=('43053b82962f6629ffa487bfb1c3195d' + 'a67cfe51079481e5b0eab1ad371379e3' + '6132ba773ee00f39d8f67ac0347a9814') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + # it is like a patch, only less fragile + sed -i 's|\"/usr/local/lib/libswmhack.so\"|\"libswmhack.so\"|' scrotwm.c + sed -i 's/# modkey = Mod1/modkey = Mod4/' scrotwm.conf + sed -i 's/-\*-terminus-medium-\*-\*-\*-\*-\*-\*-\*-\*-\*-\*-\*/-*-profont-*-*-*-*-12-*-*-*-*-*-*-*/' scrotwm.conf + + cd linux + make PREFIX="/usr" +} + +package() { + cd "$srcdir/$pkgname-$pkgver/linux" + make PREFIX="/usr" DESTDIR="$pkgdir" install + install -Dm644 scrotwm.desktop "$pkgdir/usr/share/xsessions/scrotwm.desktop" + cd .. + install -Dm644 scrotwm.conf "$pkgdir/etc/scrotwm.conf" + install -Dm755 screenshot.sh "$pkgdir/usr/share/scrotwm/screenshot.sh" + #cd ../.. + cd "$srcdir" + install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + install -Dm755 baraction.sh "$pkgdir/usr/share/scrotwm/baraction.sh" + + ln -s /usr/lib/libswmhack.so.0.0 "$pkgdir/usr/lib/libswmhack.so.0" + ln -s /usr/lib/libswmhack.so.0.0 "$pkgdir/usr/lib/libswmhack.so" +} diff --git a/community/scrotwm/baraction.sh b/community/scrotwm/baraction.sh new file mode 100755 index 000000000..9c4600adc --- /dev/null +++ b/community/scrotwm/baraction.sh @@ -0,0 +1,82 @@ +#!/bin/bash +# baraction.sh for scrotwm status bar +# From http://wiki.archlinux.org/index.php/Scrotwm + +SLEEP_SEC=5 +#loops forever outputting a line every SLEEP_SEC secs +while :; do + + eval $(cat /proc/acpi/battery/BAT0/state | awk '/charging state/ {printf "BAT_CHGSTATE=%s;", $3}; /remaining capacity/ {printf "BAT_REMNG=%s;",$3}; /present rate/ {printf "BAT_RATE=%s;",$3};' -) + eval $(cat /proc/acpi/battery/BAT0/info | awk '/present/ {printf "BAT_PRESENT=%s;", $2}; /last full capacity/ {printf "BAT_LASTFULL=%s;",$4};' -) + + BAT_REMNG_WH=`echo "scale=1; a=($BAT_REMNG+50)/1000; print a" | bc -l` + BAT_RATE_W=`echo "scale=1; a=($BAT_RATE+50)/1000; print a" | bc -l` + BCSCRIPT="scale=0; a=(100*$BAT_REMNG / $BAT_LASTFULL); print a" + BAT_PCT=`echo $BCSCRIPT | bc -l`% + + case $BAT_PRESENT in + no) + POWER_STR="AC, NO BATTERY" + ;; + yes) + + case $BAT_CHGSTATE in + charged) + #on ac + AC_STATUS="ON AC" + TIME_REMNG="N/A" + POWER_STR="$AC_STATUS $BAT_CHGSTATE $BAT_PCT" + ;; + charging) + #on ac + AC_STATUS="ON AC" + BCSCRIPT="scale=1; a=(60*($BAT_LASTFULL - $BAT_REMNG) / $BAT_RATE); print a" + TIMETOFULL_MIN=`echo $BCSCRIPT | bc -l` + POWER_STR="$AC_STATUS $BAT_CHGSTATE $BAT_PCT C="$BAT_REMNG_WH"Wh Rate="$BAT_RATE_W"W TTF="$TIMETOFULL_MIN"min" + ;; + discharging) + AC_STATUS="ON BATT" + TIME_REMNG_MIN=`echo "scale=0; a=(60*$BAT_REMNG / $BAT_RATE); print a" | bc -l` + TIME_REMNG_HH=`echo "scale=0; a=($BAT_REMNG / $BAT_RATE); if (a<10) {print "0"; print a} else {print a}" | bc -l` + + TIME_REMNG_MM=`echo "scale=0; a=($TIME_REMNG_MIN-60*$TIME_REMNG_HH); if (a<10) {print "0"; print a} else {print a}" | bc -l` + POWER_STR="$AC_STATUS $BAT_PCT C="$BAT_REMNG_WH"Wh P="$BAT_RATE_W"W R="$TIME_REMNG_HH":"$TIME_REMNG_MM + ;; + *) + POWER_STR=$BAT_CHGSTATE + ;; + esac + + ;; + *) + POWER_STR="error" + ;; + esac + + #scrotwm bar_print can't handle UTF-8 characters, such as degree symbol + #Core 0: +67.0°C (crit = +100.0°C) + eval $(sensors 2>/dev/null | sed s/[°+]//g | awk '/^Core 0/ {printf "CORE0TEMP=%s;", $3}; /^Core 1/ {printf "CORE1TEMP=%s;",$3}; /^fan1/ {printf "FANSPD=%s;",$2};' -) + TEMP_STR="Tcpu=$CORE0TEMP,$CORE1TEMP F=$FANSPD" + + WLAN_ESSID=$(iwconfig wlan0 | awk -F "\"" '/wlan0/ { print $2 }') + eval $(cat /proc/net/wireless | sed s/[.]//g | awk '/wlan0/ {printf "WLAN_QULTY=%s; WLAN_SIGNL=%s; WLAN_NOISE=%s", $3,$4,$5};' -) + BCSCRIPT="scale=0;a=100*$WLAN_QULTY/70;print a" + WLAN_QPCT=`echo $BCSCRIPT | bc -l` + WLAN_POWER=`iwconfig 2>/dev/null| grep "Tx-Power"| awk {'print $4'}|sed s/Tx-Power=//` + WLAN_STR="$WLAN_ESSID: Q=$WLAN_QPCT% S/N="$WLAN_SIGNL"/"$WLAN_NOISE"dBm T="$WLAN_POWER"dBm" + + CPUFREQ_STR=`echo "Freq:"$(cat /proc/cpuinfo | grep 'cpu MHz' | sed 's/.*: //g; s/\..*//g;')` + CPULOAD_STR="Load:$(uptime | sed 's/.*://; s/,//g')" + + eval $(awk '/^MemTotal/ {printf "MTOT=%s;", $2}; /^MemFree/ {printf "MFREE=%s;",$2}' /proc/meminfo) + MUSED=$(( $MTOT - $MFREE )) + MUSEDPT=$(( ($MUSED * 100) / $MTOT )) + MEM_STR="Mem:${MUSEDPT}%" + + echo -e "$POWER_STR $TEMP_STR $CPUFREQ_STR $CPULOAD_STR $MEM_STR $WLAN_STR" + #alternatively if you prefer a different date format + #DATE_STR=`date +"%H:%M %a %d %b` + #echo -e "$DATE_STR $POWER_STR $TEMP_STR $CPUFREQ_STR $CPULOAD_STR $MEM_STR $WLAN_STR" + + sleep $SLEEP_SEC +done diff --git a/community/ushare/PKGBUILD b/community/ushare/PKGBUILD index b579056d8..0ed1b484c 100644 --- a/community/ushare/PKGBUILD +++ b/community/ushare/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 49823 2011-06-21 09:38:58Z spupykin $ +# $Id: PKGBUILD 49979 2011-06-22 19:57:08Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Kessia 'even' Pinheiro <kessiapinheiro at gmail.com> # Contributor: kastor <kastor@fobos.org.ar> pkgname=ushare pkgver=1.1a -pkgrel=12 +pkgrel=13 pkgdesc="A free UPnP A/V Media Server for Linux" url="http://ushare.geexbox.org" license=('GPL2') arch=('i686' 'x86_64') -depends=('libupnp' 'libdlna') +depends=('libupnp' 'libdlna' 'sudo') backup=('etc/ushare/ushare.conf' 'etc/conf.d/ushare') install=ushare.install diff --git a/extra/avidemux/PKGBUILD b/extra/avidemux/PKGBUILD index 59dec52ad..9fd24d47b 100644 --- a/extra/avidemux/PKGBUILD +++ b/extra/avidemux/PKGBUILD @@ -1,22 +1,26 @@ -# $Id: PKGBUILD 126410 2011-06-05 07:19:37Z eric $ +# $Id: PKGBUILD 127810 2011-06-18 16:08:40Z ibiru $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgbase=avidemux pkgname=('avidemux-cli' 'avidemux-gtk' 'avidemux-qt') pkgver=2.5.5 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') license=('GPL') url="http://fixounet.free.fr/avidemux/" makedepends=('cmake' 'libxslt' 'gtk2' 'qt' 'jack' 'esound' 'libvorbis' 'sdl' 'libxv' \ 'alsa-lib' 'lame' 'xvidcore' 'faad2' 'faac' 'x264' 'libsamplerate' \ 'opencore-amr' 'yasm' 'mesa' 'libvpx' 'libpulse') -source=(http://downloads.sourceforge.net/avidemux/avidemux_${pkgver}.tar.gz) -md5sums=('33bbe210c6826cea1987ed18a41d57a7') +source=(http://downloads.sourceforge.net/avidemux/avidemux_${pkgver}.tar.gz + avidemux-2.5.4-x264-build115.patch) +md5sums=('33bbe210c6826cea1987ed18a41d57a7' + '24a18b53a58b678b9e87d30566985751') build() { cd "${srcdir}/${pkgbase}_${pkgver}" + patch -Np1 -i "${srcdir}/avidemux-2.5.4-x264-build115.patch" + mkdir build cd build cmake -D CMAKE_INSTALL_PREFIX=/usr -D CMAKE_BUILD_TYPE=Release -D CMAKE_SKIP_RPATH=ON -D GTK=1 -D QT4=1 .. diff --git a/extra/avidemux/avidemux-2.5.4-x264-build115.patch b/extra/avidemux/avidemux-2.5.4-x264-build115.patch new file mode 100644 index 000000000..c627667ec --- /dev/null +++ b/extra/avidemux/avidemux-2.5.4-x264-build115.patch @@ -0,0 +1,45 @@ +diff -ru avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp +--- avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp 2011-04-28 22:35:36.000000000 +0200 ++++ avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp 2011-04-28 22:40:26.000000000 +0200 +@@ -488,8 +488,10 @@ + printf("[x264] analyse.b_transform_8x8 = %d\n", x264Param->analyse.b_transform_8x8);
+ printf("[x264] analyse.inter = %d\n", x264Param->analyse.inter);
+ printf("[x264] b_cabac = %d\n", x264Param->b_cabac);
+-#if X264_BUILD > 101
++#if X264_BUILD > 101 && X264_BUILD < 115
+ printf("[x264] i_open_gop = %d\n", x264Param->i_open_gop);
++#elif X264_BUILD > 114
++ printf("[x264] b_open_gop = %d\n", x264Param->b_open_gop);
+ #endif
+ printf("[x264] b_interlaced = %d\n", x264Param->b_interlaced);
+ #if X264_BUILD > 88
+diff -ru avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp +--- avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp 2011-04-28 22:35:36.000000000 +0200 ++++ avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp 2011-04-28 22:43:36.000000000 +0200 +@@ -417,7 +417,7 @@ + _param.b_cabac = cabac;
+ }
+
+-#if X264_BUILD > 101
++#if X264_BUILD > 101 && X264_BUILD < 115
+ unsigned int x264Options::getOpenGopMode(void)
+ {
+ return _param.i_open_gop;
+@@ -428,6 +428,17 @@ + if (openGopMode < 3)
+ _param.i_open_gop = openGopMode;
+ }
++#elif X264_BUILD > 114
++unsigned int x264Options::getOpenGopMode(void)
++{
++ return _param.b_open_gop;
++}
++
++void x264Options::setOpenGopMode(unsigned int openGopMode)
++{
++ if (openGopMode < 3)
++ _param.b_open_gop = openGopMode;
++}
+ #endif
+
+ unsigned int x264Options::getInterlaced(void)
diff --git a/extra/cdargs/PKGBUILD b/extra/cdargs/PKGBUILD index 987321e06..28e471e84 100644 --- a/extra/cdargs/PKGBUILD +++ b/extra/cdargs/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 104930 2011-01-05 15:27:14Z andrea $ +# $Id: PKGBUILD 128462 2011-06-24 02:21:59Z eric $ # Maintainer: Aaron Griffin <aaron@archlinux.org> # Contributor: Damir Perisa <damir.perisa@bluewin.ch> pkgname=cdargs pkgver=1.35 -pkgrel=2 +pkgrel=3 pkgdesc="A replacement for 'cd' that includes bookmarks/browsing for faster navigation" arch=('i686' 'x86_64') license=('GPL') url="http://www.skamphausen.de/cgi-bin/ska/CDargs" depends=('ncurses' 'gcc-libs') +install=cdargs.install source=("http://www.skamphausen.de/downloads/${pkgname}/${pkgname}-${pkgver}.tar.gz") -install=${pkgname}.install md5sums=('50be618d67f0b9f2439526193c69c567') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr --mandir=/usr/share/man make @@ -24,13 +24,13 @@ build() { } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install # install helper scripts cd contrib - make DESTDIR=${pkgdir} install + make DESTDIR="${pkgdir}" install - install -d ${pkgdir}/usr/share/cdargs - install $pkgname-{tcsh.csh,bash.sh} ${pkgdir}/usr/share/cdargs + install -d "${pkgdir}/usr/share/cdargs" + install $pkgname-{tcsh.csh,bash.sh} "${pkgdir}/usr/share/cdargs" } diff --git a/extra/cdargs/cdargs.install b/extra/cdargs/cdargs.install index b1a5c1d9d..2b29beba7 100644 --- a/extra/cdargs/cdargs.install +++ b/extra/cdargs/cdargs.install @@ -1,7 +1,3 @@ post_install() { echo "cdargs: helper scripts are in /usr/share/cdargs/" } - -post_upgrade() { - echo "cdargs: helper scripts are in /usr/share/cdargs/" -} diff --git a/extra/curl/PKGBUILD b/extra/curl/PKGBUILD index 13048e9d9..07712c045 100644 --- a/extra/curl/PKGBUILD +++ b/extra/curl/PKGBUILD @@ -1,12 +1,13 @@ -# $Id: PKGBUILD 123955 2011-05-14 18:55:23Z angvp $ -# Maintainer: Angel Velasquez <angvp@archlinux.org> +# $Id: PKGBUILD 128353 2011-06-23 12:54:15Z dreisner $ +# Maintainer: Dave Reisner <dreisner@archlinux.org> +# Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Eric Belanger <eric@archlinux.org> # Contributor: Lucien Immink <l.immink@student.fnt.hvu.nl> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=curl -pkgver=7.21.6 -pkgrel=2 +pkgver=7.21.7 +pkgrel=1 pkgdesc="An URL retrival utility and library" arch=('i686' 'x86_64') url="http://curl.haxx.se" @@ -18,7 +19,7 @@ source=(http://curl.haxx.se/download/${pkgname}-${pkgver}.tar.bz2 [[ $CARCH == "x86_64" ]] && _curlbuild=curlbuild-64.h [[ $CARCH == "i686" ]] && _curlbuild=curlbuild-32.h -md5sums=('6611989a81ebd7b03a35adc3001ddee0' +md5sums=('5f6d50c4d4ee38c57fe37e3cff75adbd' '751bd433ede935c8fae727377625a8ae') build() { @@ -41,13 +42,12 @@ build() { } package() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "$srcdir/$pkgname-$pkgver" - make DESTDIR=${pkgdir} install - install -Dm644 COPYING \ - ${pkgdir}/usr/share/licenses/${pkgname}/COPYING + make DESTDIR="$pkgdir" install + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" install -Dm644 docs/libcurl/libcurl.m4 \ - ${pkgdir}/usr/share/aclocal/libcurl.m4 - mv "${pkgdir}/usr/include/curl/curlbuild.h" "${pkgdir}/usr/include/curl/${_curlbuild}" - install -m 644 ${srcdir}/curlbuild.h "${pkgdir}/usr/include/curl/curlbuild.h" + "$pkgdir/usr/share/aclocal/libcurl.m4" + mv "$pkgdir/usr/include/curl/curlbuild.h" "$pkgdir/usr/include/curl/$_curlbuild" + install -m644 "$srcdir/curlbuild.h" "$pkgdir/usr/include/curl/curlbuild.h" } diff --git a/extra/ethstatus/PKGBUILD b/extra/ethstatus/PKGBUILD index 7698321bb..9333a6adf 100644 --- a/extra/ethstatus/PKGBUILD +++ b/extra/ethstatus/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 28971 2009-03-04 02:59:17Z eric $ +# $Id: PKGBUILD 128471 2011-06-24 03:12:05Z eric $ # Maintainer: Juergen Hoetzel <juergen@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=ethstatus pkgver=0.4.3 -pkgrel=1 -pkgdesc="EthStatus was developed for Linux users that are usually in console mode, based on PPPStatus" +pkgrel=2 +pkgdesc="A simple program for displaying commonly needed/wanted statistics in real time of incoming and outgoing traffic" arch=('i686' 'x86_64') url="http://packages.qa.debian.org/e/ethstatus.html" license=('GPL') @@ -14,8 +14,12 @@ source=(http://ftp.debian.org/debian/pool/main/e/ethstatus/ethstatus_$pkgver.tar md5sums=('088412ddff67f50e32bc9d45e56b2658') build() { - cd $srcdir/ethstatus-$pkgver - make || return 1 - install -D -m755 ethstatus $pkgdir/usr/bin/ethstatus || return 1 - install -D -m644 ethstatus.1 $pkgdir/usr/share/man/man1/ethstatus.1 || return 1 + cd "$srcdir/ethstatus-$pkgver" + make +} + +package() { + cd "$srcdir/ethstatus-$pkgver" + install -D -m755 ethstatus "$pkgdir/usr/bin/ethstatus" + install -D -m644 ethstatus.1 "$pkgdir/usr/share/man/man1/ethstatus.1" } diff --git a/extra/ffcall/PKGBUILD b/extra/ffcall/PKGBUILD index fcf0a0f66..5d21a3d7b 100644 --- a/extra/ffcall/PKGBUILD +++ b/extra/ffcall/PKGBUILD @@ -1,26 +1,32 @@ -# $Id: PKGBUILD 2176 2008-05-28 20:52:39Z eric $ +# $Id: PKGBUILD 128452 2011-06-24 01:23:15Z eric $ # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: Michael Baehr <usemike@spamblocked.com> pkgname=ffcall pkgver=1.10 -pkgrel=3 +pkgrel=4 pkgdesc="C library for implementing foreign function calls in embedded interpreters" arch=('i686' 'x86_64') -url="http://www.haible.de/bruno/packages-ffcall.html" +url="http://www.gnu.org/software/libffcall/" license=('GPL2') options=('!libtool' '!makeflags') source=(http://www.haible.de/bruno/gnu/${pkgname}-${pkgver}.tar.gz) md5sums=('2db95007e901f3bc2ae7e5a9fe9ebea4') build() { - cd ${startdir}/src/${pkgname}-${pkgver} - if [ "$CARCH" = "x86_64" ]; then - ./configure --prefix=/usr --mandir=/usr/share/man --with-pic || return 1 - else - ./configure --prefix=/usr --mandir=/usr/share/man || return 1 - fi - make || return 1 - install -d ${startdir}/pkg/usr/share/man || return 1 - make DESTDIR=${startdir}/pkg/ install || return 1 + cd "${srcdir}/${pkgname}-${pkgver}" + [ "$CARCH" = "x86_64" ] && CONFIGFLAG="--with-pic" + ./configure --prefix=/usr --mandir=/usr/share/man $CONFIGFLAG + make +} + +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + make check +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + install -d "${pkgdir}"/usr/share/{man,doc/ffcall} + make DESTDIR="${pkgdir}" htmldir=/usr/share/doc/ffcall install } diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD index 466fe6629..f81b87b90 100644 --- a/extra/ffmpeg/PKGBUILD +++ b/extra/ffmpeg/PKGBUILD @@ -1,28 +1,24 @@ -# $Id: PKGBUILD 122938 2011-05-07 11:51:04Z ibiru $ +# $Id: PKGBUILD 128284 2011-06-22 13:37:20Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Contributor: Paul Mattal <paul@archlinux.org> pkgname=ffmpeg -pkgver=20110330 -pkgrel=2 +pkgver=20110622 +pkgrel=1 pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix" arch=('i686' 'x86_64') url="http://ffmpeg.org/" license=('GPL') -depends=('bzip2' 'lame' 'sdl' 'libvorbis' 'xvidcore' 'zlib' 'x264' 'libtheora' 'opencore-amr' 'alsa-lib' 'libvdpau' 'libxfixes' 'schroedinger' 'libvpx' 'libva' 'openjpeg') +depends=('bzip2' 'lame' 'sdl' 'libvorbis' 'xvidcore' 'zlib' 'x264' 'libtheora' 'opencore-amr' 'alsa-lib' 'libvdpau' 'libxfixes' 'schroedinger' 'libvpx' 'libva' 'openjpeg' 'rtmpdump') makedepends=('yasm' 'git') #git clone git://git.videolan.org/ffmpeg.git -source=(ftp://ftp.archlinux.org/other/ffmpeg/${pkgname}-${pkgver}.tar.xz - avutils-make-aes-and-sha-public.patch) -md5sums=('dd682a876a496b9f9ae8afb3b3b70389' - '06eb45335669cb742fdcbea48f0605ce') +source=(ftp://ftp.archlinux.org/other/ffmpeg/${pkgname}-${pkgver}.tar.xz) +md5sums=('ff3636c6601f68cdcc777fadaf0eba46') build() { cd "$srcdir/$pkgname" - patch -Np1 -i "$srcdir/avutils-make-aes-and-sha-public.patch" - ./configure \ --prefix=/usr \ --enable-libmp3lame \ @@ -38,6 +34,7 @@ build() { --enable-libopencore_amrwb \ --enable-libschroedinger \ --enable-libopenjpeg \ + --enable-librtmp \ --enable-gpl \ --enable-version3 \ --enable-runtime-cpudetect \ @@ -52,3 +49,4 @@ build() { } # vim:set ts=2 sw=2 et: +md5sums=('6003afa1f87857db729d697e3ec1be36') diff --git a/extra/gimp-refocus/PKGBUILD b/extra/gimp-refocus/PKGBUILD index 6d78aad67..5cc3b5703 100644 --- a/extra/gimp-refocus/PKGBUILD +++ b/extra/gimp-refocus/PKGBUILD @@ -1,34 +1,35 @@ -# $Id: PKGBUILD 54791 2009-10-11 19:30:09Z giovanni $ +# $Id: PKGBUILD 128457 2011-06-24 02:06:37Z eric $ # Maintainer: Tobias Kieslich <tobias@justdreams.de> # Contributor: Tobias Kieslich <tobias@justdreams.de> pkgname=gimp-refocus -_pname=refocus pkgver=0.9.0 -pkgrel=2 -arch=(i686 x86_64) -license=(GPL2) -pkgdesc="a sharpen plugin for gimp using FIR Wiener filtering" -depends=('gimp>=2.0.0') +pkgrel=3 +pkgdesc="A sharpen plugin for gimp using FIR Wiener filtering" +arch=('i686' 'x86_64') url="http://refocus.sourceforge.net/" -source=(http://downloads.sourceforge.net/sourceforge/${_pname}/${_pname}-${pkgver}.tar.gz -\ - ${_pname}-gimp-2.0.patch ${_pname}-mirror-fix.patch ${_pname}-gimp-preview.patch) -md5sums=('8d4eac4ef45c904fb5e73021696bec94' '8ef9dfe697cd20be2be14c1ee53a240a'\ - '532593cba030feab8ffa7800fc9cd782' '6b55dbdc656646c765064cf21e1a3c57') +license=('GPL2') +depends=('gimp') +source=(http://downloads.sourceforge.net/sourceforge/refocus/refocus-${pkgver}.tar.gz \ + refocus-gimp-2.0.patch refocus-mirror-fix.patch refocus-gimp-preview.patch) +md5sums=('8d4eac4ef45c904fb5e73021696bec94' + '8ef9dfe697cd20be2be14c1ee53a240a' + '532593cba030feab8ffa7800fc9cd782' + '6b55dbdc656646c765064cf21e1a3c57') build() { - cd ${startdir}/src/${_pname}-${pkgver} - # we need a *load of patches now to compile - patch -Np0 -i ../${_pname}-gimp-2.0.patch || return 1 - patch -Np0 -i ../${_pname}-mirror-fix.patch || return 1 - patch -Np0 -i ../${_pname}-gimp-preview.patch || return 1 + cd "${srcdir}/refocus-${pkgver}" + patch -Np0 -i ../refocus-gimp-2.0.patch + patch -Np0 -i ../refocus-mirror-fix.patch + patch -Np0 -i ../refocus-gimp-preview.patch aclocal - automake -a --gnu --include-deps Makefile - automake -a --gnu --include-deps lib/Makefile autoconf - echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" + automake --add-missing ./configure --prefix=/usr --bindir=/usr/lib/gimp/2.0/plug-ins - make || return 1 - make DESTDIR=${startdir}/pkg install + make +} + +package() { + cd "${srcdir}/refocus-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/extra/gstreamer0.10-ugly/PKGBUILD b/extra/gstreamer0.10-ugly/PKGBUILD index 4ab9fea99..9f1074038 100644 --- a/extra/gstreamer0.10-ugly/PKGBUILD +++ b/extra/gstreamer0.10-ugly/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 124039 2011-05-16 08:56:43Z jgc $ +# $Id: PKGBUILD 127813 2011-06-18 16:10:52Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=gstreamer0.10-ugly pkgname=('gstreamer0.10-ugly' 'gstreamer0.10-ugly-plugins') pkgver=0.10.18 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') license=('LGPL') makedepends=('pkgconfig' 'gstreamer0.10-base>=0.10.34' 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libid3tag' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr') diff --git a/extra/gtkglextmm/PKGBUILD b/extra/gtkglextmm/PKGBUILD index a0e738c96..7a4c1fca8 100644 --- a/extra/gtkglextmm/PKGBUILD +++ b/extra/gtkglextmm/PKGBUILD @@ -1,24 +1,35 @@ -# $Id: PKGBUILD 47716 2009-07-25 16:36:45Z giovanni $ +# $Id: PKGBUILD 128291 2011-06-22 14:49:45Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Bastien Bouclet <bastien.bouclet@gmail.com> pkgname=gtkglextmm pkgver=1.2.0 -pkgrel=4 +pkgrel=5 pkgdesc="Cpp C++ bindings for gtkglext" arch=('i686' 'x86_64') url="http://gtkglext.sourceforge.net/" -depends=('gtkmm>=2.10.1' 'gtkglext') +depends=('gtkmm' 'gtkglext') makedepends=('pkgconfig') options=('!libtool') license=('GPL') -source=(http://downloads.sourceforge.net/sourceforge/gtkglext/${pkgname}-${pkgver}.tar.bz2) -md5sums=('27c05f4d45c5fd07b6fb0f044add3056') +source=(http://downloads.sourceforge.net/sourceforge/gtkglext/${pkgname}-${pkgver}.tar.bz2 + gdkspanfunc.patch) +md5sums=('27c05f4d45c5fd07b6fb0f044add3056' + 'd7c8ea33c748a6857ee629c16b2d9bff') build() { cd ${srcdir}/${pkgname}-${pkgver} + + # FS#24706 + patch -Np1 -i ${srcdir}/gdkspanfunc.patch + ./configure --prefix=/usr \ --disable-gtkglext-test - make || return 1 - make DESTDIR=${pkgdir}/ install + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + + make DESTDIR=${pkgdir} install } diff --git a/extra/gtkglextmm/gdkspanfunc.patch b/extra/gtkglextmm/gdkspanfunc.patch new file mode 100644 index 000000000..ae5672a8c --- /dev/null +++ b/extra/gtkglextmm/gdkspanfunc.patch @@ -0,0 +1,13 @@ +--- a/gtkglext/gtkmm/gl/widget.cc 2004-05-18 03:01:50.000000000 -0300 ++++ b/gtkglext/gtkmm/gl/widget.cc 2011-06-12 17:57:13.075541070 -0300 +@@ -17,9 +17,8 @@ + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. + */ + +-#include <gtk/gtkglwidget.h> +- + #include "widget.h" ++#include <gtk/gtkglwidget.h> + + namespace Gtk + { diff --git a/extra/hd2u/PKGBUILD b/extra/hd2u/PKGBUILD index a06530a7a..846ee3015 100644 --- a/extra/hd2u/PKGBUILD +++ b/extra/hd2u/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 13826 2008-09-29 02:37:37Z douglas $ +# $Id: PKGBUILD 128435 2011-06-23 23:30:35Z dan $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Damir Perisa <damir.perisa@bluewin.ch> pkgname=hd2u pkgver=1.0.3 -pkgrel=1 +pkgrel=2 pkgdesc="Dos2Unix text file converter" arch=('i686' 'x86_64') license=('GPL2') @@ -16,6 +16,6 @@ md5sums=('8f6668fafb279aa19f956ec0515717b6') build() { cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr - make || return 1 - make prefix=$pkgdir/usr install + make + make prefix="$pkgdir/usr" install } diff --git a/extra/hexedit/PKGBUILD b/extra/hexedit/PKGBUILD index 32f9749df..cbf963d64 100644 --- a/extra/hexedit/PKGBUILD +++ b/extra/hexedit/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 68045 2010-02-10 15:26:23Z giovanni $ +# $Id: PKGBUILD 128432 2011-06-23 23:29:54Z dan $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Paul Mattal <pjmattal@elys.com> pkgname=hexedit pkgver=1.2.12 -pkgrel=2 +pkgrel=3 pkgdesc="Hex Editor for Linux" arch=('i686' 'x86_64') url="http://merd.net/pixel/hexedit.html" @@ -15,8 +15,9 @@ md5sums=('0d2f48610006278cd93359fea9a06d5c') build() { cd "${srcdir}/${pkgname}" + CFLAGS="$CFLAGS -Wall" - ./configure || return 1 - make || return 1 - make prefix="${pkgdir}/usr" install || return 1 + ./configure + make + make prefix="${pkgdir}/usr" install } diff --git a/extra/keytouch/PKGBUILD b/extra/keytouch/PKGBUILD index 34a5c53a6..bfc3d182f 100644 --- a/extra/keytouch/PKGBUILD +++ b/extra/keytouch/PKGBUILD @@ -1,46 +1,59 @@ -# $Id: PKGBUILD 56013 2009-10-17 20:37:01Z eric $ -# Maintainer: Eric Belanger <eric@archlinux.org> +# $Id: PKGBUILD 128421 2011-06-23 23:07:34Z eric $ +# Contributor: Eric Bélanger <eric@archlinux.org> # Contributor: mouse256 & AndyRTR +# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=keytouch pkgver=2.4.1 -pkgrel=2 +pkgrel=3 pkgdesc="A program which allows you to easily configure the extra function keys of your keyboard" arch=('i686' 'x86_64') url="http://keytouch.sourceforge.net/" license=('GPL') -depends=('libxtst' 'gnome-menus' 'alsa-lib') -makedepends=('pkgconfig') +depends=('libxtst' 'gnome-menus' 'alsa-lib' 'gtk2') +optdepends=('acpid: for ACPI support') options=('!makeflags') install=keytouch.install source=(http://downloads.sourceforge.net/sourceforge/keytouch/${pkgname}-${pkgver}.tar.gz \ keytouch.daemon keytouch.desktop Xsession) -md5sums=('c3a917ae9666c9649d43d9aa09ecc96a' 'a35776aee9361577220f718be81c2b4d'\ - 'c5ffe28988dc74fae812ffe204f8883b' '795430001f4fdb6691d0e93b09a241a9') -sha1sums=('f1f26dc95c21afd404aebe2b1066e75c8313ca80' 'af23f4526cb1f3e5b9a3680af6a24d1566dabb7d'\ - '5bac2f62f1ac26caa32da02a8075dc090d981cfb' '960b2fa51cfdeb2bc3fa7e086dc9f3a3be483dff') +md5sums=('c3a917ae9666c9649d43d9aa09ecc96a' + '5bd72f347f56c0524c7a7c8f44fc9a3a' + 'c5ffe28988dc74fae812ffe204f8883b' + '795430001f4fdb6691d0e93b09a241a9') +sha1sums=('f1f26dc95c21afd404aebe2b1066e75c8313ca80' + '9c3ff4fd979fd0322014768bec132ddf005c7f7b' + '5bac2f62f1ac26caa32da02a8075dc090d981cfb' + '960b2fa51cfdeb2bc3fa7e086dc9f3a3be483dff') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc || return 1 - make || return 1 - install -d "${pkgdir}"/etc/{rc.d,X11/Xsession.d} || return 1 - install -d "${pkgdir}/usr/share/keytouch" || return 1 - make DESTDIR="${pkgdir}" install || return 1 - - cd "${srcdir}/${pkgname}-${pkgver}/keytouch-config" - ./configure --prefix=/usr --sysconfdir=/etc || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 - - cd "${srcdir}/${pkgname}-${pkgver}/keytouch-keyboard" - ./configure --prefix=/usr --sysconfdir=/etc || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 - - install -D -m755 "${srcdir}/keytouch.daemon" "${pkgdir}/etc/rc.d/keytouch" || return 1 - install -D -m644 "${srcdir}/keytouch.desktop" "${pkgdir}/usr/share/applications/keytouch.desktop" || return 1 - install -D -m755 "${srcdir}/Xsession" "${pkgdir}/etc/X11/Xsession" || return 1 - chmod 755 "${pkgdir}"/etc/X11/Xsession.d/* || return 1 + ./configure --prefix=/usr --sysconfdir=/etc + make + + cd keytouch-config + ./configure --prefix=/usr --sysconfdir=/etc + make + + cd ../keytouch-keyboard + ./configure --prefix=/usr --sysconfdir=/etc + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + install -d "${pkgdir}"/etc/{rc.d,X11/Xsession.d} + install -d "${pkgdir}/usr/share/keytouch" + make DESTDIR="${pkgdir}" install + + cd keytouch-config + make DESTDIR="${pkgdir}" install + + cd ../keytouch-keyboard + make DESTDIR="${pkgdir}" install + + install -Dm755 "${srcdir}/keytouch.daemon" "${pkgdir}/etc/rc.d/keytouch" + install -Dm644 "${srcdir}/keytouch.desktop" "${pkgdir}/usr/share/applications/keytouch.desktop" + install -Dm755 "${srcdir}/Xsession" "${pkgdir}/etc/X11/Xsession" + chmod 755 "${pkgdir}"/etc/X11/Xsession.d/* rm "${pkgdir}"/etc/rc.d/*.sh } diff --git a/extra/keytouch/keytouch.daemon b/extra/keytouch/keytouch.daemon index e43bea979..d705b3dfc 100755 --- a/extra/keytouch/keytouch.daemon +++ b/extra/keytouch/keytouch.daemon @@ -7,9 +7,6 @@ PID=$(pidof -o %PPID /usr/bin/keytouch-acpid) case "$1" in start) stat_busy "Starting keyTouch Daemon" - if [ -x /etc/rc.d/acpid ]; then - ck_daemon acpid && /etc/rc.d/acpid start - fi /usr/bin/keytouch-init if [ -z "$PID" ]; then /usr/bin/keytouch-acpid &> /dev/null & diff --git a/extra/metacity/PKGBUILD b/extra/metacity/PKGBUILD index 14e5d12a0..3d028d55b 100644 --- a/extra/metacity/PKGBUILD +++ b/extra/metacity/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 118084 2011-04-05 11:18:53Z ibiru $ +# $Id: PKGBUILD 128306 2011-06-22 17:53:59Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=metacity -pkgver=2.34.0 +pkgver=2.34.1 pkgrel=1 -pkgdesc="A window manager for GNOME2" +pkgdesc="A window manager for GNOME" arch=(i686 x86_64) license=('GPL') depends=('startup-notification' 'gconf' 'zenity' 'libcanberra' 'libgtop' 'libwnck' 'libsm') -makedepends=('intltool' 'pkgconfig' 'gnome-doc-utils' 'gnome-common') +makedepends=('intltool' 'pkgconfig' 'gnome-doc-utils') url="http://www.gnome.org" groups=('gnome') options=('!libtool' '!emptydirs') install=metacity.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('e316beff76658c98e21ddf4e7eaba12cd761b35002dc38701441db6740a6d698') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('f144cb43925ca00d8eaac129a14df3260c54a32324b5cd0a4d78b0fd7ff1028a') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/nx-common/PKGBUILD b/extra/nx-common/PKGBUILD index 85fc78ce6..7ee8cac19 100644 --- a/extra/nx-common/PKGBUILD +++ b/extra/nx-common/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 126698 2011-06-06 18:56:52Z andyrtr $ +# $Id: PKGBUILD 128326 2011-06-22 20:29:20Z andyrtr $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributed: eliott <eliott@solarblue.net>, Andre Naumann <anaumann@SPARCed.org> pkgname=nx-common pkgver=3.5.0 -pkgrel=1 +pkgrel=2 pkgdesc="NoMachine NX common package for client and server" arch=('i686' 'x86_64') license=('GPL') @@ -12,14 +12,14 @@ url="http://nomachine.com/" depends=('libjpeg-turbo>=1.1.1' 'libpng>=1.4.5' 'openssl>=1.0.0' 'gcc-libs' 'bash') makedepends=('xorg-server-devel') source=( #Compression libs and proxy sources - http://64.34.161.181/download/$pkgver/sources/nxcomp-$pkgver-1.tar.gz + http://64.34.161.181/download/$pkgver/sources/nxcomp-$pkgver-2.tar.gz http://64.34.161.181/download/$pkgver/sources/nxcompsh-$pkgver-1.tar.gz - http://64.34.161.181/download/$pkgver/sources/nxssh-$pkgver-1.tar.gz + http://64.34.161.181/download/$pkgver/sources/nxssh-$pkgver-2.tar.gz nxcompsh-gcc43.patch) options=(!libtool) -md5sums=('30a182146479004ec63b8a1b9adccfcf' +md5sums=('ad8c0f133122c6d07732ca69c8759410' '84ade443b79ea079380b754aba9d392e' - '9f13262bc0bf5187fcc7e22924955bc7' + 'f52fcdb38e09f8dcfb9ff0344dfbbbd6' 'b6c279654dac421fc3dd1a27d66ff53c') build() { diff --git a/extra/nxserver/PKGBUILD b/extra/nxserver/PKGBUILD index 99b5bc2aa..50177cf29 100644 --- a/extra/nxserver/PKGBUILD +++ b/extra/nxserver/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 126704 2011-06-06 19:21:37Z andyrtr $ +# $Id: PKGBUILD 128331 2011-06-22 20:48:01Z andyrtr $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributed: eliott <eliott@solarblue.net>, Andre Naumann <anaumann@SPARCed.org> pkgname=nxserver pkgver=3.5.0 -pkgrel=1 +pkgrel=2 pkgdesc="NoMachine NX is the next-generation X compression and roundtrip suppression scheme." arch=(i686 x86_64) url="http://nomachine.com/" @@ -16,9 +16,9 @@ makedepends=('imake') source=( #X11 support programs and libraries http://64.34.161.181/download/$pkgver/sources/nx-X11-$pkgver-1.tar.gz -http://64.34.161.181/download/$pkgver/sources/nxwin-$pkgver-1.tar.gz +http://64.34.161.181/download/$pkgver/sources/nxwin-$pkgver-2.tar.gz http://64.34.161.181/download/$pkgver/sources/nxauth-$pkgver-1.tar.gz -http://64.34.161.181/download/$pkgver/sources/nxcomp-$pkgver-1.tar.gz # needed to provide NX.h and -LXcomp - part of nx-common +http://64.34.161.181/download/$pkgver/sources/nxcomp-$pkgver-2.tar.gz # needed to provide NX.h and -LXcomp - part of nx-common #X11 Agent sources http://64.34.161.181/download/$pkgver/sources/nxagent-$pkgver-2.tar.gz http://64.34.161.181/download/$pkgver/sources/nxcompsh-$pkgver-1.tar.gz # needed to get X11 built - part of nx-common @@ -30,9 +30,9 @@ http://64.34.161.181/download/$pkgver/sources/nxcompshad-$pkgver-2.tar.gz nxcompsh-gcc43.patch) options=(!libtool) md5sums=('54ac7dd8806928b991b0819cf76b37dd' - '271cef5b5345b8de77b0f6a0ce1a3b0d' + '84c7f1575d9a1506370125ed050514ab' 'cf38ec1e5a5f6453946cd387c14f2684' - '30a182146479004ec63b8a1b9adccfcf' + 'ad8c0f133122c6d07732ca69c8759410' '7b0f60d5a3c54f22da7d81aac055836e' '84ade443b79ea079380b754aba9d392e' '488bb4d9b8e9f82dc272b4e6e9c57d30' diff --git a/extra/paprefs/PKGBUILD b/extra/paprefs/PKGBUILD index a2566b10a..99bf26f3e 100644 --- a/extra/paprefs/PKGBUILD +++ b/extra/paprefs/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 101942 2010-12-02 22:07:04Z heftig $ +# $Id: PKGBUILD 128447 2011-06-23 23:50:20Z heftig $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: Corrado Primier <bardo@aur.archlinux.org> # Contributor: William Rea <sillywilly@gmail.com> @@ -6,12 +6,12 @@ pkgname=paprefs pkgver=0.9.9 -pkgrel=6 +pkgrel=7 pkgdesc="A simple GTK-based configuration dialog for PulseAudio" arch=(i686 x86_64) url="http://0pointer.de/lennart/projects/paprefs" license=(GPL) -depends=(gconfmm gnome-icon-theme libglademm 'pulseaudio=0.9.22' libsigc++) +depends=(gconfmm gnome-icon-theme libglademm 'pulseaudio=0.9.23' libsigc++) makedepends=(intltool) source=(http://0pointer.de/lennart/projects/paprefs/$pkgname-$pkgver.tar.gz paprefs.desktop) diff --git a/extra/pdksh/PKGBUILD b/extra/pdksh/PKGBUILD index 6f592e39c..388952747 100644 --- a/extra/pdksh/PKGBUILD +++ b/extra/pdksh/PKGBUILD @@ -1,27 +1,31 @@ -# $Id: PKGBUILD 30639 2009-03-21 04:22:46Z eric $ +# $Id: PKGBUILD 128476 2011-06-24 03:30:58Z eric $ # Maintainer: Aaron Griffin <aaron@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=pdksh pkgver=5.2.14 -pkgrel=5 +pkgrel=6 pkgdesc="A public domain clone of the AT&T Korn shell" arch=('i686' 'x86_64') url="http://www.cs.mun.ca/~michael/pdksh/" license=('custom') depends=('glibc') -install=$pkgname.install -source=(ftp://ftp.cs.mun.ca/pub/$pkgname/$pkgname-$pkgver.tar.gz $pkgname-$pkgver.patch usr_ksh.sh) +install=pdksh.install +#ftp://ftp.cs.mun.ca/pub/$pkgname/$pkgname-$pkgver.tar.gz +source=(http://www.cs.mun.ca/~michael/pdksh/files/$pkgname-$pkgver.tar.gz pdksh-5.2.14.patch usr_ksh.sh) md5sums=('871106b3bd937e1afba9f2ef7c43aef3' 'f11d1e711627d21a547c09e344e30dd3'\ '56084a657ecafd5dd0813a6056036712') build() { - cd $srcdir/$pkgname-$pkgver - patch -Np1 -i ../$pkgname-$pkgver.patch || return 1 - ./configure --prefix=/ --mandir=/usr/share/man || return 1 - make || return 1 - make prefix=$pkgdir mandir=$pkgdir/usr/share/man/man1 install || return 1 - install -D -m 755 ${srcdir}/usr_ksh.sh ${pkgdir}/usr/bin/ksh || return 1 - install -D -m644 LEGAL $pkgdir/usr/share/licenses/$pkgname/LICENSE || return 1 + cd "$srcdir/$pkgname-$pkgver" + patch -Np1 -i ../$pkgname-$pkgver.patch + ./configure --prefix=/ --mandir=/usr/share/man + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make prefix="$pkgdir" mandir="$pkgdir/usr/share/man/man1" install + install -D -m 755 "${srcdir}/usr_ksh.sh" "${pkgdir}/usr/bin/ksh" + install -D -m644 LEGAL "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } -# vim: ts=2 sw=2 et ft=sh diff --git a/extra/pdksh/pdksh.install b/extra/pdksh/pdksh.install index 844a4e731..17463a17e 100644 --- a/extra/pdksh/pdksh.install +++ b/extra/pdksh/pdksh.install @@ -1,5 +1,5 @@ post_install() { - if [ ! "`grep /bin/ksh etc/shells`" ]; then + if [ ! "$(grep /bin/ksh etc/shells)" ]; then echo "updating /etc/shells... done." sed -i "s|/bin/bash|/bin/bash\n/bin/ksh|" etc/shells else diff --git a/extra/pulseaudio/PKGBUILD b/extra/pulseaudio/PKGBUILD index 9d8c6945e..d62fd9ca7 100644 --- a/extra/pulseaudio/PKGBUILD +++ b/extra/pulseaudio/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 103255 2010-12-17 00:02:37Z heftig $ +# $Id: PKGBUILD 128442 2011-06-23 23:49:30Z heftig $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> # Contributor: Corrado Primier <bardo@aur.archlinux.org> @@ -6,18 +6,18 @@ pkgbase=pulseaudio pkgname=(pulseaudio libpulse) -pkgver=0.9.22 -pkgrel=2 +pkgver=0.9.23 +pkgrel=1 arch=(i686 x86_64) url="http://pulseaudio.org/" license=(GPL LGPL) -makedepends=(libasyncns libcap attr libxtst libsm tcp_wrappers libsndfile - libtool rtkit speex libsamplerate tdb udev dbus-core xcb-util - avahi bluez gconf intltool jack lirc-utils pkgconfig openssl) +makedepends=(libasyncns libcap attr libxtst libsm libsndfile libtool rtkit + speex libsamplerate tdb udev dbus-core xcb-util avahi bluez + gconf intltool jack lirc-utils openssl) options=(!emptydirs !libtool !makeflags) -source=("http://0pointer.de/lennart/projects/$pkgbase/$pkgbase-$pkgver.tar.gz" +source=("http://freedesktop.org/software/$pkgbase/releases/$pkgbase-$pkgver.tar.gz" $pkgbase.xinit) -md5sums=('ca85ab470669b05e100861654cf5eb3c' +md5sums=('7391205a337d1e04a9ff38025f684034' 'eb1cfae28eb2e4d3fdbe45a90e4318ab') build() { @@ -32,6 +32,7 @@ build() { --localstatedir=/var \ --with-database=tdb \ --disable-hal \ + --disable-tcpwrap \ --disable-rpath \ --disable-default-build-tests @@ -53,7 +54,7 @@ package_pulseaudio() { cd "$srcdir/$pkgbase-$pkgver" make DESTDIR="$pkgdir" install - # Lower resample quality + # Lower resample quality, saves CPU sed -e '/resample-method/iresample-method=speex-float-0' \ -i "$pkgdir/etc/pulse/daemon.conf" @@ -63,7 +64,7 @@ package_pulseaudio() { -i "$pkgdir/usr/bin/start-$pkgbase-x11" # Make module-console-kit optional - sed -e $'/module-console-kit/{i.nofail\n;a.fail\n;}' \ + sed -e $'/load-module module-console-kit/{i.nofail\n;a.fail\n;}' \ -i "$pkgdir/etc/pulse/default.pa" install -Dm755 "$srcdir/$pkgbase.xinit" "$pkgdir/etc/X11/xinit/xinitrc.d/$pkgbase" @@ -89,8 +90,7 @@ package_pulseaudio() { package_libpulse() { pkgdesc="A featureful, general-purpose sound server (client library)" - depends=(tcp_wrappers dbus-core xcb-util libasyncns libcap libxtst libsm - libsndfile) + depends=(dbus-core xcb-util libasyncns libcap libxtst libsm libsndfile) optdepends=('alsa-plugins: ALSA support' 'avahi: zeroconf support') backup=(etc/pulse/client.conf) diff --git a/extra/pulseaudio/pulseaudio.install b/extra/pulseaudio/pulseaudio.install index 67a346759..fd7db3b36 100755 --- a/extra/pulseaudio/pulseaudio.install +++ b/extra/pulseaudio/pulseaudio.install @@ -4,9 +4,6 @@ post_install() { on configuring your system for PulseAudio. >>> Make sure to install pulseaudio-alsa to configure ALSA for PulseAudio. - ->>> You might want to blacklist the "snd-pcm-oss" module in /etc/rc.conf to - keep ALSA's OSS emulation from interfering with ALSA or PulseAudio. MES } diff --git a/extra/terminal/PKGBUILD b/extra/terminal/PKGBUILD index 8df14db89..44383a3e1 100644 --- a/extra/terminal/PKGBUILD +++ b/extra/terminal/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 123714 2011-05-12 17:42:28Z foutrelis $ +# $Id: PKGBUILD 128296 2011-06-22 15:43:57Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: tobias <tobias funnychar archlinux.org> # Contributor: Aurelien Foret <orelien@chez.com> pkgname=terminal -pkgver=0.4.7 -pkgrel=2 +pkgver=0.4.8 +pkgrel=1 pkgdesc="A modern terminal emulator primarly for the Xfce desktop environment" arch=(i686 x86_64) license=('GPL2') @@ -16,18 +16,11 @@ depends=('exo>=0.5.4' "vte" 'dbus-glib' makedepends=('pkgconfig' 'intltool') options=('!libtool') install=terminal.install -source=(http://archive.xfce.org/src/apps/${pkgname}/0.4/Terminal-${pkgver}.tar.bz2 - bug-7595-go-menu-single-tab-sensitivity.patch) -md5sums=('34daa0090e1bc9014a5b9849103a129f' - '043774c11e2f8c1c424510847dc82fae') +source=(http://archive.xfce.org/src/apps/${pkgname}/0.4/Terminal-${pkgver}.tar.bz2) +md5sums=('8dff62234da14e1a5e542fb56560ebe2') build() { cd ${srcdir}/Terminal-${pkgver} - - # Add upstream patch for Xfce bug #7595 - # (Only make go menu action sensitive if tabs) - patch -Np1 -i ${srcdir}/bug-7595-go-menu-single-tab-sensitivity.patch - ./configure --prefix=/usr \ --sysconfdir=/etc \ --libexecdir=/usr/lib/xfce4 \ diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD index ecdad6626..95361e280 100644 --- a/extra/vlc/PKGBUILD +++ b/extra/vlc/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 126993 2011-06-09 15:41:16Z giovanni $ +# $Id: PKGBUILD 127816 2011-06-18 16:12:17Z ibiru $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> # Contributor: Martin Sandsmark <martin.sandsmark@kde.org> pkgname=vlc pkgver=1.1.10 -pkgrel=2 +pkgrel=4 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" arch=('i686' 'x86_64') url="http://www.videolan.org/vlc/" diff --git a/extra/x264/PKGBUILD b/extra/x264/PKGBUILD index a0aacc6ea..90508716e 100644 --- a/extra/x264/PKGBUILD +++ b/extra/x264/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 117096 2011-03-28 18:20:15Z ibiru $ +# $Id: PKGBUILD 127804 2011-06-18 16:05:03Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: damir <damir@archlinux.org> # Contributor: Paul Mattal <paul@archlinux.org> pkgname=x264 -pkgver=20110327 +pkgver=20110617 pkgrel=1 pkgdesc="free library for encoding H264/AVC video streams" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ license=('GPL') depends=('glibc') makedepends=('yasm') source=(ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-$pkgver-2245.tar.bz2) -md5sums=('7579aff8166a974a1b293cd18b9ead92') +md5sums=('928717aa2f0c7ca91e589d6b60e688f1') build() { cd "$srcdir/$pkgname-snapshot-$pkgver-2245" diff --git a/extra/xfce4-panel/PKGBUILD b/extra/xfce4-panel/PKGBUILD index 3e942a3c1..f0096c1b1 100644 --- a/extra/xfce4-panel/PKGBUILD +++ b/extra/xfce4-panel/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 127913 2011-06-19 20:00:47Z andyrtr $ +# $Id: PKGBUILD 128301 2011-06-22 15:48:28Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: tobias <tobias funnychar archlinux.org> pkgname=xfce4-panel -pkgver=4.8.4 +pkgver=4.8.5 pkgrel=1 pkgdesc="Panel for the Xfce desktop environment" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ makedepends=('intltool' 'gtk-doc') options=('!libtool') install=${pkgname}.install source=(http://archive.xfce.org/src/xfce/${pkgname}/4.8/${pkgname}-${pkgver}.tar.bz2) -md5sums=('44f06660226723fdd8de3ad59d648546') +md5sums=('3c00e92821709baa2a71b166a32d46a2') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/libre/kernel26-libre-lts/PKGBUILD b/libre/kernel26-libre-lts/PKGBUILD index 63d0d83da..acbdde5ad 100644 --- a/libre/kernel26-libre-lts/PKGBUILD +++ b/libre/kernel26-libre-lts/PKGBUILD @@ -7,7 +7,7 @@ pkgname=('kernel26-libre-lts' 'kernel26-libre-lts-headers') # Build stock -lts k _kernelname=${pkgname#kernel26-libre} _basekernel=2.6.32 _preset=kernel26-lts.preset -pkgver=${_basekernel}.41 +pkgver=${_basekernel}.42 pkgrel=1 arch=('i686' 'x86_64') license=('GPL2') @@ -211,8 +211,8 @@ package_kernel26-libre-lts-headers() { # remove unneeded architectures rm -rf ${pkgdir}/usr/src/linux-${_kernver}/arch/{alpha,arm,arm26,avr32,blackfin,cris,frv,h8300,ia64,m32r,m68k,m68knommu,mips,microblaze,mn10300,parisc,powerpc,ppc,s390,sh,sh64,sparc,sparc64,um,v850,xtensa} } -md5sums=('759ac16149fea3bca10a2d723c03e53a' +md5sums=('4344dc9016b73a4910566e4a45087465' '3298f542840c52a8b8abc1b3795e455b' - 'e9fd751f4e7c4bbce027aa83ea90202d' + '9990806b3bf3cec6f8bd419249903613' '2cbfeb3e2a18d45f82f613e97fc23355' - 'fbfc7a1af3208c7b729055d91e1c149a') + 'a03a56a3cd700f0c9004b17e7391f8ff') diff --git a/libre/kernel26-libre-lts/config b/libre/kernel26-libre-lts/config index fcf978f36..c538b3196 100644 --- a/libre/kernel26-libre-lts/config +++ b/libre/kernel26-libre-lts/config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.32 -# Mon Apr 18 12:31:05 2011 +# Tue Jun 7 06:41:37 2011 # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -4517,6 +4517,7 @@ CONFIG_SYSCTL_SYSCALL_CHECK=y # CONFIG_DEBUG_PAGEALLOC is not set CONFIG_USER_STACKTRACE_SUPPORT=y CONFIG_NOP_TRACER=y +CONFIG_HAVE_FTRACE_NMI_ENTER=y CONFIG_HAVE_FUNCTION_TRACER=y CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y @@ -4524,7 +4525,9 @@ CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y CONFIG_HAVE_DYNAMIC_FTRACE=y CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y CONFIG_HAVE_SYSCALL_TRACEPOINTS=y +CONFIG_TRACER_MAX_TRACE=y CONFIG_RING_BUFFER=y +CONFIG_FTRACE_NMI_ENTER=y CONFIG_EVENT_TRACING=y CONFIG_CONTEXT_SWITCH_TRACER=y CONFIG_RING_BUFFER_ALLOW_SWAP=y @@ -4532,24 +4535,28 @@ CONFIG_TRACING=y CONFIG_GENERIC_TRACER=y CONFIG_TRACING_SUPPORT=y CONFIG_FTRACE=y -# CONFIG_FUNCTION_TRACER is not set +CONFIG_FUNCTION_TRACER=y +CONFIG_FUNCTION_GRAPH_TRACER=y # CONFIG_IRQSOFF_TRACER is not set -# CONFIG_SYSPROF_TRACER is not set -# CONFIG_SCHED_TRACER is not set -# CONFIG_FTRACE_SYSCALLS is not set -# CONFIG_BOOT_TRACER is not set +CONFIG_SYSPROF_TRACER=y +CONFIG_SCHED_TRACER=y +CONFIG_FTRACE_SYSCALLS=y +CONFIG_BOOT_TRACER=y CONFIG_BRANCH_PROFILE_NONE=y # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set # CONFIG_PROFILE_ALL_BRANCHES is not set -# CONFIG_POWER_TRACER is not set -# CONFIG_STACK_TRACER is not set -# CONFIG_KMEMTRACE is not set -# CONFIG_WORKQUEUE_TRACER is not set +CONFIG_POWER_TRACER=y +CONFIG_STACK_TRACER=y +CONFIG_KMEMTRACE=y +CONFIG_WORKQUEUE_TRACER=y CONFIG_BLK_DEV_IO_TRACE=y +CONFIG_DYNAMIC_FTRACE=y +CONFIG_FUNCTION_PROFILER=y +CONFIG_FTRACE_MCOUNT_RECORD=y # CONFIG_FTRACE_STARTUP_TEST is not set CONFIG_MMIOTRACE=y # CONFIG_MMIOTRACE_TEST is not set -# CONFIG_RING_BUFFER_BENCHMARK is not set +CONFIG_RING_BUFFER_BENCHMARK=m # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set # CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set # CONFIG_DYNAMIC_DEBUG is not set @@ -4558,7 +4565,6 @@ CONFIG_MMIOTRACE=y CONFIG_HAVE_ARCH_KGDB=y # CONFIG_KGDB is not set CONFIG_HAVE_ARCH_KMEMCHECK=y -# CONFIG_KMEMCHECK is not set CONFIG_STRICT_DEVMEM=y CONFIG_X86_VERBOSE_BOOTUP=y CONFIG_EARLY_PRINTK=y diff --git a/libre/kernel26-libre-lts/config.x86_64 b/libre/kernel26-libre-lts/config.x86_64 index 2202caeeb..5f7e05284 100644 --- a/libre/kernel26-libre-lts/config.x86_64 +++ b/libre/kernel26-libre-lts/config.x86_64 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.32 -# Tue May 10 08:27:04 2011 +# Tue Jun 7 08:38:42 2011 # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -4328,6 +4328,7 @@ CONFIG_SYSCTL_SYSCALL_CHECK=y # CONFIG_DEBUG_PAGEALLOC is not set CONFIG_USER_STACKTRACE_SUPPORT=y CONFIG_NOP_TRACER=y +CONFIG_HAVE_FTRACE_NMI_ENTER=y CONFIG_HAVE_FUNCTION_TRACER=y CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y @@ -4335,7 +4336,9 @@ CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y CONFIG_HAVE_DYNAMIC_FTRACE=y CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y CONFIG_HAVE_SYSCALL_TRACEPOINTS=y +CONFIG_TRACER_MAX_TRACE=y CONFIG_RING_BUFFER=y +CONFIG_FTRACE_NMI_ENTER=y CONFIG_EVENT_TRACING=y CONFIG_CONTEXT_SWITCH_TRACER=y CONFIG_RING_BUFFER_ALLOW_SWAP=y @@ -4343,24 +4346,28 @@ CONFIG_TRACING=y CONFIG_GENERIC_TRACER=y CONFIG_TRACING_SUPPORT=y CONFIG_FTRACE=y -# CONFIG_FUNCTION_TRACER is not set +CONFIG_FUNCTION_TRACER=y +CONFIG_FUNCTION_GRAPH_TRACER=y # CONFIG_IRQSOFF_TRACER is not set -# CONFIG_SYSPROF_TRACER is not set -# CONFIG_SCHED_TRACER is not set -# CONFIG_FTRACE_SYSCALLS is not set -# CONFIG_BOOT_TRACER is not set +CONFIG_SYSPROF_TRACER=y +CONFIG_SCHED_TRACER=y +CONFIG_FTRACE_SYSCALLS=y +CONFIG_BOOT_TRACER=y CONFIG_BRANCH_PROFILE_NONE=y # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set # CONFIG_PROFILE_ALL_BRANCHES is not set -# CONFIG_POWER_TRACER is not set -# CONFIG_STACK_TRACER is not set -# CONFIG_KMEMTRACE is not set -# CONFIG_WORKQUEUE_TRACER is not set +CONFIG_POWER_TRACER=y +CONFIG_STACK_TRACER=y +CONFIG_KMEMTRACE=y +CONFIG_WORKQUEUE_TRACER=y CONFIG_BLK_DEV_IO_TRACE=y +CONFIG_DYNAMIC_FTRACE=y +CONFIG_FUNCTION_PROFILER=y +CONFIG_FTRACE_MCOUNT_RECORD=y # CONFIG_FTRACE_STARTUP_TEST is not set CONFIG_MMIOTRACE=y # CONFIG_MMIOTRACE_TEST is not set -# CONFIG_RING_BUFFER_BENCHMARK is not set +CONFIG_RING_BUFFER_BENCHMARK=m # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set # CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set # CONFIG_DYNAMIC_DEBUG is not set @@ -4369,7 +4376,6 @@ CONFIG_MMIOTRACE=y CONFIG_HAVE_ARCH_KGDB=y # CONFIG_KGDB is not set CONFIG_HAVE_ARCH_KMEMCHECK=y -# CONFIG_KMEMCHECK is not set CONFIG_STRICT_DEVMEM=y CONFIG_X86_VERBOSE_BOOTUP=y CONFIG_EARLY_PRINTK=y diff --git a/libre/kernel26-libre-lts/kernel26-libre-lts.install b/libre/kernel26-libre-lts/kernel26-libre-lts.install index c3249445a..8bc94634d 100644 --- a/libre/kernel26-libre-lts/kernel26-libre-lts.install +++ b/libre/kernel26-libre-lts/kernel26-libre-lts.install @@ -7,7 +7,7 @@ KERNEL_VERSION=2.6.32-lts post_install () { # updating module dependencies echo ">>> Updating module dependencies. Please wait ..." - depmod $KERNEL_VERSION + /sbin/depmod $KERNEL_VERSION # generate init ramdisks echo ">>> MKINITCPIO SETUP" echo ">>> ----------------" @@ -84,7 +84,7 @@ post_upgrade() { fi # updating module dependencies echo ">>> Updating module dependencies. Please wait ..." - depmod $KERNEL_VERSION + /sbin/depmod $KERNEL_VERSION echo ">>> MKINITCPIO SETUP" echo ">>> ----------------" if [ "`vercmp $2 2.6.18`" -lt 0 ]; then diff --git a/libre/kernel26-libre/PKGBUILD b/libre/kernel26-libre/PKGBUILD index 736bb1c9b..621a30245 100644 --- a/libre/kernel26-libre/PKGBUILD +++ b/libre/kernel26-libre/PKGBUILD @@ -9,8 +9,7 @@ _basekernel=2.6.39 pkgver=${_basekernel}.1 pkgrel=1 makedepends=('xmlto' 'docbook-xsl') -#_patchname="patch-${pkgver}-${pkgrel}-LIBRE" -_patchname="patch-2.6.39-1-LIBRE" +_patchname="patch-${pkgver}-${pkgrel}-LIBRE" arch=(i686 x86_64) license=('GPL2') url="http://linux-libre.fsfla.org/" @@ -241,8 +240,8 @@ find $pkgdir -type d -exec chmod 755 {} \; rm -f $pkgdir/usr/src/linux-$_kernver/Documentation/DocBook/Makefile } md5sums=('923210b0c4190733bf314e48f588c112' - 'abad63eab1f9485f6b1af76f5109f1e4' - '5d40a23419b48f5b49f1f10be0e733c3' - 'af5937ac06a78907ceb499351bdff7ab' + '252cbddfd9a8bb97181c087fdd5e2377' + 'd5c6c675662d98011513f6cbc81d66db' + '00e8553b44dac65fc093db60a1cde842' '25584700a0a679542929c4bed31433b6' - 'ba583747f515e51ec0f16d535e4be6e0') + 'fdfed5e8b46f289617ee6def01978090') diff --git a/libre/kernel26-libre/config.i686 b/libre/kernel26-libre/config.i686 index 0d9636f62..e31c29f87 100644 --- a/libre/kernel26-libre/config.i686 +++ b/libre/kernel26-libre/config.i686 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux/i386 2.6.39 Kernel Configuration -# Thu May 19 19:49:50 2011 +# Mon Jun 6 20:12:12 2011 # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -1094,7 +1094,8 @@ CONFIG_NET_CLS_IND=y CONFIG_NET_SCH_FIFO=y # CONFIG_DCB is not set CONFIG_DNS_RESOLVER=y -# CONFIG_BATMAN_ADV is not set +CONFIG_BATMAN_ADV=m +# CONFIG_BATMAN_ADV_DEBUG is not set CONFIG_RPS=y CONFIG_RFS_ACCEL=y CONFIG_XPS=y @@ -5417,6 +5418,7 @@ CONFIG_SYSCTL_SYSCALL_CHECK=y # CONFIG_DEBUG_PAGEALLOC is not set CONFIG_USER_STACKTRACE_SUPPORT=y CONFIG_NOP_TRACER=y +CONFIG_HAVE_FTRACE_NMI_ENTER=y CONFIG_HAVE_FUNCTION_TRACER=y CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y @@ -5425,7 +5427,9 @@ CONFIG_HAVE_DYNAMIC_FTRACE=y CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y CONFIG_HAVE_SYSCALL_TRACEPOINTS=y CONFIG_HAVE_C_RECORDMCOUNT=y +CONFIG_TRACER_MAX_TRACE=y CONFIG_RING_BUFFER=y +CONFIG_FTRACE_NMI_ENTER=y CONFIG_EVENT_TRACING=y CONFIG_EVENT_POWER_TRACING_DEPRECATED=y CONFIG_CONTEXT_SWITCH_TRACER=y @@ -5434,20 +5438,24 @@ CONFIG_TRACING=y CONFIG_GENERIC_TRACER=y CONFIG_TRACING_SUPPORT=y CONFIG_FTRACE=y -# CONFIG_FUNCTION_TRACER is not set +CONFIG_FUNCTION_TRACER=y +CONFIG_FUNCTION_GRAPH_TRACER=y # CONFIG_IRQSOFF_TRACER is not set # CONFIG_PREEMPT_TRACER is not set -# CONFIG_SCHED_TRACER is not set -# CONFIG_FTRACE_SYSCALLS is not set +CONFIG_SCHED_TRACER=y +CONFIG_FTRACE_SYSCALLS=y CONFIG_BRANCH_PROFILE_NONE=y # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set # CONFIG_PROFILE_ALL_BRANCHES is not set -# CONFIG_STACK_TRACER is not set +CONFIG_STACK_TRACER=y CONFIG_BLK_DEV_IO_TRACE=y +CONFIG_DYNAMIC_FTRACE=y +CONFIG_FUNCTION_PROFILER=y +CONFIG_FTRACE_MCOUNT_RECORD=y # CONFIG_FTRACE_STARTUP_TEST is not set CONFIG_MMIOTRACE=y # CONFIG_MMIOTRACE_TEST is not set -# CONFIG_RING_BUFFER_BENCHMARK is not set +CONFIG_RING_BUFFER_BENCHMARK=m # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set # CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set # CONFIG_DYNAMIC_DEBUG is not set @@ -5458,7 +5466,6 @@ CONFIG_ASYNC_RAID6_TEST=m CONFIG_HAVE_ARCH_KGDB=y # CONFIG_KGDB is not set CONFIG_HAVE_ARCH_KMEMCHECK=y -# CONFIG_KMEMCHECK is not set CONFIG_TEST_KSTRTOX=m CONFIG_STRICT_DEVMEM=y CONFIG_X86_VERBOSE_BOOTUP=y diff --git a/libre/kernel26-libre/config.x86_64 b/libre/kernel26-libre/config.x86_64 index 5f6e24386..a373f420b 100644 --- a/libre/kernel26-libre/config.x86_64 +++ b/libre/kernel26-libre/config.x86_64 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux/x86_64 2.6.39 Kernel Configuration -# Thu May 19 21:49:53 2011 +# Mon Jun 6 22:07:19 2011 # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -1061,7 +1061,8 @@ CONFIG_NET_CLS_IND=y CONFIG_NET_SCH_FIFO=y # CONFIG_DCB is not set CONFIG_DNS_RESOLVER=y -# CONFIG_BATMAN_ADV is not set +CONFIG_BATMAN_ADV=m +# CONFIG_BATMAN_ADV_DEBUG is not set CONFIG_RPS=y CONFIG_RFS_ACCEL=y CONFIG_XPS=y @@ -5161,6 +5162,7 @@ CONFIG_SYSCTL_SYSCALL_CHECK=y # CONFIG_DEBUG_PAGEALLOC is not set CONFIG_USER_STACKTRACE_SUPPORT=y CONFIG_NOP_TRACER=y +CONFIG_HAVE_FTRACE_NMI_ENTER=y CONFIG_HAVE_FUNCTION_TRACER=y CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y @@ -5169,7 +5171,9 @@ CONFIG_HAVE_DYNAMIC_FTRACE=y CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y CONFIG_HAVE_SYSCALL_TRACEPOINTS=y CONFIG_HAVE_C_RECORDMCOUNT=y +CONFIG_TRACER_MAX_TRACE=y CONFIG_RING_BUFFER=y +CONFIG_FTRACE_NMI_ENTER=y CONFIG_EVENT_TRACING=y CONFIG_EVENT_POWER_TRACING_DEPRECATED=y CONFIG_CONTEXT_SWITCH_TRACER=y @@ -5178,20 +5182,24 @@ CONFIG_TRACING=y CONFIG_GENERIC_TRACER=y CONFIG_TRACING_SUPPORT=y CONFIG_FTRACE=y -# CONFIG_FUNCTION_TRACER is not set +CONFIG_FUNCTION_TRACER=y +CONFIG_FUNCTION_GRAPH_TRACER=y # CONFIG_IRQSOFF_TRACER is not set # CONFIG_PREEMPT_TRACER is not set -# CONFIG_SCHED_TRACER is not set -# CONFIG_FTRACE_SYSCALLS is not set +CONFIG_SCHED_TRACER=y +CONFIG_FTRACE_SYSCALLS=y CONFIG_BRANCH_PROFILE_NONE=y # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set # CONFIG_PROFILE_ALL_BRANCHES is not set -# CONFIG_STACK_TRACER is not set +CONFIG_STACK_TRACER=y CONFIG_BLK_DEV_IO_TRACE=y +CONFIG_DYNAMIC_FTRACE=y +CONFIG_FUNCTION_PROFILER=y +CONFIG_FTRACE_MCOUNT_RECORD=y # CONFIG_FTRACE_STARTUP_TEST is not set CONFIG_MMIOTRACE=y # CONFIG_MMIOTRACE_TEST is not set -# CONFIG_RING_BUFFER_BENCHMARK is not set +CONFIG_RING_BUFFER_BENCHMARK=m # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set # CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set # CONFIG_DYNAMIC_DEBUG is not set @@ -5202,7 +5210,6 @@ CONFIG_ASYNC_RAID6_TEST=m CONFIG_HAVE_ARCH_KGDB=y # CONFIG_KGDB is not set CONFIG_HAVE_ARCH_KMEMCHECK=y -# CONFIG_KMEMCHECK is not set CONFIG_TEST_KSTRTOX=m CONFIG_STRICT_DEVMEM=y CONFIG_X86_VERBOSE_BOOTUP=y diff --git a/libre/kernel26-libre/kernel26.install b/libre/kernel26-libre/kernel26.install index 0a7bc7772..8c0c80c85 100644 --- a/libre/kernel26-libre/kernel26.install +++ b/libre/kernel26-libre/kernel26.install @@ -7,7 +7,7 @@ KERNEL_VERSION=2.6.39-LIBRE post_install () { # updating module dependencies echo ">>> Updating module dependencies. Please wait ..." - depmod $KERNEL_VERSION + /sbin/depmod $KERNEL_VERSION # generate init ramdisks echo ">>> MKINITCPIO SETUP" echo ">>> ----------------" @@ -84,7 +84,7 @@ post_upgrade() { fi # updating module dependencies echo ">>> Updating module dependencies. Please wait ..." - depmod $KERNEL_VERSION + /sbin/depmod $KERNEL_VERSION echo ">>> MKINITCPIO SETUP" echo ">>> ----------------" if [ "`vercmp $2 2.6.18`" -lt 0 ]; then diff --git a/libre/liferea-libre/PKGBUILD b/libre/liferea-libre/PKGBUILD new file mode 100644 index 000000000..044663626 --- /dev/null +++ b/libre/liferea-libre/PKGBUILD @@ -0,0 +1,56 @@ +# $Id$ +# Maintainer: Eric Bélanger <eric@archlinux.org> +# Contributor: bitlord + +pkgbasename=liferea +pkgname=liferea-libre +pkgver=1.6.5 +pkgrel=3 +pkgdesc="A desktop news aggregator for online news feeds and weblogs" +arch=('i686' 'x86_64') +url="http://liferea.sourceforge.net/" +provides=("liferea=$pkgver") +replaces=('liferea') +conflicts=('liferea') +license=('GPL') +depends=('gconf' 'libwebkit' 'libxslt' 'libglade' 'sqlite3' 'hicolor-icon-theme') +makedepends=('pkg-config' 'intltool' 'lua' 'libnotify') +optdepends=('lua: for lua scripting support' + 'libnotify: for notification support') +options=('!libtool' '!emptydirs') +install=liferea.install +source=(http://repo.parabolagnulinux.org/other/$pkgname-$pkgver.tar.gz + libnotify-0.7.patch + remove-non-free-suggestions.patch) +md5sums=('f2d0ae5fb9f763451ba8b9fe2216de9c' + 'fca97e3316c1c51e0179c4c7dcce47a2' + '380284dc0b54ab9488f0659e832e59fa') + +# source PKGBUILD ; mksource +mksource() { + wget http://downloads.sourceforge.net/sourceforge/liferea/liferea-${pkgver}.tar.gz \ + -O - | tar xzf - + + pushd liferea-$pkgver >/dev/null + patch -Np1 -i "../remove-non-free-suggestions.patch" || return 1 + popd >/dev/null + + tar cvzf $pkgname-$pkgver.tar.gz liferea-$pkgver/ + rm -rvf liferea-$pkgver/ +} + +build() { + cd "${srcdir}/liferea-${pkgver}" + patch -Np1 -i "$srcdir/libnotify-0.7.patch" + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --disable-schemas-install + make +} + +package() { + cd "${srcdir}/liferea-${pkgver}" + make DESTDIR="${pkgdir}" install + + install -d "${pkgdir}/usr/share/gconf/schemas" + gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" "${pkgdir}"/etc/gconf/schemas/*.schemas + rm -f "${pkgdir}"/etc/gconf/schemas/*.schemas +} diff --git a/libre/liferea-libre/libnotify-0.7.patch b/libre/liferea-libre/libnotify-0.7.patch new file mode 100644 index 000000000..6dbbffb87 --- /dev/null +++ b/libre/liferea-libre/libnotify-0.7.patch @@ -0,0 +1,21 @@ +diff -u -Nr liferea-1.6.5/src/notification/libnotify.c liferea-1.6.5-libnotify/src/notification/libnotify.c +--- liferea-1.6.5/src/notification/libnotify.c 2009-06-20 20:33:19.000000000 +0200 ++++ liferea-1.6.5-libnotify/src/notification/libnotify.c 2011-03-06 23:53:45.783336455 +0100 +@@ -150,7 +150,7 @@ + // notify_notification_update ( n, node_get_title(node_p), labelText_now_p, NULL); + // notify_notification_clear_actions(n); + +- n = notify_notification_new (node_get_title(node_p), labelText_now_p, NULL, NULL); ++ n = notify_notification_new (node_get_title(node_p), labelText_now_p, NULL); + + notify_notification_set_icon_from_pixbuf (n,node_get_icon(node_p)); + +@@ -244,7 +244,7 @@ + + labelSummary_p = g_strdup_printf (ngettext ("%s has %d new / updated headline\n", "%s has %d new / updated headlines\n", item_count), + node_get_title (node), item_count); +- n = notify_notification_new ( _("Feed Update"), labelSummary_p, NULL, NULL); ++ n = notify_notification_new ( _("Feed Update"), labelSummary_p, NULL); + g_free(labelSummary_p); + + notify_notification_set_icon_from_pixbuf (n, node_get_icon (node)); diff --git a/libre/liferea-libre/liferea.install b/libre/liferea-libre/liferea.install new file mode 100644 index 000000000..369a55727 --- /dev/null +++ b/libre/liferea-libre/liferea.install @@ -0,0 +1,21 @@ +pkgname=liferea-libre +post_install() { + usr/sbin/gconfpkg --install ${pkgname} + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +pre_upgrade() { + pre_remove $1 +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + usr/sbin/gconfpkg --uninstall ${pkgname} +} + +post_remove() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} diff --git a/libre/liferea-libre/remove-non-free-suggestions.patch b/libre/liferea-libre/remove-non-free-suggestions.patch new file mode 100644 index 000000000..0230fdb78 --- /dev/null +++ b/libre/liferea-libre/remove-non-free-suggestions.patch @@ -0,0 +1,31 @@ +--- liferea-1.6.5/src/ui/ui_prefs.c_orig 2011-06-23 01:33:39.761555322 +0200 ++++ liferea-1.6.5/src/ui/ui_prefs.c 2011-06-23 01:38:02.121556890 +0200 +@@ -76,24 +76,10 @@ + NULL, NULL + }, + { +- /* tested with SeaMonkey 1.0.6 */ +- "mozilla", "Mozilla", "mozilla %s", +- NULL, "mozilla -remote openURL(%s)", +- NULL, "mozilla -remote 'openURL(%s,new-window)'", +- NULL, "mozilla -remote 'openURL(%s,new-tab)'" +- }, +- { +- /* tested with Firefox 1.5 and 2.0 */ +- "firefox", "Firefox","firefox \"%s\"", +- NULL, "firefox -a firefox -remote \"openURL(%s)\"", +- NULL, "firefox -a firefox -remote 'openURL(%s,new-window)'", +- NULL, "firefox -a firefox -remote 'openURL(%s,new-tab)'" +- }, +- { +- "opera", "Opera","opera \"%s\"", +- "opera \"%s\"", "opera -remote \"openURL(%s)\"", +- "opera -newwindow \"%s\"", NULL, +- "opera -newpage \"%s\"", NULL ++ "icecat", "IceCat","icecat \"%s\"", ++ NULL, "icecat -a icecat -remote \"openURL(%s)\"", ++ NULL, "icecat -a icecat -remote 'openURL(%s,new-window)'", ++ NULL, "icecat -a icecat -remote 'openURL(%s,new-tab)'" + }, + { + "epiphany", "Epiphany","epiphany \"%s\"", diff --git a/libre/mplayer-libre/PKGBUILD b/libre/mplayer-libre/PKGBUILD index c3b4a0830..36fcc4aae 100644 --- a/libre/mplayer-libre/PKGBUILD +++ b/libre/mplayer-libre/PKGBUILD @@ -6,10 +6,10 @@ _pkgbase=mplayer pkgbase=mplayer-libre pkgname=('mplayer-libre' 'mencoder-libre') pkgver=33690 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') makedepends=('libxxf86dga' 'libxxf86vm' 'libmad' 'cdparanoia' 'libxinerama' 'sdl' 'lame' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient' -'aalib' 'jack' 'libcaca' 'x264' 'faad2' 'lirc-utils' 'libxvmc' 'enca' 'libvdpau' 'opencore-amr' 'libdca' 'a52dec' 'schroedinger' 'libvpx' +'aalib' 'jack' 'libcaca' 'x264' 'faad2' 'lirc-utils' 'libxvmc' 'enca' 'libvdpau' 'opencore-amr' 'libdca' 'a52dec' 'schroedinger' 'libvpx' 'speex' 'libpulse' 'fribidi' 'unzip' 'mesa' 'live-media' 'yasm' 'git' 'fontconfig') license=('GPL') url="http://www.mplayerhq.hu/" @@ -26,7 +26,7 @@ build() { --disable-gui \ --disable-arts \ --disable-liblzo \ - --disable-speex \ + --enable-speex \ --disable-openal \ --disable-libdv \ --disable-musepack \ @@ -44,8 +44,8 @@ package_mplayer-libre() { pkgdesc="A movie player for linux (no unfree faac support)" install=mplayer.install backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf') - depends=('desktop-file-utils' 'ttf-dejavu' 'enca' 'libxss' 'a52dec' 'libvpx' 'lirc-utils' 'x264' 'libmng' 'libdca' 'aalib' 'lame' 'fontconfig' 'libgl' - 'libxinerama' 'libvdpau' 'libpulse' 'smbclient' 'xvidcore' 'opencore-amr' 'jack' 'cdparanoia' 'libmad' 'sdl' 'libtheora' 'libcaca' 'libxxf86dga' 'fribidi' + depends=('desktop-file-utils' 'ttf-dejavu' 'enca' 'libxss' 'a52dec' 'libvpx' 'lirc-utils' 'x264' 'libmng' 'libdca' 'aalib' 'lame' 'fontconfig' 'libgl' 'speex' + 'libxinerama' 'libvdpau' 'libpulse' 'smbclient' 'xvidcore' 'opencore-amr' 'jack' 'cdparanoia' 'libmad' 'sdl' 'libtheora' 'libcaca' 'libxxf86dga' 'fribidi' 'libjpeg' 'faad2' 'libxvmc' 'schroedinger') provides=("mplayer=$pkgver") replaces=('mplayer') @@ -65,7 +65,7 @@ package_mplayer-libre() { package_mencoder-libre() { pkgdesc="Free command line video decoding, encoding and filtering tool (without unfree faac support)" - depends=('enca' 'a52dec' 'libvpx' 'x264' 'libmng' 'libdca' 'bzip2' 'lame' 'alsa-lib' 'fontconfig' 'giflib' 'libpng' 'smbclient' 'xvidcore' 'opencore-amr' 'cdparanoia' + depends=('enca' 'a52dec' 'libvpx' 'x264' 'libmng' 'libdca' 'bzip2' 'lame' 'alsa-lib' 'fontconfig' 'giflib' 'libpng' 'smbclient' 'xvidcore' 'opencore-amr' 'cdparanoia' 'speex' 'libmad' 'libtheora' 'fribidi' 'libjpeg' 'faad2' 'schroedinger') provides=("mencoder=$pkgver") replaces=('mencoder') diff --git a/multilib/lib32-libpulse/PKGBUILD b/multilib/lib32-libpulse/PKGBUILD index 01f9efc6d..19c66f4e8 100644 --- a/multilib/lib32-libpulse/PKGBUILD +++ b/multilib/lib32-libpulse/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 33577 2010-11-26 02:49:09Z heftig $ +# $Id: PKGBUILD 50076 2011-06-23 23:49:52Z heftig $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> # Contributor: Corrado Primier <bardo@aur.archlinux.org> @@ -7,7 +7,7 @@ _pkgbasename=libpulse pkgname=lib32-$_pkgbasename pkgdesc="A featureful, general-purpose sound server (32-bit client libraries)" -pkgver=0.9.22 +pkgver=0.9.23 pkgrel=1 arch=(x86_64) url="http://pulseaudio.org/" @@ -15,14 +15,14 @@ license=(GPL LGPL) depends=(lib32-{dbus-core,xcb-util} lib32-lib{asyncns,cap,xtst,sm,sndfile} $_pkgbasename) -makedepends=(pkgconfig gcc-multilib libtool-multilib intltool lib32-glib2 lib32-speex) +makedepends=(gcc-multilib libtool-multilib intltool lib32-glib2 lib32-speex) optdepends=('lib32-alsa-plugins: ALSA support') provides=("lib32-pulseaudio=$pkgver") conflicts=(lib32-pulseaudio) replaces=(lib32-pulseaudio) options=(!emptydirs !libtool !makeflags) -source=("http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-$pkgver.tar.gz") -md5sums=('ca85ab470669b05e100861654cf5eb3c') +source=("http://freedesktop.org/software/pulseaudio/releases/pulseaudio-$pkgver.tar.gz") +md5sums=('7391205a337d1e04a9ff38025f684034') _libs="libpulsecommon-$pkgver.la libpulse.la libpulse-simple.la libpulse-mainloop-glib.la libpulsedsp.la" @@ -42,6 +42,7 @@ build() { --libexecdir=/usr/lib32 \ --localstatedir=/var \ --disable-hal \ + --disable-tcpwrap \ --disable-rpath \ --disable-default-build-tests diff --git a/social/diaspora-git/PKGBUILD b/social/diaspora-git/PKGBUILD index b19241655..b15f66916 100644 --- a/social/diaspora-git/PKGBUILD +++ b/social/diaspora-git/PKGBUILD @@ -6,7 +6,7 @@ # https://wiki.archlinux.org/index.php/Diaspora pkgname=diaspora-git -pkgver=20110417 +pkgver=20110623 pkgrel=1 pkgdesc="A privacy aware, personally controlled, do-it-all, open source social network" arch=('i686' 'x86_64') diff --git a/social/ruby-headers/PKGBUILD b/social/ruby-headers/PKGBUILD index 73b85c3c1..9deedb708 100644 --- a/social/ruby-headers/PKGBUILD +++ b/social/ruby-headers/PKGBUILD @@ -5,12 +5,12 @@ pkgname=ruby-headers _pkgname=ruby pkgver=1.9.2_p180 _pkgver=1.9.2-p180 -pkgrel=1 +pkgrel=2 pkgdesc="A package of all Ruby headers needed by some gems like ruby-debug." arch=('any') url="http://www.ruby-lang.org/en/" license=('custom') -depends=('ruby') +depends=("ruby=$pkgver") source=("ftp://ftp.ruby-lang.org/pub/ruby/1.9/$_pkgname-$_pkgver.tar.bz2") build() { diff --git a/social/tinc/PKGBUILD b/social/tinc/PKGBUILD index c2a7dc51c..1dd9ad328 100644 --- a/social/tinc/PKGBUILD +++ b/social/tinc/PKGBUILD @@ -1,5 +1,5 @@ pkgname=tinc -pkgver=1.0.14 +pkgver=1.0.15 pkgrel=1 pkgdesc="VPN (Virtual Private Network) daemon" arch=(i686 x86_64) @@ -7,7 +7,6 @@ url="http://www.tinc-vpn.org/" license=('GPL') depends=('lzo2' 'zlib' 'openssl') source=(http://www.tinc-vpn.org/packages/tinc-$pkgver.tar.gz) -md5sums=('967dfafc4aa41a614c1d2739df8a8372') build() { cd "$srcdir/$pkgname-$pkgver" @@ -24,3 +23,4 @@ package() { install -d $pkgdir/etc/tinc tar xzvf doc/sample-config.tar.gz -C $pkgdir/etc/tinc/ } +md5sums=('44bb7d1618955a0a56e9e159f1c46362') diff --git a/staging/perl/0001-Append-CFLAGS-and-LDFLAGS-to-their-Config.pm-counter.patch b/staging/perl/0001-Append-CFLAGS-and-LDFLAGS-to-their-Config.pm-counter.patch new file mode 100644 index 000000000..1404460df --- /dev/null +++ b/staging/perl/0001-Append-CFLAGS-and-LDFLAGS-to-their-Config.pm-counter.patch @@ -0,0 +1,83 @@ +From bb249b0b26c2e79a6f55355ef94889070f07fd21 Mon Sep 17 00:00:00 2001 +From: Niko Tyni <ntyni@debian.org> +Date: Thu, 28 Apr 2011 09:18:54 +0300 +Subject: [PATCH] Append CFLAGS and LDFLAGS to their Config.pm counterparts in + EU::CBuilder + +Since ExtUtils::CBuilder 0.27_04 (bleadperl commit 06e8058f27e4), +CFLAGS and LDFLAGS from the environment have overridden the Config.pm +ccflags and ldflags settings. This can cause binary incompatibilities +between the core Perl and extensions built with EU::CBuilder. + +Append to the Config.pm values rather than overriding them. +--- + .../lib/ExtUtils/CBuilder/Base.pm | 6 +++- + dist/ExtUtils-CBuilder/t/04-base.t | 25 +++++++++++++++++++- + 2 files changed, 28 insertions(+), 3 deletions(-) + +diff --git a/dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Base.pm b/dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Base.pm +index b572312..2255c51 100644 +--- a/dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Base.pm ++++ b/dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Base.pm +@@ -40,11 +40,13 @@ sub new { + $self->{config}{$k} = $v unless exists $self->{config}{$k}; + } + $self->{config}{cc} = $ENV{CC} if defined $ENV{CC}; +- $self->{config}{ccflags} = $ENV{CFLAGS} if defined $ENV{CFLAGS}; ++ $self->{config}{ccflags} = join(" ", $self->{config}{ccflags}, $ENV{CFLAGS}) ++ if defined $ENV{CFLAGS}; + $self->{config}{cxx} = $ENV{CXX} if defined $ENV{CXX}; + $self->{config}{cxxflags} = $ENV{CXXFLAGS} if defined $ENV{CXXFLAGS}; + $self->{config}{ld} = $ENV{LD} if defined $ENV{LD}; +- $self->{config}{ldflags} = $ENV{LDFLAGS} if defined $ENV{LDFLAGS}; ++ $self->{config}{ldflags} = join(" ", $self->{config}{ldflags}, $ENV{LDFLAGS}) ++ if defined $ENV{LDFLAGS}; + + unless ( exists $self->{config}{cxx} ) { + my ($ccpath, $ccbase, $ccsfx ) = fileparse($self->{config}{cc}, qr/\.[^.]*/); +diff --git a/dist/ExtUtils-CBuilder/t/04-base.t b/dist/ExtUtils-CBuilder/t/04-base.t +index c3bf6b5..1bb15aa 100644 +--- a/dist/ExtUtils-CBuilder/t/04-base.t ++++ b/dist/ExtUtils-CBuilder/t/04-base.t +@@ -1,7 +1,7 @@ + #! perl -w + + use strict; +-use Test::More tests => 50; ++use Test::More tests => 64; + use Config; + use Cwd; + use File::Path qw( mkpath ); +@@ -326,6 +326,29 @@ is_deeply( $mksymlists_args, + "_prepare_mksymlists_args(): got expected arguments for Mksymlists", + ); + ++my %testvars = ( ++ CFLAGS => 'ccflags', ++ LDFLAGS => 'ldflags', ++); ++ ++while (my ($VAR, $var) = each %testvars) { ++ local $ENV{$VAR}; ++ $base = ExtUtils::CBuilder::Base->new( quiet => 1 ); ++ ok( $base, "ExtUtils::CBuilder::Base->new() returned true value" ); ++ isa_ok( $base, 'ExtUtils::CBuilder::Base' ); ++ like($base->{config}{$var}, qr/\Q$Config{$var}/, ++ "honours $var from Config.pm"); ++ ++ $ENV{$VAR} = "-foo -bar"; ++ $base = ExtUtils::CBuilder::Base->new( quiet => 1 ); ++ ok( $base, "ExtUtils::CBuilder::Base->new() returned true value" ); ++ isa_ok( $base, 'ExtUtils::CBuilder::Base' ); ++ like($base->{config}{$var}, qr/\Q$ENV{$VAR}/, ++ "honours $VAR from the environment"); ++ like($base->{config}{$var}, qr/\Q$Config{$var}/, ++ "doesn't override $var from Config.pm with $VAR from the environment"); ++} ++ + ##### + + for ($source_file, $object_file, $lib_file) { +-- +1.7.4.4 + diff --git a/staging/perl/ChangeLog b/staging/perl/ChangeLog index fd53c2560..9add39e20 100644 --- a/staging/perl/ChangeLog +++ b/staging/perl/ChangeLog @@ -1,3 +1,8 @@ +2011-06-22 Angel Velasquez <angvp@archlinux.org> + * Added a patch for ExtUtils doesnt overwrite CFLAGS and LDFLAGS + * Fixed #FS22197, FS#22441, FS#24767 + * Rebuilt perl 5.14.1-2 against db 5.2.28 + 2011-06-16 Angel Velasquez <angvp@archlinux.org> * Fixed #FS24660 * Rebuilt against db 5.2.28 diff --git a/staging/perl/PKGBUILD b/staging/perl/PKGBUILD index bb4053b20..788cda021 100644 --- a/staging/perl/PKGBUILD +++ b/staging/perl/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 127616 2011-06-17 07:01:46Z angvp $ +# $Id: PKGBUILD 128405 2011-06-23 21:44:26Z angvp $ # Maintainer: Angel Velasquez <angvp@archlinux.org> # Contributor: kevin <kevin.archlinux.org> # Contributor: judd <jvinet.zeroflux.org> # Contributor: francois <francois.archlinux.org> pkgname=perl -pkgver=5.14.0 -pkgrel=3 +pkgver=5.14.1 +pkgrel=2 pkgdesc="A highly capable, feature-rich programming language" arch=(i686 x86_64) license=('GPL' 'PerlArtistic') @@ -13,11 +13,16 @@ url="http://www.perl.org" groups=('base') depends=('gdbm' 'db' 'coreutils' 'glibc' 'sh') changelog=ChangeLog -source=(http://www.cpan.org/src/5.0/perl-${pkgver}.tar.bz2 perlbin.sh) +source=(http://www.cpan.org/src/5.0/perl-${pkgver}.tar.bz2 +perlbin.sh +perlbin.csh +0001-Append-CFLAGS-and-LDFLAGS-to-their-Config.pm-counter.patch) install=perl.install options=('!makeflags' '!purge') -md5sums=('e7457deea78330c5f8eebb2fd2a45479' - 'f86eb0dba1638ca6d1c8fff1b06c2a71') +md5sums=('97cd306a2c22929cc141a09568f43bb0' + '5ed2542fdb9a60682f215bd33701e61a' + 'd76445605c49886c77734446247e439d' + 'c25d86206d649046538c3daab7874564') build() { cd ${srcdir}/${pkgname}-${pkgver} @@ -41,7 +46,9 @@ build() { -Dsitescript=/usr/bin/site_perl \ -Dvendorscript=/usr/bin/vendor_perl \ -Dinc_version_list=none \ - -Dman1ext=1perl -Dman3ext=3perl ${arch_opts} + -Dman1ext=1perl -Dman3ext=3perl ${arch_opts} \ + -Dlddlflags="-shared ${LDFLAGS}" -Dldflags="${LDFLAGS}" + patch -Np1 -i $srcdir/0001-Append-CFLAGS-and-LDFLAGS-to-their-Config.pm-counter.patch make } package() { @@ -68,9 +75,12 @@ package() { -e "/{'buildflags'}/ s/'';/'installdirs=site';/" \ -i ${pkgdir}/usr/share/perl5/core_perl/CPANPLUS/Config.pm - # Profile script so set paths to perl scripts. + # Profile script to set paths to perl scripts. install -D -m755 ${srcdir}/perlbin.sh \ ${pkgdir}/etc/profile.d/perlbin.sh + # Profile script to set paths to perl scripts on csh. (FS#22441) + install -D -m755 ${srcdir}/perlbin.csh \ + ${pkgdir}/etc/profile.d/perlbin.csh (cd ${pkgdir}/usr/bin; mv perl${pkgver} perl) (cd ${pkgdir}/usr/bin/core_perl; ln -sf c2ph pstruct; ln -sf s2p psed) @@ -91,4 +101,3 @@ package() { install -dv ${pkgdir}/etc/ld.so.conf.d echo "/usr/lib/perl5/core_perl/CORE" > ${pkgdir}/etc/ld.so.conf.d/perl.conf } - diff --git a/staging/perl/perlbin.csh b/staging/perl/perlbin.csh new file mode 100644 index 000000000..cc0d5d553 --- /dev/null +++ b/staging/perl/perlbin.csh @@ -0,0 +1,17 @@ +# Set path to perl scriptdirs if they exist +# https://wiki.archlinux.org/index.php/Perl_Policy#Binaries_and_Scripts +# Added /usr/bin/*_perl dirs for scripts +# Remove /usr/lib/perl5/*_perl/bin in next release + +[ -d /usr/bin/site_perl ] && setenv PATH ${PATH}:/usr/bin/site_perl +[ -d /usr/lib/perl5/site_perl/bin ] && setenv PATH +${PATH}:/usr/lib/perl5/site_perl/bin + +[ -d /usr/bin/vendor_perl ] && setenv PATH ${PATH}:/usr/bin/vendor_perl +[ -d /usr/lib/perl5/vendor_perl/bin ] && setenv PATH +${PATH}:/usr/lib/perl5/vendor_perl/bin + +[ -d /usr/bin/core_perl ] && setenv PATH ${PATH}:/usr/bin/core_perl + +# If you have modules in non-standard directories you can add them here. +#export PERLLIB=dir1:dir2 diff --git a/staging/perl/perlbin.sh b/staging/perl/perlbin.sh index 09811a8b4..20f830436 100755 --- a/staging/perl/perlbin.sh +++ b/staging/perl/perlbin.sh @@ -3,18 +3,13 @@ # Added /usr/bin/*_perl dirs for scripts # Remove /usr/lib/perl5/*_perl/bin in next release -[ -d /usr/bin/site_perl ] && - PATH=$PATH:/usr/bin/site_perl -[ -d /usr/lib/perl5/site_perl/bin ] && - PATH=$PATH:/usr/lib/perl5/site_perl/bin +[ -d /usr/bin/site_perl ] && PATH=$PATH:/usr/bin/site_perl +[ -d /usr/lib/perl5/site_perl/bin ] && PATH=$PATH:/usr/lib/perl5/site_perl/bin -[ -d /usr/bin/vendor_perl ] && - PATH=$PATH:/usr/bin/vendor_perl -[ -d /usr/lib/perl5/vendor_perl/bin ] && - PATH=$PATH:/usr/lib/perl5/vendor_perl/bin +[ -d /usr/bin/vendor_perl ] && PATH=$PATH:/usr/bin/vendor_perl +[ -d /usr/lib/perl5/vendor_perl/bin ] && PATH=$PATH:/usr/lib/perl5/vendor_perl/bin -[ -d /usr/bin/core_perl ] && - PATH=$PATH:/usr/bin/core_perl +[ -d /usr/bin/core_perl ] && PATH=$PATH:/usr/bin/core_perl export PATH diff --git a/testing/alex/PKGBUILD b/testing/alex/PKGBUILD index d49dc3d6f..b11156af0 100644 --- a/testing/alex/PKGBUILD +++ b/testing/alex/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 120390 2011-04-23 17:05:09Z vesa $ +# $Id: PKGBUILD 128111 2011-06-22 10:56:28Z vesa $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: Philip Nilsson <pnilsson@nullref.se> pkgname=alex pkgver=2.3.5 -pkgrel=1.2 +pkgrel=1.3 pkgdesc='a lexical analyser generator for Haskell' arch=('i686' 'x86_64') url='http://www.haskell.org/alex/' diff --git a/testing/avahi/PKGBUILD b/testing/avahi/PKGBUILD new file mode 100644 index 000000000..812aeeaa0 --- /dev/null +++ b/testing/avahi/PKGBUILD @@ -0,0 +1,75 @@ +# $Id: PKGBUILD 128481 2011-06-24 03:51:45Z bisson $ +# Contributor: Douglas Soares de Andrade <douglas@archlinux.org> +# Maintainer: Gaetan Bisson <bisson@archlinux.org> + +pkgname=avahi +pkgver=0.6.30 +pkgrel=4 +pkgdesc='A multicast/unicast DNS-SD framework' +arch=('i686' 'x86_64') +url='http://www.avahi.org/' +license=('LGPL') +depends=('expat' 'libdaemon' 'glib2' 'dbus' 'libcap' 'gdbm') +optdepends=('gtk3: avahi-discover-standalone, bshell, bssh, bvnc' + 'gtk2: gtk2 bindings' + 'qt3: qt3 bindings' + 'qt: qt bindings' + 'pygtk: avahi-bookmarks, avahi-discover' + 'twisted: avahi-bookmarks' + 'mono: mono bindings' + 'dbus-python: avahi-discover' + 'nss-mdns: NSS support for mDNS') +makedepends=('qt' 'qt3' 'pygtk' 'mono' 'intltool' 'dbus-python' + 'gtk-sharp-2' 'gobject-introspection' 'gtk3') +backup=(etc/avahi/avahi-daemon.conf etc/avahi/services/{sftp-,}ssh.service) +install=install +conflicts=('howl' 'mdnsresponder') +provides=('howl' 'mdnsresponder') +replaces=('howl' 'mdnsresponder') +options=('!libtool') +source=("http://www.avahi.org/download/avahi-${pkgver}.tar.gz" + 'gnome-nettool.png' + 'rc.d.patch') +sha1sums=('5b77443537600a00770e4c77e3c443eeb5861d06' + 'cf56387c88aed246b9f435efc182ef44de4d52f3' + '625ad7c131c0c1c383caeddef18fc7a32d8f3ab9') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + sed -i 's/netdev/network/g' avahi-daemon/avahi-dbus.conf + patch -p1 -i "../rc.d.patch" + + # pygtk requires python2; make it explicit in case other python are installed: FS#21865 + PYTHON=python2 \ + PKG_CONFIG_PATH=/opt/qt/lib/pkgconfig \ + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --disable-static \ + --disable-monodoc \ + --disable-doxygen-doc \ + --disable-xmltoman \ + --enable-compat-libdns_sd \ + --enable-compat-howl \ + --with-distro=archlinux \ + --with-avahi-priv-access-group=network \ + --with-autoipd-user=avahi \ + --with-autoipd-group=avahi \ + --with-systemdsystemunitdir=/lib/systemd/system # See FS#20999 + + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -D -m 644 ../gnome-nettool.png "${pkgdir}"/usr/share/pixmaps/gnome-nettool.png + + cd "${pkgdir}" + sed -i '1c #!/usr/bin/python2' usr/bin/avahi-{bookmarks,discover} + # howl and mdnsresponder compatability + (cd usr/include; ln -s avahi-compat-libdns_sd/dns_sd.h dns_sd.h; ln -s avahi-compat-howl howl) + (cd usr/lib/pkgconfig; ln -s avahi-compat-howl.pc howl.pc) +} diff --git a/testing/avahi/gnome-nettool.png b/testing/avahi/gnome-nettool.png Binary files differnew file mode 100644 index 000000000..227d0678a --- /dev/null +++ b/testing/avahi/gnome-nettool.png diff --git a/testing/avahi/install b/testing/avahi/install new file mode 100644 index 000000000..7c75c3dd4 --- /dev/null +++ b/testing/avahi/install @@ -0,0 +1,21 @@ +post_install() { + getent group avahi &>/dev/null || groupadd -r -g 84 avahi >/dev/null + getent passwd avahi &>/dev/null || useradd -r -u 84 -g avahi -d / -s /bin/false -c avahi avahi >/dev/null + + cat <<EOF +==> The following daemons may be added to DAEMONS in /etc/rc.conf: +==> avahi-daemon: the mdns responder, you probably want this. +==> dbus needs to be running when you start it. +==> avahi-dnsconfd: daemon used for peer-to-peer automatic dns +==> configuration on dhcp-less networks. + +==> To use some of the client applications you will have to install python. +==> In addition, pygtk is required for the graphical ones and +==> twisted for avahi-bookmarks. +EOF +} + +post_remove() { + getent passwd avahi &>/dev/null && userdel avahi >/dev/null + getent group avahi &>/dev/null && groupdel avahi >/dev/null +} diff --git a/testing/avahi/rc.d.patch b/testing/avahi/rc.d.patch new file mode 100644 index 000000000..fd735734b --- /dev/null +++ b/testing/avahi/rc.d.patch @@ -0,0 +1,11 @@ +diff -aur old/initscript/archlinux/avahi-daemon.in new/initscript/archlinux/avahi-daemon.in +--- old/initscript/archlinux/avahi-daemon.in 2011-06-24 03:07:00.916170590 +0200 ++++ new/initscript/archlinux/avahi-daemon.in 2011-06-24 03:16:32.220596377 +0200 +@@ -33,6 +33,7 @@ + + case "$1" in + start) ++ ck_daemon dbus && { echo -n "Start dbus first." >&2; stat_die; } + stat_busy "Starting $DESC" + $DAEMON -D > /dev/null 2>&1 + if [ $? -gt 0 ]; then diff --git a/testing/blender/PKGBUILD b/testing/blender/PKGBUILD new file mode 100644 index 000000000..48cc575e0 --- /dev/null +++ b/testing/blender/PKGBUILD @@ -0,0 +1,93 @@ +# $Id: PKGBUILD 128410 2011-06-23 22:00:17Z eric $ +# Contributor: John Sowiak <john@archlinux.org> +# Maintainer: tobias <tobias@archlinux.org> + +# Apparently, the blender guys refuse to release source tarballs for +# intermediate releases that deal mainly with binaries but incorporate tiny +# minor changes from svn. Since I'm sick and tired of the urges of users that +# look for release numbers only we make a messy PKGBUILD that can checkout svn +# release if necessary. + +#_svn=true +_svn=false + +pkgname=blender +pkgver=2.58 +pkgrel=1 +epoch=1 +pkgdesc="A fully integrated 3D graphics creation suite" +arch=('i686' 'x86_64') +license=('GPL') +url="http://www.blender.org" +depends=('libpng' 'libtiff' 'openexr' 'python' 'desktop-file-utils' \ + 'shared-mime-info' 'hicolor-icon-theme' 'xdg-utils' 'glew' \ + 'freetype2' 'openal' 'libsamplerate' 'ffmpeg') +makedepends=('cmake') # 'subversion' +install=blender.install +if [ $_svn = false ]; then + source=(http://download.blender.org/source/$pkgname-$pkgver.tgz blender-ffmpeg.diff) + md5sums=('04a0d43ff27aa0abf14ca559f6a6bf67' 'ed36bab11bfc87864fe0cadf0de5d98f') +else + source=(ftp://ftp.archlinux.org/other/${pkgname}/$pkgname-$pkgver.tar.xz) + md5sums=('59e344d4ec48750a86e4ef079c3acbfc') +fi + +# source PKGBUILD && mksource +mksource() { + _svnver=36339 + _svntrunk="https://svn.blender.org/svnroot/bf-blender/trunk/blender" + _svnmod="$pkgname-$pkgver" + mkdir ${pkgname}-$pkgver + pushd ${pkgname}-$pkgver + svn co $_svntrunk --config-dir ./ -r $_svnver $_svnmod + find . -depth -type d -name .svn -exec rm -rf {} \; + tar -cJf ../${pkgname}-$pkgver.tar.xz ${pkgname}-$pkgver/* + popd +} + +build() { + cd "$srcdir/$pkgname-$pkgver" + patch -p0 -i ../blender-ffmpeg.diff + mkdir build + cd build + + [[ $CARCH == i686 ]] && ENABLESSE2="-DSUPPORT_SSE2_BUILD:BOOL=OFF" + + cmake .. \ + -DCMAKE_INSTALL_PREFIX:PATH=/usr \ + -DCMAKE_BUILD_TYPE:STRING=Release \ + -DWITH_INSTALL_PORTABLE:BOOL=OFF \ + -DWITH_PYTHON_INSTALL:BOOL=OFF \ + -DWITH_OPENCOLLADA:BOOL=OFF \ + -DWITH_GAMEENGINE:BOOL=ON \ + -DWITH_PLAYER:BOOL=ON \ + -DWITH_BUILTIN_GLEW:BOOL=OFF \ + -DWITH_CODEC_FFMPEG:BOOL=ON \ + -DWITH_CODEC_SNDFILE:BOOL=ON \ + -DPYTHON_VERSION:STRING=3.2 \ + -DPYTHON_LIBPATH:STRING=/usr/lib \ + -DPYTHON_LIBRARY:STRING=python3.2mu \ + -DPYTHON_INCLUDE_DIRS:STRING=/usr/include/python3.2mu \ + $ENABLESSE2 + + make $MAKEFLAGS + + cp -rf "$srcdir"/${pkgname}-$pkgver/release/plugins/* \ + "$srcdir"/${pkgname}-$pkgver/source/blender/blenpluginapi/ + cd "$srcdir"/${pkgname}-$pkgver/source/blender/blenpluginapi + chmod 755 bmake + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver/build" + make DESTDIR="${pkgdir}" install + python -m compileall "${pkgdir}/usr/share/blender" + +# install plugins + install -d -m755 "$pkgdir"/usr/share/blender/${pkgver%[a-z]}/plugins/{sequence,texture} + cp "$srcdir"/${pkgname}-$pkgver/source/blender/blenpluginapi/sequence/*.so \ + "$pkgdir"/usr/share/blender/${pkgver%[a-z]}/plugins/sequence/ + cp "$srcdir"/${pkgname}-$pkgver/source/blender/blenpluginapi/texture/*.so \ + "$pkgdir"/usr/share/blender/${pkgver%[a-z]}/plugins/texture/ +} diff --git a/testing/blender/blender-ffmpeg.diff b/testing/blender/blender-ffmpeg.diff new file mode 100644 index 000000000..ffef489e2 --- /dev/null +++ b/testing/blender/blender-ffmpeg.diff @@ -0,0 +1,13 @@ +Index: intern/ffmpeg/ffmpeg_compat.h +=================================================================== +--- intern/ffmpeg/ffmpeg_compat.h (revision 37744) ++++ intern/ffmpeg/ffmpeg_compat.h (revision 37745) +@@ -40,7 +40,7 @@ + #define FFMPEG_HAVE_AVIO 1 + #endif + +-#if (LIBAVCODEC_VERSION_MAJOR > 53) || ((LIBAVCODEC_VERSION_MAJOR == 53) && (LIBAVCODEC_VERSION_MINOR > 1)) || ((LIBAVCODEC_VERSION_MAJOR == 53) && (LIBAVCODEC_VERSION_MINOR == 1) && (LIBAVCODEC_VERSION_MICRO >= 1)) ++#if (LIBAVCODEC_VERSION_MAJOR > 53) || ((LIBAVCODEC_VERSION_MAJOR == 53) && (LIBAVCODEC_VERSION_MINOR > 1)) || ((LIBAVCODEC_VERSION_MAJOR == 53) && (LIBAVCODEC_VERSION_MINOR == 1) && (LIBAVCODEC_VERSION_MICRO >= 1)) || ((LIBAVCODEC_VERSION_MAJOR == 52) && (LIBAVCODEC_VERSION_MINOR >= 122)) + #define FFMPEG_HAVE_DEFAULT_VAL_UNION 1 + #endif + diff --git a/testing/blender/blender.install b/testing/blender/blender.install new file mode 100644 index 000000000..f4d7cc443 --- /dev/null +++ b/testing/blender/blender.install @@ -0,0 +1,17 @@ +post_install() { + update-desktop-database -q + update-mime-database usr/share/mime &> /dev/null + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + update-desktop-database -q + update-mime-database usr/share/mime &> /dev/null + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_remove() { + update-desktop-database -q + update-mime-database usr/share/mime &> /dev/null + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} diff --git a/testing/botan/PKGBUILD b/testing/botan/PKGBUILD new file mode 100644 index 000000000..2d05b70e8 --- /dev/null +++ b/testing/botan/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 128341 2011-06-23 05:31:14Z angvp $ +# Maintainer: Angel Velasquez <angvp@archlinux.org> +# Contributor: Douglas Soares de Andrade <douglas@archlinux.org> +# Contributor: d'Ronin <daronin@2600.com> +pkgname=botan +pkgver=1.10.0 +pkgrel=1 +pkgdesc="BSD-licensed crypto library written in C++" +license=('BSD') +arch=('i686' 'x86_64') +url="http://botan.randombit.net/" +depends=('gcc-libs' 'sh') +makedepends=('python2') +source=(http://files.randombit.net/botan/Botan-${pkgver}.tgz) +md5sums=('1f03a6a84f402a12e50665868dddae99') + +build() { + cd ${srcdir}/Botan-${pkgver} + sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' configure.py + ./configure.py --prefix=/usr + make +} + +package() { + cd ${srcdir}/Botan-${pkgver} + make DESTDIR=${pkgdir}/usr install +} + diff --git a/testing/cabal-install/PKGBUILD b/testing/cabal-install/PKGBUILD new file mode 100644 index 000000000..0529e034c --- /dev/null +++ b/testing/cabal-install/PKGBUILD @@ -0,0 +1,27 @@ +# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> +# Contributor: Arch Haskell Team <arch-haskell@haskell.org> +pkgname=cabal-install +pkgver=0.10.2 +pkgrel=1.1 +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=('ghc=7.0.3' 'haskell-http>=4000.1.1' 'haskell-zlib') +depends=('gmp' zlib) +options=('strip') +source=(http://hackage.haskell.org/packages/archive/cabal-install/$pkgver/cabal-install-$pkgver.tar.gz) + +build() { + cd $srcdir/cabal-install-$pkgver + runhaskell Setup configure --enable-shared --enable-split-objs --enable-executable-stripping --prefix=/usr + runhaskell Setup build +} + +package() { + cd $srcdir/cabal-install-$pkgver + runhaskell Setup copy --destdir=$pkgdir + install -D -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE +} + +md5sums=('bc906ef0bed79cbb33fdb36b73514281') diff --git a/testing/ghc/PKGBUILD b/testing/ghc/PKGBUILD index a526404af..9fddba6ca 100644 --- a/testing/ghc/PKGBUILD +++ b/testing/ghc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 120001 2011-04-18 09:44:35Z vesa $ +# $Id: PKGBUILD 128106 2011-06-22 10:54:11Z vesa $ # Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> # Special note for devs looking to upgrade this package: # ghc places a unique hash for each library when it is built. @@ -8,7 +8,7 @@ # do not carry version dependencies. You will have to remember to build them too. pkgname=ghc pkgver=7.0.3 -pkgrel=1 +pkgrel=2 pkgdesc="The Glasgow Haskell Compiler" arch=(i686 x86_64) url="http://www.haskell.org/ghc/" @@ -62,9 +62,6 @@ build() { cp $srcdir/build.mk mk/build.mk - # FS#17875 - sed -i 's/INSTALL_SHELL_WRAPPER = YES/INSTALL_SHELL_WRAPPER = NO/' utils/haddock/ghc.mk - ./configure --prefix=/usr make -j1 || return 1 } @@ -76,11 +73,7 @@ package() { install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/ghc/license install -d $pkgdir/usr/share/haskell - - rm $pkgdir/usr/bin/haddock } -md5sums=('946a18a0dc30437db72c0d3fdf26ca42' - '5a3e0880c80b1dcecf779ff2e63a9c0d') md5sums=('10bc5e9ae1b581404376efb85f260ff3' '5a3e0880c80b1dcecf779ff2e63a9c0d') diff --git a/testing/happy/PKGBUILD b/testing/happy/PKGBUILD new file mode 100644 index 000000000..d5303e80e --- /dev/null +++ b/testing/happy/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 128129 2011-06-22 11:27:01Z vesa $ +# Maintainer: simo <simo@archlinux.org> +# Contributor: Vesa Kaihlavirta <vegai@iki.fi> + +pkgname=happy +pkgver=1.18.6 +pkgrel=1.2 +pkgdesc="The Parser Generator for Haskell" +url="http://www.haskell.org/happy/" +arch=('i686' 'x86_64') +license=("custom:BSD3") +depends=(gmp) +makedepends=(ghc=7.0.3 haskell-mtl=2.0.1.0) +options=(strip) +source=(http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz) +md5sums=('7d4d1425f5068633cd477a2b2216880d') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + runhaskell Setup.lhs configure -O --prefix=/usr + runhaskell Setup.lhs build +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + runhaskell Setup.lhs copy --destdir="${pkgdir}" + install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} + diff --git a/testing/haskell-cgi/PKGBUILD b/testing/haskell-cgi/PKGBUILD index ebee2e82e..4b64ba578 100644 --- a/testing/haskell-cgi/PKGBUILD +++ b/testing/haskell-cgi/PKGBUILD @@ -4,12 +4,12 @@ _hkgname=cgi pkgname=haskell-cgi pkgver=3001.1.7.4 -pkgrel=3 +pkgrel=3.1 pkgdesc="A library for writing CGI programs" url="http://hackage.haskell.org/package/${_hkgname}" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=('ghc=7.0.2-2' 'haskell-mtl=2.0.1.0-2' 'haskell-network=2.3.0.2-2' 'haskell-parsec=3.1.1-2' 'haskell-xhtml=3000.2.0.1-7') +depends=('ghc=7.0.3-2' 'haskell-mtl=2.0.1.0-3.1' 'haskell-network=2.3.0.2-2.1' 'haskell-parsec=3.1.1-2.1' 'haskell-xhtml=3000.2.0.1-7.1') options=('strip') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) install=${pkgname}.install diff --git a/testing/haskell-deepseq/PKGBUILD b/testing/haskell-deepseq/PKGBUILD index b89f39f8b..934303f2b 100644 --- a/testing/haskell-deepseq/PKGBUILD +++ b/testing/haskell-deepseq/PKGBUILD @@ -4,12 +4,12 @@ _hkgname=deepseq pkgname=haskell-deepseq pkgver=1.1.0.2 -pkgrel=2 +pkgrel=2.1 pkgdesc="Fully evaluate data structures" url="http://hackage.haskell.org/package/${_hkgname}" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=(ghc=7.0.2-2 sh) +depends=(ghc=7.0.3-2 sh) options=('strip') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) install=${pkgname}.install diff --git a/testing/haskell-fgl/PKGBUILD b/testing/haskell-fgl/PKGBUILD index 4a866601d..45f466e91 100644 --- a/testing/haskell-fgl/PKGBUILD +++ b/testing/haskell-fgl/PKGBUILD @@ -2,20 +2,20 @@ _hkgname=fgl pkgname=haskell-fgl pkgver=5.4.2.3 -pkgrel=4 +pkgrel=4.1 pkgdesc="Martin Erwig's Functional Graph Library" url="http://hackage.haskell.org/package/${_hkgname}" license=('custom:BSD3') arch=('i686' 'x86_64') makedepends=() -depends=('ghc=7.0.2-2' 'haskell-mtl=2.0.1.0-2') +depends=('ghc=7.0.3-2' 'haskell-mtl=2.0.1.0-3.1') options=('strip') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) install=${pkgname}.install md5sums=('29ccab8bebed16a8d7346c3ed52c5d9c') build() { cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O --enable-split-objs --enable-shared \ + 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 diff --git a/testing/haskell-glut/PKGBUILD b/testing/haskell-glut/PKGBUILD index a42385959..98a30495c 100644 --- a/testing/haskell-glut/PKGBUILD +++ b/testing/haskell-glut/PKGBUILD @@ -2,13 +2,13 @@ _hkgname=GLUT pkgname=haskell-glut pkgver=2.1.2.1 -pkgrel=6 +pkgrel=7.1 pkgdesc="A binding for the OpenGL Utility Toolkit" url="http://hackage.haskell.org/package/${_hkgname}" license=('custom:BSD3') arch=('i686' 'x86_64') makedepends=() -depends=('ghc=7.0.2-2' 'haskell-opengl=2.2.3.0-6' 'freeglut') +depends=('ghc=7.0.3-2' 'haskell-opengl=2.2.3.0-7.1' 'freeglut') options=('strip') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) install=${pkgname}.install @@ -16,7 +16,7 @@ md5sums=('b97f476a04098701e330e86c1f89ed52') build() { cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O --enable-split-objs --enable-shared \ + 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 diff --git a/testing/haskell-haskell-src/PKGBUILD b/testing/haskell-haskell-src/PKGBUILD index 8b9340c4f..eeb4844a7 100644 --- a/testing/haskell-haskell-src/PKGBUILD +++ b/testing/haskell-haskell-src/PKGBUILD @@ -3,12 +3,12 @@ _hkgname=haskell-src pkgname=haskell-haskell-src pkgver=1.0.1.4 -pkgrel=2 +pkgrel=2.1 pkgdesc="Facilities for manipulating Haskell source code: an abstract syntax, lexer, parser and pretty-printer." url="http://hackage.haskell.org/package/${_hkgname}" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=('ghc=7.0.2-2' 'haskell-syb=0.3-2' sh) +depends=('ghc=7.0.3-2' 'haskell-syb=0.3-2.1' sh) makedepends=(happy) options=('strip') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz) diff --git a/testing/haskell-html/PKGBUILD b/testing/haskell-html/PKGBUILD index 10a04cbdf..1d207117e 100644 --- a/testing/haskell-html/PKGBUILD +++ b/testing/haskell-html/PKGBUILD @@ -4,12 +4,12 @@ _hkgname=html pkgname=haskell-html pkgver=1.0.1.2 -pkgrel=9 +pkgrel=9.1 pkgdesc="HTML combinator library" url="http://hackage.haskell.org/package/html" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=(ghc=7.0.2-2 sh) +depends=(ghc=7.0.3-2 sh) options=('strip') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) install=${pkgname}.install diff --git a/testing/haskell-http/PKGBUILD b/testing/haskell-http/PKGBUILD index 80fce6663..d1106c478 100644 --- a/testing/haskell-http/PKGBUILD +++ b/testing/haskell-http/PKGBUILD @@ -4,12 +4,12 @@ _hkgname=HTTP pkgname=haskell-http pkgver=4000.1.1 -pkgrel=3 +pkgrel=3.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.0.2-2' sh 'haskell-network=2.3.0.2-2' 'haskell-parsec=3.1.1-2' 'haskell-mtl=2.0.1.0-2') +depends=('ghc=7.0.3-2' sh 'haskell-network=2.3.0.2-2.1' 'haskell-parsec=3.1.1-2.1' 'haskell-mtl=2.0.1.0-3.1') options=('strip') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) install=${pkgname}.install diff --git a/testing/haskell-hunit/PKGBUILD b/testing/haskell-hunit/PKGBUILD index 634fd49f3..401887e4e 100644 --- a/testing/haskell-hunit/PKGBUILD +++ b/testing/haskell-hunit/PKGBUILD @@ -3,12 +3,12 @@ _hkgname=HUnit pkgname=haskell-hunit pkgver=1.2.2.3 -pkgrel=2 +pkgrel=2.1 pkgdesc="A unit testing framework for Haskell" url="http://hackage.haskell.org/package/${_hkgname}" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=(ghc=7.0.2-2 sh) +depends=(ghc=7.0.3-2 sh) options=('strip') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz) install=${pkgname}.install diff --git a/testing/haskell-mtl/PKGBUILD b/testing/haskell-mtl/PKGBUILD index ea29d2633..e0ee184de 100644 --- a/testing/haskell-mtl/PKGBUILD +++ b/testing/haskell-mtl/PKGBUILD @@ -3,12 +3,12 @@ _hkgname=mtl pkgname=haskell-mtl pkgver=2.0.1.0 -pkgrel=2 +pkgrel=3.1 pkgdesc="Monad transformer library" url="http://hackage.haskell.org/package/${_hkgname}" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=(ghc=7.0.2-2 sh 'haskell-transformers=0.2.2.0-2') +depends=(ghc=7.0.3-2 sh 'haskell-transformers=0.2.2.0-3.1') options=('strip') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz) install=${pkgname}.install diff --git a/testing/haskell-network/PKGBUILD b/testing/haskell-network/PKGBUILD index 685e5fe2b..372cdf623 100644 --- a/testing/haskell-network/PKGBUILD +++ b/testing/haskell-network/PKGBUILD @@ -4,12 +4,12 @@ _hkgname=network pkgname=haskell-network pkgver=2.3.0.2 -pkgrel=2 +pkgrel=2.1 pkgdesc="Networking-related facilities" url="http://hackage.haskell.org/package/network" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=(ghc=7.0.2-2 sh 'haskell-parsec=3.1.1-2') +depends=(ghc=7.0.3-2 sh 'haskell-parsec=3.1.1-2.1') options=('strip') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) install=${pkgname}.install diff --git a/testing/haskell-opengl/PKGBUILD b/testing/haskell-opengl/PKGBUILD index a45b3f303..8d70bbc91 100644 --- a/testing/haskell-opengl/PKGBUILD +++ b/testing/haskell-opengl/PKGBUILD @@ -2,20 +2,20 @@ _hkgname=OpenGL pkgname=haskell-opengl pkgver=2.2.3.0 -pkgrel=6 +pkgrel=7.1 pkgdesc="A binding for the OpenGL graphics system" url="http://hackage.haskell.org/package/${_hkgname}" license=('custom:BSD3') arch=('i686' 'x86_64') -makedepends=() -depends=('ghc=7.0.2-2' 'mesa') +depends=('ghc=7.0.3-2' 'mesa') options=('strip') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) install=${pkgname}.install md5sums=('f4e3ccb471034a6a74921d4dab9dd32d') + build() { cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O --enable-split-objs --enable-shared \ + 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 diff --git a/testing/haskell-parallel/PKGBUILD b/testing/haskell-parallel/PKGBUILD index 1191611e8..0e46c2c93 100644 --- a/testing/haskell-parallel/PKGBUILD +++ b/testing/haskell-parallel/PKGBUILD @@ -4,12 +4,12 @@ _hkgname=parallel pkgname=haskell-parallel pkgver=3.1.0.1 -pkgrel=3 +pkgrel=3.1 pkgdesc="Parallel programming library" url="http://hackage.haskell.org/package/${_hkgname}" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=(ghc=7.0.2-2 sh 'haskell-deepseq=1.1.0.2-2') +depends=(ghc=7.0.3-2 sh 'haskell-deepseq=1.1.0.2-2.1') options=('strip') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz) install=${pkgname}.install diff --git a/testing/haskell-parsec/PKGBUILD b/testing/haskell-parsec/PKGBUILD index 516621979..0810df75b 100644 --- a/testing/haskell-parsec/PKGBUILD +++ b/testing/haskell-parsec/PKGBUILD @@ -4,12 +4,12 @@ _hkgname=parsec pkgname=haskell-parsec pkgver=3.1.1 -pkgrel=2 +pkgrel=2.1 pkgdesc="Monadic parser combinators" url="http://hackage.haskell.org/package/${_hkgname}" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=(ghc=7.0.2-2 sh 'haskell-mtl=2.0.1.0-2') +depends=(ghc=7.0.3-2 sh 'haskell-mtl=2.0.1.0-3.1') options=('strip') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) install=${pkgname}.install diff --git a/testing/haskell-platform/PKGBUILD b/testing/haskell-platform/PKGBUILD index 0b6c908d2..2534d95c2 100644 --- a/testing/haskell-platform/PKGBUILD +++ b/testing/haskell-platform/PKGBUILD @@ -1,39 +1,38 @@ # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> pkgname=haskell-platform pkgver=2011.2.0.0 -pkgrel=3 +pkgrel=4 pkgdesc="The Haskell Platform" url="http://hackage.haskell.org/platform/" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=('ghc=7.0.2-2' - 'haskell-glut=2.1.2.1-6' - 'haskell-http=4000.1.1-3' - 'haskell-hunit=1.2.2.3-2' - 'haskell-opengl=2.2.3.0-6' - 'haskell-quickcheck=2.4.0.1-3' - 'haskell-cgi=3001.1.7.4-3' - 'haskell-deepseq=1.1.0.2-2' - 'haskell-fgl=5.4.2.3-4' - 'haskell-haskell-src=1.0.1.4-2' - 'haskell-html=1.0.1.2-9' - 'haskell-mtl=2.0.1.0-2' - 'haskell-network=2.3.0.2-2' - 'haskell-parallel=3.1.0.1-3' - 'haskell-parsec=3.1.1-2' - 'haskell-regex-base=0.93.2-4' - 'haskell-regex-compat=0.93.1-4' - 'haskell-regex-posix=0.94.4-2' - 'haskell-stm=2.2.0.1-2' - 'haskell-syb=0.3-2' - 'haskell-text=0.11.0.5-2' - 'haskell-transformers=0.2.2.0-2' - 'haskell-xhtml=3000.2.0.1-7' - 'haskell-zlib=0.5.3.1-2' +depends=('ghc=7.0.3-2' + 'haskell-glut=2.1.2.1-7.1' + 'haskell-http=4000.1.1-3.1' + 'haskell-hunit=1.2.2.3-2.1' + 'haskell-opengl=2.2.3.0-7.1' + 'haskell-quickcheck=2.4.0.1-3.1' + 'haskell-cgi=3001.1.7.4-3.1' + 'haskell-deepseq=1.1.0.2-2.1' + 'haskell-fgl=5.4.2.3-4.1' + 'haskell-haskell-src=1.0.1.4-2.1' + 'haskell-html=1.0.1.2-9.1' + 'haskell-mtl=2.0.1.0-3.1' + 'haskell-network=2.3.0.2-2.1' + 'haskell-parallel=3.1.0.1-3.1' + 'haskell-parsec=3.1.1-2.1' + 'haskell-regex-base=0.93.2-4.1' + 'haskell-regex-posix=0.94.4-2.1' + 'haskell-regex-compat=0.93.1-4.1' + 'haskell-stm=2.2.0.1-2.1' + 'haskell-syb=0.3-2.1' + 'haskell-text=0.11.0.5-2.1' + 'haskell-transformers=0.2.2.0-3.1' + 'haskell-xhtml=3000.2.0.1-7.1' + 'haskell-zlib=0.5.3.1-2.1' 'cabal-install=0.10.2' 'alex=2.3.5' - 'happy=1.18.6' - 'haddock=2.9.2') + 'happy=1.18.6' ) build() { return 0 diff --git a/testing/haskell-quickcheck/PKGBUILD b/testing/haskell-quickcheck/PKGBUILD index 3da28a0cb..ab05c75f7 100644 --- a/testing/haskell-quickcheck/PKGBUILD +++ b/testing/haskell-quickcheck/PKGBUILD @@ -4,12 +4,12 @@ _hkgname=QuickCheck pkgname=haskell-quickcheck pkgver=2.4.0.1 -pkgrel=3 +pkgrel=3.1 pkgdesc="Automatic testing of Haskell programs" url="http://hackage.haskell.org/package/QuickCheck" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=(ghc=7.0.2-2 haskell-mtl=2.0.1.0-2 sh) +depends=(ghc=7.0.3-2 haskell-mtl=2.0.1.0-3.1 sh) options=('strip') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz) install=${pkgname}.install diff --git a/testing/haskell-regex-base/PKGBUILD b/testing/haskell-regex-base/PKGBUILD index a28c3daa0..57721d39b 100644 --- a/testing/haskell-regex-base/PKGBUILD +++ b/testing/haskell-regex-base/PKGBUILD @@ -3,12 +3,12 @@ _hkgname=regex-base pkgname=haskell-regex-base pkgver=0.93.2 -pkgrel=4 +pkgrel=4.1 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=('i686' 'x86_64') -depends=(ghc=7.0.2-2 sh 'haskell-mtl=2.0.1.0-2') +depends=(ghc=7.0.3-2 sh 'haskell-mtl=2.0.1.0-3.1') options=('strip') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz) install=${pkgname}.install diff --git a/testing/haskell-regex-compat/PKGBUILD b/testing/haskell-regex-compat/PKGBUILD index b0778ac42..507a96618 100644 --- a/testing/haskell-regex-compat/PKGBUILD +++ b/testing/haskell-regex-compat/PKGBUILD @@ -3,12 +3,12 @@ _hkgname=regex-compat pkgname=haskell-regex-compat pkgver=0.93.1 -pkgrel=4 +pkgrel=4.1 pkgdesc="Replaces and enhances Text.Regex" url="http://hackage.haskell.org/package/${_hkgname}" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=(ghc=7.0.2-2 sh 'haskell-regex-base=0.93.2-4' 'haskell-regex-posix=0.94.4-2') +depends=(ghc=7.0.3-2 sh 'haskell-regex-base=0.93.2-4.1' 'haskell-regex-posix=0.94.4-2.1') options=('strip') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) install=${pkgname}.install diff --git a/testing/haskell-regex-posix/PKGBUILD b/testing/haskell-regex-posix/PKGBUILD index 69f3773d6..3b00616eb 100644 --- a/testing/haskell-regex-posix/PKGBUILD +++ b/testing/haskell-regex-posix/PKGBUILD @@ -3,12 +3,12 @@ _hkgname=regex-posix pkgname=haskell-regex-posix pkgver=0.94.4 -pkgrel=2 +pkgrel=2.1 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.0.2-2 sh 'haskell-regex-base=0.93.2-4') +depends=(ghc=7.0.3-2 sh 'haskell-regex-base=0.93.2-4.1') options=('strip') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) install=${pkgname}.install diff --git a/testing/haskell-stm/PKGBUILD b/testing/haskell-stm/PKGBUILD index 5f3a97ed7..9a9c9a962 100644 --- a/testing/haskell-stm/PKGBUILD +++ b/testing/haskell-stm/PKGBUILD @@ -4,12 +4,12 @@ _hkgname=stm pkgname=haskell-stm pkgver=2.2.0.1 -pkgrel=2 +pkgrel=2.1 pkgdesc="A modular composable concurrency abstraction." url="http://hackage.haskell.org/package/stm" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=(ghc=7.0.2-2 sh) +depends=(ghc=7.0.3-2 sh) options=('strip') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz) install=${pkgname}.install diff --git a/testing/haskell-syb/PKGBUILD b/testing/haskell-syb/PKGBUILD index f90006a56..64faf05ed 100644 --- a/testing/haskell-syb/PKGBUILD +++ b/testing/haskell-syb/PKGBUILD @@ -3,12 +3,12 @@ _hkgname=syb pkgname=haskell-syb pkgver=0.3 -pkgrel=2 +pkgrel=2.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.0.2-2' sh) +depends=('ghc=7.0.3-2' sh) options=('strip') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) install=${pkgname}.install diff --git a/testing/haskell-text/PKGBUILD b/testing/haskell-text/PKGBUILD index e60891918..7dbc1ce17 100644 --- a/testing/haskell-text/PKGBUILD +++ b/testing/haskell-text/PKGBUILD @@ -3,12 +3,12 @@ _hkgname=text pkgname=haskell-text pkgver=0.11.0.5 -pkgrel=2 +pkgrel=2.1 pkgdesc="An efficient packed Unicode text type." url="http://hackage.haskell.org/package/${_hkgname}" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=('ghc=7.0.2-2' sh 'haskell-deepseq=1.1.0.2-2') +depends=('ghc=7.0.3-2' sh 'haskell-deepseq=1.1.0.2-2.1') options=('strip') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) install=${pkgname}.install diff --git a/testing/haskell-transformers/PKGBUILD b/testing/haskell-transformers/PKGBUILD index c14b2eecc..446b2ffca 100644 --- a/testing/haskell-transformers/PKGBUILD +++ b/testing/haskell-transformers/PKGBUILD @@ -1,15 +1,15 @@ # Maintainer: Rémy Oudompheng <remy@archlinux.org> -# $Id: PKGBUILD 115140 2011-03-17 09:11:21Z vesa $ +# $Id: PKGBUILD 128119 2011-06-22 11:19:38Z vesa $ _hkgname=transformers pkgname=haskell-transformers pkgver=0.2.2.0 -pkgrel=2 +pkgrel=3.1 pkgdesc="Concrete functor and monad transformers" url="http://hackage.haskell.org/package/${_hkgname}" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=(ghc=7.0.2-2 sh) +depends=(ghc=7.0.3-2 sh) options=('strip') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz) install=${pkgname}.install diff --git a/testing/haskell-xhtml/PKGBUILD b/testing/haskell-xhtml/PKGBUILD index 63abbbb64..4a34206ad 100644 --- a/testing/haskell-xhtml/PKGBUILD +++ b/testing/haskell-xhtml/PKGBUILD @@ -4,12 +4,12 @@ _hkgname=xhtml pkgname=haskell-xhtml pkgver=3000.2.0.1 -pkgrel=7 +pkgrel=7.1 pkgdesc="Combinators for producing XHTML 1.0, including the Strict, Transitional and Frameset variants." url="http://hackage.haskell.org/package/xhtml" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=(ghc=7.0.2-2 sh) +depends=(ghc=7.0.3-2 sh) options=('strip') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz) install=${pkgname}.install diff --git a/testing/haskell-zlib/PKGBUILD b/testing/haskell-zlib/PKGBUILD index 7aca7312b..22a9eb932 100644 --- a/testing/haskell-zlib/PKGBUILD +++ b/testing/haskell-zlib/PKGBUILD @@ -4,12 +4,12 @@ _hkgname=zlib pkgname=haskell-zlib pkgver=0.5.3.1 -pkgrel=2 +pkgrel=2.1 pkgdesc="Compression and decompression in the gzip and zlib formats" url="http://hackage.haskell.org/package/zlib" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=(ghc=7.0.2-2 'zlib' sh) +depends=(ghc=7.0.3-2 'zlib' sh) options=('strip') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) install=${pkgname}.install diff --git a/testing/libreoffice/0001-fix-configure-without-the-optional-translations-modu.patch b/testing/libreoffice/0001-fix-configure-without-the-optional-translations-modu.patch new file mode 100644 index 000000000..31ad95d36 --- /dev/null +++ b/testing/libreoffice/0001-fix-configure-without-the-optional-translations-modu.patch @@ -0,0 +1,31 @@ +From 900baff9ff400a6eba034089ed69362c2c2d61e4 Mon Sep 17 00:00:00 2001 +From: Petr Mladek <pmladek@suse.cz> +Date: Wed, 22 Jun 2011 12:05:19 +0200 +Subject: [PATCH] fix configure without the optional translations module + +--- + set_soenv.in | 8 +++++--- + 1 files changed, 5 insertions(+), 3 deletions(-) + +diff --git a/set_soenv.in b/set_soenv.in +index f015bab..8e39314 100755 +--- a/set_soenv.in ++++ b/set_soenv.in +@@ -1068,9 +1068,11 @@ $XCLASSPATH = '$JAVA_HOME'.$ds.'jre'.$LIB.$ds."rt.jar".$wps.'.'; + $L10N_MODULE = PathFormat($SRC_ROOT."/translations"); + + # Check for poor help localizations, i.e. no help translation at all... +-opendir(DIR,$L10N_MODULE . "/source"); +-@languages = readdir(DIR); +-closedir(DIR); ++@languages=(); ++if (opendir(DIR,$L10N_MODULE . "/source")) ++{ @languages = readdir(DIR); ++ closedir(DIR); ++} + $WITH_POOR_HELP_LOCALIZATIONS = ""; + + foreach $language (@languages) +-- +1.7.3.4 + diff --git a/testing/libreoffice/PKGBUILD b/testing/libreoffice/PKGBUILD index 7ffa3b42e..646192a73 100644 --- a/testing/libreoffice/PKGBUILD +++ b/testing/libreoffice/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 127521 2011-06-15 18:45:39Z andyrtr $ +# $Id: PKGBUILD 128395 2011-06-23 18:37:12Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> pkgbase="libreoffice" @@ -24,8 +24,8 @@ pkgname=('libreoffice' 'libreoffice-sdk' 'libreoffice-extension-validator' 'libreoffice-extension-watch-window' 'libreoffice-extension-wiki-publisher') -_LOver=3.4.1.1 -pkgver=3.4.1rc1 +_LOver=3.4.1.2 +pkgver=3.4.1rc2 pkgrel=1 arch=('i686' 'x86_64') #_LO_tree="3.4" @@ -47,8 +47,8 @@ makedepends=( # makedepends # translate-toolkit - todo move them to extra to allow --with-system-foo builds # http://download.documentfoundation.org/mirrors/all.html # http://wiki.documentfoundation.org/Mirrors -_mirror="http://download.documentfoundation.org/libreoffice/src" -#_mirror="http://dev-builds.libreoffice.org/pre-releases/src/" +#_mirror="http://download.documentfoundation.org/libreoffice/src" +_mirror="http://dev-builds.libreoffice.org/pre-releases/src/" _additional_source_url="http://hg.services.openoffice.org/binaries" source=(${_mirror}/${pkgbase}-{artwork,base,bootstrap,calc,components,extensions,extras,filters,help,impress,libs-core,libs-extern,libs-extern-sys,libs-gui,postprocess,sdk,testing,ure,writer}-${_LOver}.tar.bz2 #,translations ${_additional_source_url}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz @@ -92,7 +92,8 @@ source=(${_mirror}/${pkgbase}-{artwork,base,bootstrap,calc,components,extensions http://ooo.itc.hu/oxygenoffice/download/libreoffice/b7b2d0e04e142f26dd96119c80757d1f-oooblogger_0.1.oxt buildfix_boost.diff buildfix_ct2n.diff - vbahelper.visibility.patch) + vbahelper.visibility.patch + 0001-fix-configure-without-the-optional-translations-modu.patch) noextract=(185d60944ea767075d27247c3162b3bc-unowinreg.dll b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2 7a0dcb3fe1e8c7229ab4fb868b7325e6-mdds_0.5.2.tar.bz2 @@ -131,25 +132,25 @@ noextract=(185d60944ea767075d27247c3162b3bc-unowinreg.dll b7b2d0e04e142f26dd96119c80757d1f-oooblogger_0.1.oxt 90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2 f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2) -md5sums=('a21bbbc0cf9b482a78357b7b6132e799' - 'd9ccdb2b53de8e16d7bb3215b9e97d7a' - 'd3aa4a8e05f8b5c3ccf4f945b82b32a2' - 'eb03b6627f2a2240eca089c925692259' - '190c9b25a7193b7ca98d6f6d09cd20d2' - '45b632fb71b123b699c9e89f9db6632a' - '19b3e65676e8e8839a4dd884a74e83e4' - '79a955fd38d0eedca7db146c5a985041' - '9b9b80ff14a3c6f430cc1fee4551c53e' - 'c592798d08cccfb14f6cda95eb542d7b' - '1f98cbec964a9563b72962c943af3545' - '01aa850fa07e4440706dcea0def5c27a' - '9765abf75b58c5dbdf82a953af8c6de4' - '1f07e271d64606116c84c7adbc90a324' - '877cf0733c202936f8b918b9ad423f0d' - '231f5a392ab78167a5a7ab7bc922a421' - '9452301d1eee5fc3bb4758e003829075' - '1bc390b972bbe27f513956af37e60538' - '974b73ed0add1d6e325b9da4e3ca5c5d' +md5sums=('f38317f991b1c253c416c67be7c3754d' + 'aa0d333b2eeca843c55cd4fafb77cda4' + '571a1d550c7d2d0ae80d712611447f71' + '30794ddc83d1c2e79564f0788f09186a' + '6887bf7d9badf0f0822a0c85261b4679' + '5b9891c11e79a6131763c0131a5c442e' + '3b91cbeaa68f22b5c017cd5f3919c070' + '5578f0dc49d092c57285e3bf3a311702' + '117fc2edb8c0765d0d39dba2ed910ea7' + '6e7b4efe196c44519d0d438c5a65bd92' + '44eddc7cd60a61a347694aa9a1988c28' + '361d32db4b08954fd210219e2fcc45d8' + '793ceaf4c7af5bbcfd0b8feb369d1f54' + '58177e2ff875c494f08490b061171669' + '43d7f4910b01a826ea97f63af4bdb36c' + '852c34e284cddf499d80957e7c994da5' + '281fe1792a84129e33853ba3fea4d378' + 'cc2553bf6be74f818f2e9ad7178bef92' + 'fe8fb18f2d4e4a37a4c23bc59f7a730c' '1f24ab1d39f4a51faf22244c94a6203f' '35c94d2df8893241173de1d16b6034c0' '798b2ffdc8bcfe7bca2cf92b62caf685' @@ -191,7 +192,8 @@ md5sums=('a21bbbc0cf9b482a78357b7b6132e799' 'b7b2d0e04e142f26dd96119c80757d1f' 'bc228237108cab7745897a9f466b6d39' 'eee273f501ff45dc5f1365e78c6d57c0' - '43b145db28e6c0d73578ae6fd35e510d') + '43b145db28e6c0d73578ae6fd35e510d' + 'f8a8fdcc58f50560fbc266e28efdbbfe') build() { @@ -218,6 +220,7 @@ build() { patch -Np1 -i ${srcdir}/buildfix_boost.diff patch -Np1 -i ${srcdir}/buildfix_ct2n.diff patch -Np0 -i ${srcdir}/vbahelper.visibility.patch + patch -Np1 -i ${srcdir}/0001-fix-configure-without-the-optional-translations-modu.patch # unset C(XX)FLAGS # http://www.openoffice.org/issues/show_bug.cgi?id=103205 @@ -467,7 +470,7 @@ package_libreoffice-sdk() { sed -i -e "s,@OO_SDK_NAME@,libreoffice-sdk," \ -e "s,@OO_SDK_HOME@,/usr/lib/libreoffice/basis3.4/sdk," \ -e "s,@OFFICE_HOME@,/usr/lib/libreoffice," \ - -e "s,@OFFICE_BASE_HOME@,/usr/lib/libreoffice," \ + -e "s,@OFFICE_BASE_HOME@,/usr/lib/libreoffice/basis3.4," \ -e "s,@OO_SDK_URE_HOME@,/usr/lib/libreoffice/ure," \ -e "s,@OO_SDK_MAKE_HOME@,/usr/bin," \ -e "s,@OO_SDK_ZIP_HOME@,/usr/bin," \ diff --git a/testing/perl/0001-Append-CFLAGS-and-LDFLAGS-to-their-Config.pm-counter.patch b/testing/perl/0001-Append-CFLAGS-and-LDFLAGS-to-their-Config.pm-counter.patch new file mode 100644 index 000000000..1404460df --- /dev/null +++ b/testing/perl/0001-Append-CFLAGS-and-LDFLAGS-to-their-Config.pm-counter.patch @@ -0,0 +1,83 @@ +From bb249b0b26c2e79a6f55355ef94889070f07fd21 Mon Sep 17 00:00:00 2001 +From: Niko Tyni <ntyni@debian.org> +Date: Thu, 28 Apr 2011 09:18:54 +0300 +Subject: [PATCH] Append CFLAGS and LDFLAGS to their Config.pm counterparts in + EU::CBuilder + +Since ExtUtils::CBuilder 0.27_04 (bleadperl commit 06e8058f27e4), +CFLAGS and LDFLAGS from the environment have overridden the Config.pm +ccflags and ldflags settings. This can cause binary incompatibilities +between the core Perl and extensions built with EU::CBuilder. + +Append to the Config.pm values rather than overriding them. +--- + .../lib/ExtUtils/CBuilder/Base.pm | 6 +++- + dist/ExtUtils-CBuilder/t/04-base.t | 25 +++++++++++++++++++- + 2 files changed, 28 insertions(+), 3 deletions(-) + +diff --git a/dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Base.pm b/dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Base.pm +index b572312..2255c51 100644 +--- a/dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Base.pm ++++ b/dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Base.pm +@@ -40,11 +40,13 @@ sub new { + $self->{config}{$k} = $v unless exists $self->{config}{$k}; + } + $self->{config}{cc} = $ENV{CC} if defined $ENV{CC}; +- $self->{config}{ccflags} = $ENV{CFLAGS} if defined $ENV{CFLAGS}; ++ $self->{config}{ccflags} = join(" ", $self->{config}{ccflags}, $ENV{CFLAGS}) ++ if defined $ENV{CFLAGS}; + $self->{config}{cxx} = $ENV{CXX} if defined $ENV{CXX}; + $self->{config}{cxxflags} = $ENV{CXXFLAGS} if defined $ENV{CXXFLAGS}; + $self->{config}{ld} = $ENV{LD} if defined $ENV{LD}; +- $self->{config}{ldflags} = $ENV{LDFLAGS} if defined $ENV{LDFLAGS}; ++ $self->{config}{ldflags} = join(" ", $self->{config}{ldflags}, $ENV{LDFLAGS}) ++ if defined $ENV{LDFLAGS}; + + unless ( exists $self->{config}{cxx} ) { + my ($ccpath, $ccbase, $ccsfx ) = fileparse($self->{config}{cc}, qr/\.[^.]*/); +diff --git a/dist/ExtUtils-CBuilder/t/04-base.t b/dist/ExtUtils-CBuilder/t/04-base.t +index c3bf6b5..1bb15aa 100644 +--- a/dist/ExtUtils-CBuilder/t/04-base.t ++++ b/dist/ExtUtils-CBuilder/t/04-base.t +@@ -1,7 +1,7 @@ + #! perl -w + + use strict; +-use Test::More tests => 50; ++use Test::More tests => 64; + use Config; + use Cwd; + use File::Path qw( mkpath ); +@@ -326,6 +326,29 @@ is_deeply( $mksymlists_args, + "_prepare_mksymlists_args(): got expected arguments for Mksymlists", + ); + ++my %testvars = ( ++ CFLAGS => 'ccflags', ++ LDFLAGS => 'ldflags', ++); ++ ++while (my ($VAR, $var) = each %testvars) { ++ local $ENV{$VAR}; ++ $base = ExtUtils::CBuilder::Base->new( quiet => 1 ); ++ ok( $base, "ExtUtils::CBuilder::Base->new() returned true value" ); ++ isa_ok( $base, 'ExtUtils::CBuilder::Base' ); ++ like($base->{config}{$var}, qr/\Q$Config{$var}/, ++ "honours $var from Config.pm"); ++ ++ $ENV{$VAR} = "-foo -bar"; ++ $base = ExtUtils::CBuilder::Base->new( quiet => 1 ); ++ ok( $base, "ExtUtils::CBuilder::Base->new() returned true value" ); ++ isa_ok( $base, 'ExtUtils::CBuilder::Base' ); ++ like($base->{config}{$var}, qr/\Q$ENV{$VAR}/, ++ "honours $VAR from the environment"); ++ like($base->{config}{$var}, qr/\Q$Config{$var}/, ++ "doesn't override $var from Config.pm with $VAR from the environment"); ++} ++ + ##### + + for ($source_file, $object_file, $lib_file) { +-- +1.7.4.4 + diff --git a/testing/perl/ChangeLog b/testing/perl/ChangeLog index fd53c2560..9add39e20 100644 --- a/testing/perl/ChangeLog +++ b/testing/perl/ChangeLog @@ -1,3 +1,8 @@ +2011-06-22 Angel Velasquez <angvp@archlinux.org> + * Added a patch for ExtUtils doesnt overwrite CFLAGS and LDFLAGS + * Fixed #FS22197, FS#22441, FS#24767 + * Rebuilt perl 5.14.1-2 against db 5.2.28 + 2011-06-16 Angel Velasquez <angvp@archlinux.org> * Fixed #FS24660 * Rebuilt against db 5.2.28 diff --git a/testing/perl/PKGBUILD b/testing/perl/PKGBUILD index b00377dc1..8f6af76c0 100644 --- a/testing/perl/PKGBUILD +++ b/testing/perl/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 127611 2011-06-17 06:29:52Z angvp $ +# $Id: PKGBUILD 128400 2011-06-23 21:11:34Z angvp $ # Maintainer: Angel Velasquez <angvp@archlinux.org> # Contributor: kevin <kevin.archlinux.org> # Contributor: judd <jvinet.zeroflux.org> # Contributor: francois <francois.archlinux.org> pkgname=perl -pkgver=5.14.0 -pkgrel=2 +pkgver=5.14.1 +pkgrel=1 pkgdesc="A highly capable, feature-rich programming language" arch=(i686 x86_64) license=('GPL' 'PerlArtistic') @@ -13,11 +13,16 @@ url="http://www.perl.org" groups=('base') depends=('gdbm' 'db' 'coreutils' 'glibc' 'sh') changelog=ChangeLog -source=(http://www.cpan.org/src/5.0/perl-${pkgver}.tar.bz2 perlbin.sh) +source=(http://www.cpan.org/src/5.0/perl-${pkgver}.tar.bz2 +perlbin.sh +perlbin.csh +0001-Append-CFLAGS-and-LDFLAGS-to-their-Config.pm-counter.patch) install=perl.install options=('!makeflags' '!purge') -md5sums=('e7457deea78330c5f8eebb2fd2a45479' - 'f86eb0dba1638ca6d1c8fff1b06c2a71') +md5sums=('97cd306a2c22929cc141a09568f43bb0' + '5ed2542fdb9a60682f215bd33701e61a' + 'd76445605c49886c77734446247e439d' + 'c25d86206d649046538c3daab7874564') build() { cd ${srcdir}/${pkgname}-${pkgver} @@ -41,7 +46,9 @@ build() { -Dsitescript=/usr/bin/site_perl \ -Dvendorscript=/usr/bin/vendor_perl \ -Dinc_version_list=none \ - -Dman1ext=1perl -Dman3ext=3perl ${arch_opts} + -Dman1ext=1perl -Dman3ext=3perl ${arch_opts} \ + -Dlddlflags="-shared ${LDFLAGS}" -Dldflags="${LDFLAGS}" + patch -Np1 -i $srcdir/0001-Append-CFLAGS-and-LDFLAGS-to-their-Config.pm-counter.patch make } package() { @@ -68,9 +75,12 @@ package() { -e "/{'buildflags'}/ s/'';/'installdirs=site';/" \ -i ${pkgdir}/usr/share/perl5/core_perl/CPANPLUS/Config.pm - # Profile script so set paths to perl scripts. + # Profile script to set paths to perl scripts. install -D -m755 ${srcdir}/perlbin.sh \ ${pkgdir}/etc/profile.d/perlbin.sh + # Profile script to set paths to perl scripts on csh. (FS#22441) + install -D -m755 ${srcdir}/perlbin.csh \ + ${pkgdir}/etc/profile.d/perlbin.csh (cd ${pkgdir}/usr/bin; mv perl${pkgver} perl) (cd ${pkgdir}/usr/bin/core_perl; ln -sf c2ph pstruct; ln -sf s2p psed) @@ -91,4 +101,3 @@ package() { install -dv ${pkgdir}/etc/ld.so.conf.d echo "/usr/lib/perl5/core_perl/CORE" > ${pkgdir}/etc/ld.so.conf.d/perl.conf } - diff --git a/testing/perl/perlbin.csh b/testing/perl/perlbin.csh new file mode 100644 index 000000000..cc0d5d553 --- /dev/null +++ b/testing/perl/perlbin.csh @@ -0,0 +1,17 @@ +# Set path to perl scriptdirs if they exist +# https://wiki.archlinux.org/index.php/Perl_Policy#Binaries_and_Scripts +# Added /usr/bin/*_perl dirs for scripts +# Remove /usr/lib/perl5/*_perl/bin in next release + +[ -d /usr/bin/site_perl ] && setenv PATH ${PATH}:/usr/bin/site_perl +[ -d /usr/lib/perl5/site_perl/bin ] && setenv PATH +${PATH}:/usr/lib/perl5/site_perl/bin + +[ -d /usr/bin/vendor_perl ] && setenv PATH ${PATH}:/usr/bin/vendor_perl +[ -d /usr/lib/perl5/vendor_perl/bin ] && setenv PATH +${PATH}:/usr/lib/perl5/vendor_perl/bin + +[ -d /usr/bin/core_perl ] && setenv PATH ${PATH}:/usr/bin/core_perl + +# If you have modules in non-standard directories you can add them here. +#export PERLLIB=dir1:dir2 diff --git a/testing/perl/perlbin.sh b/testing/perl/perlbin.sh index 09811a8b4..20f830436 100755 --- a/testing/perl/perlbin.sh +++ b/testing/perl/perlbin.sh @@ -3,18 +3,13 @@ # Added /usr/bin/*_perl dirs for scripts # Remove /usr/lib/perl5/*_perl/bin in next release -[ -d /usr/bin/site_perl ] && - PATH=$PATH:/usr/bin/site_perl -[ -d /usr/lib/perl5/site_perl/bin ] && - PATH=$PATH:/usr/lib/perl5/site_perl/bin +[ -d /usr/bin/site_perl ] && PATH=$PATH:/usr/bin/site_perl +[ -d /usr/lib/perl5/site_perl/bin ] && PATH=$PATH:/usr/lib/perl5/site_perl/bin -[ -d /usr/bin/vendor_perl ] && - PATH=$PATH:/usr/bin/vendor_perl -[ -d /usr/lib/perl5/vendor_perl/bin ] && - PATH=$PATH:/usr/lib/perl5/vendor_perl/bin +[ -d /usr/bin/vendor_perl ] && PATH=$PATH:/usr/bin/vendor_perl +[ -d /usr/lib/perl5/vendor_perl/bin ] && PATH=$PATH:/usr/lib/perl5/vendor_perl/bin -[ -d /usr/bin/core_perl ] && - PATH=$PATH:/usr/bin/core_perl +[ -d /usr/bin/core_perl ] && PATH=$PATH:/usr/bin/core_perl export PATH diff --git a/testing/spamassassin/PKGBUILD b/testing/spamassassin/PKGBUILD index 6b97ea8c1..c84fcb803 100644 --- a/testing/spamassassin/PKGBUILD +++ b/testing/spamassassin/PKGBUILD @@ -1,10 +1,9 @@ -# $Id: PKGBUILD 125325 2011-05-25 21:40:50Z remy $ +# $Id: PKGBUILD 128413 2011-06-23 22:14:04Z angvp $ # Maintainer: Dale Blount <dale@archlinux.org> # Contributor: Manolis Tzanidakis - pkgname=spamassassin -pkgver=3.3.1 -pkgrel=5 +pkgver=3.3.2 +pkgrel=1 pkgdesc="A mail filter to identify spam." arch=(i686 x86_64) license=(APACHE) @@ -16,8 +15,9 @@ depends=('perl>=5.14' 'perl-net-dns' 'perl-uri' 'perl-html-parser' \ # perl-archive-tar perl-io-zlib) makedepends=('razor' 'perl-dbi') optdepends=('razor: to identify collaborately-flagged spam' - 'gnupg: gpg support, without this use --nogpg flag for sa-update' - 're2c: regexp compiler, for compiling rules with sa-compile') + 'gnupg: gpg support, without this use --nogpg flag for sa-update' + 're2c: regexp compiler, for compiling rules with sa-compile' + 'dkim: DomainKeys Identified Mail (DKIM) checking') backup=(etc/conf.d/spamd etc/mail/spamassassin/local.cf \ etc/mail/spamassassin/init.pre \ etc/mail/spamassassin/v310.pre \ @@ -27,7 +27,7 @@ install=${pkgname}.install options=(!emptydirs) source=(http://mirrors.devlib.org/apache/${pkgname}/source/Mail-SpamAssassin-${pkgver}.tar.gz \ spamd.conf.d spamd) -md5sums=('5a93f81fda315411560ff5da099382d2' +md5sums=('d1d62cc5c6eac57e88c4006d9633b81e' 'af501c6b0bb937a2775b747cc4b6d150' '0534d3071a526a27ddc2b297afa03b04') diff --git a/~fauno/transmission-remote-cli-git/PKGBUILD b/~fauno/transmission-remote-cli-git/PKGBUILD new file mode 100644 index 000000000..3e513edd7 --- /dev/null +++ b/~fauno/transmission-remote-cli-git/PKGBUILD @@ -0,0 +1,48 @@ +# Maintainer: fauno <fauno@kiwwwi.com.ar> +pkgname=transmission-remote-cli-git +pkgver=20110623 +pkgrel=1 +pkgdesc="Curses interface for the daemon of the BitTorrent client Transmission" +arch=('any') +url="http://github.com/fagga/transmission-remote-cli" +license=('GPL3') +depends=('python2') +optdepends=('adns-python: Resolve IPs to host names' + 'python-geoip: Guess which country peers come from') +makedepends=('git') +provides=('transmission-remote-cli') +conflicts=('transmission-remote-cli') +install= +source=(python2.patch) + +_gitroot="http://github.com/fagga/transmission-remote-cli.git" +_gitname="transmission-remote-cli" + +build() { + cd "$srcdir" + msg "Connecting to the GIT repository..." + + if [ -d "$srcdir/$_gitname" ] ; then + cd $_gitname && git pull origin + msg "The local files are updated." + else + git clone $_gitroot + fi + + rm -rf "$srcdir/$_gitname-build" + git clone "$srcdir/$_gitname" "$srcdir/$_gitname-build" + cd "$srcdir/$_gitname-build" + + msg "GIT checkout done or server timeout" + msg "Starting make..." + + cd $srcdir/$_gitname-build + + patch -Np1 -i ${srcdir}/python2.patch + + install -d $pkgdir/usr/bin/ + install -D transmission-remote-cli.py $pkgdir/usr/bin/transmission-remote-cli + +} + +md5sums=('6273609fb3a7294328aeaa526b76411c') diff --git a/~fauno/transmission-remote-cli-git/python2.patch b/~fauno/transmission-remote-cli-git/python2.patch new file mode 100644 index 000000000..256b676f0 --- /dev/null +++ b/~fauno/transmission-remote-cli-git/python2.patch @@ -0,0 +1,9 @@ +diff -Nur transmission-remote-cli/transmission-remote-cli.py transmission-remote-cli-python2//transmission-remote-cli.py +--- transmission-remote-cli/transmission-remote-cli.py 2010-10-19 10:33:49.544594708 -0300 ++++ transmission-remote-cli-python2//transmission-remote-cli.py 2010-10-19 10:42:51.278983745 -0300 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + ######################################################################## + # This is transmission-remote-cli, whereas 'cli' stands for 'Curses # + # Luminous Interface', a client for the daemon of the BitTorrent # |
