diff options
73 files changed, 575 insertions, 557 deletions
diff --git a/community/alex/PKGBUILD b/community/alex/PKGBUILD index 4f078a8ca..b7cc2cb52 100644 --- a/community/alex/PKGBUILD +++ b/community/alex/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 67160 2012-03-05 00:29:42Z pschmitz $ +# $Id: PKGBUILD 72380 2012-06-13 13:45:40Z tdziedzic $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: Philip Nilsson <pnilsson@nullref.se> pkgname=alex -pkgver=3.0.1 +pkgver=3.0.2 pkgrel=1 pkgdesc='a lexical analyser generator for Haskell' arch=('i686' 'x86_64') url='http://www.haskell.org/alex/' license=('custom:BSD3') depends=('gmp') -makedepends=('ghc=7.4.1-2' 'haskell-quickcheck=2.4.2-1') +makedepends=('ghc=7.4.2-1' 'haskell-quickcheck=2.4.2-2') source=("http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz") -md5sums=('5dec239c89165d159faa2154bc0724cd') +md5sums=('b8f0d831b65d05e5f54ff08bd3d9d10d') build() { cd $srcdir/$pkgname-$pkgver diff --git a/community/go/PKGBUILD b/community/go/PKGBUILD index ab6e73e97..941892808 100644 --- a/community/go/PKGBUILD +++ b/community/go/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 70799 2012-05-16 17:49:57Z arodseth $ +# $Id: PKGBUILD 72413 2012-06-13 22:11:36Z arodseth $ # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Rémy Oudompheng <remy@archlinux.org> @@ -10,7 +10,7 @@ pkgname=go pkgver=1.0.1 -pkgrel=5 +pkgrel=6 epoch=2 pkgdesc='Google Go compiler and tools (release version)' arch=('x86_64' 'i686') @@ -20,10 +20,11 @@ depends=('perl' 'gawk') makedepends=('inetutils') options=('!strip' '!emptydirs') install=go.install +backup=('usr/lib/go/bin') source=("http://go.googlecode.com/files/${pkgname}$pkgver.src.tar.gz" "$pkgname.sh") -sha1sums=('fc8a6d6725f7f2bf7c94685c5fd0880c9b7f67f6' - '0e8c7edc9d788be3518367bf04bdb5ff8b6bbdcf') +sha256sums=('29cdba7bc909df7091d81f52049de023502b5b3351cd206094f2c2d9961c0315' + 'a03db71d323ed2794123bb31b5c8ad5febd551c490b5c0b341052c8e5f0ba892') build() { cd "$srcdir/$pkgname" @@ -91,6 +92,18 @@ package() { # For packages that source /etc/profile.d/go.sh install -Dm755 "$srcdir/$pkgname.sh" "$pkgdir/etc/profile.d/$pkgname.sh" + # This is to make go get code.google.com/p/go-tour/gotour and + # then running the gotour executable work out of the box. + # + # Also, /usr/bin is the place for system-wide executables, + # not /usr/lib/go/bin. Users should use different paths by + # setting the appropriate environment variables. + # + ln -sf /usr/bin "$pkgdir/usr/lib/go/bin" + + # For godoc + install -Dm644 favicon.ico "$pkgdir/usr/lib/go/favicon.ico" + rm -f "$pkgdir/usr/share/go/doc/articles/wiki/get.bin" } diff --git a/community/go/go.install b/community/go/go.install index 25b9690ac..755f0a442 100644 --- a/community/go/go.install +++ b/community/go/go.install @@ -1,20 +1,4 @@ post_upgrade() { - # Backup any previous /usr/lib/go/bin directory - if [ -d /usr/lib/go/bin -a ! -L /usr/lib/go/bin ]; then - mv /usr/lib/go/bin /usr/lib/go/bin.pacnew - fi - - # Point /usr/lib/go/bin to /usr/bin instead - # - # This is to make go get code.google.com/p/go-tour/gotour and - # then running the gotour executable work out of the box. - # - # Also, /usr/bin is the place for system-wide executables, - # not /usr/lib/go/bin. Users should use different paths by - # setting the appropriate environment variables. - # - ln -sf /usr/bin /usr/lib/go/bin - # Friendly message to the user echo "Example use of the \"go\" tool as a user:" echo " mkdir ~/go" @@ -26,13 +10,4 @@ post_install() { post_upgrade } -pre_remove() { - if [ -c /usr/lib/go/bin ]; then - rmdir --ignore-fail-on-non-empty /usr/lib/go/bin - fi - if [ -L /usr/lib/go/bin ]; then - rm /usr/lib/go/bin - fi -} - # vim:set ts=2 sw=2 et: diff --git a/community/gtk2hs-buildtools/PKGBUILD b/community/gtk2hs-buildtools/PKGBUILD index 71471ef0e..2d83c6a52 100644 --- a/community/gtk2hs-buildtools/PKGBUILD +++ b/community/gtk2hs-buildtools/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 67585 2012-03-13 12:44:00Z spupykin $ +# $Id: PKGBUILD 72381 2012-06-13 13:45:43Z tdziedzic $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=gtk2hs-buildtools -pkgver=0.12.3 +pkgver=0.12.3.1 pkgrel=1 pkgdesc="Tools to build the Gtk2Hs suite of User Interface libraries." url="http://hackage.haskell.org/package/gtk2hs-buildtools" @@ -13,7 +13,7 @@ depends=('gmp') options=('strip') provides=('haskell-gtk2hs-buildtools') source=(http://hackage.haskell.org/packages/archive/gtk2hs-buildtools/$pkgver/gtk2hs-buildtools-$pkgver.tar.gz) -md5sums=('18b6eefca1db8898aa9f790bfc9b5ad0') +md5sums=('612611d831635024c953d2817b124e29') build() { cd ${srcdir}/gtk2hs-buildtools-$pkgver diff --git a/community/haddock/PKGBUILD b/community/haddock/PKGBUILD index f951e5c67..10cf419f9 100644 --- a/community/haddock/PKGBUILD +++ b/community/haddock/PKGBUILD @@ -5,13 +5,13 @@ pkgname=haddock pkgver=2.10.0 -pkgrel=1 +pkgrel=2 pkgdesc="Tool for generating documentation for Haskell libraries" url="http://hackage.haskell.org/package/haddock" license=('custom:BSD3') arch=('i686' 'x86_64' 'mips64el') makedepends=('alex' 'happy') -depends=('ghc=7.4.1-2' 'haskell-xhtml=3000.2.0.5-2' 'haskell-ghc-paths=0.1.0.8-7') # 'haskell-mtl' +depends=('ghc=7.4.2-1' 'haskell-xhtml=3000.2.1-1' 'haskell-ghc-paths=0.1.0.8-8') install=$pkgname.install source=("http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz") sha256sums=('d107dba15e8aee5abcb540b818b5dcb8ced98bae7d0714f50192dba26cadb410') diff --git a/community/happy/PKGBUILD b/community/happy/PKGBUILD index 783bb51d6..fb8ecf1f5 100644 --- a/community/happy/PKGBUILD +++ b/community/happy/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 67990 2012-03-16 18:40:06Z tdziedzic $ +# $Id: PKGBUILD 72383 2012-06-13 13:45:51Z tdziedzic $ # Maintainer: Thomas Dziedzic <gostrc@gmail.com> # Contributor: simo <simo@archlinux.org> # Contributor: Vesa Kaihlavirta <vegai@iki.fi> pkgname=happy pkgver=1.18.9 -pkgrel=4 +pkgrel=5 pkgdesc="The Parser Generator for Haskell" url="http://www.haskell.org/happy/" arch=('i686' 'x86_64') license=("custom:BSD3") depends=('gmp') -makedepends=('ghc=7.4.1' 'haskell-mtl=2.0.1.0-4') +makedepends=('ghc=7.4.2-1' 'haskell-mtl=2.1.1-1') source=(http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz) md5sums=('aeb565fe572f979f15a24db0df2de37d') diff --git a/community/haskell-bytestring-show/PKGBUILD b/community/haskell-bytestring-show/PKGBUILD index 576ac74a3..d59b21995 100644 --- a/community/haskell-bytestring-show/PKGBUILD +++ b/community/haskell-bytestring-show/PKGBUILD @@ -1,15 +1,14 @@ -# $Id: PKGBUILD 67048 2012-03-03 16:09:42Z tdziedzic $ +# $Id: PKGBUILD 72384 2012-06-13 13:45:56Z tdziedzic $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=haskell-bytestring-show pkgver=0.3.5.1 -pkgrel=2 +pkgrel=3 pkgdesc="Efficient conversion of values into readable byte strings." url="http://code.haskell.org/~dolio/" license=("BSD3") arch=('i686' 'x86_64') -makedepends=() -depends=("ghc=7.4.1-2") +depends=("ghc=7.4.2-1") install="${pkgname}.install" source=("http://hackage.haskell.org/packages/archive/bytestring-show/${pkgver}/bytestring-show-${pkgver}.tar.gz") md5sums=('7396bc2e8f88dedc3374c3f12f24e4bd') diff --git a/community/haskell-cairo/PKGBUILD b/community/haskell-cairo/PKGBUILD index 9af4c4cd4..a292c37c8 100644 --- a/community/haskell-cairo/PKGBUILD +++ b/community/haskell-cairo/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 67618 2012-03-13 14:21:56Z spupykin $ +# $Id: PKGBUILD 72385 2012-06-13 13:46:01Z tdziedzic $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=haskell-cairo -pkgver=0.12.3 +pkgver=0.12.3.1 pkgrel=1 pkgdesc="Binding to the cairo library for Gtk2Hs." url="http://hackage.haskell.org/package/cairo" license=('LGPL2.1') arch=('i686' 'x86_64') -depends=('ghc' 'cairo' 'haskell-mtl') +depends=('ghc=7.4.2-1' 'cairo' 'haskell-mtl=2.1.1-1') makedepends=("gtk2hs-buildtools") options=('strip') conflicts=('gtk2hs-cairo') @@ -16,7 +16,7 @@ provides=('gtk2hs-cairo') replaces=('gtk2hs-cairo') install=gtk2hs-cairo.install source=(http://hackage.haskell.org/packages/archive/cairo/$pkgver/cairo-$pkgver.tar.gz) -md5sums=('cdb322086f5b78a7611650b2b29826b3') +md5sums=('9d489fbb6cadb3d109543fe25c50195e') build() { cd ${srcdir}/cairo-$pkgver @@ -31,9 +31,6 @@ build() { } package() { - _ghcver=`pacman -Q ghc | cut -f2 -d\ | cut -f1 -d-` - depends=("ghc=${_ghcver}" 'cairo' 'haskell-mtl=2.0.1.0') - cd ${srcdir}/cairo-${pkgver} install -D -m744 register.sh ${pkgdir}/usr/share/haskell/gtk2hs-cairo/register.sh install -m744 unregister.sh ${pkgdir}/usr/share/haskell/gtk2hs-cairo/unregister.sh diff --git a/community/haskell-dataenc/PKGBUILD b/community/haskell-dataenc/PKGBUILD index 015dcd164..aa3d36b36 100644 --- a/community/haskell-dataenc/PKGBUILD +++ b/community/haskell-dataenc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 67052 2012-03-03 16:10:16Z tdziedzic $ +# $Id: PKGBUILD 72386 2012-06-13 13:46:06Z tdziedzic $ # Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> # Contributor: Arch Haskell Team <arch-haskell@haskell.org> # Package generated by cabal2arch 0.7.5 @@ -6,12 +6,12 @@ _hkgname=dataenc pkgname=haskell-dataenc pkgver=0.14.0.3 -pkgrel=1 +pkgrel=2 pkgdesc="Data encoding library" url="http://hackage.haskell.org/package/dataenc" license=('custom:BSD3') arch=('i686' 'x86_64' 'mips64el') -depends=('ghc=7.4.1-2' sh) +depends=('ghc=7.4.2-1' sh) source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) install=${pkgname}.install md5sums=('643a8c022b9c840f801faf9a661fe637') diff --git a/community/haskell-ghc-paths/PKGBUILD b/community/haskell-ghc-paths/PKGBUILD index 2311006a1..b9a2f1e68 100644 --- a/community/haskell-ghc-paths/PKGBUILD +++ b/community/haskell-ghc-paths/PKGBUILD @@ -4,12 +4,12 @@ pkgname=haskell-ghc-paths pkgver=0.1.0.8 -pkgrel=7 +pkgrel=8 pkgdesc="Knowledge of GHC's installation directories" url="http://hackage.haskell.org/package/ghc-paths" license=('custom:BSD3') arch=('i686' 'x86_64' 'mips64el') -depends=('ghc=7.4.1-2') +depends=('ghc=7.4.2-1') source=("http://hackage.haskell.org/packages/archive/ghc-paths/$pkgver/ghc-paths-$pkgver.tar.gz") install=haskell-ghc-paths.install md5sums=('d2b23dc563888e380588501d2ce1d82b') diff --git a/community/haskell-glib/PKGBUILD b/community/haskell-glib/PKGBUILD index 0b74ceec2..367c45adb 100644 --- a/community/haskell-glib/PKGBUILD +++ b/community/haskell-glib/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 67605 2012-03-13 14:06:20Z spupykin $ +# $Id: PKGBUILD 72388 2012-06-13 13:46:17Z tdziedzic $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=haskell-glib -pkgver=0.12.3 +pkgver=0.12.3.1 pkgrel=1 pkgdesc="Binding to the GLIB library for Gtk2Hs." url="http://hackage.haskell.org/package/glib" license=('LGPL2.1') arch=('i686' 'x86_64') -depends=('ghc' 'glib2') +depends=('ghc=7.4.2-1' 'glib2') makedepends=("gtk2hs-buildtools") options=('strip') install=gtk2hs-glib.install @@ -16,7 +16,7 @@ provides=('gtk2hs-glib') replaces=('gtk2hs-glib') conflicts=('gtk2hs-glib') source=(http://hackage.haskell.org/packages/archive/glib/$pkgver/glib-$pkgver.tar.gz) -md5sums=('ace7b5a3ae64dc10886c701e3a7684cb') +md5sums=('f2899bd2a2850fe95479ddb63490eb04') build() { cd ${srcdir}/glib-$pkgver diff --git a/community/haskell-gtk/PKGBUILD b/community/haskell-gtk/PKGBUILD index 060c24cd4..9b1e2ba62 100644 --- a/community/haskell-gtk/PKGBUILD +++ b/community/haskell-gtk/PKGBUILD @@ -1,25 +1,33 @@ -# $Id: PKGBUILD 67620 2012-03-13 14:23:58Z spupykin $ +# $Id: PKGBUILD 72389 2012-06-13 13:46:24Z tdziedzic $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=haskell-gtk pkgver=0.12.3 -pkgrel=1 +pkgrel=2 pkgdesc="Binding to the gtk library for Gtk2Hs." url="http://hackage.haskell.org/package/gtk" license=('LGPL2.1') arch=('i686' 'x86_64') -depends=('ghc' 'gtk2' "haskell-pango=$pkgver" 'haskell-mtl=2.0.1.0') +depends=('ghc' 'gtk2' "haskell-pango=0.12.3-2" 'haskell-mtl=2.1.1-1') makedepends=("gtk2hs-buildtools") provides=('gtk2hs-gtk') replaces=('gtk2hs-gtk') conflicts=('gtk2hs-gtk') options=('strip') install=gtk2hs-gtk.install -source=(http://hackage.haskell.org/packages/archive/gtk/$pkgver/gtk-$pkgver.tar.gz) -md5sums=('65a65b5cc1e1db0fbf722779a7044ded') +source=(http://hackage.haskell.org/packages/archive/gtk/$pkgver/gtk-$pkgver.tar.gz + 'gtk-gthread.h-include.patch') +md5sums=('65a65b5cc1e1db0fbf722779a7044ded' + '5277990f8ca28d2b12e77dac97c10354') build() { cd ${srcdir}/gtk-${pkgver} + + # fix compile error with latest glib2 >= 2.32 + # http://hackage.haskell.org/trac/gtk2hs/ticket/1253 + # got the patch from fedora + patch -Np1 -i ${srcdir}/gtk-gthread.h-include.patch + runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ --prefix=/usr --docdir=/usr/share/doc/haskell-gtk \ --libsubdir=\$compiler/site-local/\$pkgid @@ -31,8 +39,8 @@ build() { } package() { - _ghcver=`pacman -Q ghc | cut -f2 -d\ | cut -f1 -d-` - depends=("ghc=${_ghcver}" 'gtk2' "haskell-pango=$pkgver" 'haskell-mtl=2.0.1.0') + #_ghcver=`pacman -Q ghc | cut -f2 -d\ | cut -f1 -d-` + #depends=("ghc=${_ghcver}" 'gtk2' "haskell-pango=$pkgver" 'haskell-mtl=2.0.1.0') cd ${srcdir}/gtk-${pkgver} install -D -m744 register.sh ${pkgdir}/usr/share/haskell/gtk2hs-gtk/register.sh diff --git a/community/haskell-gtk/gtk-gthread.h-include.patch b/community/haskell-gtk/gtk-gthread.h-include.patch new file mode 100644 index 000000000..fc600d6be --- /dev/null +++ b/community/haskell-gtk/gtk-gthread.h-include.patch @@ -0,0 +1,15 @@ +diff -u gtk-0.12.2/Graphics/UI/Gtk/General/hsgthread.c\~ gtk-0.12.2/Graphics/UI/Gtk/General/hsgthread.c +--- gtk-0.12.2/Graphics/UI/Gtk/General/hsgthread.c~ 2011-11-14 07:15:41.000000000 +0900 ++++ gtk-0.12.2/Graphics/UI/Gtk/General/hsgthread.c 2012-01-08 14:58:45.849209318 +0900 +@@ -26,7 +26,8 @@ + */ + + #include <glib.h> +-#include <glib/gthread.h> ++/* f17 gives Error "Only <glib.h> can be included directly." ++ #include <glib/gthread.h> */ + #include <gdk/gdk.h> + #include "hsgthread.h" + + +Diff finished. Sun Jan 8 14:58:54 2012 diff --git a/community/haskell-haskeline/PKGBUILD b/community/haskell-haskeline/PKGBUILD index 620b08ea1..efa76ace8 100644 --- a/community/haskell-haskeline/PKGBUILD +++ b/community/haskell-haskeline/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 67058 2012-03-03 16:10:40Z tdziedzic $ +# $Id: PKGBUILD 72390 2012-06-13 13:46:29Z tdziedzic $ # 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.4.6 +pkgver=0.6.4.7 pkgrel=1 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' 'mips64el') -depends=('ghc=7.4.1-2' 'sh' 'haskell-utf8-string=0.3.7-1' 'haskell-mtl=2.0.1.0-4' 'haskell-terminfo=0.3.2.3-1') +depends=('ghc=7.4.2-1' 'sh' 'haskell-utf8-string=0.3.7-2' 'haskell-mtl=2.1.1-1' 'haskell-terminfo=0.3.2.3-2') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) install=${pkgname}.install -md5sums=('c43d01e3ea23eed266060391ca680a76') +md5sums=('d8d0a90a9965f4f68935e76e4e777035') build() { cd ${srcdir}/${_hkgname}-${pkgver} diff --git a/community/haskell-hslogger/PKGBUILD b/community/haskell-hslogger/PKGBUILD index 864bcd213..8908acc29 100644 --- a/community/haskell-hslogger/PKGBUILD +++ b/community/haskell-hslogger/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 67060 2012-03-03 16:10:47Z tdziedzic $ +# $Id: PKGBUILD 72391 2012-06-13 13:46:34Z tdziedzic $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Arch Haskell Team <arch-haskell@haskell.org> pkgname=haskell-hslogger pkgver=1.1.5 -pkgrel=6 +pkgrel=7 pkgdesc="Versatile logging framework" url="http://hackage.haskell.org/package/hslogger" license=('LGPL') arch=('i686' 'x86_64' 'mips64el') -depends=('ghc=7.4.1-2' 'haskell-mtl=2.0.1.0-4' 'haskell-network=2.3.0.11-1') +depends=('ghc=7.4.2-1' 'haskell-mtl=2.1.1-1' 'haskell-network=2.3.0.14-1') install=${pkgname}.install source=(http://hackage.haskell.org/packages/archive/hslogger/${pkgver}/hslogger-${pkgver}.tar.gz) md5sums=('cd3dfd6f88176bd53b333ea29130a857') diff --git a/community/haskell-html/PKGBUILD b/community/haskell-html/PKGBUILD index 44a3ea50b..f9aaa0f0f 100644 --- a/community/haskell-html/PKGBUILD +++ b/community/haskell-html/PKGBUILD @@ -5,12 +5,12 @@ _hkgname=html pkgname=haskell-html pkgver=1.0.1.2 -pkgrel=10 +pkgrel=11 pkgdesc="HTML combinator library" url="http://hackage.haskell.org/package/html" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=('ghc=7.4.1-2' sh) +depends=('ghc=7.4.2-1' sh) source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) install=${pkgname}.install md5sums=('2a7de5a2af9a2f80d39825d6a95ee445') diff --git a/community/haskell-pango/PKGBUILD b/community/haskell-pango/PKGBUILD index bf74c6d06..aa044c1ad 100644 --- a/community/haskell-pango/PKGBUILD +++ b/community/haskell-pango/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 67607 2012-03-13 14:08:52Z spupykin $ +# $Id: PKGBUILD 72393 2012-06-13 13:46:44Z tdziedzic $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=haskell-pango pkgver=0.12.3 -pkgrel=1 +pkgrel=2 pkgdesc="Binding to the pango library for Gtk2Hs." url="http://hackage.haskell.org/package/pango" license=('LGPL2.1') arch=('i686' 'x86_64') -depends=('ghc' 'pango' 'haskell-glib' 'haskell-cairo') +depends=('ghc=7.4.2-1' 'pango' 'haskell-glib=0.12.3.1-1' 'haskell-cairo=0.12.3.1-1') makedepends=("gtk2hs-buildtools") provides=('gtk2hs-pango') replaces=('gtk2hs-pango') @@ -31,8 +31,8 @@ build() { } package() { - _ghcver=`pacman -Q ghc | cut -f2 -d\ | cut -f1 -d-` - depends=("ghc=${_ghcver}" 'pango' 'haskell-glib' 'haskell-cairo') + #_ghcver=`pacman -Q ghc | cut -f2 -d\ | cut -f1 -d-` + #depends=("ghc=${_ghcver}" 'pango' 'haskell-glib' 'haskell-cairo') cd ${srcdir}/pango-${pkgver} install -D -m744 register.sh ${pkgdir}/usr/share/haskell/gtk2hs-pango/register.sh diff --git a/community/haskell-quickcheck/PKGBUILD b/community/haskell-quickcheck/PKGBUILD index 7b27cfb0c..70fbf160f 100644 --- a/community/haskell-quickcheck/PKGBUILD +++ b/community/haskell-quickcheck/PKGBUILD @@ -5,12 +5,13 @@ _hkgname=QuickCheck pkgname=haskell-quickcheck pkgver=2.4.2 -pkgrel=1 +pkgrel=2 pkgdesc="Automatic testing of Haskell programs" url="http://hackage.haskell.org/package/QuickCheck" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=('ghc=7.4.1-2' 'haskell-mtl=2.0.1.0-4' 'haskell-random=1.0.1.1-1' 'sh') +#depends=('ghc=7.4.2-1' 'haskell-mtl=2.0.1.0-4' 'haskell-random=1.0.1.1-1' 'sh') +depends=('ghc=7.4.2-1' 'haskell-random=1.0.1.1-2' 'sh') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz) install=${pkgname}.install md5sums=('9e22f9741cbc7d9cd8d52d3928e57b67') diff --git a/community/haskell-regex-base/PKGBUILD b/community/haskell-regex-base/PKGBUILD index 3b8ecb4bb..d787c6007 100644 --- a/community/haskell-regex-base/PKGBUILD +++ b/community/haskell-regex-base/PKGBUILD @@ -4,12 +4,12 @@ _hkgname=regex-base pkgname=haskell-regex-base pkgver=0.93.2 -pkgrel=5 +pkgrel=6 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.4.1-2' sh 'haskell-mtl=2.0.1.0-4') +depends=('ghc=7.4.2-1' sh 'haskell-mtl=2.1.1-1') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz) install=${pkgname}.install md5sums=('e7b93b0b17eff8d3068ecb2f5d5f6ea3') diff --git a/community/haskell-regex-compat/PKGBUILD b/community/haskell-regex-compat/PKGBUILD index c880ff4f2..f1e91b553 100644 --- a/community/haskell-regex-compat/PKGBUILD +++ b/community/haskell-regex-compat/PKGBUILD @@ -4,12 +4,12 @@ _hkgname=regex-compat pkgname=haskell-regex-compat pkgver=0.95.1 -pkgrel=1 +pkgrel=2 pkgdesc="Replaces and enhances Text.Regex" url="http://hackage.haskell.org/package/${_hkgname}" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=('ghc=7.4.1-2' 'sh' 'haskell-regex-base=0.93.2-5' 'haskell-regex-posix=0.95.1-1') +depends=('ghc=7.4.2-1' 'sh' 'haskell-regex-base=0.93.2-6' 'haskell-regex-posix=0.95.2-1') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) install=${pkgname}.install md5sums=('d0573ab4e2f3de5faa61380b67333320') diff --git a/community/haskell-regex-posix/PKGBUILD b/community/haskell-regex-posix/PKGBUILD index 1bed15490..f49daf3b2 100644 --- a/community/haskell-regex-posix/PKGBUILD +++ b/community/haskell-regex-posix/PKGBUILD @@ -3,16 +3,16 @@ _hkgname=regex-posix pkgname=haskell-regex-posix -pkgver=0.95.1 +pkgver=0.95.2 pkgrel=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.4.1-2' 'sh' 'haskell-regex-base=0.93.2-5') +depends=('ghc=7.4.2-1' 'sh' 'haskell-regex-base=0.93.2-6') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) install=${pkgname}.install -md5sums=('41cbc6d2b99837b64e0cc457c2737cc8') +md5sums=('1df0f9494aab110c7231f36393285c7c') build() { cd ${srcdir}/${_hkgname}-${pkgver} diff --git a/community/haskell-stm/PKGBUILD b/community/haskell-stm/PKGBUILD index fa9819d51..8eba45641 100644 --- a/community/haskell-stm/PKGBUILD +++ b/community/haskell-stm/PKGBUILD @@ -3,16 +3,16 @@ # Package generated by cabal2arch 0.7.5 _hkgname=stm pkgname=haskell-stm -pkgver=2.2.0.1 -pkgrel=3 +pkgver=2.3 +pkgrel=1 pkgdesc="A modular composable concurrency abstraction." url="http://hackage.haskell.org/package/stm" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=('ghc=7.4.1' 'sh') +depends=('ghc=7.4.2-1' 'sh') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz) install=${pkgname}.install -md5sums=('b1cf03ed315e00c33160746feeee8682') +md5sums=('fcaf091a492974045cc04b231a3b7c9c') build() { cd ${srcdir}/${_hkgname}-$pkgver diff --git a/community/haskell-syb/PKGBUILD b/community/haskell-syb/PKGBUILD index 9223379b2..301c463b5 100644 --- a/community/haskell-syb/PKGBUILD +++ b/community/haskell-syb/PKGBUILD @@ -2,17 +2,17 @@ # Contributor: Arch Haskell Team <arch-haskell@haskell.org> _hkgname=syb pkgname=haskell-syb -pkgver=0.3.6 +pkgver=0.3.6.1 pkgrel=1 pkgdesc="A library for client-side HTTP" url="http://hackage.haskell.org/package/${_hkgname}" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=('ghc=7.4.1' sh) +depends=('ghc=7.4.2-1' sh) options=('strip') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) install=${pkgname}.install -md5sums=('0d807bb244fdeb95fa546b4311fcd8df') +md5sums=('50e0a755fcc735cccd0d77a89714ae38') build() { cd ${srcdir}/${_hkgname}-${pkgver} diff --git a/community/haskell-tar/PKGBUILD b/community/haskell-tar/PKGBUILD index 469d9a305..f6890f827 100644 --- a/community/haskell-tar/PKGBUILD +++ b/community/haskell-tar/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 67068 2012-03-03 16:11:12Z tdziedzic $ +# $Id: PKGBUILD 72400 2012-06-13 13:47:19Z tdziedzic $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Arch Haskell Team <arch-haskell@haskell.org> pkgname=haskell-tar pkgver=0.4.0.0 -pkgrel=1 +pkgrel=2 pkgdesc="Reading, writing and manipulating \".tar\" archive files." url="http://hackage.haskell.org/package/tar" license=('custom:BSD3') arch=('i686' 'x86_64' 'mips64el') -depends=('ghc=7.4.1') +depends=('ghc=7.4.2-1') options=('strip') source=("http://hackage.haskell.org/packages/archive/tar/$pkgver/tar-$pkgver.tar.gz") install=haskell-tar.install diff --git a/community/haskell-terminfo/PKGBUILD b/community/haskell-terminfo/PKGBUILD index ccdb4dfda..b1036e177 100644 --- a/community/haskell-terminfo/PKGBUILD +++ b/community/haskell-terminfo/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 67070 2012-03-03 16:11:18Z tdziedzic $ +# $Id: PKGBUILD 72401 2012-06-13 13:47:24Z tdziedzic $ # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: Arch Haskell Team <arch-haskell@haskell.org> _hkgname=terminfo pkgname=haskell-terminfo pkgver=0.3.2.3 -pkgrel=1 +pkgrel=2 pkgdesc="Haskell bindings to the terminfo library." url="http://hackage.haskell.org/package/${_hkgname}" license=('custom:BSD3') arch=('i686' 'x86_64' 'mips64el') -depends=('ghc=7.4.1-2' 'sh') +depends=('ghc=7.4.2-1' 'sh') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) install=${pkgname}.install md5sums=('706f546c629ac100a402c9c2629c25fa') diff --git a/community/haskell-utf8-string/PKGBUILD b/community/haskell-utf8-string/PKGBUILD index 8b300aab7..5f5a528da 100644 --- a/community/haskell-utf8-string/PKGBUILD +++ b/community/haskell-utf8-string/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 67072 2012-03-03 16:11:24Z tdziedzic $ +# $Id: PKGBUILD 72402 2012-06-13 13:47:29Z tdziedzic $ # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: Arch Haskell Team <arch-haskell@haskell.org> # Package generated by cabal2arch 0.7.6 _hkgname=utf8-string pkgname=haskell-utf8-string pkgver=0.3.7 -pkgrel=1 +pkgrel=2 pkgdesc="Support for reading and writing UTF8 Strings" url="http://hackage.haskell.org/package/${_hkgname}" license=('custom:BSD3') arch=('i686' 'x86_64' 'mips64el') -depends=('ghc=7.4.1' 'sh') +depends=('ghc=7.4.2-1' 'sh') install=${pkgname}.install source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) md5sums=('50e5c395713e716e0e4a56da73f87ccd') diff --git a/community/haskell-x11-xft/PKGBUILD b/community/haskell-x11-xft/PKGBUILD index 9f0809ad1..0a5d0b0f3 100644 --- a/community/haskell-x11-xft/PKGBUILD +++ b/community/haskell-x11-xft/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 67076 2012-03-03 16:11:39Z tdziedzic $ +# $Id: PKGBUILD 72404 2012-06-13 13:47:39Z tdziedzic $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> _hkgname=X11-xft pkgname=haskell-x11-xft pkgver=0.3.1 -pkgrel=3 +pkgrel=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' 'mips64el') -depends=('ghc=7.4.1' 'haskell-x11=1.5.0.1' 'haskell-utf8-string=0.3.7' 'libxft') +depends=('ghc=7.4.2-1' 'haskell-x11=1.6.0' 'haskell-utf8-string=0.3.7' 'libxft') options=('strip') install=haskell-x11-xft.install source=(http://hackage.haskell.org/packages/archive/X11-xft/$pkgver/X11-xft-$pkgver.tar.gz) diff --git a/community/haskell-x11/PKGBUILD b/community/haskell-x11/PKGBUILD index 931e91e40..4e2bf7feb 100644 --- a/community/haskell-x11/PKGBUILD +++ b/community/haskell-x11/PKGBUILD @@ -1,22 +1,22 @@ -# $Id: PKGBUILD 69214 2012-04-10 04:17:58Z spupykin $ +# $Id: PKGBUILD 72403 2012-06-13 13:47:34Z tdziedzic $ # 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.1 -pkgrel=3 +pkgver=1.6.0 +pkgrel=1 pkgdesc="A Haskell binding to the X11 graphics library." arch=(i686 x86_64 'mips64el') url="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/X11" license=('custom:BSD3') options=('strip') -depends=("ghc=7.4.1" "haskell-syb=0.3.6" 'libx11' 'libxinerama' 'libxrandr') +depends=("ghc=7.4.2-1" "haskell-syb=0.3.6.1" 'libx11' 'libxinerama' 'libxrandr') conflicts=(haskell-x11-extras) install=hsmod.install source=(http://hackage.haskell.org/packages/archive/X11/$pkgver/X11-$pkgver.tar.gz) -md5sums=('7d69b204f773a0335828ced0e1e069f2') +md5sums=('8199520ce58e91762d31d54ed081b99c') build() { cd ${srcdir}/${_hkgname}-${pkgver} diff --git a/community/haskell-xhtml/PKGBUILD b/community/haskell-xhtml/PKGBUILD index b3762851d..68041976a 100644 --- a/community/haskell-xhtml/PKGBUILD +++ b/community/haskell-xhtml/PKGBUILD @@ -4,16 +4,16 @@ _hkgname=xhtml pkgname=haskell-xhtml -pkgver=3000.2.0.5 -pkgrel=2 +pkgver=3000.2.1 +pkgrel=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.4.1-2' 'sh') +depends=('ghc=7.4.2-1' 'sh') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz) install=${pkgname}.install -md5sums=('d51e20de416b825aba6b874a221acfc4') +md5sums=('c63487bea16cbf0ecf252d6ed73106bf') build() { cd ${srcdir}/${_hkgname}-${pkgver} diff --git a/community/hedgewars/PKGBUILD b/community/hedgewars/PKGBUILD index 8acb86b92..1a6789832 100644 --- a/community/hedgewars/PKGBUILD +++ b/community/hedgewars/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 67078 2012-03-03 16:11:51Z tdziedzic $ +# $Id: PKGBUILD 72406 2012-06-13 13:47:51Z tdziedzic $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=hedgewars pkgver=0.9.17 -pkgrel=2 +pkgrel=3 pkgdesc="Free Worms-like turn based strategy game" arch=('i686' 'x86_64' 'mips64el') url="http://hedgewars.org" @@ -11,10 +11,10 @@ license=('GPL' 'custom') depends=('qt' 'sdl' 'sdl_mixer' 'sdl_image' 'sdl_net' 'sdl_ttf' 'lua') makedepends=('fpc' 'cmake' # haskell specific - 'ghc=7.4.1-2' - 'haskell-network=2.3.0.11-1' 'haskell-bytestring-show=0.3.5.1-2' - 'haskell-utf8-string=0.3.7-1' 'haskell-dataenc=0.14.0.3-1' - 'haskell-hslogger=1.1.5-6') + 'ghc=7.4.2-1' + 'haskell-network=2.3.0.14-1' 'haskell-bytestring-show=0.3.5.1-3' + 'haskell-utf8-string=0.3.7-2' 'haskell-dataenc=0.14.0.3-2' + 'haskell-hslogger=1.1.5-7') source=(http://download.gna.org/hedgewars/hedgewars-src-$pkgver.tar.bz2 hedgewars.desktop hedgewars.png) diff --git a/community/kpartsplugin/PKGBUILD b/community/kpartsplugin/PKGBUILD index 14460add9..7c4ece00b 100644 --- a/community/kpartsplugin/PKGBUILD +++ b/community/kpartsplugin/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 71596 2012-05-30 14:38:44Z tredaelli $ +# $Id: PKGBUILD 72379 2012-06-13 10:58:19Z tredaelli $ # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com> # Contributor: birdflesh <antkoul at gmail dot com> # Contributor: Frikilinux <frikilinux at frikilinux.com.ar> pkgname=kpartsplugin -pkgver=20120529 +pkgver=20120605 pkgrel=1 pkgdesc="This plugin uses KDE's KParts to embed file viewers into non-KDE browsers" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ license=('GPL3' 'BSD') depends=('kdelibs') makedepends=('automoc4' 'cmake') source=("${url}${pkgname}-${pkgver}.tar.bz2" "LICENSE") -md5sums=('ad6b0f146f6b1c6bf1db4ff21ba95dda' +md5sums=('c6deb7b58b0bac9e5ef89afee83ef17c' 'c4cc811349e40e9f34e77e27b902ad96') build(){ diff --git a/community/mingw32-gcc-base/PKGBUILD b/community/mingw32-gcc-base/PKGBUILD index 2735d3fbb..6882392cb 100644 --- a/community/mingw32-gcc-base/PKGBUILD +++ b/community/mingw32-gcc-base/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 61843 2012-01-08 20:32:16Z spupykin $ +# $Id: PKGBUILD 72373 2012-06-13 10:03:53Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Ondrej Jirman <megous@megous.com> pkgname=mingw32-gcc-base -pkgver=4.6.2 +pkgver=4.7.0 _w32apiver=3.17 _runtimever=3.20 _uprel=1 @@ -21,7 +21,7 @@ source=(gcc-$pkgver-${_uprel}-mingw32-src.tar.lzma::http://downloads.sourceforge http://downloads.sourceforge.net/project/mingw/MinGW/Base/w32api/w32api-${_w32apiver}/w32api-${_w32apiver}-${_upw32rel}-mingw32-src.tar.lzma http://downloads.sourceforge.net/project/mingw/MinGW/Base/mingw-rt/mingwrt-${_runtimever}/mingwrt-${_runtimever}-mingw32-src.tar.gz gcc-1-mingw-float.patch) -md5sums=('1f71a7f486bdf7a9875b7932f628b2b4' +md5sums=('9a4ecdacdc6dc83a4a43ef0693e2295d' '89e5800096aa334009f98e7c1743d825' '26c0886cc60729b94956cc6d81cd076c' '2407123c35c0aa92ee5ffc27decca9a7') diff --git a/community/mingw32-gcc/PKGBUILD b/community/mingw32-gcc/PKGBUILD index 69b2aa3ec..4603b2af1 100644 --- a/community/mingw32-gcc/PKGBUILD +++ b/community/mingw32-gcc/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 61845 2012-01-08 21:08:39Z spupykin $ +# $Id: PKGBUILD 72371 2012-06-13 10:02:07Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Ondrej Jirman <megous@megous.com> pkgname=mingw32-gcc -pkgver=4.6.2 +pkgver=4.7.0 pkgrel=1 _uprel=1 arch=(i686 x86_64 mips64el) @@ -17,7 +17,7 @@ url="http://sourceforge.net/projects/mingw/files/MinGW/Base/gcc/Version4/" license=(GPL LGPL) source=(gcc-$pkgver-${_uprel}-mingw32-src.tar.lzma::http://downloads.sourceforge.net/project/mingw/MinGW/Base/gcc/Version4/gcc-$pkgver-${_uprel}/gcc-$pkgver-${_uprel}-mingw32-src.tar.lzma gcc-1-mingw-float.patch) -md5sums=('1f71a7f486bdf7a9875b7932f628b2b4' +md5sums=('9a4ecdacdc6dc83a4a43ef0693e2295d' '2407123c35c0aa92ee5ffc27decca9a7') build() diff --git a/community/vidalia/PKGBUILD b/community/vidalia/PKGBUILD index dc704b888..fbcf5573f 100644 --- a/community/vidalia/PKGBUILD +++ b/community/vidalia/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 64515 2012-02-15 15:45:44Z tredaelli $ +# $Id: PKGBUILD 72377 2012-06-13 10:27:38Z tredaelli $ # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com> # Contributor: Rorschach <r0rschach@lavabit.com> pkgname=vidalia -pkgver=0.2.17 +pkgver=0.2.19 pkgrel=1 pkgdesc="Controller GUI for Tor" url="https://www.torproject.org/vidalia" @@ -12,8 +12,9 @@ license=('GPL') depends=('qt' 'tor') makedepends=('cmake') install=vidalia.install -source=("https://www.torproject.org/vidalia/dist/$pkgname-$pkgver.tar.gz") -md5sums=(dcfd49e7f2ff73702e6007091cbe33d6) +source=(https://www.torproject.org/vidalia/dist/$pkgname-$pkgver.tar.gz{,.asc}) +md5sums=('caf92b44ad2932bbc1c40d6405951c39' + '1ba45d7c91797e880d79a3fc85818dee') build() { [[ -f /etc/profile.d/qt4.sh ]] && source /etc/profile.d/qt4.sh diff --git a/community/xmobar/PKGBUILD b/community/xmobar/PKGBUILD index ed26181bd..5ec585d40 100644 --- a/community/xmobar/PKGBUILD +++ b/community/xmobar/PKGBUILD @@ -1,25 +1,26 @@ -# $Id: PKGBUILD 67080 2012-03-03 16:12:00Z tdziedzic $ +# $Id: PKGBUILD 72407 2012-06-13 13:47:57Z tdziedzic $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Arch Haskell Team <arch-haskell@haskell.org> # Package generated by cabal2arch 0.4 pkgname=xmobar -pkgver=0.14 -pkgrel=2 +pkgver=0.15 +pkgrel=1 pkgdesc="A Minimalistic Text Based Status Bar" url="http://hackage.haskell.org/package/xmobar" license=('custom:BSD3') arch=('i686' 'x86_64' 'mips64el') depends=('gmp' 'libxft' 'libxinerama' 'wireless_tools' 'libxrandr') -makedepends=('ghc>=7.0.2' 'haskell-x11>=1.3.0' 'haskell-x11-xft>=0.2' 'haskell-utf8-string' - 'haskell-stm' 'haskell-parsec>=3' 'haskell-mtl>=2') +makedepends=('ghc=7.4.2-1' 'haskell-x11=1.6.0' 'haskell-x11-xft=0.3.1' 'haskell-utf8-string' + 'haskell-stm>=2.3' 'haskell-parsec>=3.1' 'haskell-mtl>=2') options=('strip') -source=(http://hackage.haskell.org/packages/archive/xmobar/$pkgver/xmobar-$pkgver.tar.gz) -md5sums=('b965e2db0555c741db96945210995777') +source=(http://hackage.haskell.org/packages/archive/xmobar/$pkgver/xmobar-$pkgver.tar.gz xmobar-0.15-haskell-mtl.patch) build() { cd ${srcdir}/xmobar-$pkgver -# runhaskell Setup configure --disable-optimization --prefix=/usr --flags="with_xft with_alsa with_inotify with_iwlib" + # Fix haskell mtl dep + patch -Np1 -i $srcdir/xmobar-0.15-haskell-mtl.patch + runhaskell Setup configure --disable-optimization --prefix=/usr --flags="with_xft with_iwlib" runhaskell Setup build } @@ -29,3 +30,7 @@ package() { runhaskell Setup copy --destdir=${pkgdir} install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/$pkgname/LICENSE } +md5sums=('0658679b39168f49d32fe178029ff9f1') + +md5sums=('0658679b39168f49d32fe178029ff9f1' + '0d9fb64557233c3a349feb53097c7b09') diff --git a/community/xmobar/xmobar-0.15-haskell-mtl.patch b/community/xmobar/xmobar-0.15-haskell-mtl.patch new file mode 100644 index 000000000..bee3dc354 --- /dev/null +++ b/community/xmobar/xmobar-0.15-haskell-mtl.patch @@ -0,0 +1,12 @@ +diff -aur xmobar-0.15.old/xmobar.cabal xmobar-0.15/xmobar.cabal +--- xmobar-0.15.old/xmobar.cabal 2012-06-11 17:04:21.422444926 +0000 ++++ xmobar-0.15/xmobar.cabal 2012-06-11 17:05:16.772001865 +0000 +@@ -112,7 +112,7 @@ + time, + filepath, + X11 == 1.6.*, +- mtl == 2.0.*, ++ mtl >= 2.0 && <2.2, + parsec == 3.1.*, + stm == 2.3.* + diff --git a/community/xmonad-contrib/PKGBUILD b/community/xmonad-contrib/PKGBUILD index ff82a1cdc..33de65a5a 100644 --- a/community/xmonad-contrib/PKGBUILD +++ b/community/xmonad-contrib/PKGBUILD @@ -1,22 +1,26 @@ -# $Id: PKGBUILD 69222 2012-04-10 09:03:48Z bluewind $ +# $Id: PKGBUILD 72409 2012-06-13 13:48:15Z tdziedzic $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: orbisvicis <gmail.com> pkgname=xmonad-contrib pkgver=0.10 -pkgrel=3 +pkgrel=4 pkgdesc="Add-ons for xmonad" arch=('i686' 'x86_64' 'mips64el') url="http://xmonad.org/" license=('BSD') -depends=('ghc=7.4.1-2' 'xmonad=0.10-3' 'sh' 'haskell-x11=1.5.0.1-3' 'haskell-x11-xft=0.3.1-3' 'haskell-utf8-string=0.3.7-1' 'haskell-random=1.0.1.1-1') +depends=('ghc=7.4.2-1' 'xmonad=0.10-4' 'sh' 'haskell-x11=1.6.0' 'haskell-x11-xft=0.3.1-4' 'haskell-utf8-string=0.3.7-2' 'haskell-random=1.0.1.1-2') install='xmonad-contrib.install' -source=(http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz) -md5sums=('9a4353a94ec0ea3a9c4700757ef5ae81') +source=(http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz xmonad-contrib-0.10-x11-1.6.patch) +md5sums=('9a4353a94ec0ea3a9c4700757ef5ae81' + '32163aaeb3424cf73bf831640c162a8a') build() { cd $srcdir/$pkgname-$pkgver + # Patch xmonad-contrib to support haskell-x11 + patch -Np1 -i $srcdir/xmonad-contrib-0.10-x11-1.6.patch + runhaskell Setup.lhs configure --ghc --enable-shared --enable-split-objs --prefix=/usr -fuse_xft \ --libsubdir=\$compiler/site-local/\$pkgid runhaskell Setup build diff --git a/community/xmonad-contrib/xmonad-contrib-0.10-x11-1.6.patch b/community/xmonad-contrib/xmonad-contrib-0.10-x11-1.6.patch new file mode 100644 index 000000000..8372b4144 --- /dev/null +++ b/community/xmonad-contrib/xmonad-contrib-0.10-x11-1.6.patch @@ -0,0 +1,46 @@ +Tue Mar 20 03:53:11 FET 2012 Adam Vogt <vogt.adam@gmail.com> + * Bump version to 0.10.1 + + Raising the X11 dependency while keeping the xmonad version the same leads to + problems where cabal install uses the dependency versions following hackage, + not what is installed. +diff --git a/xmonad-contrib.cabal b/xmonad-contrib.cabal +index 743bdc8..0fbf4ac 100644 +--- a/xmonad-contrib.cabal ++++ b/xmonad-contrib.cabal +@@ -61,7 +61,7 @@ library + extensions: ForeignFunctionInterface + cpp-options: -DXFT + +- build-depends: mtl >= 1 && < 3, unix, X11>=1.5.0.0 && < 1.6, xmonad>=0.10, xmonad<0.11, utf8-string ++ build-depends: mtl >= 1 && < 3, unix, X11>=1.5.0.0 && < 1.7, xmonad>=0.10, xmonad<0.11, utf8-string + + if true + ghc-options: -fwarn-tabs -Wall +diff --git a/XMonad/Layout/Spiral.hs b/XMonad/Layout/Spiral.hs +index a485d95..5e388e2 100644 +--- a/XMonad/Layout/Spiral.hs ++++ b/XMonad/Layout/Spiral.hs +@@ -26,7 +26,7 @@ module XMonad.Layout.Spiral ( + ) where + + import Data.Ratio +-import XMonad ++import XMonad (LayoutClass(..), Rectangle(..), fromMessage, Resize(..)) + import XMonad.StackSet ( integrate ) + + -- $usage +diff --git a/XMonad/Util/Paste.hs b/XMonad/Util/Paste.hs +index 0d78653..4b7fd3b 100644 +--- a/XMonad/Util/Paste.hs ++++ b/XMonad/Util/Paste.hs +@@ -23,7 +23,8 @@ module XMonad.Util.Paste ( -- * Usage + where + + import XMonad (io, theRoot, withDisplay, X ()) +-import Graphics.X11 ++import Graphics.X11 (Window, shiftMask, KeyMask, stringToKeysym, KeySym, keysymToKeycode) ++import Graphics.X11 (allocaXEvent, keyPress, sendEvent, keyPressMask, keyRelease, keyReleaseMask) + import Graphics.X11.Xlib.Extras (none, setEventType, setKeyEvent) + import Control.Monad.Reader (asks) + import XMonad.Operations (withFocused) diff --git a/community/xmonad/PKGBUILD b/community/xmonad/PKGBUILD index 1719df6fc..05065a05b 100644 --- a/community/xmonad/PKGBUILD +++ b/community/xmonad/PKGBUILD @@ -1,29 +1,31 @@ -# $Id: PKGBUILD 67082 2012-03-03 16:12:17Z tdziedzic $ +# $Id: PKGBUILD 72408 2012-06-13 13:48:08Z tdziedzic $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: shild <shildv@gmail.com> pkgname=xmonad pkgver=0.10 -pkgrel=3 -pkgdesc="A lightweight X11 tiled window manager written in Haskell" +pkgrel=4 +pkgdesc="Lightweight X11 tiled window manager written in Haskell" arch=('i686' 'x86_64' 'mips64el') url="http://xmonad.org/" license=('BSD') -depends=('ghc=7.4.1' 'gmp' 'haskell-x11=1.5.0.1' 'sh' 'haskell-mtl=2.0.1.0' 'haskell-utf8-string=0.3.7') +depends=('ghc=7.4.2-1' 'gmp' 'haskell-x11=1.6.0' 'sh' 'haskell-mtl=2.1.1-1' 'haskell-utf8-string=0.3.7') +makedepends=('setconf' 'gendesk') optdepends=('xorg-xmessage: for displaying visual error messages') install='xmonad.install' source=(http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz - xmonad.desktop - xmonad.session - xmonad.svg) -md5sums=('f8381e1ec15137863558a454d4466467' - 'f8e3d84a9f154d1b5d7fcffbc0a058c9' - '9d1bc84a7f32897d32f3fc71ef76228e' - '72bfa5e62e4e44fe7fa59b6a7593d993') + xmonad.svg xmonad-0.10-x11-1.6.patch) build() { + cd "$srcdir" + gendesk + cd $srcdir/$pkgname-$pkgver + # Patch XMonad so we support haskell 1.6 + patch -Np1 -i $srcdir/xmonad-0.10-x11-1.6.patch + + runhaskell Setup.lhs configure --ghc --enable-shared --enable-split-objs --prefix=/usr \ --libsubdir=\$compiler/site-local/\$pkgid runhaskell Setup build @@ -37,13 +39,14 @@ package() { 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 + # 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=('f8381e1ec15137863558a454d4466467' + '72bfa5e62e4e44fe7fa59b6a7593d993' + '22d29900d71f09a8f9fa6f0d2f3fed32') diff --git a/community/xmonad/xmonad-0.10-x11-1.6.patch b/community/xmonad/xmonad-0.10-x11-1.6.patch new file mode 100644 index 000000000..5b7afaf3b --- /dev/null +++ b/community/xmonad/xmonad-0.10-x11-1.6.patch @@ -0,0 +1,19 @@ +Tue Mar 20 03:49:24 FET 2012 Adam Vogt <vogt.adam@gmail.com> + * Address versioning problems related to X11 1.6 release. + + Bump version to 0.10.1 since cabal uses hackage dependencies even when the + locally installed package differs. + + Allow X11-1.6 dependency. +diff -rN -u old-xmonad/xmonad.cabal new-xmonad/xmonad.cabal +--- old-xmonad/xmonad.cabal 2012-05-06 12:20:26.788767220 +0300 ++++ new-xmonad/xmonad.cabal 2012-05-06 12:20:26.818766844 +0300 +@@ -46,7 +46,7 @@ + build-depends: base < 5 && >=3, containers, directory, process, filepath, extensible-exceptions + else + build-depends: base < 3 +- build-depends: X11>=1.5.0.0 && < 1.6, mtl, unix, ++ build-depends: X11>=1.5 && < 1.7, mtl, unix, + utf8-string >= 0.3 && < 0.4 + + if true diff --git a/community/xmonad/xmonad-gnome-session.session b/community/xmonad/xmonad-gnome-session.session new file mode 100644 index 000000000..c0bd16781 --- /dev/null +++ b/community/xmonad/xmonad-gnome-session.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/extra/alsaplayer/PKGBUILD b/extra/alsaplayer/PKGBUILD index 05e684130..ea0cde120 100644 --- a/extra/alsaplayer/PKGBUILD +++ b/extra/alsaplayer/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 148672 2012-02-05 11:46:26Z ibiru $ +# $Id: PKGBUILD 161645 2012-06-13 05:17:46Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=alsaplayer pkgver=0.99.81 -pkgrel=3 +pkgrel=4 pkgdesc="A heavily multi-threaded PCM player that tries to excercise the ALSA library and driver quite a bit" arch=('i686' 'x86_64' 'mips64el') url="http://www.alsaplayer.org/" diff --git a/extra/cabal-install/PKGBUILD b/extra/cabal-install/PKGBUILD index 0dc8c8e87..b96d1830d 100644 --- a/extra/cabal-install/PKGBUILD +++ b/extra/cabal-install/PKGBUILD @@ -4,12 +4,12 @@ pkgname=cabal-install pkgver=0.14.0 -pkgrel=1 +pkgrel=2 pkgdesc="The command-line interface for Cabal and Hackage." url="http://hackage.haskell.org/package/cabal-install" license=('custom:BSD3') arch=('i686' 'x86_64' 'mips64el') -makedepends=('haskell-http=4000.2.2-1' 'haskell-zlib=0.5.3.3-3' 'haskell-mtl=2.0.1.0-4' 'haskell-network=2.3.0.11-1' 'haskell-random=1.0.1.1-1') +makedepends=('haskell-http=4000.2.3-1' 'haskell-zlib=0.5.3.3-4' 'haskell-mtl=2.1.1-1' 'haskell-network=2.3.0.14-1' 'haskell-random=1.0.1.1-2') depends=('ghc' 'gmp' 'zlib') source=(http://hackage.haskell.org/packages/archive/cabal-install/$pkgver/cabal-install-$pkgver.tar.gz) md5sums=('638514bd1a5792d75866481852148ae5') diff --git a/extra/cinepaint/PKGBUILD b/extra/cinepaint/PKGBUILD index 6c5f1296d..d5b9a4817 100644 --- a/extra/cinepaint/PKGBUILD +++ b/extra/cinepaint/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 156562 2012-04-21 01:56:35Z eric $ +# $Id: PKGBUILD 161773 2012-06-13 17:38:02Z andyrtr $ # Maintainer: tobias [tobias.archlinux.org] # Contributor: tobias [tobias.justdreams.de] pkgname=cinepaint pkgver=1.3 -pkgrel=1 +pkgrel=2 pkgdesc="Sophisticated graphics manipulation programm supporting > 8bit pictures" arch=('i686' 'x86_64' 'mips64el') license=('LGPL' 'GPL' 'MIT') url="http://www.cinepaint.org" depends=('gtk2' 'openexr' 'lcms' 'libxpm' 'fltk' 'ftgl' 'libxxf86vm') -makedepends=('python2' 'gutenprint') +makedepends=('python2' 'gutenprint>=5.2.8') optdepends=('python2: for python plug-ins' 'gutenprint: for print plug-ins' 'ghostscript: for pdf plug-ins') @@ -30,8 +30,10 @@ build() { find plug-ins/pygimp -type f -exec sed -i 's#env python#env python2#' {} + sed -i 's|$(LDFLAGS) -o|$(LDFLAGS) $(GTK_LIBS) -o|' lib/Makefile.in - aclocal -I aclocal - autoconf +# aclocal -I aclocal +# autoconf + sh autogen.sh + LIBS+="-lstdc++ -lm -lX11" ./configure --prefix=/usr --libdir=/usr/lib --mandir=/usr/share/man \ --enable-gtk2 --enable-pygimp --with-python=/usr/bin/python2 sed -i 's/-Wl,,/-Wl,/' lib/fl_i18n/Makefile plug-ins/bracketing_to_hdr/Makefile \ diff --git a/extra/cups/PKGBUILD b/extra/cups/PKGBUILD index e292b2c4a..409767b13 100644 --- a/extra/cups/PKGBUILD +++ b/extra/cups/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 160812 2012-06-06 15:26:42Z andyrtr $ +# $Id: PKGBUILD 161774 2012-06-13 17:38:37Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgbase="cups" pkgname=('libcups' 'cups') pkgver=1.5.3 -pkgrel=4 +pkgrel=5 arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://www.cups.org/" @@ -163,9 +163,12 @@ optdepends=('php: for included phpcups.so module' # remove client.conf man page rm -f ${pkgdir}/usr/share/man/man5/client.conf.5 - # remove files now part of cups-filters + # remove files now part of cups-filters - check cups-filters INSTALL for packagers instructions rm -v ${pkgdir}/usr/lib/cups/backend/{parallel,serial} - rm -v ${pkgdir}/usr/lib/cups/filter/{commandtoescpx,commandtopclx,imagetops,imagetoraster,pdftops,rastertoescpx,rastertopclx,texttops} - rm -v ${pkgdir}/usr/share/cups/banners/{classified,confidential,secret,standard,topsecret,unclassified} - rm -v ${pkgdir}/usr/share/cups/data/testprint + rm -v ${pkgdir}/usr/lib/cups/filter/{bannertops,commandtoescpx,commandtopclx,imagetops,imagetoraster,pdftops,rastertoescpx,rastertopclx,texttops} + rm -v ${pkgdir}/usr/share/cups/banners/* + rm -v ${pkgdir}/usr/share/cups/data/{testprint,psglyphs} + rm -v ${pkgdir}/usr/share/cups/fonts/* + # comment out all conversion rules which use any of the removed filters + perl -p -i -e 's:^(.*\s+(pdftops|texttops|imagetops|bannertops|imagetoraster)\s*)$:#\1:' ${pkgdir}/usr/share/cups/mime/mime.convs } diff --git a/extra/cups/PKGBUILD.16 b/extra/cups/PKGBUILD.16 index 57db7916a..01faba047 100644 --- a/extra/cups/PKGBUILD.16 +++ b/extra/cups/PKGBUILD.16 @@ -138,6 +138,9 @@ optdepends=('xdg-utils: xdg .desktop file support') rm -f ${pkgdir}/usr/share/man/man5/client.conf.5 # remove files now part of cups-filters - rm -v ${pkgdir}/usr/share/cups/banners/{classified,confidential,secret,standard,topsecret,unclassified} + rm -v ${pkgdir}/usr/lib/cups/filter/bannertops + rm -v ${pkgdir}/usr/share/cups/banners/* rm -v ${pkgdir}/usr/share/cups/data/testprint + # comment out all conversion rules which use any of the removed filters + perl -p -i -e 's:^(.*\s+bannertops\s*)$:#\1:' /usr/share/cups/mime/mime.convs } diff --git a/extra/ghc/PKGBUILD b/extra/ghc/PKGBUILD index 548a16f84..eae48b02f 100644 --- a/extra/ghc/PKGBUILD +++ b/extra/ghc/PKGBUILD @@ -1,27 +1,28 @@ -# $Id: PKGBUILD 151872 2012-03-03 16:05:55Z tdziedzic $ +# $Id: PKGBUILD 161653 2012-06-13 13:44:00Z tdziedzic $ # Maintainer: Thomas Dziedzic <gostrc@gmail.com> # 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. # Libraries depend on versions specified by those hashes. # This implies that all libraries need to be rebuilt when ghc is rebuilt. -# Also, due to dependency loop problems, haskell-ghc-paths and haddock -# do not carry version dependencies. You will have to remember to build them too. pkgname=ghc -pkgver=7.4.1 -pkgrel=2 +pkgver=7.4.2 +pkgrel=1 pkgdesc='The Glasgow Haskell Compiler' arch=('i686' 'x86_64' 'mips64el') url='http://www.haskell.org/ghc/' license=('custom') -depends=('perl' 'gmp>=5.0' 'gcc' 'libffi') -makedepends=('ghc' 'happy' 'perl' 'libxslt' 'docbook-xsl') +# libffi might be needed in the future: http://hackage.haskell.org/trac/ghc/ticket/4496 +depends=('perl' 'gmp>=5.0' 'gcc') # 'libffi') +makedepends=('ghc' 'perl' 'libxslt' 'docbook-xsl') checkdepends=('python2') install='ghc.install' -groups=('haskell') +# keep this otherwise a lot of tests will show as unexpected failures... need to investigate why using -jn for n > 1 does this... +options=('!makeflags') +# missing rtl? provides=('haskell-array=0.4.0.0' - 'haskell-base=4.5.0.0' + 'haskell-base=4.5.1.0' 'haskell-binary=0.5.1.0' 'haskell-bin-package-db=0.0.0.0' 'haskell-bytestring=0.9.2.1' @@ -42,11 +43,11 @@ provides=('haskell-array=0.4.0.0' 'haskell-process=1.1.0.1' 'haskell-template-haskell=2.7.0.0' 'haskell-time=1.4' - 'haskell-unix=2.5.1.0' + 'haskell-unix=2.5.1.1' 'haskell-cabal=1.14.0' ) replaces=('haskell-array<0.4.0.0' - 'haskell-base<4.5.0.0' + 'haskell-base<4.5.1.0' 'haskell-binary<0.5.1.0' 'haskell-bin-package-db<0.0.0.0' 'haskell-bytestring<0.9.2.1' @@ -67,25 +68,31 @@ replaces=('haskell-array<0.4.0.0' 'haskell-process<1.1.0.1' 'haskell-template-haskell<2.7.0.0' 'haskell-time<1.4' - 'haskell-unix<2.5.1.0' + 'haskell-unix<2.5.1.1' 'haskell-cabal<1.14.0' ) source=("http://www.haskell.org/ghc/dist/${pkgver}/ghc-${pkgver}-src.tar.bz2" "http://www.haskell.org/ghc/dist/${pkgver}/ghc-${pkgver}-testsuite.tar.bz2" - 'build.mk') -md5sums=('5d86c420978b49cc60edea9bd4c36703' - '54bc9405c14c3226b6e3de3cd61e2777' - '82b67cdd24a2e434a4399f30f14b21a3') + 'build.mk' + 'silence-gen_contents_index.diff') +md5sums=('267462db5c5a7c245fb26361b77007c4' + '528005749c761fe6c12a0079bd84fb90' + '88ad4108c26f56fc38466d82aaf9a295' + '2ac480d025b706fc47acc58c54b246bb') build() { cd ghc-${pkgver} + # Silence gen_contents_index for the common case. + # http://hackage.haskell.org/trac/ghc/ticket/5992 + patch -Np1 -i ${srcdir}/silence-gen_contents_index.diff + cp ${srcdir}/build.mk mk/build.mk ./configure \ --prefix=/usr - make -j4 -l8 + make } check() { @@ -96,7 +103,8 @@ check() { sed -e 's_#!/usr/bin/env python_&2_' -i testsuite/timeout/calibrate testsuite/timeout/timeout.py # note: there is one test failure on i686 only: http://hackage.haskell.org/trac/ghc/ticket/5856 - make THREADS=9 test + #make THREADS=9 test + make test # might be some failures #make fulltest } diff --git a/extra/ghc/build.mk b/extra/ghc/build.mk index bc26a21fe..73645a957 100644 --- a/extra/ghc/build.mk +++ b/extra/ghc/build.mk @@ -117,7 +117,7 @@ HADDOCK_DOCS = NO BUILD_DOCBOOK_HTML = NO BUILD_DOCBOOK_PS = NO BUILD_DOCBOOK_PDF = NO -LAX_DEPENDENCIES = NO +LAX_DEPENDENCIES = YES endif @@ -134,7 +134,7 @@ HADDOCK_DOCS = NO BUILD_DOCBOOK_HTML = NO BUILD_DOCBOOK_PS = NO BUILD_DOCBOOK_PDF = NO -LAX_DEPENDENCIES = NO +LAX_DEPENDENCIES = YES # After stage 1 and the libraries have been built, you can uncomment this line: diff --git a/extra/ghc/silence-gen_contents_index.diff b/extra/ghc/silence-gen_contents_index.diff new file mode 100644 index 000000000..6d835f8fb --- /dev/null +++ b/extra/ghc/silence-gen_contents_index.diff @@ -0,0 +1,10 @@ +--- ghc-7.4.2/libraries/gen_contents_index.original 2012-06-10 22:23:28.810059378 +0000 ++++ ghc-7.4.2/libraries/gen_contents_index 2012-06-10 22:24:00.289814576 +0000 +@@ -47,7 +47,6 @@ + esac + + # Now create the combined contents and index pages +-echo $HADDOCK_ARGS + $HADDOCK --gen-index --gen-contents -o . \ + -t "Haskell Hierarchical Libraries" \ + -p "prologue.txt" \ diff --git a/extra/gutenprint/PKGBUILD b/extra/gutenprint/PKGBUILD index 37327b798..1a36ce8b7 100644 --- a/extra/gutenprint/PKGBUILD +++ b/extra/gutenprint/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 143830 2011-11-29 16:30:26Z andyrtr $ +# $Id: PKGBUILD 161772 2012-06-13 17:37:51Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=gutenprint -pkgver=5.2.7 -pkgrel=3 +pkgver=5.2.8 +pkgrel=1 pkgdesc="Top quality printer drivers for POSIX systems" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -14,23 +14,22 @@ optdepends=('cups: to use cups printer spooler(recommended)' 'foomatic-db-engine: to use foomatic spooler' 'ghostscript: adds postscript support for ijsgutenprint' 'gimp: adds gutenprint plugin to gimp') -source=(http://downloads.sourceforge.net/gimp-print/$pkgname-$pkgver.tar.bz2 buildfix.patch) +source=(http://downloads.sourceforge.net/gimp-print/$pkgname-$pkgver.tar.bz2) url="http://gimp-print.sourceforge.net/" replaces=('gimp-print') options=('!libtool' '!emptydirs') -md5sums=('b19029972bf28f6efd693270daf8f5de' - '2354cdecf1fbab32eca84266c8c72e7d') +md5sums=(5ed64c0f994245852da8e9fa6a137060'') build() { cd ${srcdir}/${pkgname}-${pkgver} - patch -Np1 -i ${srcdir}/buildfix.patch - ./configure --prefix=/usr --disable-samples --with-cups --with-gimp2 \ - --disable-translated-cups-ppds --with-gimp2-as-gutenprint \ - --disable-libgutenprintui --enable-libgutenprintui2 --disable-gtktest \ - --enable-cups-ppds --enable-cups-ppds-at-top-level \ - --with-foomatic --with-foomatic3 --with-ghostscript \ - --disable-static --disable-static-genppd --with-ijs \ - --disable-globalized-cups-ppds + ./configure --prefix=/usr \ + --enable-samples \ + --enable-cups-ppds \ + --enable-cups-ppds-at-top-level \ + --disable-translated-cups-ppds \ + --disable-globalized-cups-ppds \ + --disable-static \ + --disable-static-genppd make } diff --git a/extra/haskell-http/PKGBUILD b/extra/haskell-http/PKGBUILD index cb9c79c0c..58db565ca 100644 --- a/extra/haskell-http/PKGBUILD +++ b/extra/haskell-http/PKGBUILD @@ -5,16 +5,16 @@ _hkgname=HTTP pkgname=haskell-http -pkgver=4000.2.2 +pkgver=4000.2.3 pkgrel=1 pkgdesc="A library for client-side HTTP" url="http://hackage.haskell.org/package/${_hkgname}" license=('custom:BSD3') arch=('i686' 'x86_64' 'mips64el') -depends=('ghc=7.4.1' 'sh' 'haskell-network=2.3.0.11-1' 'haskell-parsec=3.1.2-1' 'haskell-mtl=2.0.1.0-4') +depends=('ghc=7.4.2-1' 'sh' 'haskell-network=2.3.0.14-1' 'haskell-parsec=3.1.2-2' 'haskell-mtl=2.1.1-1') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) install=${pkgname}.install -md5sums=('b61ff88ef8d699f73a6ed27c6abf6600') +md5sums=('872a1e49c3701c61c354f76716d4e3e7') build() { cd ${srcdir}/${_hkgname}-${pkgver} diff --git a/extra/haskell-mtl/PKGBUILD b/extra/haskell-mtl/PKGBUILD index c8c1d9e62..48c05c8e7 100644 --- a/extra/haskell-mtl/PKGBUILD +++ b/extra/haskell-mtl/PKGBUILD @@ -4,16 +4,16 @@ _hkgname=mtl pkgname=haskell-mtl -pkgver=2.0.1.0 -pkgrel=4 +pkgver=2.1.1 +pkgrel=1 pkgdesc="Monad transformer library" url="http://hackage.haskell.org/package/${_hkgname}" license=('custom:BSD3') arch=('i686' 'x86_64' 'mips64el') -depends=('ghc=7.4.1' 'sh' 'haskell-transformers=0.2.2.0-4') +depends=('ghc=7.4.2-1' 'sh' 'haskell-transformers=0.3.0.0-1') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz) install=${pkgname}.install -md5sums=('934fa813625ef7e88a6a96a09815ff95') +md5sums=('0654be687f1492a2ff30cf6f3fb7eed0') build() { cd ${srcdir}/${_hkgname}-${pkgver} diff --git a/extra/haskell-network/PKGBUILD b/extra/haskell-network/PKGBUILD index 03f6992d5..fb74295df 100644 --- a/extra/haskell-network/PKGBUILD +++ b/extra/haskell-network/PKGBUILD @@ -5,16 +5,16 @@ _hkgname=network pkgname=haskell-network -pkgver=2.3.0.11 +pkgver=2.3.0.14 pkgrel=1 pkgdesc="Networking-related facilities" url="http://hackage.haskell.org/package/network" license=('custom:BSD3') arch=('i686' 'x86_64' 'mips64el') -depends=('ghc=7.4.1' 'sh' 'haskell-parsec=3.1.2-1') +depends=('ghc=7.4.2-1' 'sh' 'haskell-parsec=3.1.2-2') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) install=${pkgname}.install -md5sums=('cfe4922ac85685be9f86d4d34654f481') +md5sums=('1e45cc731647acff8b9c33bda085bf2a') build() { cd ${srcdir}/${_hkgname}-${pkgver} diff --git a/extra/haskell-parsec/PKGBUILD b/extra/haskell-parsec/PKGBUILD index 8603734f0..7109f66e9 100644 --- a/extra/haskell-parsec/PKGBUILD +++ b/extra/haskell-parsec/PKGBUILD @@ -6,12 +6,12 @@ _hkgname=parsec pkgname=haskell-parsec pkgver=3.1.2 -pkgrel=1 +pkgrel=2 pkgdesc="Monadic parser combinators" url="http://hackage.haskell.org/package/${_hkgname}" license=('custom:BSD3') arch=('i686' 'x86_64' 'mips64el') -depends=('ghc=7.4.1' 'sh' 'haskell-mtl=2.0.1.0-4' 'haskell-text=0.11.1.13-1') +depends=('ghc=7.4.2-1' 'sh' 'haskell-mtl=2.1.1-1' 'haskell-text=0.11.2.1-1') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) install=${pkgname}.install md5sums=('c2a75dfd247ae4839e2602b62dc87487') diff --git a/extra/haskell-random/PKGBUILD b/extra/haskell-random/PKGBUILD index 3b929c3d6..56b110289 100644 --- a/extra/haskell-random/PKGBUILD +++ b/extra/haskell-random/PKGBUILD @@ -3,13 +3,13 @@ _hkgname=random pkgname=haskell-random pkgver=1.0.1.1 -pkgrel=1 +pkgrel=2 pkgdesc="A basic random number generation library" url="http://hackage.haskell.org/package/${_hkgname}" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=('ghc=7.4.1' 'sh') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) +depends=('ghc=7.4.2-1' 'sh') +source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz") install=${pkgname}.install md5sums=('9a249cfa7ff6793cbf2be06e9fcd7538') diff --git a/extra/haskell-text/PKGBUILD b/extra/haskell-text/PKGBUILD index 53e9644f0..de6bc360a 100644 --- a/extra/haskell-text/PKGBUILD +++ b/extra/haskell-text/PKGBUILD @@ -1,18 +1,19 @@ # Maintainer: Thomas Dziedzic <gostrc@gmail.com> # Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> # Contributor: Arch Haskell Team <arch-haskell@haskell.org> + _hkgname=text pkgname=haskell-text -pkgver=0.11.1.13 +pkgver=0.11.2.1 pkgrel=1 pkgdesc="An efficient packed Unicode text type." url="http://hackage.haskell.org/package/${_hkgname}" license=('custom:BSD3') arch=('i686' 'x86_64' 'mips64el') -depends=('ghc=7.4.1' 'sh') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) +depends=('ghc=7.4.2-1' 'sh') +source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz") install=${pkgname}.install -md5sums=('62b781a5d9d4dab2b2a1dbf2dc1b593f') +md5sums=('77245df79d10ed5f896a9d3f5b17ee74') build() { cd ${srcdir}/${_hkgname}-${pkgver} @@ -35,4 +36,3 @@ package() { install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE } - diff --git a/extra/haskell-transformers/PKGBUILD b/extra/haskell-transformers/PKGBUILD index 112040d99..13ecd271a 100644 --- a/extra/haskell-transformers/PKGBUILD +++ b/extra/haskell-transformers/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 151894 2012-03-03 16:06:32Z tdziedzic $ +# $Id: PKGBUILD 161660 2012-06-13 13:44:42Z tdziedzic $ # Maintainer: Thomas Dziedzic <gostrc@gmail.com> # Contributor: Rémy Oudompheng <remy@archlinux.org> _hkgname=transformers pkgname=haskell-transformers -pkgver=0.2.2.0 -pkgrel=4 +pkgver=0.3.0.0 +pkgrel=1 pkgdesc="Concrete functor and monad transformers" url="http://hackage.haskell.org/package/${_hkgname}" license=('custom:BSD3') arch=('i686' 'x86_64' 'mips64el') -depends=('ghc=7.4.1' 'sh') +depends=('ghc=7.4.2-1' 'sh') source=("http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz") install=${pkgname}.install -md5sums=('3470ac66116900cd1ba84d3744474e49') +md5sums=('852dc0b79cc2bcb39136287d3dd385e5') build() { cd ${srcdir}/${_hkgname}-${pkgver} diff --git a/extra/haskell-zlib/PKGBUILD b/extra/haskell-zlib/PKGBUILD index de4aaee08..1cd980203 100644 --- a/extra/haskell-zlib/PKGBUILD +++ b/extra/haskell-zlib/PKGBUILD @@ -6,13 +6,13 @@ _hkgname=zlib pkgname=haskell-zlib pkgver=0.5.3.3 -pkgrel=3 +pkgrel=4 pkgdesc="Compression and decompression in the gzip and zlib formats" url="http://hackage.haskell.org/package/zlib" license=('custom:BSD3') arch=('i686' 'x86_64' 'mips64el') -depends=('ghc=7.4.1' 'zlib' 'sh') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) +depends=('ghc=7.4.2-1' 'zlib' 'sh') +source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz") install=${pkgname}.install md5sums=('1649e56d13ce2c6a6a9210227401dbbc') diff --git a/extra/openjdk6/PKGBUILD b/extra/openjdk6/PKGBUILD index 6468fdba8..9c0afac6d 100644 --- a/extra/openjdk6/PKGBUILD +++ b/extra/openjdk6/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 158936 2012-05-13 13:26:46Z andyrtr $ +# $Id: PKGBUILD 161769 2012-06-13 16:55:23Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=('openjdk6' 'openjdk6-src') pkgbase="openjdk6" _javaver=6 -_icedteaver=1.11.2 +_icedteaver=1.11.3 _openjdk_version=b24 _openjdk_date=14_nov_2011 pkgver=${_javaver}.${_openjdk_version}_${_icedteaver} @@ -32,8 +32,8 @@ noextract=(openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz jaxp144_03.zip jdk6-jaxws2_1_6-2011_06_13.zip jdk6-jaf-b20.zip) -sha256sums=('078637dc8323951b18cbb2aac56fd2f24baaa81f0757391aaa17e1b7577e9ce5' - '1c4b7ae37498c61b18ac5fcf04b3322b4b82afe7e959e5949f05bf252cdf73c7' +sha256sums=('7d91c407b9795bd6f6255bcf0fb808416b36418c57f601dc47cfabff83194cf4' + '31a26872d3f0b96ac075608df13ae635923a0960cdcdb4ecab3fe6482f2ef978' 'f84e7f0938f4939660ff8f9c2aa164d301faa8a519f2324ceb05ad34b2e09227' 'c1a5348e17b330a7e4b18431e61a40efd2ba99a7da71102cf2c604478ef96012' '229040544e791f44906e8e7b6f6faf503c730a5d854275135f3925490d5c3be3' diff --git a/extra/pyqt/PKGBUILD b/extra/pyqt/PKGBUILD index db25947aa..49a7c000c 100644 --- a/extra/pyqt/PKGBUILD +++ b/extra/pyqt/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 150176 2012-02-14 07:57:37Z andrea $ +# $Id: PKGBUILD 161771 2012-06-13 17:06:46Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> # Contributor: riai <riai@bigfoot.com> Ben <ben@benmazer.net> @@ -6,12 +6,12 @@ pkgbase=pyqt pkgname=('pyqt' 'python2-pyqt') pkgver=4.9.1 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url="http://riverbankcomputing.co.uk/software/pyqt/intro" license=('GPL') -makedepends=('qt' 'python-sip' 'dbus-python' 'python2-sip' 'phonon' - 'python-opengl' 'qt-assistant-compat' 'qtwebkit') +makedepends=('qt' 'python-sip' 'python-dbus' 'python2-sip' 'phonon' + 'python-opengl' 'qt-assistant-compat' 'qtwebkit' 'python2-dbus') source=("http://riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-${pkgver}.tar.gz" 'fix-qthelp-build.patch') md5sums=('7f495dc49f71e3bfb64bf942e0d8bb3c' @@ -50,7 +50,7 @@ build() { package_pyqt(){ pkgdesc="A set of Python 3.x bindings for the Qt toolkit" - depends=('qtwebkit' 'python-sip') + depends=('qtwebkit' 'python-sip' 'python-dbus') optdepends=('phonon: enable audio and video in PyQt applications' 'qscintilla: QScintilla API' 'qt-assistant-compat: add PyQt online help in Qt Assistant') @@ -64,7 +64,7 @@ package_pyqt(){ package_python2-pyqt(){ pkgdesc="A set of Python 2.x bindings for the Qt toolkit" - depends=('pyqt' 'python2-sip' 'dbus-python') + depends=('pyqt' 'python2-sip' 'python2-dbus') optdepends=('phonon: enable audio and video in PyQt applications' 'python-opengl: enable OpenGL 3D graphics in PyQt applications' 'qscintilla: QScintilla API' diff --git a/extra/qemu/PKGBUILD b/extra/qemu/PKGBUILD index 5d3977f53..b3ef1a2f1 100644 --- a/extra/qemu/PKGBUILD +++ b/extra/qemu/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 161390 2012-06-10 20:21:44Z tpowa $ +# $Id: PKGBUILD 161651 2012-06-13 12:26:10Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=qemu pkgver=1.1.0 -pkgrel=1 +pkgrel=2 pkgdesc="A generic and open source processor emulator which achieves a good emulation speed by using dynamic translation." arch=('i686' 'x86_64' 'mips64el') license=('GPL2' 'LGPL2.1') @@ -22,13 +22,13 @@ build() ./configure --prefix=/usr --sysconfdir=/etc --audio-drv-list=oss,alsa,sdl,pa \ --python=/usr/bin/python2 \ --audio-card-list=ac97,sb16,es1370,hda \ - --enable-docs + --enable-docs make } package() { cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + make DESTDIR="${pkgdir}" libexecdir="/usr/lib/qemu" install rm "${pkgdir}/usr/share/qemu/bios.bin" install -D -m644 "${srcdir}/65-kvm.rules" \ diff --git a/extra/swt/PKGBUILD b/extra/swt/PKGBUILD index 01ca0fe9e..332cb5a36 100644 --- a/extra/swt/PKGBUILD +++ b/extra/swt/PKGBUILD @@ -1,75 +1,59 @@ -# $Id: PKGBUILD 138506 2011-09-26 08:00:12Z guillaume $ +# $Id: PKGBUILD 161779 2012-06-13 21:37:16Z guillaume $ # Maintainer: Guillaume ALAUX <guillaume@archlinux.org> pkgname=swt -pkgver=3.7.1 +pkgver=3.7.2 pkgrel=1 +_date=201202080800 pkgdesc="An open source widget toolkit for Java" -_date=201109091335 -arch=(i686 x86_64 mips64el) +arch=('i686' 'x86_64') url="http://www.eclipse.org/swt/" license=('EPL') depends=('java-runtime>=6' 'gtk2>=2.20.1' 'libxtst') -#optdepends=('libgnomeui' 'xulrunner' 'mesa') -#makedepends=('openjdk6' 'libxtst' 'mesa' 'libgnomeui' 'xulrunner>=1.9.1' 'unzip' 'pkgconfig' 'apache-ant') -optdepends=('libgnomeui' 'mesa') -makedepends=('openjdk6' 'libxtst' 'mesa' 'libgnomeui' 'unzip' 'pkgconfig' 'apache-ant') +optdepends=('libgnomeui' 'mesa' 'libwebkit') +makedepends=('java-environment' 'libxtst' 'mesa' 'libgnomeui' 'unzip' 'pkgconfig' 'libwebkit' 'apache-ant') if [ "${CARCH}" = "i686" ]; then - source=(http://download.eclipse.org/eclipse/downloads/drops/R-${pkgver}-${_date}/swt-${pkgver}-gtk-linux-x86.zip - build-swt.xml) - noextract=(swt-${pkgver}-gtk-linux-x86.zip) - md5sums=('b7d6d24e2feb7489b0baa0ce941ea4d2' + _carch=x86 + md5sums=('9a858b11e66de8af41786eaf09fc9ee2' 'f5e548bc26a0f1f3c18131be76face40') fi if [ "${CARCH}" = "x86_64" ]; then - source=(http://download.eclipse.org/eclipse/downloads/drops/R-${pkgver}-${_date}/swt-${pkgver}-gtk-linux-x86_64.zip - build-swt.xml) - md5sums=('8816631e7993a783a87e98ba39da7fa6' + _carch=x86_64 + md5sums=('b16ab5c9d274b9488432ebeae6e4af5a' 'f5e548bc26a0f1f3c18131be76face40') - noextract=(swt-${pkgver}-gtk-linux-x86_64.zip) fi +source=(http://download.eclipse.org/eclipse/downloads/drops/R-${pkgver}-${_date}/swt-${pkgver}-gtk-linux-${_carch}.zip + build-swt.xml) +noextract=(swt-${pkgver}-gtk-linux-${_carch}.zip) +# To test this pkg: +# http://www.eclipse.org/swt/examples.php#standaloneOutsideEclipse +# http://download.eclipse.org/eclipse/downloads/drops/R-${pkgver}-${_date}/swt-${pkgver}-gtk-linux-${_carch}.zip build() { - cd "${srcdir}" - . /etc/profile.d/openjdk6.sh - . /etc/profile.d/apache-ant.sh - unzip -jqo ${srcdir}/swt-${pkgver}-gtk-linux-*.zip "*src.zip" - unzip -qo src.zip - rm -rf about_files - mkdir src - mv org src/ - cp build-swt.xml build.xml + cd ${srcdir} + unzip -oq swt-${pkgver}-gtk-linux-${_carch}.zip src.zip + unzip -oq src.zip -d src - [ "${CARCH}" = "x86_64" ] && export SWT_PTR_CFLAGS=-DJNI64 + . /etc/profile.d/jdk.sh + . /etc/profile.d/apache-ant.sh - make -f make_linux.mak make_awt - make -f make_linux.mak make_swt - make -f make_linux.mak make_atk - make -f make_linux.mak make_gnome -# "XULRunner >= 2.0 is not currently supported" -# https://bugs.eclipse.org/bugs/show_bug.cgi?id=327696 -# -# export MOZILLA_INCLUDES="`pkg-config --cflags libxul`" -# export MOZILLA_LIBS="-Wl,-R`pkg-config libxul --variable=libdir` `pkg-config libxul --libs`" -# export XULRUNNER_INCLUDES="${MOZILLA_INCLUDES}" -# export XULRUNNER_LIBS="${MOZILLA_LIBS}" -# make -f make_linux.mak make_mozilla -# make -f make_linux.mak make_xulrunner + # Shared objects + cd src + ./build.sh - make -f make_linux.mak make_cairo - make -f make_linux.mak make_glx - - ant compile + # SWT jar + ant -f ../build-swt.xml compile } package() { - cd "${srcdir}" - cp version.txt build/version.txt - cp src/org/eclipse/swt/internal/SWTMessages.properties build/org/eclipse/swt/internal/ + cd ${srcdir}/src - ant jar + # Shared objects + export OUTPUT_DIR=${pkgdir}/usr/lib + install -dm755 ${OUTPUT_DIR} + make -f make_linux.mak install - install -m755 -d "${pkgdir}/usr/share/java" - install -m755 -d "${pkgdir}/usr/lib" - install -m644 swt.jar "${pkgdir}/usr/share/java/" - install -m755 *.so "${pkgdir}/usr/lib/" + # SWT jar + ant -f ../build-swt.xml jar + install -Dm755 ../swt.jar ${pkgdir}/usr/share/java/swt-${pkgver}.jar + ln -s swt-${pkgver}.jar ${pkgdir}/usr/share/java/swt.jar } diff --git a/extra/tcpdump/PKGBUILD b/extra/tcpdump/PKGBUILD index 1b8fb77ae..d9ceeda41 100644 --- a/extra/tcpdump/PKGBUILD +++ b/extra/tcpdump/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 148483 2012-02-02 13:39:36Z giovanni $ +# $Id: PKGBUILD 161647 2012-06-13 06:49:09Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> pkgname=tcpdump -pkgver=4.2.1 -pkgrel=2 +pkgver=4.3.0 +pkgrel=1 pkgdesc="A tool for network monitoring and data acquisition" arch=('i686' 'x86_64' 'mips64el') url="http://www.tcpdump.org" @@ -12,8 +12,8 @@ license=('BSD') depends=('libpcap' 'openssl') source=("http://www.tcpdump.org/release/${pkgname}-${pkgver}.tar.gz" 'tcpdump_duplicate_executable.patch') -md5sums=('c202878c6db054767b52651041b9e60e' - 'b45c978dff8193ff5529d3566e7dbfa3') +md5sums=('a3fe4d30ac85ff5467c889ff46b7e1e8' + '96c116e5ed51759a029bb6c236d63178') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/tcpdump/tcpdump_duplicate_executable.patch b/extra/tcpdump/tcpdump_duplicate_executable.patch index 705983ccc..bb3e60f1a 100644 --- a/extra/tcpdump/tcpdump_duplicate_executable.patch +++ b/extra/tcpdump/tcpdump_duplicate_executable.patch @@ -1,6 +1,6 @@ ---- a/Makefile.in 2011-07-24 22:58:55.000000000 +0200 -+++ b/Makefile.in 2011-12-05 12:59:23.000000000 +0100 -@@ -399,7 +399,6 @@ +--- a/Makefile.in 2012-06-12 18:56:20.000000000 +0200 ++++ b/Makefile.in 2012-06-13 08:41:09.000000000 +0200 +@@ -409,7 +409,6 @@ [ -d $(DESTDIR)$(sbindir) ] || \ (mkdir -p $(DESTDIR)$(sbindir); chmod 755 $(DESTDIR)$(sbindir)) $(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(sbindir)/$(PROG) diff --git a/kernels/linux-libre-aufs_friendly/linux-libre-aufs_friendly.install b/kernels/linux-libre-aufs_friendly/linux-libre-aufs_friendly.install index cad3564d8..2553613f7 100644 --- a/kernels/linux-libre-aufs_friendly/linux-libre-aufs_friendly.install +++ b/kernels/linux-libre-aufs_friendly/linux-libre-aufs_friendly.install @@ -8,8 +8,10 @@ post_install () { # updating module dependencies echo ">>> Updating module dependencies. Please wait ..." depmod ${KERNEL_VERSION} - echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..." - mkinitcpio -p linux-libre${KERNEL_NAME} + if command -v mkinitcpio 2>&1 > /dev/null; then + echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..." + mkinitcpio -p linux-libre${KERNEL_NAME} + fi # compat symlinks for the official kernels only if [ -z "${KERNEL_NAME}" -o "${KERNEL_NAME}" = "-aufs_friendly" ]; then @@ -28,7 +30,7 @@ post_install () { post_upgrade() { pacman -Q grub &>/dev/null hasgrub=$? - pacman -Q grub2 &>/dev/null + pacman -Q grub2-common &>/dev/null hasgrub2=$? pacman -Q lilo &>/dev/null haslilo=$? @@ -51,8 +53,10 @@ post_upgrade() { # updating module dependencies echo ">>> Updating module dependencies. Please wait ..." depmod ${KERNEL_VERSION} - echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..." - mkinitcpio -p linux-libre${KERNEL_NAME} + if command -v mkinitcpio 2>&1 > /dev/null; then + echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..." + mkinitcpio -p linux-libre${KERNEL_NAME} + fi } post_remove() { diff --git a/kernels/linux-libre-lts-xen/PKGBUILD b/kernels/linux-libre-lts-xen/PKGBUILD index fe102f9b8..63bb952f9 100644 --- a/kernels/linux-libre-lts-xen/PKGBUILD +++ b/kernels/linux-libre-lts-xen/PKGBUILD @@ -8,7 +8,7 @@ pkgname=('linux-libre-lts-xen' 'linux-libre-lts-xen-headers') # Build stock -LIB # pkgname=linux-custom # Build kernel with a different name _kernelname=-LIBRE-LTS-XEN _basekernel=3.0 -pkgver=${_basekernel}.28 +pkgver=${_basekernel}.31 pkgrel=1 arch=('i686') url="http://linux-libre.fsfla.org/" @@ -26,8 +26,8 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'i915-fix-ghost-tv-output.patch' 'ext4-options.patch') md5sums=('5f64180fe7df4e574dac5911b78f5067' - '150cef79eaa9a41cd5ccd65c696e7f10' - 'd260f5926a4ffec1e6d0408dcde732df' + '2748e4e15dada12fe284e9ae341a4652' + '162fda63a1b6f9e0bf801e30cbb52195' 'f967e9030fc45775a2141fbae18b8c6e' '04b21c79df0a952c22d681dd4f4562df' '9d3c56a4b999c8bfbd4018089a62f662' diff --git a/kernels/linux-libre-lts-xen/config.i686 b/kernels/linux-libre-lts-xen/config.i686 index a0406c4e7..03d91513e 100644 --- a/kernels/linux-libre-lts-xen/config.i686 +++ b/kernels/linux-libre-lts-xen/config.i686 @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/i386 3.0.28 Kernel Configuration +# Linux/i386 3.0.31 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -1243,7 +1243,6 @@ CONFIG_WIMAX_DEBUG_LEVEL=8 CONFIG_RFKILL=m CONFIG_RFKILL_LEDS=y CONFIG_RFKILL_INPUT=y -CONFIG_RFKILL_REGULATOR=m CONFIG_NET_9P=m CONFIG_NET_9P_VIRTIO=m # CONFIG_NET_9P_DEBUG is not set @@ -1454,7 +1453,7 @@ CONFIG_SENSORS_LIS3LV02D=m CONFIG_MISC_DEVICES=y CONFIG_AD525X_DPOT=m CONFIG_AD525X_DPOT_I2C=m -CONFIG_AD525X_DPOT_SPI=m +# CONFIG_AD525X_DPOT_SPI is not set # CONFIG_IBM_ASM is not set CONFIG_PHANTOM=m CONFIG_INTEL_MID_PTI=m @@ -1476,7 +1475,7 @@ CONFIG_SENSORS_BH1770=m CONFIG_SENSORS_APDS990X=m CONFIG_HMC6352=m CONFIG_DS1682=m -CONFIG_TI_DAC7512=m +# CONFIG_TI_DAC7512 is not set CONFIG_VMWARE_BALLOON=m CONFIG_BMP085=m # CONFIG_PCH_PHUB is not set @@ -1487,7 +1486,7 @@ CONFIG_C2PORT_DURAMAR_2150=m # EEPROM support # CONFIG_EEPROM_AT24=m -CONFIG_EEPROM_AT25=m +# CONFIG_EEPROM_AT25 is not set CONFIG_EEPROM_LEGACY=m CONFIG_EEPROM_MAX6875=m CONFIG_EEPROM_93CX6=m @@ -1961,8 +1960,7 @@ CONFIG_NET_VENDOR_SMC=y CONFIG_WD80x3=m CONFIG_ULTRA=m CONFIG_SMC9194=m -CONFIG_ENC28J60=m -# CONFIG_ENC28J60_WRITEVERIFY is not set +# CONFIG_ENC28J60 is not set CONFIG_ETHOC=m CONFIG_NET_VENDOR_RACAL=y CONFIG_NI52=m @@ -2033,7 +2031,7 @@ CONFIG_SUNDANCE=m # CONFIG_SUNDANCE_MMIO is not set CONFIG_TLAN=m CONFIG_KS8842=m -CONFIG_KS8851=m +# CONFIG_KS8851 is not set CONFIG_KS8851_MLL=m CONFIG_VIA_RHINE=m # CONFIG_VIA_RHINE_MMIO is not set @@ -2209,7 +2207,7 @@ CONFIG_LIBERTAS=m CONFIG_LIBERTAS_USB=m CONFIG_LIBERTAS_CS=m CONFIG_LIBERTAS_SDIO=m -CONFIG_LIBERTAS_SPI=m +# CONFIG_LIBERTAS_SPI is not set # CONFIG_LIBERTAS_DEBUG is not set CONFIG_LIBERTAS_MESH=y CONFIG_HERMES=m @@ -2225,8 +2223,7 @@ CONFIG_ORINOCO_USB=m CONFIG_P54_COMMON=m CONFIG_P54_USB=m CONFIG_P54_PCI=m -CONFIG_P54_SPI=m -CONFIG_P54_SPI_DEFAULT_EEPROM=y +# CONFIG_P54_SPI is not set CONFIG_P54_LEDS=y CONFIG_RT2X00=m CONFIG_RT2400PCI=m @@ -2257,12 +2254,12 @@ CONFIG_RTL8192CU=m CONFIG_RTLWIFI=m CONFIG_RTL8192C_COMMON=m CONFIG_WL1251=m -CONFIG_WL1251_SPI=m +# CONFIG_WL1251_SPI is not set CONFIG_WL1251_SDIO=m CONFIG_WL12XX_MENU=m CONFIG_WL12XX=m CONFIG_WL12XX_HT=y -CONFIG_WL12XX_SPI=m +# CONFIG_WL12XX_SPI is not set CONFIG_WL12XX_SDIO=m CONFIG_WL12XX_SDIO_TEST=m CONFIG_WL12XX_PLATFORM_DATA=y @@ -2647,11 +2644,11 @@ CONFIG_TABLET_USB_HANWANG=m CONFIG_TABLET_USB_KBTAB=m CONFIG_TABLET_USB_WACOM=m CONFIG_INPUT_TOUCHSCREEN=y -CONFIG_TOUCHSCREEN_ADS7846=m -CONFIG_TOUCHSCREEN_AD7877=m +# CONFIG_TOUCHSCREEN_ADS7846 is not set +# CONFIG_TOUCHSCREEN_AD7877 is not set CONFIG_TOUCHSCREEN_AD7879=m CONFIG_TOUCHSCREEN_AD7879_I2C=m -CONFIG_TOUCHSCREEN_AD7879_SPI=m +# CONFIG_TOUCHSCREEN_AD7879_SPI is not set CONFIG_TOUCHSCREEN_ATMEL_MXT=m CONFIG_TOUCHSCREEN_BU21013=m CONFIG_TOUCHSCREEN_CY8CTMG110=m @@ -2672,13 +2669,11 @@ CONFIG_TOUCHSCREEN_PENMOUNT=m CONFIG_TOUCHSCREEN_TOUCHRIGHT=m CONFIG_TOUCHSCREEN_TOUCHWIN=m CONFIG_TOUCHSCREEN_UCB1400=m -CONFIG_TOUCHSCREEN_WM831X=m CONFIG_TOUCHSCREEN_WM97XX=m CONFIG_TOUCHSCREEN_WM9705=y CONFIG_TOUCHSCREEN_WM9712=y CONFIG_TOUCHSCREEN_WM9713=y CONFIG_TOUCHSCREEN_USB_COMPOSITE=m -CONFIG_TOUCHSCREEN_MC13783=m CONFIG_TOUCHSCREEN_USB_EGALAX=y CONFIG_TOUCHSCREEN_USB_PANJIT=y CONFIG_TOUCHSCREEN_USB_3M=y @@ -2696,9 +2691,8 @@ CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y CONFIG_TOUCHSCREEN_USB_ETT_TC45USB=y CONFIG_TOUCHSCREEN_USB_NEXIO=y CONFIG_TOUCHSCREEN_TOUCHIT213=m -CONFIG_TOUCHSCREEN_TSC2005=m +# CONFIG_TOUCHSCREEN_TSC2005 is not set CONFIG_TOUCHSCREEN_TSC2007=m -CONFIG_TOUCHSCREEN_PCAP=m CONFIG_TOUCHSCREEN_ST1232=m CONFIG_TOUCHSCREEN_TPS6507X=m CONFIG_INPUT_MISC=y @@ -2720,8 +2714,6 @@ CONFIG_INPUT_UINPUT=m CONFIG_INPUT_PCF50633_PMU=m CONFIG_INPUT_PCF8574=m CONFIG_INPUT_GPIO_ROTARY_ENCODER=m -CONFIG_INPUT_WM831X_ON=m -# CONFIG_INPUT_PCAP is not set CONFIG_INPUT_ADXL34X=m CONFIG_INPUT_ADXL34X_I2C=m CONFIG_INPUT_ADXL34X_SPI=m @@ -2793,10 +2785,9 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4 # # Non-8250 serial port support # -CONFIG_SERIAL_MAX3100=m -CONFIG_SERIAL_MAX3107=m +# CONFIG_SERIAL_MAX3100 is not set +# CONFIG_SERIAL_MAX3107 is not set CONFIG_SERIAL_MFD_HSU=m -CONFIG_SERIAL_UARTLITE=m CONFIG_SERIAL_CORE=y CONFIG_SERIAL_CORE_CONSOLE=y CONFIG_SERIAL_JSM=m @@ -2805,7 +2796,7 @@ CONFIG_SERIAL_ALTERA_JTAGUART=m CONFIG_SERIAL_ALTERA_UART=m CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4 CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200 -CONFIG_SERIAL_IFX6X60=m +# CONFIG_SERIAL_IFX6X60 is not set CONFIG_SERIAL_PCH_UART=m CONFIG_SERIAL_XILINX_PS_UART=m CONFIG_PRINTER=m @@ -3001,7 +2992,6 @@ CONFIG_GPIO_MAX7300=m CONFIG_GPIO_MAX732X=m CONFIG_GPIO_PCA953X=m CONFIG_GPIO_PCF857X=m -CONFIG_GPIO_WM831X=m CONFIG_GPIO_ADP5588=m # @@ -3011,7 +3001,6 @@ CONFIG_GPIO_CS5535=m CONFIG_GPIO_LANGWELL=y CONFIG_GPIO_PCH=m CONFIG_GPIO_ML_IOH=m -CONFIG_GPIO_TIMBERDALE=y CONFIG_GPIO_RDC321X=m # @@ -3030,7 +3019,6 @@ CONFIG_GPIO_UCB1400=y # # MODULbus GPIO expanders: # -CONFIG_GPIO_JANZ_TTL=m CONFIG_W1=m CONFIG_W1_CON=y @@ -3059,22 +3047,18 @@ CONFIG_W1_SLAVE_BQ27000=m CONFIG_POWER_SUPPLY=y # CONFIG_POWER_SUPPLY_DEBUG is not set CONFIG_PDA_POWER=m -CONFIG_WM831X_BACKUP=m -CONFIG_WM831X_POWER=m CONFIG_TEST_POWER=m -CONFIG_BATTERY_DS2760=m -CONFIG_BATTERY_DS2780=m -CONFIG_BATTERY_DS2782=m -CONFIG_BATTERY_BQ20Z75=m -CONFIG_BATTERY_BQ27x00=m -CONFIG_BATTERY_BQ27X00_I2C=y -CONFIG_BATTERY_BQ27X00_PLATFORM=y -CONFIG_BATTERY_MAX17040=m -CONFIG_BATTERY_MAX17042=m -CONFIG_CHARGER_PCF50633=m -CONFIG_CHARGER_ISP1704=m -CONFIG_CHARGER_MAX8903=m -CONFIG_CHARGER_GPIO=m +# CONFIG_BATTERY_DS2760 is not set +# CONFIG_BATTERY_DS2780 is not set +# CONFIG_BATTERY_DS2782 is not set +# CONFIG_BATTERY_BQ20Z75 is not set +# CONFIG_BATTERY_BQ27x00 is not set +# CONFIG_BATTERY_MAX17040 is not set +# CONFIG_BATTERY_MAX17042 is not set +# CONFIG_CHARGER_PCF50633 is not set +# CONFIG_CHARGER_ISP1704 is not set +# CONFIG_CHARGER_MAX8903 is not set +# CONFIG_CHARGER_GPIO is not set CONFIG_HWMON=y CONFIG_HWMON_VID=m # CONFIG_HWMON_DEBUG_CHIP is not set @@ -3086,7 +3070,7 @@ CONFIG_SENSORS_ABITUGURU=m CONFIG_SENSORS_ABITUGURU3=m CONFIG_SENSORS_AD7414=m CONFIG_SENSORS_AD7418=m -CONFIG_SENSORS_ADCXX=m +# CONFIG_SENSORS_ADCXX is not set CONFIG_SENSORS_ADM1021=m CONFIG_SENSORS_ADM1025=m CONFIG_SENSORS_ADM1026=m @@ -3121,7 +3105,7 @@ CONFIG_SENSORS_IT87=m CONFIG_SENSORS_JC42=m CONFIG_SENSORS_LINEAGE=m CONFIG_SENSORS_LM63=m -CONFIG_SENSORS_LM70=m +# CONFIG_SENSORS_LM70 is not set CONFIG_SENSORS_LM73=m CONFIG_SENSORS_LM75=m CONFIG_SENSORS_LM77=m @@ -3138,7 +3122,7 @@ CONFIG_SENSORS_LTC4215=m CONFIG_SENSORS_LTC4245=m CONFIG_SENSORS_LTC4261=m CONFIG_SENSORS_LM95241=m -CONFIG_SENSORS_MAX1111=m +# CONFIG_SENSORS_MAX1111 is not set CONFIG_SENSORS_MAX16065=m CONFIG_SENSORS_MAX1619=m CONFIG_SENSORS_MAX6639=m @@ -3169,7 +3153,7 @@ CONFIG_SENSORS_SMSC47B397=m CONFIG_SENSORS_SCH5627=m CONFIG_SENSORS_ADS1015=m CONFIG_SENSORS_ADS7828=m -CONFIG_SENSORS_ADS7871=m +# CONFIG_SENSORS_ADS7871 is not set CONFIG_SENSORS_AMC6821=m CONFIG_SENSORS_THMC50=m CONFIG_SENSORS_TMP102=m @@ -3189,9 +3173,7 @@ CONFIG_SENSORS_W83L785TS=m CONFIG_SENSORS_W83L786NG=m CONFIG_SENSORS_W83627HF=m CONFIG_SENSORS_W83627EHF=m -CONFIG_SENSORS_WM831X=m CONFIG_SENSORS_APPLESMC=m -CONFIG_SENSORS_MC13783_ADC=m # # ACPI drivers @@ -3207,7 +3189,6 @@ CONFIG_WATCHDOG=y # Watchdog Device Drivers # CONFIG_SOFT_WATCHDOG=m -CONFIG_WM831X_WATCHDOG=m CONFIG_ACQUIRE_WDT=m CONFIG_ADVANTECH_WDT=m CONFIG_ALIM1535_WDT=m @@ -3296,57 +3277,28 @@ CONFIG_MFD_SM501=m CONFIG_MFD_SM501_GPIO=y CONFIG_HTC_PASIC3=m CONFIG_UCB1400_CORE=m -CONFIG_TPS6105X=m +# CONFIG_TPS6105X is not set CONFIG_TPS65010=m CONFIG_TPS6507X=m # CONFIG_MFD_TMIO is not set CONFIG_MFD_WM8400=m -CONFIG_MFD_WM831X=y -CONFIG_MFD_WM831X_SPI=y +# CONFIG_MFD_WM831X_SPI is not set CONFIG_MFD_PCF50633=m CONFIG_PCF50633_ADC=m CONFIG_PCF50633_GPIO=m -CONFIG_MFD_MC13783=m -CONFIG_MFD_MC13XXX=m +# CONFIG_MFD_MC13XXX is not set CONFIG_ABX500_CORE=y -CONFIG_EZX_PCAP=y +# CONFIG_EZX_PCAP is not set CONFIG_AB8500_CORE=y # CONFIG_AB8500_DEBUG is not set -CONFIG_AB8500_GPADC=y CONFIG_MFD_CS5535=m -CONFIG_MFD_TIMBERDALE=m +# CONFIG_MFD_TIMBERDALE is not set CONFIG_LPC_SCH=m CONFIG_MFD_RDC321X=m -CONFIG_MFD_JANZ_CMODIO=m +# CONFIG_MFD_JANZ_CMODIO is not set CONFIG_MFD_VX855=m CONFIG_MFD_WL1273_CORE=m -CONFIG_REGULATOR=y -# CONFIG_REGULATOR_DEBUG is not set -CONFIG_REGULATOR_DUMMY=y -CONFIG_REGULATOR_FIXED_VOLTAGE=m -CONFIG_REGULATOR_VIRTUAL_CONSUMER=m -CONFIG_REGULATOR_USERSPACE_CONSUMER=m -CONFIG_REGULATOR_BQ24022=m -CONFIG_REGULATOR_MAX1586=m -CONFIG_REGULATOR_MAX8649=m -CONFIG_REGULATOR_MAX8660=m -CONFIG_REGULATOR_MAX8952=m -CONFIG_REGULATOR_WM831X=m -CONFIG_REGULATOR_WM8400=m -CONFIG_REGULATOR_PCF50633=m -CONFIG_REGULATOR_LP3971=m -CONFIG_REGULATOR_LP3972=m -CONFIG_REGULATOR_PCAP=m -CONFIG_REGULATOR_MC13XXX_CORE=m -CONFIG_REGULATOR_MC13783=m -CONFIG_REGULATOR_MC13892=m -CONFIG_REGULATOR_TPS6105X=m -CONFIG_REGULATOR_TPS65023=m -CONFIG_REGULATOR_TPS6507X=m -CONFIG_REGULATOR_ISL6271A=m -CONFIG_REGULATOR_AD5398=m -CONFIG_REGULATOR_AB8500=y -CONFIG_REGULATOR_TPS6524X=m +# CONFIG_REGULATOR is not set CONFIG_MEDIA_SUPPORT=m # @@ -3660,7 +3612,6 @@ CONFIG_USB_MR800=m CONFIG_RADIO_TEA5764=m CONFIG_RADIO_SAA7706H=m CONFIG_RADIO_TEF6862=m -CONFIG_RADIO_TIMBERDALE=m CONFIG_RADIO_WL1273=m # @@ -3994,23 +3945,21 @@ CONFIG_XEN_FBDEV_FRONTEND=m # CONFIG_FB_BROADSHEET is not set CONFIG_BACKLIGHT_LCD_SUPPORT=y CONFIG_LCD_CLASS_DEVICE=m -CONFIG_LCD_L4F00242T03=m -CONFIG_LCD_LMS283GF05=m -CONFIG_LCD_LTV350QV=m -CONFIG_LCD_ILI9320=m -CONFIG_LCD_TDO24M=m -CONFIG_LCD_VGG2432A4=m -CONFIG_LCD_PLATFORM=m -CONFIG_LCD_S6E63M0=m -CONFIG_LCD_LD9040=m +# CONFIG_LCD_L4F00242T03 is not set +# CONFIG_LCD_LMS283GF05 is not set +# CONFIG_LCD_LTV350QV is not set +# CONFIG_LCD_TDO24M is not set +# CONFIG_LCD_VGG2432A4 is not set +# CONFIG_LCD_PLATFORM is not set +# CONFIG_LCD_S6E63M0 is not set +# CONFIG_LCD_LD9040 is not set CONFIG_BACKLIGHT_CLASS_DEVICE=y -CONFIG_BACKLIGHT_GENERIC=m +# CONFIG_BACKLIGHT_GENERIC is not set CONFIG_BACKLIGHT_PROGEAR=m CONFIG_BACKLIGHT_APPLE=m -CONFIG_BACKLIGHT_SAHARA=m -CONFIG_BACKLIGHT_WM831X=m -CONFIG_BACKLIGHT_ADP8860=m -CONFIG_BACKLIGHT_ADP8870=m +# CONFIG_BACKLIGHT_SAHARA is not set +# CONFIG_BACKLIGHT_ADP8860 is not set +# CONFIG_BACKLIGHT_ADP8870 is not set CONFIG_BACKLIGHT_PCF50633=m # @@ -4240,10 +4189,7 @@ CONFIG_SND_ISIGHT=m CONFIG_SND_PCMCIA=y CONFIG_SND_VXPOCKET=m CONFIG_SND_PDAUDIOCF=m -CONFIG_SND_SOC=m -CONFIG_SND_SOC_CACHE_LZO=y -CONFIG_SND_SOC_I2C_AND_SPI=m -# CONFIG_SND_SOC_ALL_CODECS is not set +# CONFIG_SND_SOC is not set # CONFIG_SOUND_PRIME is not set CONFIG_AC97_BUS=m CONFIG_HID_SUPPORT=y @@ -4617,7 +4563,7 @@ CONFIG_LEDS_CLASS=y # LED drivers # CONFIG_LEDS_LM3530=m -CONFIG_LEDS_NET5501=m +# CONFIG_LEDS_NET5501 is not set CONFIG_LEDS_ALIX2=m CONFIG_LEDS_PCA9532=m CONFIG_LEDS_PCA9532_GPIO=y @@ -4628,14 +4574,11 @@ CONFIG_LEDS_LP5521=m CONFIG_LEDS_LP5523=m CONFIG_LEDS_CLEVO_MAIL=m CONFIG_LEDS_PCA955X=m -CONFIG_LEDS_WM831X_STATUS=m -CONFIG_LEDS_DAC124S085=m -CONFIG_LEDS_REGULATOR=m +# CONFIG_LEDS_DAC124S085 is not set CONFIG_LEDS_BD2802=m CONFIG_LEDS_INTEL_SS4200=m CONFIG_LEDS_LT3593=m CONFIG_LEDS_DELL_NETBOOKS=m -CONFIG_LEDS_MC13783=m CONFIG_LEDS_TRIGGERS=y # @@ -4723,15 +4666,15 @@ CONFIG_RTC_DRV_RV3029C2=m # # SPI RTC drivers # -CONFIG_RTC_DRV_M41T93=m -CONFIG_RTC_DRV_M41T94=m -CONFIG_RTC_DRV_DS1305=m -CONFIG_RTC_DRV_DS1390=m -CONFIG_RTC_DRV_MAX6902=m -CONFIG_RTC_DRV_R9701=m -CONFIG_RTC_DRV_RS5C348=m -CONFIG_RTC_DRV_DS3234=m -CONFIG_RTC_DRV_PCF2123=m +# CONFIG_RTC_DRV_M41T93 is not set +# CONFIG_RTC_DRV_M41T94 is not set +# CONFIG_RTC_DRV_DS1305 is not set +# CONFIG_RTC_DRV_DS1390 is not set +# CONFIG_RTC_DRV_MAX6902 is not set +# CONFIG_RTC_DRV_R9701 is not set +# CONFIG_RTC_DRV_RS5C348 is not set +# CONFIG_RTC_DRV_DS3234 is not set +# CONFIG_RTC_DRV_PCF2123 is not set # # Platform RTC drivers @@ -4749,15 +4692,12 @@ CONFIG_RTC_DRV_MSM6242=m CONFIG_RTC_DRV_BQ4802=m CONFIG_RTC_DRV_RP5C01=m CONFIG_RTC_DRV_V3020=m -CONFIG_RTC_DRV_WM831X=m CONFIG_RTC_DRV_PCF50633=m CONFIG_RTC_DRV_AB8500=m # # on-CPU RTC drivers # -# CONFIG_RTC_DRV_PCAP is not set -CONFIG_RTC_DRV_MC13XXX=m CONFIG_DMADEVICES=y # CONFIG_DMADEVICES_DEBUG is not set diff --git a/kernels/linux-libre-lts-xen/linux-libre-lts-xen.install b/kernels/linux-libre-lts-xen/linux-libre-lts-xen.install index 8510e226d..95b8d4e26 100644 --- a/kernels/linux-libre-lts-xen/linux-libre-lts-xen.install +++ b/kernels/linux-libre-lts-xen/linux-libre-lts-xen.install @@ -2,14 +2,16 @@ # arg 2: the old package version KERNEL_NAME=-lts-xen -KERNEL_VERSION=3.0.28-1-LIBRE-LTS-XEN +KERNEL_VERSION=3.0.31-1-LIBRE-LTS-XEN post_install () { # updating module dependencies echo ">>> Updating module dependencies. Please wait ..." depmod ${KERNEL_VERSION} - echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..." - mkinitcpio -p linux-libre${KERNEL_NAME} + if command -v mkinitcpio 2>&1 > /dev/null; then + echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..." + mkinitcpio -p linux-libre${KERNEL_NAME} + fi # compat symlinks for the official kernels only if [ -z "${KERNEL_NAME}" -o "${KERNEL_NAME}" = "-xen" ]; then @@ -28,7 +30,7 @@ post_install () { post_upgrade() { pacman -Q grub &>/dev/null hasgrub=$? - pacman -Q grub2 &>/dev/null + pacman -Q grub2-common &>/dev/null hasgrub2=$? pacman -Q lilo &>/dev/null haslilo=$? @@ -51,8 +53,10 @@ post_upgrade() { # updating module dependencies echo ">>> Updating module dependencies. Please wait ..." depmod ${KERNEL_VERSION} - echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..." - mkinitcpio -p linux-libre${KERNEL_NAME} + if command -v mkinitcpio 2>&1 > /dev/null; then + echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..." + mkinitcpio -p linux-libre${KERNEL_NAME} + fi } post_remove() { diff --git a/kernels/linux-libre-rt/linux-libre-rt.install b/kernels/linux-libre-rt/linux-libre-rt.install index 407bf32c1..698814cdc 100644 --- a/kernels/linux-libre-rt/linux-libre-rt.install +++ b/kernels/linux-libre-rt/linux-libre-rt.install @@ -8,8 +8,10 @@ post_install () { # updating module dependencies echo ">>> Updating module dependencies. Please wait ..." depmod ${KERNEL_VERSION} - echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..." - mkinitcpio -p linux-libre${KERNEL_NAME} + if command -v mkinitcpio 2>&1 > /dev/null; then + echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..." + mkinitcpio -p linux-libre${KERNEL_NAME} + fi # compat symlinks for the official kernels only if [ -z "${KERNEL_NAME}" -o "${KERNEL_NAME}" = "-rt" ]; then @@ -51,8 +53,10 @@ post_upgrade() { # updating module dependencies echo ">>> Updating module dependencies. Please wait ..." depmod ${KERNEL_VERSION} - echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..." - mkinitcpio -p linux-libre${KERNEL_NAME} + if command -v mkinitcpio 2>&1 > /dev/null; then + echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..." + mkinitcpio -p linux-libre${KERNEL_NAME} + fi } post_remove() { diff --git a/kernels/linux-libre-xen/PKGBUILD b/kernels/linux-libre-xen/PKGBUILD index caa0d045b..a51108a82 100644 --- a/kernels/linux-libre-xen/PKGBUILD +++ b/kernels/linux-libre-xen/PKGBUILD @@ -11,7 +11,7 @@ pkgname=('linux-libre-xen' 'linux-libre-xen-headers') # Build stock -LIBRE kerne # pkgname=linux-custom # Build kernel with a different name _kernelname=-LIBRE-XEN _basekernel=3.3 -pkgver=${_basekernel}.2 +pkgver=${_basekernel}.6 pkgrel=1 arch=('i686') url="http://linux-libre.fsfla.org/" @@ -29,8 +29,8 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'i915-fix-ghost-tv-output.patch' 'ext4-options.patch') md5sums=('5487da14ca81715a469c7594d39722fa' - 'b43d3bdecfa355bf45bd1154819e3687' - '7e49ab7e4e63c890d0196be139a55656' + '6d9d139e4b53802615833372728cc0e4' + '08169715a665016e8e54a92f98768494' 'b7c2805bb287a644c0a303bf7721e534' '04b21c79df0a952c22d681dd4f4562df' '9d3c56a4b999c8bfbd4018089a62f662' diff --git a/kernels/linux-libre-xen/config.i686 b/kernels/linux-libre-xen/config.i686 index b1d41d390..7de310e0b 100644 --- a/kernels/linux-libre-xen/config.i686 +++ b/kernels/linux-libre-xen/config.i686 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 3.3.2 Kernel Configuration +# Linux/i386 3.3.6 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -1299,7 +1299,7 @@ CONFIG_WIMAX_DEBUG_LEVEL=8 CONFIG_RFKILL=m CONFIG_RFKILL_LEDS=y CONFIG_RFKILL_INPUT=y -CONFIG_RFKILL_REGULATOR=m +# CONFIG_RFKILL_REGULATOR is not set CONFIG_NET_9P=m CONFIG_NET_9P_VIRTIO=m # CONFIG_NET_9P_DEBUG is not set @@ -1342,8 +1342,7 @@ CONFIG_SYS_HYPERVISOR=y # CONFIG_GENERIC_CPU_DEVICES is not set CONFIG_REGMAP=y CONFIG_REGMAP_I2C=m -CONFIG_REGMAP_SPI=y -CONFIG_REGMAP_IRQ=y +CONFIG_REGMAP_SPI=m # CONFIG_DMA_SHARED_BUFFER is not set CONFIG_CONNECTOR=y CONFIG_PROC_EVENTS=y @@ -1536,7 +1535,7 @@ CONFIG_BLK_DEV_RBD=m CONFIG_SENSORS_LIS3LV02D=m CONFIG_AD525X_DPOT=m CONFIG_AD525X_DPOT_I2C=m -CONFIG_AD525X_DPOT_SPI=m +# CONFIG_AD525X_DPOT_SPI is not set # CONFIG_IBM_ASM is not set CONFIG_PHANTOM=m CONFIG_INTEL_MID_PTI=m @@ -1558,7 +1557,7 @@ CONFIG_SENSORS_BH1770=m CONFIG_SENSORS_APDS990X=m CONFIG_HMC6352=m CONFIG_DS1682=m -CONFIG_TI_DAC7512=m +# CONFIG_TI_DAC7512 is not set CONFIG_VMWARE_BALLOON=m CONFIG_BMP085=m # CONFIG_PCH_PHUB is not set @@ -1570,11 +1569,11 @@ CONFIG_C2PORT_DURAMAR_2150=m # EEPROM support # CONFIG_EEPROM_AT24=m -CONFIG_EEPROM_AT25=m +# CONFIG_EEPROM_AT25 is not set CONFIG_EEPROM_LEGACY=m CONFIG_EEPROM_MAX6875=m CONFIG_EEPROM_93CX6=m -CONFIG_EEPROM_93XX46=m +# CONFIG_EEPROM_93XX46 is not set CONFIG_CB710_CORE=m # CONFIG_CB710_DEBUG is not set CONFIG_CB710_DEBUG_ASSUMPTIONS=y @@ -2216,7 +2215,7 @@ CONFIG_STE10XP=m CONFIG_LSI_ET1011C_PHY=m CONFIG_MICREL_PHY=m # CONFIG_MDIO_BITBANG is not set -CONFIG_MICREL_KS8995MA=m +# CONFIG_MICREL_KS8995MA is not set CONFIG_PLIP=m CONFIG_PPP=m CONFIG_PPP_BSDCOMP=m @@ -2389,7 +2388,7 @@ CONFIG_LIBERTAS=m CONFIG_LIBERTAS_USB=m CONFIG_LIBERTAS_CS=m CONFIG_LIBERTAS_SDIO=m -CONFIG_LIBERTAS_SPI=m +# CONFIG_LIBERTAS_SPI is not set # CONFIG_LIBERTAS_DEBUG is not set CONFIG_LIBERTAS_MESH=y CONFIG_HERMES=m @@ -2405,8 +2404,7 @@ CONFIG_ORINOCO_USB=m CONFIG_P54_COMMON=m CONFIG_P54_USB=m CONFIG_P54_PCI=m -CONFIG_P54_SPI=m -CONFIG_P54_SPI_DEFAULT_EEPROM=y +# CONFIG_P54_SPI is not set CONFIG_P54_LEDS=y CONFIG_RT2X00=m CONFIG_RT2400PCI=m @@ -2438,11 +2436,11 @@ CONFIG_RTL8192CU=m CONFIG_RTLWIFI=m CONFIG_RTL8192C_COMMON=m CONFIG_WL1251=m -CONFIG_WL1251_SPI=m +# CONFIG_WL1251_SPI is not set CONFIG_WL1251_SDIO=m CONFIG_WL12XX_MENU=m CONFIG_WL12XX=m -CONFIG_WL12XX_SPI=m +# CONFIG_WL12XX_SPI is not set CONFIG_WL12XX_SDIO=m CONFIG_WL12XX_PLATFORM_DATA=y CONFIG_ZD1211RW=m @@ -2654,7 +2652,6 @@ CONFIG_KEYBOARD_MPR121=m # CONFIG_KEYBOARD_OPENCORES is not set # CONFIG_KEYBOARD_STOWAWAY is not set # CONFIG_KEYBOARD_SUNKBD is not set -CONFIG_KEYBOARD_STMPE=m # CONFIG_KEYBOARD_XTKBD is not set CONFIG_INPUT_MOUSE=y CONFIG_MOUSE_PS2=m @@ -2674,7 +2671,7 @@ CONFIG_MOUSE_INPORT=m CONFIG_MOUSE_LOGIBM=m CONFIG_MOUSE_PC110PAD=m CONFIG_MOUSE_VSXXXAA=m -CONFIG_MOUSE_GPIO=m +# CONFIG_MOUSE_GPIO is not set CONFIG_MOUSE_SYNAPTICS_I2C=m CONFIG_INPUT_JOYSTICK=y CONFIG_JOYSTICK_ANALOG=m @@ -2715,11 +2712,11 @@ CONFIG_TABLET_USB_HANWANG=m CONFIG_TABLET_USB_KBTAB=m CONFIG_TABLET_USB_WACOM=m CONFIG_INPUT_TOUCHSCREEN=y -CONFIG_TOUCHSCREEN_ADS7846=m -CONFIG_TOUCHSCREEN_AD7877=m +# CONFIG_TOUCHSCREEN_ADS7846 is not set +# CONFIG_TOUCHSCREEN_AD7877 is not set CONFIG_TOUCHSCREEN_AD7879=m CONFIG_TOUCHSCREEN_AD7879_I2C=m -CONFIG_TOUCHSCREEN_AD7879_SPI=m +# CONFIG_TOUCHSCREEN_AD7879_SPI is not set CONFIG_TOUCHSCREEN_ATMEL_MXT=m CONFIG_TOUCHSCREEN_AUO_PIXCIR=m CONFIG_TOUCHSCREEN_BU21013=m @@ -2743,13 +2740,11 @@ CONFIG_TOUCHSCREEN_TOUCHRIGHT=m CONFIG_TOUCHSCREEN_TOUCHWIN=m CONFIG_TOUCHSCREEN_UCB1400=m CONFIG_TOUCHSCREEN_PIXCIR=m -CONFIG_TOUCHSCREEN_WM831X=m CONFIG_TOUCHSCREEN_WM97XX=m CONFIG_TOUCHSCREEN_WM9705=y CONFIG_TOUCHSCREEN_WM9712=y CONFIG_TOUCHSCREEN_WM9713=y CONFIG_TOUCHSCREEN_USB_COMPOSITE=m -CONFIG_TOUCHSCREEN_MC13783=m CONFIG_TOUCHSCREEN_USB_EGALAX=y CONFIG_TOUCHSCREEN_USB_PANJIT=y CONFIG_TOUCHSCREEN_USB_3M=y @@ -2769,11 +2764,9 @@ CONFIG_TOUCHSCREEN_USB_ETT_TC45USB=y CONFIG_TOUCHSCREEN_USB_NEXIO=y CONFIG_TOUCHSCREEN_TOUCHIT213=m CONFIG_TOUCHSCREEN_TSC_SERIO=m -CONFIG_TOUCHSCREEN_TSC2005=m +# CONFIG_TOUCHSCREEN_TSC2005 is not set CONFIG_TOUCHSCREEN_TSC2007=m -CONFIG_TOUCHSCREEN_PCAP=m CONFIG_TOUCHSCREEN_ST1232=m -CONFIG_TOUCHSCREEN_STMPE=m CONFIG_TOUCHSCREEN_TPS6507X=m CONFIG_INPUT_MISC=y CONFIG_INPUT_AB8500_PONKEY=m @@ -2782,12 +2775,11 @@ CONFIG_INPUT_AD714X_I2C=m CONFIG_INPUT_AD714X_SPI=m CONFIG_INPUT_BMA150=m CONFIG_INPUT_PCSPKR=m -CONFIG_INPUT_MC13783_PWRBUTTON=m CONFIG_INPUT_MMA8450=m CONFIG_INPUT_MPU3050=m CONFIG_INPUT_APANEL=m CONFIG_INPUT_GP2A=m -CONFIG_INPUT_GPIO_TILT_POLLED=m +# CONFIG_INPUT_GPIO_TILT_POLLED is not set CONFIG_INPUT_WISTRON_BTNS=m CONFIG_INPUT_ATLAS_BTNS=m CONFIG_INPUT_ATI_REMOTE2=m @@ -2801,8 +2793,6 @@ CONFIG_INPUT_UINPUT=m CONFIG_INPUT_PCF50633_PMU=m CONFIG_INPUT_PCF8574=m CONFIG_INPUT_GPIO_ROTARY_ENCODER=m -CONFIG_INPUT_WM831X_ON=m -# CONFIG_INPUT_PCAP is not set CONFIG_INPUT_ADXL34X=m CONFIG_INPUT_ADXL34X_I2C=m CONFIG_INPUT_ADXL34X_SPI=m @@ -2875,19 +2865,19 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4 # # Non-8250 serial port support # -CONFIG_SERIAL_MAX3100=m -CONFIG_SERIAL_MAX3107=m +# CONFIG_SERIAL_MAX3100 is not set +# CONFIG_SERIAL_MAX3107 is not set CONFIG_SERIAL_MFD_HSU=m -CONFIG_SERIAL_UARTLITE=m CONFIG_SERIAL_CORE=y CONFIG_SERIAL_CORE_CONSOLE=y CONFIG_SERIAL_JSM=m -CONFIG_SERIAL_TIMBERDALE=m +CONFIG_SERIAL_OF_PLATFORM=m +# CONFIG_SERIAL_TIMBERDALE is not set CONFIG_SERIAL_ALTERA_JTAGUART=m CONFIG_SERIAL_ALTERA_UART=m CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4 CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200 -CONFIG_SERIAL_IFX6X60=m +# CONFIG_SERIAL_IFX6X60 is not set CONFIG_SERIAL_PCH_UART=m CONFIG_SERIAL_XILINX_PS_UART=m CONFIG_PRINTER=m @@ -2942,14 +2932,7 @@ CONFIG_I2C=m CONFIG_I2C_BOARDINFO=y CONFIG_I2C_COMPAT=y CONFIG_I2C_CHARDEV=m -CONFIG_I2C_MUX=m - -# -# Multiplexer I2C Chip support -# -CONFIG_I2C_MUX_GPIO=m -CONFIG_I2C_MUX_PCA9541=m -CONFIG_I2C_MUX_PCA954x=m +# CONFIG_I2C_MUX is not set CONFIG_I2C_HELPER_AUTO=y CONFIG_I2C_SMBUS=m CONFIG_I2C_ALGOBIT=m @@ -3085,9 +3068,6 @@ CONFIG_GPIO_MAX7300=m CONFIG_GPIO_MAX732X=m CONFIG_GPIO_PCA953X=m CONFIG_GPIO_PCF857X=m -CONFIG_GPIO_STMPE=y -CONFIG_GPIO_TPS65912=m -CONFIG_GPIO_WM831X=m CONFIG_GPIO_ADP5588=m # @@ -3097,7 +3077,6 @@ CONFIG_GPIO_CS5535=m CONFIG_GPIO_LANGWELL=y CONFIG_GPIO_PCH=m CONFIG_GPIO_ML_IOH=m -CONFIG_GPIO_TIMBERDALE=y CONFIG_GPIO_RDC321X=m # @@ -3116,7 +3095,6 @@ CONFIG_GPIO_UCB1400=y # # MODULbus GPIO expanders: # -CONFIG_GPIO_JANZ_TTL=m CONFIG_W1=m CONFIG_W1_CON=y @@ -3145,8 +3123,6 @@ CONFIG_W1_SLAVE_BQ27000=m CONFIG_POWER_SUPPLY=y # CONFIG_POWER_SUPPLY_DEBUG is not set CONFIG_PDA_POWER=m -CONFIG_WM831X_BACKUP=m -CONFIG_WM831X_POWER=m CONFIG_TEST_POWER=m CONFIG_BATTERY_DS2760=m CONFIG_BATTERY_DS2780=m @@ -3202,7 +3178,7 @@ CONFIG_SENSORS_FSCHMD=m CONFIG_SENSORS_G760A=m CONFIG_SENSORS_GL518SM=m CONFIG_SENSORS_GL520SM=m -CONFIG_SENSORS_GPIO_FAN=m +# CONFIG_SENSORS_GPIO_FAN is not set CONFIG_SENSORS_CORETEMP=m CONFIG_SENSORS_IBMAEM=m CONFIG_SENSORS_IBMPEX=m @@ -3210,7 +3186,7 @@ CONFIG_SENSORS_IT87=m CONFIG_SENSORS_JC42=m CONFIG_SENSORS_LINEAGE=m CONFIG_SENSORS_LM63=m -CONFIG_SENSORS_LM70=m +# CONFIG_SENSORS_LM70 is not set CONFIG_SENSORS_LM73=m CONFIG_SENSORS_LM75=m CONFIG_SENSORS_LM77=m @@ -3228,7 +3204,7 @@ CONFIG_SENSORS_LTC4245=m CONFIG_SENSORS_LTC4261=m CONFIG_SENSORS_LM95241=m CONFIG_SENSORS_LM95245=m -CONFIG_SENSORS_MAX1111=m +# CONFIG_SENSORS_MAX1111 is not set CONFIG_SENSORS_MAX16065=m CONFIG_SENSORS_MAX1619=m CONFIG_SENSORS_MAX1668=m @@ -3266,7 +3242,7 @@ CONFIG_SENSORS_SCH5627=m CONFIG_SENSORS_SCH5636=m CONFIG_SENSORS_ADS1015=m CONFIG_SENSORS_ADS7828=m -CONFIG_SENSORS_ADS7871=m +# CONFIG_SENSORS_ADS7871 is not set CONFIG_SENSORS_AMC6821=m CONFIG_SENSORS_THMC50=m CONFIG_SENSORS_TMP102=m @@ -3286,9 +3262,7 @@ CONFIG_SENSORS_W83L785TS=m CONFIG_SENSORS_W83L786NG=m CONFIG_SENSORS_W83627HF=m CONFIG_SENSORS_W83627EHF=m -CONFIG_SENSORS_WM831X=m CONFIG_SENSORS_APPLESMC=m -CONFIG_SENSORS_MC13783_ADC=m # # ACPI drivers @@ -3305,7 +3279,6 @@ CONFIG_WATCHDOG_CORE=y # Watchdog Device Drivers # CONFIG_SOFT_WATCHDOG=m -CONFIG_WM831X_WATCHDOG=m CONFIG_ACQUIRE_WDT=m CONFIG_ADVANTECH_WDT=m CONFIG_ALIM1535_WDT=m @@ -3399,38 +3372,29 @@ CONFIG_MFD_SM501=m CONFIG_MFD_SM501_GPIO=y CONFIG_HTC_PASIC3=m CONFIG_UCB1400_CORE=m -CONFIG_TPS6105X=m +# CONFIG_TPS6105X is not set CONFIG_TPS65010=m CONFIG_TPS6507X=m -CONFIG_MFD_TPS65912=y -CONFIG_MFD_TPS65912_SPI=y -CONFIG_MFD_STMPE=y - -# -# STMPE Interface Drivers -# -CONFIG_STMPE_SPI=y +# CONFIG_MFD_TPS65912_SPI is not set +# CONFIG_MFD_STMPE is not set # CONFIG_MFD_TMIO is not set -CONFIG_PMIC_DA9052=y -CONFIG_MFD_DA9052_SPI=y +# CONFIG_MFD_DA9052_SPI is not set CONFIG_MFD_WM8400=m -CONFIG_MFD_WM831X=y -CONFIG_MFD_WM831X_SPI=y +# CONFIG_MFD_WM831X_SPI is not set CONFIG_MFD_PCF50633=m CONFIG_PCF50633_ADC=m CONFIG_PCF50633_GPIO=m -CONFIG_MFD_MC13783=m -CONFIG_MFD_MC13XXX=m +# CONFIG_MFD_MC13XXX is not set CONFIG_ABX500_CORE=y -CONFIG_EZX_PCAP=y +# CONFIG_EZX_PCAP is not set CONFIG_AB8500_CORE=y # CONFIG_AB8500_DEBUG is not set CONFIG_AB8500_GPADC=y CONFIG_MFD_CS5535=m -CONFIG_MFD_TIMBERDALE=m +# CONFIG_MFD_TIMBERDALE is not set CONFIG_LPC_SCH=m CONFIG_MFD_RDC321X=m -CONFIG_MFD_JANZ_CMODIO=m +# CONFIG_MFD_JANZ_CMODIO is not set CONFIG_MFD_VX855=m CONFIG_MFD_WL1273_CORE=m CONFIG_REGULATOR=y @@ -3445,20 +3409,12 @@ CONFIG_REGULATOR_MAX1586=m CONFIG_REGULATOR_MAX8649=m CONFIG_REGULATOR_MAX8660=m CONFIG_REGULATOR_MAX8952=m -CONFIG_REGULATOR_WM831X=m CONFIG_REGULATOR_WM8400=m -CONFIG_REGULATOR_DA9052=m CONFIG_REGULATOR_PCF50633=m CONFIG_REGULATOR_LP3971=m CONFIG_REGULATOR_LP3972=m -CONFIG_REGULATOR_PCAP=m -CONFIG_REGULATOR_MC13XXX_CORE=m -CONFIG_REGULATOR_MC13783=m -CONFIG_REGULATOR_MC13892=m -CONFIG_REGULATOR_TPS6105X=m CONFIG_REGULATOR_TPS65023=m CONFIG_REGULATOR_TPS6507X=m -CONFIG_REGULATOR_TPS65912=m CONFIG_REGULATOR_ISL6271A=m CONFIG_REGULATOR_AD5398=m CONFIG_REGULATOR_AB8500=y @@ -3769,7 +3725,6 @@ CONFIG_RADIO_SI4713=m CONFIG_RADIO_TEA5764=m CONFIG_RADIO_SAA7706H=m CONFIG_RADIO_TEF6862=m -CONFIG_RADIO_TIMBERDALE=m CONFIG_RADIO_WL1273=m # @@ -4142,7 +4097,6 @@ CONFIG_BACKLIGHT_GENERIC=m CONFIG_BACKLIGHT_PROGEAR=m CONFIG_BACKLIGHT_APPLE=m CONFIG_BACKLIGHT_SAHARA=m -CONFIG_BACKLIGHT_WM831X=m CONFIG_BACKLIGHT_ADP8860=m CONFIG_BACKLIGHT_ADP8870=m CONFIG_BACKLIGHT_PCF50633=m @@ -4776,14 +4730,12 @@ CONFIG_LEDS_LP5521=m CONFIG_LEDS_LP5523=m CONFIG_LEDS_CLEVO_MAIL=m CONFIG_LEDS_PCA955X=m -CONFIG_LEDS_WM831X_STATUS=m CONFIG_LEDS_DAC124S085=m CONFIG_LEDS_REGULATOR=m CONFIG_LEDS_BD2802=m CONFIG_LEDS_INTEL_SS4200=m CONFIG_LEDS_LT3593=m CONFIG_LEDS_DELL_NETBOOKS=m -CONFIG_LEDS_MC13783=m CONFIG_LEDS_TCA6507=m CONFIG_LEDS_OT200=m CONFIG_LEDS_TRIGGERS=y @@ -4895,15 +4847,12 @@ CONFIG_RTC_DRV_MSM6242=m CONFIG_RTC_DRV_BQ4802=m CONFIG_RTC_DRV_RP5C01=m CONFIG_RTC_DRV_V3020=m -CONFIG_RTC_DRV_WM831X=m CONFIG_RTC_DRV_PCF50633=m CONFIG_RTC_DRV_AB8500=m # # on-CPU RTC drivers # -# CONFIG_RTC_DRV_PCAP is not set -CONFIG_RTC_DRV_MC13XXX=m CONFIG_DMADEVICES=y # CONFIG_DMADEVICES_DEBUG is not set diff --git a/kernels/linux-libre-xen/linux-libre-xen.install b/kernels/linux-libre-xen/linux-libre-xen.install index 06c1f6ae8..013ea1d37 100644 --- a/kernels/linux-libre-xen/linux-libre-xen.install +++ b/kernels/linux-libre-xen/linux-libre-xen.install @@ -2,14 +2,16 @@ # arg 2: the old package version KERNEL_NAME=-xen -KERNEL_VERSION=3.3.2-1-LIBRE-XEN +KERNEL_VERSION=3.3.6-1-LIBRE-XEN post_install () { # updating module dependencies echo ">>> Updating module dependencies. Please wait ..." depmod ${KERNEL_VERSION} - echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..." - mkinitcpio -p linux-libre${KERNEL_NAME} + if command -v mkinitcpio 2>&1 > /dev/null; then + echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..." + mkinitcpio -p linux-libre${KERNEL_NAME} + fi # compat symlinks for the official kernels only if [ -z "${KERNEL_NAME}" -o "${KERNEL_NAME}" = "-xen" ]; then @@ -28,7 +30,7 @@ post_install () { post_upgrade() { pacman -Q grub &>/dev/null hasgrub=$? - pacman -Q grub2 &>/dev/null + pacman -Q grub2-common &>/dev/null hasgrub2=$? pacman -Q lilo &>/dev/null haslilo=$? @@ -51,8 +53,10 @@ post_upgrade() { # updating module dependencies echo ">>> Updating module dependencies. Please wait ..." depmod ${KERNEL_VERSION} - echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..." - mkinitcpio -p linux-libre${KERNEL_NAME} + if command -v mkinitcpio 2>&1 > /dev/null; then + echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..." + mkinitcpio -p linux-libre${KERNEL_NAME} + fi } post_remove() { diff --git a/libre/clementine-libre/PKGBUILD b/libre/clementine-libre/PKGBUILD index a8b58f29e..c22a7a230 100644 --- a/libre/clementine-libre/PKGBUILD +++ b/libre/clementine-libre/PKGBUILD @@ -8,14 +8,14 @@ _pkgname=clementine pkgname=clementine-libre pkgver=1.0.1 -pkgrel=3.1 +pkgrel=4 pkgdesc="A music player and library organizer, without spotify support" url="http://www.clementine-player.org/" license=('GPL') arch=('i686' 'x86_64' 'mips64el') depends=('gstreamer0.10-base' 'taglib' 'glew' 'liblastfm' 'libgpod' 'libmtp' 'libplist' 'hicolor-icon-theme' 'qt' 'libimobiledevice' - 'qjson' 'libcdio' 'protobuf' 'qca' 'qca-ossl') + 'qjson' 'libcdio' 'protobuf' 'qca' 'qca-ossl' 'gvfs') makedepends=('cmake' 'boost') optdepends=('gstreamer0.10-base-plugins: for more open formats' 'gstreamer0.10-good-plugins: for use with "Good" plugin libraries' @@ -52,7 +52,7 @@ build() { # Remove nonfree spotifyblob folder rm -Rf "./spotifyblob" - cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DENABLE_REMOTE=ON + cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release make } |