summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorroot <root@rshg054.dnsready.net>2012-10-10 00:43:13 -0700
committerroot <root@rshg054.dnsready.net>2012-10-10 00:43:13 -0700
commit769ba4645df3c2f793bc2d3ee245573b79b206d3 (patch)
tree13e34d51217ced7053937eb57c7e12664fd881b5
parent26bcb2409416374f6728bd9b863e4fd147adccb3 (diff)
Wed Oct 10 00:43:09 PDT 2012
-rw-r--r--community-staging/luxrays/PKGBUILD37
-rw-r--r--community-staging/luxrender/PKGBUILD50
-rw-r--r--community-testing/conntrack-tools/01-config-file-path.patch3
-rw-r--r--community-testing/conntrack-tools/PKGBUILD20
-rw-r--r--community-testing/libnetfilter_cthelper/PKGBUILD26
-rw-r--r--community-testing/warzone2100/PKGBUILD30
-rw-r--r--community/alex/PKGBUILD8
-rw-r--r--community/avr-gcc/PKGBUILD8
-rw-r--r--community/gtk2hs-buildtools/0001-fix-for-ghc-7.6.1-changes.patch69
-rw-r--r--community/gtk2hs-buildtools/PKGBUILD15
-rw-r--r--community/haddock/0001-fix-incorrect-types-in-documentation-haddock.patch33
-rw-r--r--community/haddock/PKGBUILD37
-rw-r--r--community/happy/PKGBUILD16
-rw-r--r--community/haskell-bytestring-show/PKGBUILD14
-rw-r--r--community/haskell-cairo/PKGBUILD6
-rw-r--r--community/haskell-dataenc/0001-update-build-deps-for-ghc-7.6.1.patch25
-rw-r--r--community/haskell-dataenc/PKGBUILD16
-rw-r--r--community/haskell-extensible-exceptions/PKGBUILD39
-rw-r--r--community/haskell-extensible-exceptions/haskell-extensible-exceptions.install19
-rw-r--r--community/haskell-ghc-paths/PKGBUILD4
-rw-r--r--community/haskell-glib/0001-compatibility-with-ghc-7.6.1.patch55
-rw-r--r--community/haskell-glib/PKGBUILD17
-rw-r--r--community/haskell-gtk/PKGBUILD48
-rw-r--r--community/haskell-gtk/ghc-7.6.1.patch574
-rw-r--r--community/haskell-haskeline/PKGBUILD8
-rw-r--r--community/haskell-hslogger/PKGBUILD6
-rw-r--r--community/haskell-html/PKGBUILD4
-rw-r--r--community/haskell-pango/PKGBUILD45
-rw-r--r--community/haskell-quickcheck/0001-update-code-to-support-extensible-exceptions-no-long.patch50
-rw-r--r--community/haskell-quickcheck/PKGBUILD7
-rw-r--r--community/haskell-regex-base/PKGBUILD4
-rw-r--r--community/haskell-regex-compat/PKGBUILD4
-rw-r--r--community/haskell-regex-posix/PKGBUILD4
-rw-r--r--community/haskell-stm/PKGBUILD6
-rw-r--r--community/haskell-syb/PKGBUILD6
-rw-r--r--community/haskell-tar/0001-update-changed-time-code-for-ghc-7.6.1.patch50
-rw-r--r--community/haskell-tar/PKGBUILD16
-rw-r--r--community/haskell-terminfo/PKGBUILD10
-rw-r--r--community/haskell-utf8-string/PKGBUILD6
-rw-r--r--community/haskell-x11-xft/PKGBUILD6
-rw-r--r--community/haskell-x11/PKGBUILD8
-rw-r--r--community/haskell-xhtml/PKGBUILD53
-rw-r--r--community/hedgewars/PKGBUILD15
-rw-r--r--community/libnetfilter_acct/PKGBUILD15
-rw-r--r--community/libnetfilter_conntrack/PKGBUILD28
-rw-r--r--community/libnetfilter_queue/PKGBUILD27
-rw-r--r--community/libnfnetlink/PKGBUILD21
-rw-r--r--community/sfk/PKGBUILD6
-rw-r--r--community/ulogd/PKGBUILD62
-rw-r--r--community/ulogd/ulogd.conf20
-rw-r--r--community/ulogd/ulogd.logrotate10
-rw-r--r--community/ulogd/ulogd.rc54
-rw-r--r--community/xmobar/0001-Update-usage-of-catch-to-catchIOError-since-catch-ha.patch34
-rw-r--r--community/xmobar/PKGBUILD28
-rw-r--r--community/xmonad-contrib/PKGBUILD6
-rw-r--r--community/xmonad/PKGBUILD9
-rw-r--r--core/iputils/PKGBUILD4
-rw-r--r--core/iputils/iputils.install5
-rw-r--r--extra/bind/PKGBUILD8
-rw-r--r--extra/bind/remove-tools.patch2
-rw-r--r--extra/cabal-install/PKGBUILD41
-rw-r--r--extra/ghc/PKGBUILD133
-rw-r--r--extra/ghc/build.mk27
-rw-r--r--extra/haskell-http/PKGBUILD6
-rw-r--r--extra/haskell-mtl/PKGBUILD6
-rw-r--r--extra/haskell-network/PKGBUILD6
-rw-r--r--extra/haskell-parsec/PKGBUILD8
-rw-r--r--extra/haskell-random/PKGBUILD4
-rw-r--r--extra/haskell-text/PKGBUILD6
-rw-r--r--extra/haskell-transformers/PKGBUILD6
-rw-r--r--extra/haskell-zlib/PKGBUILD8
-rw-r--r--extra/kdevelop-php/PKGBUILD12
-rw-r--r--extra/kdevelop/PKGBUILD8
-rw-r--r--extra/kdevplatform/PKGBUILD10
-rw-r--r--extra/libva-intel-driver/PKGBUILD32
-rw-r--r--extra/libva-intel-driver/build-fix.patch68
-rw-r--r--extra/libva-vdpau-driver/PKGBUILD31
-rw-r--r--extra/libva/PKGBUILD14
-rw-r--r--extra/libxcb/PKGBUILD11
-rw-r--r--extra/nx/PKGBUILD39
-rw-r--r--extra/nx/nx-cflags.patch54
-rw-r--r--gnome-unstable/farstream/PKGBUILD6
-rw-r--r--libre/cdfs-libre/PKGBUILD2
-rw-r--r--libre/cdfs-libre/cdfs.install6
-rw-r--r--libre/linux-libre-firmware/PKGBUILD49
-rw-r--r--libre/linux-libre-lts/PKGBUILD2
-rw-r--r--libre/linux-libre/PKGBUILD5
-rw-r--r--libre/lirc-libre/PKGBUILD8
-rw-r--r--libre/lirc-libre/lirc.install2
-rw-r--r--libre/tp_smapi-libre/PKGBUILD6
-rw-r--r--libre/tp_smapi-libre/tp_smapi.install2
-rw-r--r--libre/vhba-module-libre/PKGBUILD7
-rw-r--r--libre/vhba-module-libre/vhba-module.install2
-rw-r--r--libre/virtualbox-libre-modules/PKGBUILD12
-rwxr-xr-xlibre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install6
-rw-r--r--multilib-testing/wine/PKGBUILD154
-rw-r--r--multilib-testing/wine/wine.install12
-rw-r--r--multilib/gcc-multilib/PKGBUILD18
-rw-r--r--multilib/lib32-dbus-core/PKGBUILD6
-rw-r--r--multilib/lib32-gnutls/PKGBUILD10
-rw-r--r--multilib/lib32-libtasn1/PKGBUILD32
-rw-r--r--multilib/lib32-libtiff/PKGBUILD8
-rw-r--r--multilib/lib32-libxcb/PKGBUILD14
-rw-r--r--multilib/libtool-multilib/PKGBUILD6
-rw-r--r--pcr/debootstrap/PKGBUILD20
-rw-r--r--pcr/debootstrap/debootstrap.install14
-rw-r--r--staging/python-lxml/PKGBUILD49
-rw-r--r--testing/dnsutils/PKGBUILD8
-rw-r--r--testing/dnsutils/remove-bind.patch2
-rw-r--r--testing/mesa/PKGBUILD18
-rw-r--r--testing/mesa/git_fixes.diff93
-rw-r--r--testing/subversion/PKGBUILD8
112 files changed, 2433 insertions, 500 deletions
diff --git a/community-staging/luxrays/PKGBUILD b/community-staging/luxrays/PKGBUILD
new file mode 100644
index 000000000..89e7088fb
--- /dev/null
+++ b/community-staging/luxrays/PKGBUILD
@@ -0,0 +1,37 @@
+# $Id: PKGBUILD 77407 2012-10-09 16:46:51Z stativ $
+# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
+pkgname=luxrays
+pkgver=1.1
+_pkgver=589aa5dac899
+pkgrel=1
+epoch=0
+pkgdesc="Accelerate the ray intersection process by using GPUs"
+arch=('i686' 'x86_64')
+url="http://www.luxrender.net/"
+license=('GPL')
+depends=('freeimage' 'freeglut' 'glew' 'libcl')
+makedepends=('cmake' 'boost' 'opencl-headers')
+source=(https://bitbucket.org/luxrender/luxrays/get/$_pkgver.tar.bz2)
+md5sums=('7513d71148fa14bc1779b816816580b9')
+
+build() {
+ cd "$srcdir/luxrender-$pkgname-$_pkgver"
+
+ export CXXFLAGS="$CXXFLAGS -lpthread"
+ cmake -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_SKIP_RPATH=ON \
+ -DLUXRAYS_DISABLE_OPENCL=OFF \
+ .
+ make
+}
+
+package() {
+ cd "$srcdir/luxrender-$pkgname-$_pkgver"
+
+ install -d -m755 "$pkgdir"/usr/{bin,include,lib}
+ install -m755 bin/* "$pkgdir"/usr/bin
+ install -m644 lib/* "$pkgdir"/usr/lib
+ cp -a include/luxrays "$pkgdir"/usr/include
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community-staging/luxrender/PKGBUILD b/community-staging/luxrender/PKGBUILD
new file mode 100644
index 000000000..93a60466c
--- /dev/null
+++ b/community-staging/luxrender/PKGBUILD
@@ -0,0 +1,50 @@
+# $Id: PKGBUILD 77421 2012-10-09 18:45:01Z stativ $
+# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
+# Initial contributor: flixie <69one@gmx.net>
+# Contributor: Imanol Celaya <ornitorrincos@archlinux-es.org>
+pkgname=luxrender
+pkgver=1.1
+_pkgver=4b4289cda943
+pkgrel=1
+pkgdesc="Rendering system for physically correct, unbiased image synthesis"
+arch=('i686' 'x86_64')
+url="http://www.luxrender.net/"
+license=('GPL')
+depends=('boost-libs' 'freeimage' 'openexr' 'libcl')
+optdepends=('luxblend25: Blender exporter' 'qt: Qt GUI' \
+ 'python: Python interface (pylux)'
+ 'nvidia-utils: OpenCL support for nVidia GPUs' \
+ 'amdstream: OpenCL support for AMD GPUs' \
+ 'intel-opencl-sdk: OpenCL support for Intel CPUs')
+makedepends=('cmake' 'boost' 'qt' "luxrays=$pkgver" 'python' 'opencl-headers')
+source=(https://bitbucket.org/luxrender/lux/get/$_pkgver.tar.bz2)
+md5sums=('accca65afdc4cc38db49a6e54f20e0f2')
+
+build() {
+ cd "$srcdir"/luxrender-lux-$_pkgver
+
+ # fix the installation
+ sed -i '/.*wxgui.*/ d' CMakeLists.txt
+
+ export CXXFLAGS="$CXXFLAGS -lpthread"
+ cmake -DCMAKE_INSTALL_PREFIX=/usr \
+ -DLUXRAYS_DISABLE_OPENCL=OFF \
+ -DPYTHON_CUSTOM=ON \
+ -DPYTHON_LIBRARIES=/usr/lib/libpython3.3m.so \
+ -DPYTHON_INCLUDE_PATH=/usr/include/python3.3m/ \
+ .
+ make
+}
+
+package() {
+ cd "$srcdir"/luxrender-lux-$_pkgver
+ make DESTDIR="$pkgdir" install
+
+ # fix library path on x86_64
+ [ "$CARCH" = "x86_64" ] && mv "$pkgdir"/usr/lib64 "$pkgdir"/usr/lib
+
+ #install pylux
+ install -D -m644 pylux.so "$pkgdir"/usr/lib/python3.3/pylux.so
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community-testing/conntrack-tools/01-config-file-path.patch b/community-testing/conntrack-tools/01-config-file-path.patch
index 8512cc9ab..9041ddbc4 100644
--- a/community-testing/conntrack-tools/01-config-file-path.patch
+++ b/community-testing/conntrack-tools/01-config-file-path.patch
@@ -6,6 +6,7 @@
-#define DEFAULT_CONFIGFILE "/etc/conntrackd/conntrackd.conf"
+#define DEFAULT_CONFIGFILE "/etc/conntrackd.conf"
- #define DEFAULT_LOCKFILE "/var/lock/conntrackd.lock"
+-#define DEFAULT_LOCKFILE "/var/lock/conntrackd.lock"
++#define DEFAULT_LOCKFILE "/run/lock/conntrackd.lock"
#define DEFAULT_LOGFILE "/var/log/conntrackd.log"
#define DEFAULT_STATS_LOGFILE "/var/log/conntrackd-stats.log"
diff --git a/community-testing/conntrack-tools/PKGBUILD b/community-testing/conntrack-tools/PKGBUILD
index f8c8ba7ef..d8d986e66 100644
--- a/community-testing/conntrack-tools/PKGBUILD
+++ b/community-testing/conntrack-tools/PKGBUILD
@@ -1,31 +1,33 @@
-# $Id: PKGBUILD 71335 2012-05-27 00:50:12Z seblu $
+# $Id: PKGBUILD 77397 2012-10-09 15:40:57Z seblu $
# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
# Contributor: Valere Monseur <valere_monseur@hotmail.com>
# Contributor: Alessandro Sagratini <ale_sagra@hotmail.com>
# Contributor: Kevin Edmonds <edmondskevin@hotmail.com>
pkgname=conntrack-tools
-pkgver=1.2.0
+pkgver=1.4.0
pkgrel=1
pkgdesc='Userspace tools to interact with the Netfilter connection tracking system'
arch=('i686' 'x86_64')
url='http://www.netfilter.org/projects/conntrack-tools'
license=('GPL2')
-depends=('libnetfilter_conntrack' 'libnetfilter_cttimeout')
+depends=('libnetfilter_conntrack'
+ 'libnetfilter_cttimeout'
+ 'libnetfilter_cthelper'
+ 'libnetfilter_queue')
backup=('etc/conntrackd.conf' 'etc/conf.d/conntrackd')
-install=$pkgname.install
+options=('!libtool')
source=("http://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2"
'conntrackd.rc'
'conntrackd.conf'
'conntrackd.service'
- '01-config-file-path.patch'
- '02-fix-compilation-of-timeout-extension.patch')
-md5sums=('8e20330d6ca3a3f23552aa900b1d467c'
+ '01-config-file-path.patch')
+install=$pkgname.install
+md5sums=('ee737c774e01349f75e935228a2d851b'
'478fe76da0202fcb5249bf65968d1c26'
'd3e73e81b54e3e8166d357d434680684'
'bd135eaefb47923bb8e8d26f084d3e9d'
- '411fc0eb97c02595aab69b14c26c1d00'
- '0144021bbec4d5b496ddd86a7ff7a257')
+ 'e71ff7b8c4997b797cab3eaaccb693f4')
build() {
cd $pkgname-$pkgver
diff --git a/community-testing/libnetfilter_cthelper/PKGBUILD b/community-testing/libnetfilter_cthelper/PKGBUILD
new file mode 100644
index 000000000..3a051836e
--- /dev/null
+++ b/community-testing/libnetfilter_cthelper/PKGBUILD
@@ -0,0 +1,26 @@
+# $Id: PKGBUILD 77374 2012-10-09 09:35:39Z seblu $
+# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
+
+pkgname=libnetfilter_cthelper
+pkgver=1.0.0
+pkgrel=1
+pkgdesc='Library for the connection tracking helper infrastructure'
+arch=('i686' 'x86_64')
+url='http://www.netfilter.org/projects/libnetfilter_cthelper/'
+license=('GPL2')
+depends=('libmnl')
+options=('!libtool')
+source=("http://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2")
+md5sums=('b2efab1a3a198a5add448960ba011acd')
+
+build() {
+ cd $pkgname-$pkgver
+ ./configure --prefix=/usr
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community-testing/warzone2100/PKGBUILD b/community-testing/warzone2100/PKGBUILD
new file mode 100644
index 000000000..0fbaa7e37
--- /dev/null
+++ b/community-testing/warzone2100/PKGBUILD
@@ -0,0 +1,30 @@
+# $Id: PKGBUILD 77388 2012-10-09 14:04:20Z lcarlier $
+# Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
+# Contributor: Angelo Theodorou <encelo@users.sourceforge.net>
+
+pkgname=warzone2100
+pkgver=2.3.9
+pkgrel=3
+pkgdesc="3D realtime strategy game on a future Earth"
+url="http://wz2100.net/"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('sdl' 'openal' 'libpng' 'libvorbis' 'libtheora' 'physfs' 'quesoglc' 'popt' 'ttf-dejavu')
+makedepends=('gawk' 'bison' 'flex' 'zip' 'unzip' 'asciidoc')
+source=(#"http://downloads.sourceforge.net/project/warzone2100/releases/${pkgver}/${pkgname}-${pkgver}.tar.gz"
+ "http://downloads.sourceforge.net/project/warzone2100/archive/${pkgver}/${pkgname}-${pkgver}.tar.gz")
+md5sums=('7185090a089c9c0e0eca7535a8f25dca')
+
+build() {
+ cd ${pkgname}-${pkgver}
+
+ ./configure --prefix=/usr --with-distributor="Arch linux"
+
+ make
+}
+
+package() {
+ cd ${pkgname}-${pkgver}
+
+ make DESTDIR=${pkgdir} install
+}
diff --git a/community/alex/PKGBUILD b/community/alex/PKGBUILD
index b7cc2cb52..380db3bd6 100644
--- a/community/alex/PKGBUILD
+++ b/community/alex/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 72380 2012-06-13 13:45:40Z tdziedzic $
+# $Id: PKGBUILD 77336 2012-10-09 04:16:39Z 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.2
-pkgrel=1
+pkgrel=2
pkgdesc='a lexical analyser generator for Haskell'
arch=('i686' 'x86_64')
-url='http://www.haskell.org/alex/'
+url='http://hackage.haskell.org/package/alex'
license=('custom:BSD3')
depends=('gmp')
-makedepends=('ghc=7.4.2-1' 'haskell-quickcheck=2.4.2-2')
+makedepends=('ghc=7.6.1-1' 'haskell-quickcheck=2.5-2')
source=("http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz")
md5sums=('b8f0d831b65d05e5f54ff08bd3d9d10d')
diff --git a/community/avr-gcc/PKGBUILD b/community/avr-gcc/PKGBUILD
index 2b28e0904..36ed19ef1 100644
--- a/community/avr-gcc/PKGBUILD
+++ b/community/avr-gcc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 75204 2012-08-16 01:56:23Z allan $
+# $Id: PKGBUILD 77419 2012-10-09 18:03:26Z schuay $
# Maintainer: schuay <jakob.gruber@gmail.com>
# Contributor: Brad Fanella <bradfanella@archlinux.us>
# Contributor: Corrado Primier <bardo@aur.archlinux.org>
@@ -8,8 +8,8 @@
pkgname=avr-gcc
_pkgname=gcc
-pkgver=4.7.1
-pkgrel=2
+pkgver=4.7.2
+pkgrel=1
pkgdesc="The GNU AVR Compiler Collection"
arch=('i686' 'x86_64')
license=('GPL' 'LGPL' 'custom')
@@ -69,4 +69,4 @@ package() {
rm -rf ${pkgdir}/usr/share/info
}
-md5sums=('933e6f15f51c031060af64a9e14149ff')
+md5sums=('cc308a0891e778cfda7a151ab8a6e762')
diff --git a/community/gtk2hs-buildtools/0001-fix-for-ghc-7.6.1-changes.patch b/community/gtk2hs-buildtools/0001-fix-for-ghc-7.6.1-changes.patch
new file mode 100644
index 000000000..1c6a7dd65
--- /dev/null
+++ b/community/gtk2hs-buildtools/0001-fix-for-ghc-7.6.1-changes.patch
@@ -0,0 +1,69 @@
+From 7d94bcd36eb1d5a2feae182fcb74f9d6ca439a80 Mon Sep 17 00:00:00 2001
+From: Thomas Dziedzic <gostrc@gmail.com>
+Date: Wed, 12 Sep 2012 03:29:46 -0700
+Subject: [PATCH] fix for ghc 7.6.1 changes
+
+---
+ c2hs/base/general/FileOps.hs | 3 ++-
+ c2hs/base/state/StateTrans.hs | 3 ++-
+ c2hs/toplevel/C2HSConfig.hs | 2 +-
+ 3 files changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/c2hs/base/general/FileOps.hs b/c2hs/base/general/FileOps.hs
+index 83ac70c..4914c4b 100644
+--- a/c2hs/base/general/FileOps.hs
++++ b/c2hs/base/general/FileOps.hs
+@@ -39,6 +39,7 @@ import Control.Monad (liftM)
+ import System.Random (newStdGen, randomRs)
+
+ import FNameOps (dirname, stripDirname, addPath)
++import System.IO.Error (catchIOError)
+
+
+ -- search for the given file in the given list of directories (EXPORTED)
+@@ -89,7 +90,7 @@ mktemp pre post =
+ in do
+ h <- openFile fname ReadWriteMode
+ return (h, fname)
+- `catch` \_ -> createLoop (attempts - 1) rs'
++ `catchIOError` \_ -> createLoop (attempts - 1) rs'
+ --
+ sixChars :: [Int] -> ([Int], String)
+ sixChars is =
+diff --git a/c2hs/base/state/StateTrans.hs b/c2hs/base/state/StateTrans.hs
+index ada62f4..2ab0ad1 100644
+--- a/c2hs/base/state/StateTrans.hs
++++ b/c2hs/base/state/StateTrans.hs
+@@ -84,6 +84,7 @@ import System.IO (fixIO)
+ import Data.IORef (IORef, newIORef, readIORef, writeIORef)
+
+ import Errors (interr)
++import System.IO.Error (catchIOError)
+
+ infixr 1 +>=, +>
+
+@@ -337,7 +338,7 @@ fatalsHandledBy m handler =
+ ioError err
+ Right a -> return state
+ )
+- `catch` (\err -> let
++ `catchIOError` (\err -> let
+ STB handler' = handler err
+ in
+ handler' bs gs)
+diff --git a/c2hs/toplevel/C2HSConfig.hs b/c2hs/toplevel/C2HSConfig.hs
+index e8deddf..af32886 100644
+--- a/c2hs/toplevel/C2HSConfig.hs
++++ b/c2hs/toplevel/C2HSConfig.hs
+@@ -46,7 +46,7 @@ import Data.Array (Array, array)
+
+ import Foreign (Ptr, FunPtr)
+ import Foreign (Storable(sizeOf, alignment), toBool)
+-import Foreign.C (CInt)
++import Foreign.C (CInt(..))
+ import System.Info (os)
+
+ -- program settings
+--
+1.7.12
+
diff --git a/community/gtk2hs-buildtools/PKGBUILD b/community/gtk2hs-buildtools/PKGBUILD
index 7f03c504e..f7dedfd1f 100644
--- a/community/gtk2hs-buildtools/PKGBUILD
+++ b/community/gtk2hs-buildtools/PKGBUILD
@@ -1,22 +1,27 @@
-# $Id: PKGBUILD 72381 2012-06-13 13:45:43Z tdziedzic $
+# $Id: PKGBUILD 77337 2012-10-09 04:16:44Z tdziedzic $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
pkgname=gtk2hs-buildtools
pkgver=0.12.3.1
-pkgrel=1
+pkgrel=2
pkgdesc="Tools to build the Gtk2Hs suite of User Interface libraries."
url="http://hackage.haskell.org/package/gtk2hs-buildtools"
license=('GPL2')
arch=('i686' 'x86_64')
-makedepends=('ghc' 'alex' 'happy' 'haskell-random')
+makedepends=('ghc=7.6.1-1' 'alex=3.0.2-2' 'happy=1.18.9-6' 'haskell-random=1.0.1.1-3')
depends=('gmp')
options=('strip')
provides=('haskell-gtk2hs-buildtools')
-source=(http://hackage.haskell.org/packages/archive/gtk2hs-buildtools/$pkgver/gtk2hs-buildtools-$pkgver.tar.gz)
-md5sums=('612611d831635024c953d2817b124e29')
+source=(http://hackage.haskell.org/packages/archive/gtk2hs-buildtools/$pkgver/gtk2hs-buildtools-$pkgver.tar.gz
+ '0001-fix-for-ghc-7.6.1-changes.patch')
+md5sums=('612611d831635024c953d2817b124e29'
+ 'b6551d8085c97bc2c6600ab397833101')
build() {
cd ${srcdir}/gtk2hs-buildtools-$pkgver
+
+ patch -Np1 -i ${srcdir}/0001-fix-for-ghc-7.6.1-changes.patch
+
runhaskell Setup configure --prefix=/usr --docdir=/usr/share/doc/${pkgname}
runhaskell Setup build
}
diff --git a/community/haddock/0001-fix-incorrect-types-in-documentation-haddock.patch b/community/haddock/0001-fix-incorrect-types-in-documentation-haddock.patch
new file mode 100644
index 000000000..2e687db21
--- /dev/null
+++ b/community/haddock/0001-fix-incorrect-types-in-documentation-haddock.patch
@@ -0,0 +1,33 @@
+From c60f2ab90f6e39fdb515cc0305467e534f718a7d Mon Sep 17 00:00:00 2001
+From: Thomas Dziedzic <gostrc@gmail.com>
+Date: Tue, 11 Sep 2012 07:43:41 -0700
+Subject: [PATCH] fix incorrect types in documentation/haddock
+
+---
+ src/Documentation/Haddock.hs | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/Documentation/Haddock.hs b/src/Documentation/Haddock.hs
+index 60bb314..8fd9674 100644
+--- a/src/Documentation/Haddock.hs
++++ b/src/Documentation/Haddock.hs
+@@ -59,6 +59,7 @@ import Haddock.Types
+ import Haddock.Options
+ import Haddock.Utils
+ import Main
++import GHC (Ghc)
+
+
+ -- | Create 'Interface' structures from a given list of Haddock command-line
+@@ -68,7 +69,7 @@ import Main
+ createInterfaces
+ :: [Flag] -- ^ A list of command-line flags
+ -> [String] -- ^ File or module names
+- -> IO [Interface] -- ^ Resulting list of interfaces
++ -> Ghc [Interface] -- ^ Resulting list of interfaces
+ createInterfaces flags modules = do
+ (_, ifaces, _) <- readPackagesAndProcessModules flags modules
+ return ifaces
+--
+1.7.12
+
diff --git a/community/haddock/PKGBUILD b/community/haddock/PKGBUILD
index 81a65961c..274cc7851 100644
--- a/community/haddock/PKGBUILD
+++ b/community/haddock/PKGBUILD
@@ -1,31 +1,30 @@
-# Maintainer:
-# Contributor: Alexander Rødseth <rodseth@gmail.com>
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
# Contributor: Vesa Kaihlavirta <vesa@archlinux.org>
# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
pkgname=haddock
-pkgver=2.10.0
-pkgrel=2
+pkgver=2.12.0
+pkgrel=1
pkgdesc="Tool for generating documentation for Haskell libraries"
url="http://hackage.haskell.org/package/haddock"
license=('custom:BSD3')
arch=('x86_64' 'i686')
-makedepends=('alex' 'happy')
-depends=('ghc=7.4.2-1' 'haskell-xhtml=3000.2.1-1' 'haskell-ghc-paths=0.1.0.8-8')
+makedepends=('alex=3.0.2-2' 'happy=1.18.9-6')
+depends=('ghc=7.6.1-1' 'haskell-xhtml=3000.2.1-2' 'haskell-ghc-paths=0.1.0.8-9')
install=$pkgname.install
-source=("http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz")
-sha256sums=('d107dba15e8aee5abcb540b818b5dcb8ced98bae7d0714f50192dba26cadb410')
+source=("http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz"
+ '0001-fix-incorrect-types-in-documentation-haddock.patch')
+sha256sums=('b6c53c3c2dcfc7604941f81acd8954c7deb101b1341003d2e9c6c26dd4ad6d02'
+ 'a260b828ddf6e56440209d9631efcd6e1530b8996859528feee37638cc26e92a')
build() {
cd "$srcdir/$pkgname-$pkgver"
-
- # These doesn't make haddock work for ghc 7.4.1
- #sed -i 's:ghc >= 7.2 && < 7.4:ghc:' haddock.cabal
- #sed -i 's:base >= 4.3 && < 4.5:base:' haddock.cabal
- #sed -i 's:#elif __GLASGOW_HASKELL__ == 703:#elif __GLASGOW_HASKELL__ == 704:' src/Haddock/InterfaceFile.hs
- runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \
- --docdir=/usr/share/doc/"$pkgname" --libsubdir=\$compiler/site-local/\$pkgid
+ patch -Np1 -i ${srcdir}/0001-fix-incorrect-types-in-documentation-haddock.patch
+
+ runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
+ --prefix=/usr --docdir=/usr/share/doc/"$pkgname" \
+ --libsubdir=\$compiler/site-local/\$pkgid
runhaskell Setup build
runhaskell Setup haddock
runhaskell Setup register --gen-script
@@ -37,11 +36,15 @@ package() {
cd "$srcdir/$pkgname-$pkgver"
install -Dm744 register.sh "$pkgdir/usr/share/haskell/$pkgname/register.sh"
- install -m744 unregister.sh "$pkgdir/usr/share/haskell/$pkgname/unregister.sh"
+ install -m744 unregister.sh \
+ "$pkgdir/usr/share/haskell/$pkgname/unregister.sh"
install -dm755 "$pkgdir/usr/share/doc/ghc/html/libraries"
- ln -s "/usr/share/doc/$pkgname/html" "$pkgdir/usr/share/doc/ghc/html/libraries/$pkgname"
+ ln -s "/usr/share/doc/$pkgname/html" \
+ "$pkgdir/usr/share/doc/ghc/html/libraries/$pkgname"
runhaskell Setup copy --destdir="$pkgdir"
install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
rm -f "$pkgdir/usr/share/doc/$pkgname/LICENSE"
mv "$pkgdir/usr/bin/haddock" "$pkgdir/usr/bin/haddock-cabal"
}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/happy/PKGBUILD b/community/happy/PKGBUILD
index fb8ecf1f5..99e4581d9 100644
--- a/community/happy/PKGBUILD
+++ b/community/happy/PKGBUILD
@@ -1,23 +1,27 @@
-# $Id: PKGBUILD 72383 2012-06-13 13:45:51Z tdziedzic $
+# $Id: PKGBUILD 77339 2012-10-09 04:16:54Z 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=5
+pkgver=1.18.10
+pkgrel=1
pkgdesc="The Parser Generator for Haskell"
-url="http://www.haskell.org/happy/"
+url="http://hackage.haskell.org/package/happy"
arch=('i686' 'x86_64')
license=("custom:BSD3")
depends=('gmp')
-makedepends=('ghc=7.4.2-1' 'haskell-mtl=2.1.1-1')
+makedepends=('ghc=7.6.1-1' 'haskell-mtl=2.1.2-1')
source=(http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz)
-md5sums=('aeb565fe572f979f15a24db0df2de37d')
+md5sums=('a1638e89434427e57f68ef311761dc30')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
+ # try was deprecated and removed into control.exception
+ # we really want tryIOError
+ #sed 's/try/&IOError/' -i Setup.lhs
+
runhaskell Setup.lhs configure -O --prefix=/usr
runhaskell Setup.lhs build
}
diff --git a/community/haskell-bytestring-show/PKGBUILD b/community/haskell-bytestring-show/PKGBUILD
index 081f77510..3f0ee6008 100644
--- a/community/haskell-bytestring-show/PKGBUILD
+++ b/community/haskell-bytestring-show/PKGBUILD
@@ -1,22 +1,24 @@
-# $Id: PKGBUILD 75911 2012-09-05 10:26:10Z spupykin $
+# $Id: PKGBUILD 77340 2012-10-09 04:16:59Z tdziedzic $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
pkgname=haskell-bytestring-show
-pkgver=0.3.5.2
+pkgver=0.3.5.3
pkgrel=1
pkgdesc="Efficient conversion of values into readable byte strings."
-#url="http://code.haskell.org/~dolio/"
-url="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/bytestring-show"
+url="http://hackage.haskell.org/package/bytestring-show"
license=("BSD3")
arch=('i686' 'x86_64')
-depends=("ghc=7.4.2-1")
+depends=("ghc=7.6.1-1")
install="${pkgname}.install"
source=("http://hackage.haskell.org/packages/archive/bytestring-show/${pkgver}/bytestring-show-${pkgver}.tar.gz")
-md5sums=('bd7cc8c9da04814d5c81041f8f087a8c')
+md5sums=('cbcc94f57fc754685f428aba003ba058')
build() {
cd ${srcdir}/bytestring-show-${pkgver}
+ # update outdated dependency
+ sed 's/build-depends: integer-gmp >= 0.2 && < 0.5/build-depends: integer-gmp >= 0.2 \&\& < 0.6/' -i bytestring-show.cabal
+
runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
--prefix=/usr --docdir=/usr/share/doc/${pkgname} \
--libsubdir=\$compiler/site-local/\$pkgid
diff --git a/community/haskell-cairo/PKGBUILD b/community/haskell-cairo/PKGBUILD
index a292c37c8..f5053689a 100644
--- a/community/haskell-cairo/PKGBUILD
+++ b/community/haskell-cairo/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 72385 2012-06-13 13:46:01Z tdziedzic $
+# $Id: PKGBUILD 77341 2012-10-09 04:17:04Z tdziedzic $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
pkgname=haskell-cairo
pkgver=0.12.3.1
-pkgrel=1
+pkgrel=2
pkgdesc="Binding to the cairo library for Gtk2Hs."
url="http://hackage.haskell.org/package/cairo"
license=('LGPL2.1')
arch=('i686' 'x86_64')
-depends=('ghc=7.4.2-1' 'cairo' 'haskell-mtl=2.1.1-1')
+depends=('ghc=7.6.1-1' 'cairo' 'haskell-mtl=2.1.2-1')
makedepends=("gtk2hs-buildtools")
options=('strip')
conflicts=('gtk2hs-cairo')
diff --git a/community/haskell-dataenc/0001-update-build-deps-for-ghc-7.6.1.patch b/community/haskell-dataenc/0001-update-build-deps-for-ghc-7.6.1.patch
new file mode 100644
index 000000000..9f544bb27
--- /dev/null
+++ b/community/haskell-dataenc/0001-update-build-deps-for-ghc-7.6.1.patch
@@ -0,0 +1,25 @@
+From 961892779b5f5a2f46d6baa44c31d06c39e56470 Mon Sep 17 00:00:00 2001
+From: Thomas Dziedzic <gostrc@gmail.com>
+Date: Tue, 11 Sep 2012 05:06:59 -0700
+Subject: [PATCH] update build deps for ghc 7.6.1
+
+---
+ dataenc.cabal | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/dataenc.cabal b/dataenc.cabal
+index 1ad42ca..3a4f5bb 100644
+--- a/dataenc.cabal
++++ b/dataenc.cabal
+@@ -21,7 +21,7 @@ flag BuildTests
+
+ library
+ hs-source-dirs: src
+- build-depends: array >= 0.1.0 && < 0.5, base >= 3.0.0 && < 4.6, containers >= 0.1.0 && < 0.5
++ build-depends: array >= 0.1.0 && < 0.5, base >= 3.0.0 && < 4.7, containers >= 0.1.0 && < 0.6
+ exposed-modules:
+ Codec.Binary.Base16
+ Codec.Binary.Base32
+--
+1.7.12
+
diff --git a/community/haskell-dataenc/PKGBUILD b/community/haskell-dataenc/PKGBUILD
index 1bedcdbad..758f25719 100644
--- a/community/haskell-dataenc/PKGBUILD
+++ b/community/haskell-dataenc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 72386 2012-06-13 13:46:06Z tdziedzic $
+# $Id: PKGBUILD 77342 2012-10-09 04:17:11Z tdziedzic $
# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
# Package generated by cabal2arch 0.7.5
@@ -6,18 +6,24 @@
_hkgname=dataenc
pkgname=haskell-dataenc
pkgver=0.14.0.3
-pkgrel=2
+pkgrel=3
pkgdesc="Data encoding library"
url="http://hackage.haskell.org/package/dataenc"
license=('custom:BSD3')
arch=('i686' 'x86_64')
-depends=('ghc=7.4.2-1' sh)
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
+depends=('ghc=7.6.1-1' sh)
+source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz
+ '0001-update-build-deps-for-ghc-7.6.1.patch')
install=${pkgname}.install
-md5sums=('643a8c022b9c840f801faf9a661fe637')
+md5sums=('643a8c022b9c840f801faf9a661fe637'
+ '662056adcb79efe8898298c271b49600')
build() {
cd ${srcdir}/${_hkgname}-${pkgver}
+
+ # update build deps for ghc 7.6.1
+ patch -Np1 -i ${srcdir}/0001-update-build-deps-for-ghc-7.6.1.patch
+
runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
--prefix=/usr --docdir=/usr/share/doc/${pkgname} \
--libsubdir=\$compiler/site-local/\$pkgid
diff --git a/community/haskell-extensible-exceptions/PKGBUILD b/community/haskell-extensible-exceptions/PKGBUILD
new file mode 100644
index 000000000..2f2fbaa3c
--- /dev/null
+++ b/community/haskell-extensible-exceptions/PKGBUILD
@@ -0,0 +1,39 @@
+# $Id: PKGBUILD 77370 2012-10-09 08:29:13Z foutrelis $
+# Maintainer: Jelle van der Waa <jelle@vdwaa.nl>
+
+_hkgname=extensible-exceptions
+pkgname=haskell-${_hkgname}
+pkgver=0.1.1.4
+pkgrel=3
+pkgdesc="extensible exceptions for both new and old versions of GHC"
+url="http://hackage.haskell.org/package/extensible-exceptions"
+license=('custom:BSD3')
+arch=('i686' 'x86_64')
+depends=('ghc=7.6.1-1' sh)
+source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
+install=$pkgname.install
+md5sums=('fa1cadd15c1c7aa362618d41c6e17d8b')
+
+build() {
+ cd ${srcdir}/${_hkgname}-${pkgver}
+
+ runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
+ --prefix=/usr --docdir=/usr/share/doc/${pkgname} \
+ --libsubdir=\$compiler/site-local/\$pkgid
+ runhaskell Setup build
+ runhaskell Setup haddock
+ runhaskell Setup register --gen-script
+ runhaskell Setup unregister --gen-script
+ sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+ cd ${srcdir}/${_hkgname}-${pkgver}
+ install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
+ install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
+ install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
+ ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
+ runhaskell Setup copy --destdir=${pkgdir}
+ install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+ rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
+}
diff --git a/community/haskell-extensible-exceptions/haskell-extensible-exceptions.install b/community/haskell-extensible-exceptions/haskell-extensible-exceptions.install
new file mode 100644
index 000000000..20c7dce30
--- /dev/null
+++ b/community/haskell-extensible-exceptions/haskell-extensible-exceptions.install
@@ -0,0 +1,19 @@
+HS_DIR=usr/share/haskell/haskell-extensible-exceptions
+post_install() {
+ ${HS_DIR}/register.sh
+ (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+pre_upgrade() {
+ ${HS_DIR}/unregister.sh
+}
+post_upgrade() {
+ ${HS_DIR}/register.sh
+ (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+pre_remove() {
+ ${HS_DIR}/unregister.sh
+}
+post_remove() {
+ (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+
diff --git a/community/haskell-ghc-paths/PKGBUILD b/community/haskell-ghc-paths/PKGBUILD
index 25bb789ee..1e23d3c10 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=8
+pkgrel=9
pkgdesc="Knowledge of GHC's installation directories"
url="http://hackage.haskell.org/package/ghc-paths"
license=('custom:BSD3')
arch=('x86_64' 'i686')
-depends=('ghc=7.4.2-1')
+depends=('ghc=7.6.1-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/0001-compatibility-with-ghc-7.6.1.patch b/community/haskell-glib/0001-compatibility-with-ghc-7.6.1.patch
new file mode 100644
index 000000000..845beb2bd
--- /dev/null
+++ b/community/haskell-glib/0001-compatibility-with-ghc-7.6.1.patch
@@ -0,0 +1,55 @@
+From 7e677b1c633d2b426fc956fcfa084a82ef6df861 Mon Sep 17 00:00:00 2001
+From: Thomas Dziedzic <gostrc@gmail.com>
+Date: Thu, 27 Sep 2012 04:48:10 -0700
+Subject: [PATCH] compatibility with ghc 7.6.1
+
+---
+ System/Glib/GObject.chs | 4 +---
+ System/Glib/MainLoop.chs | 4 ++--
+ 2 files changed, 3 insertions(+), 5 deletions(-)
+
+diff --git a/System/Glib/GObject.chs b/System/Glib/GObject.chs
+index 5f0fe5c..9925d2c 100644
+--- a/System/Glib/GObject.chs
++++ b/System/Glib/GObject.chs
+@@ -127,8 +127,6 @@ makeNewGObject (constr, objectUnref) generator = do
+
+ {#pointer GDestroyNotify as DestroyNotify#}
+
+-foreign import ccall "wrapper" mkDestroyNotifyPtr :: IO () -> IO DestroyNotify
+-
+ -- | This function wraps any newly created objects that derives from
+ -- GInitiallyUnowned also known as objects with
+ -- \"floating-references\". The object will be refSink (for glib
+@@ -225,4 +223,4 @@ isA obj gType =
+ -- at this point we would normally implement the notify signal handler;
+ -- I've moved this definition into the Object class of the gtk package
+ -- since there's a quite a bit of machinery missing here (generated signal
+--- register functions and the problem of recursive modules)
+\ No newline at end of file
++-- register functions and the problem of recursive modules)
+diff --git a/System/Glib/MainLoop.chs b/System/Glib/MainLoop.chs
+index 72fecb6..feb4c77 100644
+--- a/System/Glib/MainLoop.chs
++++ b/System/Glib/MainLoop.chs
+@@ -71,7 +71,7 @@ import System.Glib.GObject (DestroyNotify, destroyFunPtr)
+
+ {#pointer SourceFunc#}
+
+-foreign import ccall "wrapper" mkSourceFunc :: IO {#type gint#} -> IO SourceFunc
++foreign import ccall "wrapper" mkSourceFunc :: (Ptr () -> IO {#type gint#}) -> IO SourceFunc
+
+ type HandlerId = {#type guint#}
+
+@@ -79,7 +79,7 @@ type HandlerId = {#type guint#}
+ --
+ makeCallback :: IO {#type gint#} -> IO (SourceFunc, DestroyNotify)
+ makeCallback fun = do
+- funPtr <- mkSourceFunc fun
++ funPtr <- mkSourceFunc (const fun)
+ return (funPtr, destroyFunPtr)
+
+ -- | Sets a function to be called at regular intervals, with the default
+--
+1.7.12.1
+
diff --git a/community/haskell-glib/PKGBUILD b/community/haskell-glib/PKGBUILD
index 367c45adb..2ea2ff587 100644
--- a/community/haskell-glib/PKGBUILD
+++ b/community/haskell-glib/PKGBUILD
@@ -1,25 +1,30 @@
-# $Id: PKGBUILD 72388 2012-06-13 13:46:17Z tdziedzic $
+# $Id: PKGBUILD 77344 2012-10-09 04:17:23Z tdziedzic $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
pkgname=haskell-glib
pkgver=0.12.3.1
-pkgrel=1
+pkgrel=2
pkgdesc="Binding to the GLIB library for Gtk2Hs."
url="http://hackage.haskell.org/package/glib"
license=('LGPL2.1')
arch=('i686' 'x86_64')
-depends=('ghc=7.4.2-1' 'glib2')
+depends=('ghc=7.6.1-1' 'glib2')
makedepends=("gtk2hs-buildtools")
options=('strip')
install=gtk2hs-glib.install
provides=('gtk2hs-glib')
replaces=('gtk2hs-glib')
conflicts=('gtk2hs-glib')
-source=(http://hackage.haskell.org/packages/archive/glib/$pkgver/glib-$pkgver.tar.gz)
-md5sums=('f2899bd2a2850fe95479ddb63490eb04')
+source=(http://hackage.haskell.org/packages/archive/glib/$pkgver/glib-$pkgver.tar.gz
+ '0001-compatibility-with-ghc-7.6.1.patch')
+md5sums=('f2899bd2a2850fe95479ddb63490eb04'
+ 'b00660b7102542942b0b9d84b59d1f3c')
build() {
- cd ${srcdir}/glib-$pkgver
+ cd glib-$pkgver
+
+ patch -Np1 -i ${srcdir}/0001-compatibility-with-ghc-7.6.1.patch
+
runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
--prefix=/usr --docdir=/usr/share/doc/haskell-glib \
--libsubdir=\$compiler/site-local/\$pkgid
diff --git a/community/haskell-gtk/PKGBUILD b/community/haskell-gtk/PKGBUILD
index 064702b29..89e49dc07 100644
--- a/community/haskell-gtk/PKGBUILD
+++ b/community/haskell-gtk/PKGBUILD
@@ -1,40 +1,48 @@
-# $Id: PKGBUILD 73280 2012-07-05 11:48:30Z spupykin $
+# $Id: PKGBUILD 77345 2012-10-09 04:17:32Z tdziedzic $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
pkgname=haskell-gtk
pkgver=0.12.3.1
-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=0.12.3-2" 'haskell-mtl=2.1.1-1')
+depends=('ghc' 'gtk2' "haskell-pango" 'haskell-mtl')
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=('b10dfe92d2e4dfe3c0c92dd349489727')
+source=(http://hackage.haskell.org/packages/archive/gtk/$pkgver/gtk-$pkgver.tar.gz
+ ghc-7.6.1.patch)
+md5sums=('b10dfe92d2e4dfe3c0c92dd349489727'
+ '5fb93f37fe3f494b30ee682a36b8f1b6')
build() {
- cd ${srcdir}/gtk-${pkgver}
- runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
- --prefix=/usr --docdir=/usr/share/doc/haskell-gtk \
- --libsubdir=\$compiler/site-local/\$pkgid
- runhaskell Setup build
- runhaskell Setup haddock
- runhaskell Setup register --gen-script
- runhaskell Setup unregister --gen-script
- sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+ cd ${srcdir}/gtk-${pkgver}
+ patch -p1 <$srcdir/ghc-7.6.1.patch
+ runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
+ --prefix=/usr --docdir=/usr/share/doc/haskell-gtk \
+ --libsubdir=\$compiler/site-local/\$pkgid
+ sed -i 's|import Foreign.C.Types.*(CULong, CUInt)|import Foreign.C.Types (CULong(..), CUInt(..))|' Graphics/UI/Gtk/Types.chs
+ runhaskell Setup build
+ runhaskell Setup haddock
+ runhaskell Setup register --gen-script
+ runhaskell Setup unregister --gen-script
+ sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
}
package() {
- cd ${srcdir}/gtk-${pkgver}
- install -D -m744 register.sh ${pkgdir}/usr/share/haskell/gtk2hs-gtk/register.sh
- install -m744 unregister.sh ${pkgdir}/usr/share/haskell/gtk2hs-gtk/unregister.sh
- install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
- ln -s /usr/share/doc/haskell-gtk/html ${pkgdir}/usr/share/doc/ghc/html/libraries/gtk2hs-gtk
- runhaskell Setup copy --destdir=${pkgdir}
+ _hmtlver=`pacman -Q haskell-mtl | cut -f2 -d\ | cut -f1 -d-`
+ _hpangover=`pacman -Q haskell-pango | cut -f2 -d\ | cut -f1 -d-`
+ depends=("ghc" "gtk2" "haskell-pango=${_hpangover}" "haskell-mtl=${_hmtlver}")
+
+ cd ${srcdir}/gtk-${pkgver}
+ install -D -m744 register.sh ${pkgdir}/usr/share/haskell/gtk2hs-gtk/register.sh
+ install -m744 unregister.sh ${pkgdir}/usr/share/haskell/gtk2hs-gtk/unregister.sh
+ install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
+ ln -s /usr/share/doc/haskell-gtk/html ${pkgdir}/usr/share/doc/ghc/html/libraries/gtk2hs-gtk
+ runhaskell Setup copy --destdir=${pkgdir}
}
diff --git a/community/haskell-gtk/ghc-7.6.1.patch b/community/haskell-gtk/ghc-7.6.1.patch
new file mode 100644
index 000000000..5e259a38f
--- /dev/null
+++ b/community/haskell-gtk/ghc-7.6.1.patch
@@ -0,0 +1,574 @@
+diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Abstract/Object.chs gtk/Graphics/UI/Gtk/Abstract/Object.chs
+--- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Abstract/Object.chs 2012-06-18 01:39:34.000000000 +0400
++++ gtk/Graphics/UI/Gtk/Abstract/Object.chs 2012-10-02 16:30:54.000000000 +0400
+@@ -126,7 +126,8 @@
+
+ {#pointer GWeakNotify#}
+
+-foreign import ccall "wrapper" mkDestructor :: IO () -> IO GWeakNotify
++foreign import ccall "wrapper" mkDestructor
++ :: (Ptr () -> Ptr GObject -> IO ()) -> IO GWeakNotify
+
+ -- | Attach a callback that will be called after the
+ -- destroy hooks have been called
+@@ -134,7 +135,7 @@
+ objectWeakref :: ObjectClass o => o -> IO () -> IO GWeakNotify
+ objectWeakref obj uFun = do
+ funPtrContainer <- newIORef nullFunPtr
+- uFunPtr <- mkDestructor $ do
++ uFunPtr <- mkDestructor $ \_ _ -> do
+ uFun
+ funPtr <- readIORef funPtrContainer
+ freeHaskellFunPtr funPtr
+diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Entry/Entry.chs gtk/Graphics/UI/Gtk/Entry/Entry.chs
+--- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Entry/Entry.chs 2012-06-18 01:39:34.000000000 +0400
++++ gtk/Graphics/UI/Gtk/Entry/Entry.chs 2012-10-02 16:27:26.000000000 +0400
+@@ -78,6 +78,10 @@
+ entrySetCompletion,
+ entryGetCompletion,
+ #endif
++#if GTK_CHECK_VERSION (2,18,0)
++ entryGetBuffer,
++ entrySetBuffer,
++#endif
+ #if GTK_CHECK_VERSION(2,20,0)
+ entryGetIconWindow,
+ entryGetTextWindow,
+@@ -104,6 +108,9 @@
+ entryAlignment,
+ entryCompletion,
+ #endif
++#if GTK_CHECK_VERSION (2,18,0)
++ entryBuffer,
++#endif
+
+ -- * Signals
+ entryActivate,
+@@ -157,6 +164,9 @@
+ import Graphics.UI.Gtk.Gdk.EventM (EventM, EButton, EKey)
+ import Control.Monad.Reader ( ask )
+ import Control.Monad.Trans ( liftIO )
++#if GTK_CHECK_VERSION (2,18,0)
++import Graphics.UI.Gtk.Entry.EntryBuffer
++#endif
+ {#import Graphics.UI.Gtk.Types#}
+ {#import Graphics.UI.Gtk.Signals#}
+
+@@ -429,6 +439,23 @@
+ (toEntry self)
+ #endif
+
++#if GTK_CHECK_VERSION(2,18,0)
++-- | Get the 'EntryBuffer' object which holds the text for this widget.
++entryGetBuffer :: EntryClass self => self
++ -> IO EntryBuffer
++entryGetBuffer self =
++ makeNewGObject mkEntryBuffer $
++ {# call gtk_entry_get_buffer #}
++ (toEntry self)
++
++-- | Set the 'EntryBuffer' object which holds the text for this widget.
++entrySetBuffer :: (EntryClass self, EntryBufferClass buffer) => self
++ -> buffer -> IO ()
++entrySetBuffer self =
++ {# call gtk_entry_set_buffer #}
++ (toEntry self) . toEntryBuffer
++#endif
++
+ #if GTK_CHECK_VERSION(2,20,0)
+ -- | Returns the 'Window' which contains the entry's icon at @iconPos@. This function is useful when
+ -- drawing something to the entry in an 'eventExpose' callback because it enables the callback to
+@@ -623,6 +650,15 @@
+ entrySetCompletion
+ #endif
+
++#if GTK_CHECK_VERSION(2,18,0)
++entryBuffer :: (EntryClass self, EntryBufferClass buffer) =>
++ ReadWriteAttr self EntryBuffer buffer
++entryBuffer = newAttr
++ entryGetBuffer
++ entrySetBuffer
++#endif
++
++
+ --------------------
+ -- Signals
+
+diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Gdk/EventM.hsc gtk/Graphics/UI/Gtk/Gdk/EventM.hsc
+--- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Gdk/EventM.hsc 2012-06-18 01:39:34.000000000 +0400
++++ gtk/Graphics/UI/Gtk/Gdk/EventM.hsc 2012-10-02 16:27:27.000000000 +0400
+@@ -639,14 +639,16 @@
+
+
+ -- | Execute an event handler and assume it handled the event unless it
+--- threw a pattern match exception.
++-- threw a pattern match exception or calls mzero (e.g. via guard).
+ tryEvent :: EventM any () -> EventM any Bool
+ tryEvent act = do
+ ptr <- ask
+ liftIO $ (runReaderT (act >> return True) ptr)
+ #if __GLASGOW_HASKELL__ >= 610
+ `catches` [ Handler (\ (PatternMatchFail _) -> return False)
+- , Handler (\ e -> if isUserError e && "Pattern" `isPrefixOf` ioeGetErrorString e
++ , Handler (\ e -> if isUserError e &&
++ ("Pattern" `isPrefixOf` ioeGetErrorString e ||
++ "mzero" == ioeGetErrorString e)
+ then return False
+ else throw e) ]
+ #else
+@@ -654,6 +656,8 @@
+ IOException e
+ | "user error (Pattern" `isPrefixOf` show e ->
+ return False
++ | "user error (mzero" `isPrefixOf` show e ->
++ return False
+ PatternMatchFail _ -> return False
+ _ -> throw e)
+ #endif
+diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Gdk/Pixbuf.chs gtk/Graphics/UI/Gtk/Gdk/Pixbuf.chs
+--- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Gdk/Pixbuf.chs 2012-06-18 01:39:34.000000000 +0400
++++ gtk/Graphics/UI/Gtk/Gdk/Pixbuf.chs 2012-10-02 16:27:28.000000000 +0400
+@@ -69,6 +69,7 @@
+
+ -- * Constructors
+ pixbufNew,
++ pixbufNewFromData,
+ pixbufNewFromFile,
+ #if GTK_CHECK_VERSION(2,4,0)
+ pixbufNewFromFileAtSize,
+@@ -402,6 +403,19 @@
+ (fromBool hasAlpha) (fromIntegral bitsPerSample) (fromIntegral width)
+ (fromIntegral height)
+
++pixbufNewFromData :: Ptr CUChar -> Colorspace -> Bool -> Int -> Int -> Int -> Int -> IO Pixbuf
++pixbufNewFromData imData cSpace hasAlpha bitsPerSample width height rowStride
++ = wrapNewGObject mkPixbuf $
++ {#call pixbuf_new_from_data #}
++ imData
++ (fromIntegral . fromEnum $ cSpace)
++ (fromBool hasAlpha)
++ (fromIntegral bitsPerSample)
++ (fromIntegral width)
++ (fromIntegral height)
++ (fromIntegral rowStride)
++ nullFunPtr nullPtr
++
+ -- | Create a new image from a String.
+ --
+ -- * Creates a new pixbuf from a string description.
+diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/General/Clipboard.chs gtk/Graphics/UI/Gtk/General/Clipboard.chs
+--- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/General/Clipboard.chs 2012-06-18 01:39:34.000000000 +0400
++++ gtk/Graphics/UI/Gtk/General/Clipboard.chs 2012-10-02 16:30:54.000000000 +0400
+@@ -260,7 +260,7 @@
+ -- data succeeded.
+ clipboardSetWithData self targets getFunc clearFunc = do
+ gFunPtr <- mkClipboardGetFunc
+- (\_ sPtr info -> runReaderT (getFunc info) sPtr >> return ())
++ (\_ sPtr info _ -> runReaderT (getFunc info) sPtr >> return ())
+ cFunPtr <- mkClipboardClearFunc
+ (\_ _ -> clearFunc)
+ res <- withTargetEntries targets $ \nTargets targets ->
+@@ -282,7 +282,7 @@
+ {#pointer ClipboardClearFunc#}
+
+ foreign import ccall "wrapper" mkClipboardGetFunc ::
+- (Ptr Clipboard -> Ptr () -> {#type guint#} -> IO ()) -> IO ClipboardGetFunc
++ (Ptr Clipboard -> Ptr () -> {#type guint#} -> Ptr () -> IO ()) -> IO ClipboardGetFunc
+
+ foreign import ccall "wrapper" mkClipboardClearFunc ::
+ (Ptr Clipboard -> Ptr () -> IO ()) -> IO ClipboardClearFunc
+@@ -313,7 +313,7 @@
+ -- ignored.
+ clipboardSetWithOwner self targets getFunc clearFunc owner = do
+ gFunPtr <- mkClipboardGetFunc
+- (\_ sPtr info -> runReaderT (getFunc info) sPtr >> return ())
++ (\_ sPtr info _ -> runReaderT (getFunc info) sPtr >> return ())
+ cFunPtr <- mkClipboardClearFunc
+ (\_ _ -> clearFunc)
+ res <- withTargetEntries targets $ \nTargets targets ->
+@@ -404,7 +404,7 @@
+ clipboardRequestContents self (Atom target) callback = do
+ cbRef <- newIORef nullFunPtr
+ cbPtr <- mkClipboardReceivedFunc
+- (\_ sPtr -> do
++ (\_ sPtr _ -> do
+ freeHaskellFunPtr =<< readIORef cbRef
+ runReaderT callback sPtr
+ return ())
+@@ -418,7 +418,7 @@
+ {#pointer ClipboardReceivedFunc#}
+
+ foreign import ccall "wrapper" mkClipboardReceivedFunc ::
+- (Ptr Clipboard -> Ptr () -> IO ()) -> IO ClipboardReceivedFunc
++ (Ptr Clipboard -> Ptr () -> Ptr () -> IO ()) -> IO ClipboardReceivedFunc
+
+ -- %hash c:7bb1 d:4ef1
+ -- | Requests the contents of the clipboard as text. When the text is later
+@@ -439,7 +439,7 @@
+ clipboardRequestText self callback = do
+ cbRef <- newIORef nullFunPtr
+ cbPtr <- mkClipboardTextReceivedFunc
+- (\_ sPtr -> do
++ (\_ sPtr _ -> do
+ freeHaskellFunPtr =<< readIORef cbRef
+ mStr <- if sPtr==nullPtr then return Nothing else
+ liftM Just $ peekUTFString sPtr
+@@ -453,7 +453,7 @@
+ {#pointer ClipboardTextReceivedFunc#}
+
+ foreign import ccall "wrapper" mkClipboardTextReceivedFunc ::
+- (Ptr Clipboard -> CString -> IO ()) -> IO ClipboardTextReceivedFunc
++ (Ptr Clipboard -> CString -> Ptr () -> IO ()) -> IO ClipboardTextReceivedFunc
+
+
+ #if GTK_CHECK_VERSION(2,6,0)
+@@ -477,7 +477,7 @@
+ clipboardRequestImage self callback = do
+ cbRef <- newIORef nullFunPtr
+ cbPtr <- mkClipboardImageReceivedFunc
+- (\_ sPtr -> do
++ (\_ sPtr _ -> do
+ freeHaskellFunPtr =<< readIORef cbRef
+ mPixbuf <- maybeNull (makeNewGObject mkPixbuf) (return sPtr)
+ callback mPixbuf)
+@@ -490,7 +490,7 @@
+ {#pointer ClipboardImageReceivedFunc#}
+
+ foreign import ccall "wrapper" mkClipboardImageReceivedFunc ::
+- (Ptr Clipboard -> Ptr Pixbuf -> IO ()) -> IO ClipboardImageReceivedFunc
++ (Ptr Clipboard -> Ptr Pixbuf -> Ptr () -> IO ()) -> IO ClipboardImageReceivedFunc
+
+ #endif
+
+@@ -513,7 +513,7 @@
+ clipboardRequestTargets self callback = do
+ cbRef <- newIORef nullFunPtr
+ cbPtr <- mkClipboardTargetsReceivedFunc
+- (\_ tPtr len -> do
++ (\_ tPtr len _ -> do
+ -- We must free Haskell pointer *in* the callback to avoid segfault.
+ freeHaskellFunPtr =<< readIORef cbRef
+ mTargets <- if tPtr==nullPtr then return Nothing else
+@@ -528,7 +528,7 @@
+ {#pointer ClipboardTargetsReceivedFunc#}
+
+ foreign import ccall "wrapper" mkClipboardTargetsReceivedFunc ::
+- (Ptr Clipboard -> Ptr (Ptr ()) -> {#type gint#} -> IO ()) -> IO ClipboardTargetsReceivedFunc
++ (Ptr Clipboard -> Ptr (Ptr ()) -> {#type gint#} -> Ptr () -> IO ()) -> IO ClipboardTargetsReceivedFunc
+
+ #if GTK_CHECK_VERSION(2,10,0)
+ -- %hash c:5601 d:d6a6
+@@ -552,10 +552,10 @@
+ clipboardRequestRichText self buffer callback = do
+ cbRef <- newIORef nullFunPtr
+ cbPtr <- mkClipboardRichTextReceivedFunc
+- (\_ tPtr sPtr len -> do
++ (\_ tPtr sPtr len _ -> do
+ freeHaskellFunPtr =<< readIORef cbRef
+ mRes <- if sPtr==nullPtr then return Nothing else liftM Just $ do
+- str <- peekUTFStringLen (sPtr,fromIntegral len)
++ str <- peekUTFStringLen (castPtr sPtr,fromIntegral len)
+ return (Atom tPtr, str)
+ callback mRes)
+ writeIORef cbRef cbPtr
+@@ -568,7 +568,7 @@
+ {#pointer ClipboardRichTextReceivedFunc#}
+
+ foreign import ccall "wrapper" mkClipboardRichTextReceivedFunc ::
+- (Ptr Clipboard -> Ptr () -> CString -> {#type gsize#} -> IO ()) ->
++ (Ptr Clipboard -> Ptr () -> Ptr CUChar -> {#type gsize#} -> Ptr () -> IO ()) ->
+ IO ClipboardRichTextReceivedFunc
+ #endif
+ #endif
+diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/General/General.chs gtk/Graphics/UI/Gtk/General/General.chs
+--- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/General/General.chs 2012-06-18 01:39:34.000000000 +0400
++++ gtk/Graphics/UI/Gtk/General/General.chs 2012-10-02 16:27:28.000000000 +0400
+@@ -202,7 +202,7 @@
+ -- their arguments from the main loop, that is, from the OS thread of Gtk,
+ -- thereby ensuring that any Gtk and OS function can be called.
+ --
+-{#fun unsafe gdk_threads_enter as threadsEnter {} -> `()' #}
++{#fun gdk_threads_enter as threadsEnter {} -> `()' #}
+
+ -- | Release the global Gtk lock.
+ --
+diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/MenuComboToolbar/ComboBox.chs gtk/Graphics/UI/Gtk/MenuComboToolbar/ComboBox.chs
+--- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/MenuComboToolbar/ComboBox.chs 2012-06-18 01:39:34.000000000 +0400
++++ gtk/Graphics/UI/Gtk/MenuComboToolbar/ComboBox.chs 2012-10-02 16:30:54.000000000 +0400
+@@ -493,17 +493,17 @@
+ {# call gtk_combo_box_set_row_separator_func #}
+ (toComboBox self) nullFunPtr nullPtr nullFunPtr
+ comboBoxSetRowSeparatorSource self (Just (model, extract)) = do
+- funPtr <- mkRowSeparatorFunc $ \_ iterPtr -> do
++ funPtr <- mkRowSeparatorFunc $ \_ iterPtr _ -> do
+ iter <- peek iterPtr
+ value <- customStoreGetRow model iter
+- return (extract value)
++ return (fromBool $ extract value)
+ {# call gtk_combo_box_set_row_separator_func #}
+ (toComboBox self) funPtr (castFunPtrToPtr funPtr) destroyFunPtr
+
+ {#pointer TreeViewRowSeparatorFunc#}
+
+ foreign import ccall "wrapper" mkRowSeparatorFunc ::
+- (Ptr TreeModel -> Ptr TreeIter -> IO Bool) -> IO TreeViewRowSeparatorFunc
++ (Ptr TreeModel -> Ptr TreeIter -> Ptr () -> IO {#type gboolean #}) -> IO TreeViewRowSeparatorFunc
+
+ -- %hash c:5bf8
+ -- | Sets whether the popup menu should have a tearoff menu item.
+diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/MenuComboToolbar/MenuItem.chs gtk/Graphics/UI/Gtk/MenuComboToolbar/MenuItem.chs
+--- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/MenuComboToolbar/MenuItem.chs 2012-06-18 01:39:34.000000000 +0400
++++ gtk/Graphics/UI/Gtk/MenuComboToolbar/MenuItem.chs 2012-10-02 16:27:30.000000000 +0400
+@@ -76,6 +76,12 @@
+ menuItemNewWithMnemonic,
+
+ -- * Methods
++#if GTK_CHECK_VERSION(2,16,0)
++ menuItemSetLabel,
++ menuItemGetLabel,
++ menuItemSetUseUnderline,
++ menuItemGetUseUnderline,
++#endif
+ menuItemSetSubmenu,
+ menuItemGetSubmenu,
+ menuItemRemoveSubmenu,
+@@ -89,6 +95,10 @@
+ -- * Attributes
+ menuItemSubmenu,
+ menuItemRightJustified,
++#if GTK_CHECK_VERSION(2,16,0)
++ menuItemLabel,
++ menuItemUseUnderline,
++#endif
+
+ -- * Signals
+ menuItemActivateItem,
+@@ -163,7 +173,36 @@
+
+ --------------------
+ -- Methods
++#if GTK_CHECK_VERSION(2,16,0)
++-- | Sets text on the MenuItem label
++
++menuItemSetLabel :: (MenuItemClass self) => self -> String -> IO ()
++menuItemSetLabel self label =
++ withUTFString label $ {# call gtk_menu_item_set_label #} (toMenuItem self)
++
++-- | Gets text on the MenuItem label
++menuItemGetLabel :: (MenuItemClass self) => self -> IO String
++menuItemGetLabel self =
++ {# call gtk_menu_item_get_label #}
++ (toMenuItem self)
++ >>= \strPtr -> if strPtr == nullPtr
++ then return ""
++ else peekUTFString strPtr
++
++-- | If True, an underline in the text indicates the next character should be used for the mnemonic accelerator key.
++--
++menuItemSetUseUnderline :: (MenuItemClass self) => self -> Bool -> IO ()
++menuItemSetUseUnderline self =
++ {# call gtk_menu_item_set_use_underline #} (toMenuItem self) . fromBool
+
++-- | Checks if an underline in the text indicates the next character should be used for the mnemonic accelerator key.
++--
++menuItemGetUseUnderline :: (MenuItemClass self) => self -> IO Bool
++menuItemGetUseUnderline self =
++ liftM toBool $ {# call gtk_menu_item_get_use_underline #}
++ (toMenuItem self)
++
++#endif
+ -- | Sets the item's submenu, or changes it.
+ --
+ menuItemSetSubmenu :: (MenuItemClass self, MenuClass submenu) => self -> submenu -> IO ()
+@@ -278,6 +317,22 @@
+ menuItemGetRightJustified
+ menuItemSetRightJustified
+
++#if GTK_CHECK_VERSION(2,16,0)
++-- | \'label\' property. See 'menuItemSetLabel' and 'menuItemGetLabel'
++--
++menuItemLabel :: MenuItemClass self => Attr self String
++menuItemLabel = newAttr
++ menuItemGetLabel
++ menuItemSetLabel
++
++-- | \'useUnderline\' property. See 'menuItemSetUseUnderline' and
++-- 'menuItemGetUseEUnderline'
++--
++menuItemUseUnderline :: MenuItemClass self => Attr self Bool
++menuItemUseUnderline = newAttr
++ menuItemGetUseUnderline
++ menuItemSetUseUnderline
++#endif
+ --------------------
+ -- Signals
+
+diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/CustomStore.chs gtk/Graphics/UI/Gtk/ModelView/CustomStore.chs
+--- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/CustomStore.chs 2012-06-18 01:39:34.000000000 +0400
++++ gtk/Graphics/UI/Gtk/ModelView/CustomStore.chs 2012-10-02 16:27:33.000000000 +0400
+@@ -239,7 +239,7 @@
+ customTreeDragSourceIface = fromMaybe dummyDragSource mDragSource,
+ customTreeDragDestIface = fromMaybe dummyDragDest mDragDest }
+ privPtr <- newStablePtr priv
+- liftM con $ makeNewGObject (CustomStore, objectUnref) $
++ liftM con $ wrapNewGObject (CustomStore, objectUnref) $
+ gtk2hs_store_new implPtr privPtr
+
+ foreign import ccall unsafe "Gtk2HsStore.h gtk2hs_store_new"
+diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/TreeModel.chs gtk/Graphics/UI/Gtk/ModelView/TreeModel.chs
+--- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/TreeModel.chs 2012-06-18 01:39:34.000000000 +0400
++++ gtk/Graphics/UI/Gtk/ModelView/TreeModel.chs 2012-10-02 16:30:54.000000000 +0400
+@@ -427,7 +427,7 @@
+ {#pointer TreeModelForeachFunc#}
+
+ foreign import ccall "wrapper" mkTreeModelForeachFunc ::
+- (Ptr () -> Ptr () -> Ptr TreeIter -> Ptr () -> IO CInt) ->
++ (Ptr TreeModel -> Ptr NativeTreePath -> Ptr TreeIter -> Ptr () -> IO CInt) ->
+ IO TreeModelForeachFunc
+
+ #if GTK_CHECK_VERSION(2,2,0)
+diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/TreeModelFilter.chs gtk/Graphics/UI/Gtk/ModelView/TreeModelFilter.chs
+--- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/TreeModelFilter.chs 2012-06-18 01:39:34.000000000 +0400
++++ gtk/Graphics/UI/Gtk/ModelView/TreeModelFilter.chs 2012-10-02 16:30:54.000000000 +0400
+@@ -160,7 +160,7 @@
+ {#pointer TreeModelFilterVisibleFunc #}
+
+ foreign import ccall "wrapper" mkTreeModelFilterVisibleFunc ::
+- (Ptr TreeModelFilter -> Ptr TreeIter -> Ptr () -> IO {#type gboolean#}) ->
++ (Ptr TreeModel -> Ptr TreeIter -> Ptr () -> IO {#type gboolean#}) ->
+ IO TreeModelFilterVisibleFunc
+
+ -- %hash c:a56d d:b42e
+diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/TreeSelection.chs gtk/Graphics/UI/Gtk/ModelView/TreeSelection.chs
+--- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/TreeSelection.chs 2012-06-18 01:39:34.000000000 +0400
++++ gtk/Graphics/UI/Gtk/ModelView/TreeSelection.chs 2012-10-02 16:30:54.000000000 +0400
+@@ -151,7 +151,7 @@
+ treeSelectionSetSelectFunction :: TreeSelectionClass self => self
+ -> TreeSelectionCB -> IO ()
+ treeSelectionSetSelectFunction ts fun = do
+- fPtr <- mkTreeSelectionFunc (\_ _ tp _ -> do
++ fPtr <- mkTreeSelectionFunc (\_ _ tp _ _ -> do
+ path <- peekTreePath (castPtr tp)
+ liftM fromBool $ fun path
+ )
+@@ -168,7 +168,7 @@
+ {#pointer TreeSelectionFunc#}
+
+ foreign import ccall "wrapper" mkTreeSelectionFunc ::
+- (Ptr () -> Ptr () -> Ptr TreePath -> Ptr () -> IO CInt)->
++ (Ptr TreeSelection -> Ptr TreeModel -> Ptr NativeTreePath -> {#type gint#} -> Ptr () -> IO CInt)->
+ IO TreeSelectionFunc
+
+ -- | Retrieve the 'TreeView' widget that this 'TreeSelection' works on.
+@@ -199,7 +199,7 @@
+ -> TreeSelectionForeachCB
+ -> IO ()
+ treeSelectionSelectedForeach self fun = do
+- fPtr <- mkTreeSelectionForeachFunc (\_ _ iterPtr -> do
++ fPtr <- mkTreeSelectionForeachFunc (\_ _ iterPtr _ -> do
+ -- make a deep copy of the iterator. This makes it possible to store this
+ -- iterator in Haskell land somewhere. The TreeModel parameter is not
+ -- passed to the function due to performance reasons. But since it is
+@@ -219,7 +219,7 @@
+ {#pointer TreeSelectionForeachFunc#}
+
+ foreign import ccall "wrapper" mkTreeSelectionForeachFunc ::
+- (Ptr () -> Ptr () -> Ptr TreeIter -> IO ()) -> IO TreeSelectionForeachFunc
++ (Ptr TreeModel -> Ptr NativeTreePath -> Ptr TreeIter -> Ptr () -> IO ()) -> IO TreeSelectionForeachFunc
+
+ #if GTK_CHECK_VERSION(2,2,0)
+ -- | Creates a list of paths of all selected rows.
+diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/TreeView.chs gtk/Graphics/UI/Gtk/ModelView/TreeView.chs
+--- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/TreeView.chs 2012-06-18 01:39:34.000000000 +0400
++++ gtk/Graphics/UI/Gtk/ModelView/TreeView.chs 2012-10-02 16:30:54.000000000 +0400
+@@ -582,7 +582,7 @@
+ {#pointer TreeViewColumnDropFunc#}
+
+ foreign import ccall "wrapper" mkTreeViewColumnDropFunc ::
+- (Ptr () -> Ptr TreeViewColumn -> Ptr TreeViewColumn -> Ptr TreeViewColumn ->
++ (Ptr TreeView -> Ptr TreeViewColumn -> Ptr TreeViewColumn -> Ptr TreeViewColumn ->
+ Ptr () -> IO {#type gboolean#}) -> IO TreeViewColumnDropFunc
+
+ -- | Scroll to a coordinate.
+@@ -798,7 +798,7 @@
+ {#pointer TreeViewMappingFunc#}
+
+ foreign import ccall "wrapper" mkTreeViewMappingFunc ::
+- (Ptr () -> Ptr NativeTreePath -> Ptr () -> IO ()) ->
++ (Ptr TreeView -> Ptr NativeTreePath -> Ptr () -> IO ()) ->
+ IO TreeViewMappingFunc
+
+ -- | Check if row is expanded.
+diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Multiline/TextBuffer.chs gtk/Graphics/UI/Gtk/Multiline/TextBuffer.chs
+--- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Multiline/TextBuffer.chs 2012-06-18 01:39:34.000000000 +0400
++++ gtk/Graphics/UI/Gtk/Multiline/TextBuffer.chs 2012-10-02 16:27:34.000000000 +0400
+@@ -1251,16 +1251,26 @@
+
+ -- | A 'Pixbuf' is inserted into the buffer.
+ --
++-- * See note in 'bufferInsertText'.
++--
+ insertPixbuf :: TextBufferClass self => Signal self (TextIter -> Pixbuf -> IO ())
+ insertPixbuf = Signal (connect_BOXED_OBJECT__NONE "insert-pixbuf" mkTextIterCopy)
+
+ -- | The 'insertChildAnchor' signal is emitted to insert a 'TextChildAnchor' in a 'TextBuffer'.
+ -- Insertion actually occurs in the default handler.
+ --
++-- * See note in 'bufferInsertText'.
++--
+ insertChildAnchor :: TextBufferClass self => Signal self (TextIter -> TextChildAnchor -> IO ())
+ insertChildAnchor = Signal (connect_BOXED_OBJECT__NONE "insert-child-anchor" mkTextIterCopy)
+
+--- | Some text was inserted.
++-- | Some text is inserted. Insertion actually occurs in the default handler.
++--
++-- * The function connected to this handler may not modify the buffer since
++-- this would invalidate the iterator. If this function replaces the
++-- default handler, it needs to stop the emission of this signal in order
++-- to prevent the default handler from running. If additional text should
++-- be inserted, this can be done using the 'after' function to connect.
+ --
+ bufferInsertText :: TextBufferClass self => Signal self (TextIter -> String -> IO ())
+ bufferInsertText = Signal $ \after obj handler ->
+diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Multiline/TextIter.chs gtk/Graphics/UI/Gtk/Multiline/TextIter.chs
+--- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Multiline/TextIter.chs 2012-06-18 01:39:34.000000000 +0400
++++ gtk/Graphics/UI/Gtk/Multiline/TextIter.chs 2012-10-02 16:30:54.000000000 +0400
+@@ -797,7 +797,7 @@
+ {#pointer TextCharPredicate#}
+
+ foreign import ccall "wrapper" mkTextCharPredicate ::
+- ({#type gunichar#} -> Ptr () -> {#type gboolean#}) -> IO TextCharPredicate
++ ({#type gunichar#} -> Ptr () -> IO {#type gboolean#}) -> IO TextCharPredicate
+
+ -- | Move 'TextIter' forward until a
+ -- predicate function returns True.
+@@ -810,7 +810,7 @@
+ textIterForwardFindChar :: TextIter -> (Char -> Bool) -> Maybe TextIter ->
+ IO Bool
+ textIterForwardFindChar ti pred limit = do
+- fPtr <- mkTextCharPredicate (\c _ -> fromBool $ pred (chr (fromIntegral c)))
++ fPtr <- mkTextCharPredicate (\c _ -> return $ fromBool $ pred (chr (fromIntegral c)))
+ res <- liftM toBool $ {#call text_iter_forward_find_char#}
+ ti fPtr nullPtr (fromMaybe (TextIter nullForeignPtr) limit)
+ freeHaskellFunPtr fPtr
+@@ -827,7 +827,7 @@
+ textIterBackwardFindChar :: TextIter -> (Char -> Bool) -> Maybe TextIter ->
+ IO Bool
+ textIterBackwardFindChar ti pred limit = do
+- fPtr <- mkTextCharPredicate (\c _ -> fromBool $ pred (chr (fromIntegral c)))
++ fPtr <- mkTextCharPredicate (\c _ -> return $ fromBool $ pred (chr (fromIntegral c)))
+ res <- liftM toBool $ {#call text_iter_backward_find_char#}
+ ti fPtr nullPtr (fromMaybe (TextIter nullForeignPtr) limit)
+ freeHaskellFunPtr fPtr
+diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Windows/Assistant.chs gtk/Graphics/UI/Gtk/Windows/Assistant.chs
+--- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Windows/Assistant.chs 2012-06-18 01:39:34.000000000 +0400
++++ gtk/Graphics/UI/Gtk/Windows/Assistant.chs 2012-10-02 16:30:54.000000000 +0400
+@@ -274,7 +274,7 @@
+ {#pointer AssistantPageFunc#}
+
+ foreign import ccall "wrapper" mkAssistantPageFunc ::
+- ({#type glong#} -> Ptr () -> IO {#type glong#})
++ ({#type gint#} -> Ptr () -> IO {#type gint#})
+ -> IO AssistantPageFunc
+
+ -- | Sets the page type for @page@. The page type determines the page behavior
diff --git a/community/haskell-haskeline/PKGBUILD b/community/haskell-haskeline/PKGBUILD
index e18e5a596..d0089aa8c 100644
--- a/community/haskell-haskeline/PKGBUILD
+++ b/community/haskell-haskeline/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 72390 2012-06-13 13:46:29Z tdziedzic $
+# $Id: PKGBUILD 77346 2012-10-09 04:17:37Z 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.7
+pkgver=0.7.0.3
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')
-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')
+depends=('ghc=7.6.1-1' 'sh' 'haskell-utf8-string=0.3.7-3' 'haskell-mtl=2.1.2-1' 'haskell-terminfo=0.3.2.5-1')
source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
install=${pkgname}.install
-md5sums=('d8d0a90a9965f4f68935e76e4e777035')
+md5sums=('3a78043dc80b5510202e71e77c0a9923')
build() {
cd ${srcdir}/${_hkgname}-${pkgver}
diff --git a/community/haskell-hslogger/PKGBUILD b/community/haskell-hslogger/PKGBUILD
index db574668e..4d8e06c53 100644
--- a/community/haskell-hslogger/PKGBUILD
+++ b/community/haskell-hslogger/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 75909 2012-09-05 10:20:43Z spupykin $
+# $Id: PKGBUILD 77347 2012-10-09 04:17:42Z tdziedzic $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer: Arch Haskell Team <arch-haskell@haskell.org>
pkgname=haskell-hslogger
pkgver=1.2.0
-pkgrel=1
+pkgrel=2
pkgdesc="Versatile logging framework"
url="http://hackage.haskell.org/package/hslogger"
license=('LGPL')
arch=('i686' 'x86_64')
-depends=('ghc=7.4.2-1' 'haskell-mtl=2.1.1-1' 'haskell-network=2.3.0.14-1')
+depends=('ghc=7.6.1-1' 'haskell-mtl=2.1.2-1' 'haskell-network=2.3.1.0-1')
install=${pkgname}.install
source=(http://hackage.haskell.org/packages/archive/hslogger/${pkgver}/hslogger-${pkgver}.tar.gz)
md5sums=('e0737887b0df75a3781989c8f6689850')
diff --git a/community/haskell-html/PKGBUILD b/community/haskell-html/PKGBUILD
index f9aaa0f0f..8eb9fc6f4 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=11
+pkgrel=12
pkgdesc="HTML combinator library"
url="http://hackage.haskell.org/package/html"
license=('custom:BSD3')
arch=('i686' 'x86_64')
-depends=('ghc=7.4.2-1' sh)
+depends=('ghc=7.6.1-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 aa044c1ad..347c3a31d 100644
--- a/community/haskell-pango/PKGBUILD
+++ b/community/haskell-pango/PKGBUILD
@@ -1,43 +1,46 @@
-# $Id: PKGBUILD 72393 2012-06-13 13:46:44Z tdziedzic $
+# $Id: PKGBUILD 77349 2012-10-09 04:17:52Z tdziedzic $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
pkgname=haskell-pango
pkgver=0.12.3
-pkgrel=2
+pkgrel=3
pkgdesc="Binding to the pango library for Gtk2Hs."
url="http://hackage.haskell.org/package/pango"
license=('LGPL2.1')
arch=('i686' 'x86_64')
-depends=('ghc=7.4.2-1' 'pango' 'haskell-glib=0.12.3.1-1' 'haskell-cairo=0.12.3.1-1')
+depends=('ghc' 'pango' 'haskell-glib' 'haskell-cairo')
makedepends=("gtk2hs-buildtools")
provides=('gtk2hs-pango')
replaces=('gtk2hs-pango')
conflicts=('gtk2hs-pango')
options=('strip')
-source=(http://hackage.haskell.org/packages/archive/pango/${pkgver}/pango-${pkgver}.tar.gz)
install=gtk2hs-pango.install
+source=(http://hackage.haskell.org/packages/archive/pango/${pkgver}/pango-${pkgver}.tar.gz)
md5sums=('1ef3132cb569703d5b1bc262c9d86fe3')
build() {
- cd ${srcdir}/pango-${pkgver}
- runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
- --prefix=/usr --docdir=/usr/share/doc/haskell-pango \
- --libsubdir=\$compiler/site-local/\$pkgid
- runhaskell Setup build
- runhaskell Setup haddock
- runhaskell Setup register --gen-script
- runhaskell Setup unregister --gen-script
- sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+ cd ${srcdir}/pango-${pkgver}
+ runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
+ --prefix=/usr --docdir=/usr/share/doc/haskell-pango \
+ --libsubdir=\$compiler/site-local/\$pkgid
+ sed -i 's|import Foreign.C.Types.*(CULong, CUInt)|import Foreign.C.Types (CULong(..), CUInt(..))|' Graphics/Rendering/Pango/Types.chs
+ runhaskell Setup build
+ runhaskell Setup haddock
+ runhaskell Setup register --gen-script
+ runhaskell Setup unregister --gen-script
+ sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
}
package() {
- #_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-`
+ _hglibver=`pacman -Q haskell-glib | cut -f2 -d\ | cut -f1 -d-`
+ _hcairover=`pacman -Q haskell-cairo | cut -f2 -d\ | cut -f1 -d-`
+ depends=("ghc=${_ghcver}" "pango" "haskell-glib=${_hglibver}" "haskell-cairo=${_hcairover}")
- cd ${srcdir}/pango-${pkgver}
- install -D -m744 register.sh ${pkgdir}/usr/share/haskell/gtk2hs-pango/register.sh
- install -m744 unregister.sh ${pkgdir}/usr/share/haskell/gtk2hs-pango/unregister.sh
- install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
- ln -s /usr/share/doc/haskell-pango/html ${pkgdir}/usr/share/doc/ghc/html/libraries/pango
- runhaskell Setup copy --destdir=${pkgdir}
+ cd ${srcdir}/pango-${pkgver}
+ install -D -m744 register.sh ${pkgdir}/usr/share/haskell/gtk2hs-pango/register.sh
+ install -m744 unregister.sh ${pkgdir}/usr/share/haskell/gtk2hs-pango/unregister.sh
+ install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
+ ln -s /usr/share/doc/haskell-pango/html ${pkgdir}/usr/share/doc/ghc/html/libraries/pango
+ runhaskell Setup copy --destdir=${pkgdir}
}
diff --git a/community/haskell-quickcheck/0001-update-code-to-support-extensible-exceptions-no-long.patch b/community/haskell-quickcheck/0001-update-code-to-support-extensible-exceptions-no-long.patch
new file mode 100644
index 000000000..a25506e67
--- /dev/null
+++ b/community/haskell-quickcheck/0001-update-code-to-support-extensible-exceptions-no-long.patch
@@ -0,0 +1,50 @@
+From 554b8dc1439b4dbb5bc9a853fc27efe7b1e111de Mon Sep 17 00:00:00 2001
+From: Thomas Dziedzic <gostrc@gmail.com>
+Date: Tue, 11 Sep 2012 03:59:50 -0700
+Subject: [PATCH] update code to support extensible exceptions no longer being
+ a part of ghc >= 7.6.1
+
+---
+ QuickCheck.cabal | 6 +++++-
+ Test/QuickCheck/Exception.hs | 6 ++++++
+ 2 files changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/QuickCheck.cabal b/QuickCheck.cabal
+index 1a9126e..5afd6fb 100644
+--- a/QuickCheck.cabal
++++ b/QuickCheck.cabal
+@@ -60,9 +60,13 @@ library
+ Build-depends: ghc
+
+ -- We want to use extensible-exceptions even if linking against base-3.
+- if impl(ghc >= 6.9)
++ if impl(ghc >= 6.9) && impl(ghc < 7.6)
+ Build-depends: extensible-exceptions
+
++ -- GHC >= 7.6.1 no longer provides extensible exceptions
++ if impl(ghc >= 7.6)
++ cpp-options: -DNEW_EXCEPTIONS
++
+ -- Modules that are always built.
+ Exposed-Modules:
+ Test.QuickCheck,
+diff --git a/Test/QuickCheck/Exception.hs b/Test/QuickCheck/Exception.hs
+index f895351..d463195 100644
+--- a/Test/QuickCheck/Exception.hs
++++ b/Test/QuickCheck/Exception.hs
+@@ -18,6 +18,12 @@ module Test.QuickCheck.Exception where
+
+ #if defined(OLD_EXCEPTIONS)
+ import Control.Exception(evaluate, try, Exception(..), throw)
++#elif defined(NEW_EXCEPTIONS)
++import Control.Exception(evaluate, try, SomeException(SomeException), ErrorCall(..), throw
++#if defined(GHC_INTERRUPT)
++ , AsyncException(UserInterrupt)
++#endif
++ )
+ #else
+ import Control.Exception.Extensible(evaluate, try, SomeException(SomeException), ErrorCall(..), throw
+ #if defined(GHC_INTERRUPT)
+--
+1.7.12
+
diff --git a/community/haskell-quickcheck/PKGBUILD b/community/haskell-quickcheck/PKGBUILD
index 2ee16af54..e96121f81 100644
--- a/community/haskell-quickcheck/PKGBUILD
+++ b/community/haskell-quickcheck/PKGBUILD
@@ -4,19 +4,20 @@
_hkgname=QuickCheck
pkgname=haskell-quickcheck
-pkgver=2.5
+pkgver=2.5.1.1
pkgrel=1
pkgdesc="Automatic testing of Haskell programs"
url="http://hackage.haskell.org/package/QuickCheck"
license=('custom:BSD3')
arch=('i686' 'x86_64')
-depends=('ghc=7.4.2-1' 'haskell-random=1.0.1.1-2' 'sh')
+depends=('ghc=7.6.1-1' 'haskell-random=1.0.1.1-3' 'sh')
source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz)
install=${pkgname}.install
-md5sums=('ad647a3f208092e5d41469369c18185e')
+md5sums=('2631b41c8b6e297b52622d1698387f09')
build() {
cd ${srcdir}/${_hkgname}-${pkgver}
+
runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \
--docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
runhaskell Setup build
diff --git a/community/haskell-regex-base/PKGBUILD b/community/haskell-regex-base/PKGBUILD
index d787c6007..d4e951cc6 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=6
+pkgrel=7
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.2-1' sh 'haskell-mtl=2.1.1-1')
+depends=('ghc=7.6.1-1' sh 'haskell-mtl=2.1.2-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 f1e91b553..c546442ec 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=2
+pkgrel=3
pkgdesc="Replaces and enhances Text.Regex"
url="http://hackage.haskell.org/package/${_hkgname}"
license=('custom:BSD3')
arch=('i686' 'x86_64')
-depends=('ghc=7.4.2-1' 'sh' 'haskell-regex-base=0.93.2-6' 'haskell-regex-posix=0.95.2-1')
+depends=('ghc=7.6.1-1' 'sh' 'haskell-regex-base=0.93.2-7' 'haskell-regex-posix=0.95.2-2')
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 f49daf3b2..3c570e4d1 100644
--- a/community/haskell-regex-posix/PKGBUILD
+++ b/community/haskell-regex-posix/PKGBUILD
@@ -4,12 +4,12 @@
_hkgname=regex-posix
pkgname=haskell-regex-posix
pkgver=0.95.2
-pkgrel=1
+pkgrel=2
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.2-1' 'sh' 'haskell-regex-base=0.93.2-6')
+depends=('ghc=7.6.1-1' 'sh' 'haskell-regex-base=0.93.2-7')
source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
install=${pkgname}.install
md5sums=('1df0f9494aab110c7231f36393285c7c')
diff --git a/community/haskell-stm/PKGBUILD b/community/haskell-stm/PKGBUILD
index 8eba45641..fec52e949 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.3
+pkgver=2.4
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.2-1' 'sh')
+depends=('ghc=7.6.1-1' 'sh')
source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz)
install=${pkgname}.install
-md5sums=('fcaf091a492974045cc04b231a3b7c9c')
+md5sums=('fe8ab1a8231202f1748da53454cf55fc')
build() {
cd ${srcdir}/${_hkgname}-$pkgver
diff --git a/community/haskell-syb/PKGBUILD b/community/haskell-syb/PKGBUILD
index 301c463b5..a2595bf2c 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.1
+pkgver=0.3.7
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.2-1' sh)
+depends=('ghc=7.6.1-1' sh)
options=('strip')
source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
install=${pkgname}.install
-md5sums=('50e0a755fcc735cccd0d77a89714ae38')
+md5sums=('fa653976a4ee43918cc7546089f94b60')
build() {
cd ${srcdir}/${_hkgname}-${pkgver}
diff --git a/community/haskell-tar/0001-update-changed-time-code-for-ghc-7.6.1.patch b/community/haskell-tar/0001-update-changed-time-code-for-ghc-7.6.1.patch
new file mode 100644
index 000000000..b8c2264bc
--- /dev/null
+++ b/community/haskell-tar/0001-update-changed-time-code-for-ghc-7.6.1.patch
@@ -0,0 +1,50 @@
+From bd14edd6240c72baa22822338fc872e6827af680 Mon Sep 17 00:00:00 2001
+From: Thomas Dziedzic <gostrc@gmail.com>
+Date: Tue, 11 Sep 2012 06:24:09 -0700
+Subject: [PATCH] update changed time code for ghc 7.6.1
+
+---
+ Codec/Archive/Tar/Pack.hs | 9 +++++----
+ tar.cabal | 2 +-
+ 2 files changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/Codec/Archive/Tar/Pack.hs b/Codec/Archive/Tar/Pack.hs
+index 8e43091..0af6103 100644
+--- a/Codec/Archive/Tar/Pack.hs
++++ b/Codec/Archive/Tar/Pack.hs
+@@ -28,8 +28,8 @@ import qualified System.FilePath as FilePath.Native
+ import System.Directory
+ ( getDirectoryContents, doesDirectoryExist, getModificationTime
+ , Permissions(..), getPermissions )
+-import System.Time
+- ( ClockTime(..) )
++import Data.Time.Clock.POSIX
++ ( utcTimeToPOSIXSeconds )
+ import System.IO
+ ( IOMode(ReadMode), openBinaryFile, hFileSize )
+ import System.IO.Unsafe (unsafeInterleaveIO)
+@@ -170,5 +170,6 @@ recurseDirectories base (dir:dirs) = unsafeInterleaveIO $ do
+
+ getModTime :: FilePath -> IO EpochTime
+ getModTime path = do
+- (TOD s _) <- getModificationTime path
+- return $! fromIntegral s
++ utcTime <- getModificationTime path
++ let s = truncate . utcTimeToPOSIXSeconds $ utcTime
++ return $! s
+diff --git a/tar.cabal b/tar.cabal
+index e748b07..d85b0da 100644
+--- a/tar.cabal
++++ b/tar.cabal
+@@ -25,7 +25,7 @@ source-repository head
+
+ library
+ build-depends: base >= 3 && < 5, filepath,
+- directory, old-time, bytestring
++ directory, bytestring, time
+
+ exposed-modules:
+ Codec.Archive.Tar
+--
+1.7.12
+
diff --git a/community/haskell-tar/PKGBUILD b/community/haskell-tar/PKGBUILD
index 3bee1826d..629285c73 100644
--- a/community/haskell-tar/PKGBUILD
+++ b/community/haskell-tar/PKGBUILD
@@ -1,23 +1,27 @@
-# $Id: PKGBUILD 72400 2012-06-13 13:47:19Z tdziedzic $
+# $Id: PKGBUILD 77356 2012-10-09 04:18:31Z 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=2
+pkgrel=3
pkgdesc="Reading, writing and manipulating \".tar\" archive files."
url="http://hackage.haskell.org/package/tar"
license=('custom:BSD3')
arch=('x86_64' 'i686')
-depends=('ghc=7.4.2-1')
-options=('strip')
-source=("http://hackage.haskell.org/packages/archive/tar/$pkgver/tar-$pkgver.tar.gz")
+depends=('ghc=7.6.1-1')
+source=("http://hackage.haskell.org/packages/archive/tar/$pkgver/tar-$pkgver.tar.gz"
+ '0001-update-changed-time-code-for-ghc-7.6.1.patch')
install=haskell-tar.install
-sha256sums=('a3d37be1b8666c16c6371d193a0795b8abe7b0216e81870a2666e1e85d931113')
+sha256sums=('a3d37be1b8666c16c6371d193a0795b8abe7b0216e81870a2666e1e85d931113'
+ '17b8afc519db5bed5d89807e6e659788f5d9c2f5c569150a9d1c6faac52e98e6')
build() {
cd "$srcdir/tar-$pkgver"
+ # time functions have changed in ghc 7.6.1
+ patch -Np1 -i ${srcdir}/0001-update-changed-time-code-for-ghc-7.6.1.patch
+
runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
--prefix=/usr --docdir="/usr/share/doc/$pkgname" \
--libsubdir=\$compiler/site-local/\$pkgid
diff --git a/community/haskell-terminfo/PKGBUILD b/community/haskell-terminfo/PKGBUILD
index 7c57260e3..1576e8dd8 100644
--- a/community/haskell-terminfo/PKGBUILD
+++ b/community/haskell-terminfo/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 72401 2012-06-13 13:47:24Z tdziedzic $
+# $Id: PKGBUILD 77357 2012-10-09 04:18:36Z 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=2
+pkgver=0.3.2.5
+pkgrel=1
pkgdesc="Haskell bindings to the terminfo library."
url="http://hackage.haskell.org/package/${_hkgname}"
license=('custom:BSD3')
arch=('i686' 'x86_64')
-depends=('ghc=7.4.2-1' 'sh')
+depends=('ghc=7.6.1-1' 'sh')
source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
install=${pkgname}.install
-md5sums=('706f546c629ac100a402c9c2629c25fa')
+md5sums=('7ef09acfac9f6fc499ed3bb804ae2ab3')
build() {
cd ${srcdir}/${_hkgname}-${pkgver}
diff --git a/community/haskell-utf8-string/PKGBUILD b/community/haskell-utf8-string/PKGBUILD
index 13123d4c8..0c5cc75d0 100644
--- a/community/haskell-utf8-string/PKGBUILD
+++ b/community/haskell-utf8-string/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 72402 2012-06-13 13:47:29Z tdziedzic $
+# $Id: PKGBUILD 77358 2012-10-09 04:18:41Z 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=2
+pkgrel=3
pkgdesc="Support for reading and writing UTF8 Strings"
url="http://hackage.haskell.org/package/${_hkgname}"
license=('custom:BSD3')
arch=('i686' 'x86_64')
-depends=('ghc=7.4.2-1' 'sh')
+depends=('ghc=7.6.1-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 5afddd050..97ee3a2ed 100644
--- a/community/haskell-x11-xft/PKGBUILD
+++ b/community/haskell-x11-xft/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 72404 2012-06-13 13:47:39Z tdziedzic $
+# $Id: PKGBUILD 77360 2012-10-09 04:18:51Z tdziedzic $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
_hkgname=X11-xft
pkgname=haskell-x11-xft
pkgver=0.3.1
-pkgrel=4
+pkgrel=5
pkgdesc="Bindings to the Xft, X Free Type interface library, and some Xrender parts"
url="http://hackage.haskell.org/package/${_hkgname}"
license=('LGPL')
arch=('i686' 'x86_64')
-depends=('ghc=7.4.2-1' 'haskell-x11=1.6.0' 'haskell-utf8-string=0.3.7' 'libxft')
+depends=('ghc=7.6.1-1' 'haskell-x11=1.6.0.2' 'haskell-utf8-string=0.3.7' 'libxft')
options=('strip')
install=haskell-x11-xft.install
source=(http://hackage.haskell.org/packages/archive/X11-xft/$pkgver/X11-xft-$pkgver.tar.gz)
diff --git a/community/haskell-x11/PKGBUILD b/community/haskell-x11/PKGBUILD
index ded1012e2..e03a1fb93 100644
--- a/community/haskell-x11/PKGBUILD
+++ b/community/haskell-x11/PKGBUILD
@@ -1,22 +1,22 @@
-# $Id: PKGBUILD 72403 2012-06-13 13:47:34Z tdziedzic $
+# $Id: PKGBUILD 77359 2012-10-09 04:18:46Z 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.6.0
+pkgver=1.6.0.2
pkgrel=1
pkgdesc="A Haskell binding to the X11 graphics library."
arch=(i686 x86_64)
url="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/X11"
license=('custom:BSD3')
options=('strip')
-depends=("ghc=7.4.2-1" "haskell-syb=0.3.6.1" 'libx11' 'libxinerama' 'libxrandr')
+depends=("ghc=7.6.1-1" "haskell-syb=0.3.7" 'libx11' 'libxinerama' 'libxrandr')
conflicts=(haskell-x11-extras)
install=hsmod.install
source=(http://hackage.haskell.org/packages/archive/X11/$pkgver/X11-$pkgver.tar.gz)
-md5sums=('8199520ce58e91762d31d54ed081b99c')
+md5sums=('0227ba7a8788c3cfd146e952a5fafc82')
build() {
cd ${srcdir}/${_hkgname}-${pkgver}
diff --git a/community/haskell-xhtml/PKGBUILD b/community/haskell-xhtml/PKGBUILD
index 68041976a..7ccfca159 100644
--- a/community/haskell-xhtml/PKGBUILD
+++ b/community/haskell-xhtml/PKGBUILD
@@ -1,38 +1,49 @@
# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-# Package generated by cabal2arch 0.7.6
+# Contributor: Alexander Rødseth <rodseth@gmail.com>
_hkgname=xhtml
pkgname=haskell-xhtml
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"
+pkgrel=2
+pkgdesc='Combinators for producing XHTML 1.0'
+url='http://hackage.haskell.org/package/xhtml'
license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.4.2-1' 'sh')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz)
-install=${pkgname}.install
-md5sums=('c63487bea16cbf0ecf252d6ed73106bf')
+arch=('x86_64' 'i686')
+depends=('ghc=7.6.1-1' 'sh')
+source=("http://hackage.haskell.org/packages/archive/$_hkgname/$pkgver/$_hkgname-$pkgver.tar.gz")
+install=$pkgname.install
+sha256sums=('33020782170c1c083bc59fc3bfcb72cec2db223e02d1181c07ae23b9fa7fdcd8')
build() {
- cd ${srcdir}/${_hkgname}-${pkgver}
- runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \
- --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
+ cd "$srcdir/$_hkgname-$pkgver"
+
+ runhaskell Setup configure -O -p \
+ --enable-split-objs \
+ --enable-shared \
+ --prefix=/usr \
+ --docdir="/usr/share/doc/$pkgname" \
+ --libsubdir=\$compiler/site-local/\$pkgid
runhaskell Setup build
runhaskell Setup haddock
- runhaskell Setup register --gen-script
+ runhaskell Setup register --gen-script
runhaskell Setup unregister --gen-script
sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
}
package() {
- cd ${srcdir}/${_hkgname}-${pkgver}
- install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
- install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
- install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
- ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
- runhaskell Setup copy --destdir=${pkgdir}
- install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
- rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
+ cd "$srcdir/$_hkgname-$pkgver"
+
+ install -Dm744 register.sh \
+ "$pkgdir/usr/share/haskell/$pkgname/register.sh"
+ install -m744 unregister.sh \
+ "$pkgdir/usr/share/haskell/$pkgname/unregister.sh"
+ install -dm755 "$pkgdir/usr/share/doc/ghc/html/libraries"
+ ln -s "/usr/share/doc/$pkgname/html" \
+ "$pkgdir/usr/share/doc/ghc/html/libraries/$_hkgname"
+ runhaskell Setup copy --destdir="$pkgdir"
+ install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+ rm -f "$pkgdir/usr/share/doc/$pkgname/LICENSE"
}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/hedgewars/PKGBUILD b/community/hedgewars/PKGBUILD
index 1da471ef9..57a320a7a 100644
--- a/community/hedgewars/PKGBUILD
+++ b/community/hedgewars/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 75756 2012-08-30 21:02:59Z spupykin $
+# $Id: PKGBUILD 77362 2012-10-09 04:19:03Z tdziedzic $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
pkgname=hedgewars
pkgver=0.9.17
-pkgrel=4
+pkgrel=5
pkgdesc="Free Worms-like turn based strategy game"
arch=('i686' 'x86_64')
url="http://hedgewars.org"
license=('GPL' 'custom')
depends=('qt' 'sdl' 'sdl_mixer' 'sdl_image' 'sdl_net' 'sdl_ttf' 'lua')
makedepends=('fpc' 'cmake'
- # haskell specific
- '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')
+ # haskell specific
+ 'ghc'
+ 'haskell-network' 'haskell-bytestring-show'
+ 'haskell-utf8-string' 'haskell-dataenc'
+ 'haskell-hslogger')
source=(http://download.gna.org/hedgewars/hedgewars-src-$pkgver.tar.bz2
hedgewars.desktop
hedgewars.png)
@@ -26,6 +26,7 @@ build() {
cd $pkgname-src-$pkgver
# sed -i 's|.*misc/liblua.*||' CMakeLists.txt
+ sed -i 's|instance NFData B.ByteString||' gameServer/Actions.hs
cmake \
-DCMAKE_INSTALL_PREFIX=/usr \
diff --git a/community/libnetfilter_acct/PKGBUILD b/community/libnetfilter_acct/PKGBUILD
index 3f105d946..3ab673656 100644
--- a/community/libnetfilter_acct/PKGBUILD
+++ b/community/libnetfilter_acct/PKGBUILD
@@ -1,12 +1,13 @@
# $Id: PKGBUILD 71613 2012-05-31 08:51:38Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
# Contributor: Kevin Edmonds <edmondskevin@hotmail.com>
# Maintainer: Filip Wojciechowski, filip at loka dot pl
pkgname=libnetfilter_acct
-pkgver=1.0.0
+pkgver=1.0.1
pkgrel=1
-pkgdesc="userspace library providing interface to extended accounting infrastructure"
+pkgdesc='userspace library providing interface to extended accounting infrastructure'
arch=('i686' 'x86_64')
url="http://www.netfilter.org/projects/libnetfilter_acct/index.html"
license=('GPL')
@@ -14,11 +15,15 @@ depends=('libnfnetlink' 'libmnl')
makedepends=('pkgconfig')
options=('!libtool')
source=(http://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2)
-md5sums=('246e97feb9cf98f7ddf70d71a3813336')
+md5sums=('4755429cbd46ad0ed32bb30f84da0dee')
build() {
- cd $srcdir/$pkgname-$pkgver
+ cd $pkgname-$pkgver
./configure --prefix=/usr
make
- make DESTDIR=$pkgdir install
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
}
diff --git a/community/libnetfilter_conntrack/PKGBUILD b/community/libnetfilter_conntrack/PKGBUILD
index 6fbc80694..1592d9027 100644
--- a/community/libnetfilter_conntrack/PKGBUILD
+++ b/community/libnetfilter_conntrack/PKGBUILD
@@ -1,24 +1,30 @@
-# $Id: PKGBUILD 70936 2012-05-20 08:39:06Z spupykin $
+# $Id: PKGBUILD 77383 2012-10-09 10:14:26Z seblu $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
# Contributor: Alessandro Sagratini <ale_sagra@hotmail.com>
# Contributor: Kevin Edmonds <edmondskevin@hotmail.com>
pkgname=libnetfilter_conntrack
-pkgver=1.0.1
+pkgver=1.0.2
pkgrel=1
-pkgdesc="userspace library providing a programming interface (API) to the in-kernel connection tracking state table"
+pkgdesc='Library providing an API to the in-kernel connection tracking state table'
arch=('i686' 'x86_64')
-depends=(libnfnetlink)
-makedepends=(pkgconfig)
-url="http://www.netfilter.org/projects/libnetfilter_conntrack/index.html"
-license=("GPL")
+depends=('libnfnetlink' 'libmnl')
+url='http://www.netfilter.org/projects/libnetfilter_conntrack/'
+license=('GPL')
options=('!libtool')
-source=(http://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2)
-md5sums=('2d17d9da1404728d61a29b4a8338ad0c')
+source=("http://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2")
+md5sums=('447114b5d61bb9a9617ead3217c3d3ff')
build() {
- cd $srcdir/$pkgname-$pkgver
+ cd $pkgname-$pkgver
./configure --prefix=/usr
make
- make DESTDIR=$pkgdir install
}
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+}
+
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/libnetfilter_queue/PKGBUILD b/community/libnetfilter_queue/PKGBUILD
index e7b74f128..fa219ba98 100644
--- a/community/libnetfilter_queue/PKGBUILD
+++ b/community/libnetfilter_queue/PKGBUILD
@@ -1,24 +1,29 @@
-# $Id: PKGBUILD 71614 2012-05-31 08:52:14Z spupykin $
+# $Id: PKGBUILD 77377 2012-10-09 09:50:14Z seblu $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
# Contributor: Kevin Edmonds <edmondskevin@hotmail.com>
# Maintainer: Filip Wojciechowski, filip at loka dot pl
pkgname=libnetfilter_queue
-pkgver=1.0.1
+pkgver=1.0.2
pkgrel=1
-pkgdesc="userspace library providing an API to packets that have been queued by the kernel packet filter"
+pkgdesc='Userspace API to packets that have been queued by the kernel packet filter'
arch=('i686' 'x86_64')
-url="http://www.netfilter.org/projects/libnetfilter_queue/index.html"
+url='http://www.netfilter.org/projects/libnetfilter_queue/'
license=('GPL')
-depends=(libnfnetlink)
-makedepends=(pkgconfig)
+depends=('libnfnetlink' 'libmnl')
options=('!libtool')
-source=(http://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2)
-md5sums=('08b968cb2d36c24deb7f26a69f5d8602')
+source=("http://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2")
+md5sums=('df09befac35cb215865b39a36c96a3fa')
build() {
- cd $srcdir/$pkgname-$pkgver
+ cd $pkgname-$pkgver
./configure --prefix=/usr
- make
- make DESTDIR=$pkgdir install
}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/libnfnetlink/PKGBUILD b/community/libnfnetlink/PKGBUILD
index fc8e6d8dd..5bb6c345d 100644
--- a/community/libnfnetlink/PKGBUILD
+++ b/community/libnfnetlink/PKGBUILD
@@ -1,27 +1,30 @@
-# $Id: PKGBUILD 55539 2011-09-14 08:04:26Z andrea $
+# $Id: PKGBUILD 77381 2012-10-09 10:06:36Z seblu $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
# Contributor: Kevin Edmonds <edmondskevin@hotmail.com>
# Contributor: Filip Wojciechowski, filip at loka dot pl
pkgname=libnfnetlink
-pkgver=1.0.0
-pkgrel=2
-pkgdesc="low-level library for netfilter related kernel/userspace communication"
+pkgver=1.0.1
+pkgrel=1
+pkgdesc='Low-level library for netfilter related kernel/userspace communication'
arch=('i686' 'x86_64')
-url="http://www.netfilter.org/projects/libnfnetlink/index.html"
+url='http://www.netfilter.org/projects/libnfnetlink/'
license=('GPL')
depends=('glibc')
options=('!libtool')
source=("http://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2")
-md5sums=('016fdec8389242615024c529acc1adb8')
+md5sums=('98927583d2016a9fb1936fed992e2c5e')
build() {
- cd "${srcdir}"/$pkgname-$pkgver
+ cd $pkgname-$pkgver
./configure --prefix=/usr
make
}
package() {
- cd "${srcdir}"/$pkgname-$pkgver
- make DESTDIR="${pkgdir}" install
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/sfk/PKGBUILD b/community/sfk/PKGBUILD
index 10e7381bf..494390ff0 100644
--- a/community/sfk/PKGBUILD
+++ b/community/sfk/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 67087 2012-03-03 17:34:42Z seblu $
+# $Id: PKGBUILD 77369 2012-10-09 06:40:23Z seblu $
# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
# Contributor: Baumi <baumi@gmx.com>
pkgname=sfk
-pkgver=1.6.5
+pkgver=1.6.6
pkgrel=1
pkgdesc='Swiss File Knife - A Command Line Tools Collection'
arch=('i686' 'x86_64')
@@ -11,7 +11,7 @@ url='http://stahlforce.com/dev/?tool=sfk'
license=('custom: BSD')
depends=('gcc-libs')
source=("http://downloads.sourceforge.net/swissfileknife/${pkgname}${pkgver//./}.zip")
-md5sums=('b40c0c01785d40e7cde7cba3e4227f0b')
+md5sums=('d32f487d783356eb15e23f5e26bf7ac7')
build() {
cd ${pkgname}${pkgver//./}
diff --git a/community/ulogd/PKGBUILD b/community/ulogd/PKGBUILD
index bed484f6c..84e674e1e 100644
--- a/community/ulogd/PKGBUILD
+++ b/community/ulogd/PKGBUILD
@@ -1,36 +1,34 @@
-# $Id: PKGBUILD 75920 2012-09-05 14:02:57Z spupykin $
+# $Id: PKGBUILD 77404 2012-10-09 16:01:10Z seblu $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer: Sebastien Luttringer <seblu+arch@seblu.net>
# Contributor: Dale Blount <dale@archlinux.org>
# Contributor: Sergej Pupykin <ps@lx-ltd.ru>
pkgname=ulogd
-pkgver=2.0.0
-pkgrel=5
+pkgver=2.0.1
+pkgrel=2
pkgdesc='Userspace Packet Logging for netfilter'
arch=('i686' 'x86_64')
url='http://www.netfilter.org/projects/ulogd/index.html'
license=('GPL2')
-depends=('libmnl')
+depends=('libmnl' 'libnfnetlink')
backup=('etc/ulogd.conf')
-makedepends=('libmysqlclient' 'postgresql-libs' 'sqlite' 'libpcap' 'libdbi'
- 'libnetfilter_acct' 'libnetfilter_log' 'libnetfilter_conntrack'
- 'linuxdoc-tools' 'groff' 'texlive-core')
-optdepends=('postgresql-libs'
- 'sqlite'
- 'libpcap'
- 'libmysqlclient'
- 'libdbi'
- 'libnetfilter_acct'
- 'libnetfilter_log'
- 'libnetfilter_conntrack')
+makedepends=('libmysqlclient'
+ 'libnetfilter_acct'
+ 'libnetfilter_conntrack'
+ 'libnetfilter_log'
+ 'libpcap'
+ 'libdbi'
+ 'postgresql-libs'
+ 'sqlite')
+optdepends=("${makedepends[@]}")
options=('!libtool')
source=("ftp://ftp.netfilter.org/pub/$pkgname/$pkgname-$pkgver.tar.bz2"
- 'rc'
- 'logrotate'
- 'ulogd.conf.min'
- 'ulogd.service')
-md5sums=('211e68781e3860959606fc94b97cf22e'
+ "$pkgname.rc"
+ "$pkgname.logrotate"
+ "$pkgname.conf"
+ "$pkgname.service")
+md5sums=('2f4b1a58955fcad4ebf22f0d00885fc9'
'c42230c1cabf5dd9b80bf9a0fd87ca7e'
'dd32eeee0949adff4188544419acd17e'
'c21531312f95e790ed19aa267a17d35a'
@@ -40,23 +38,19 @@ build() {
cd $pkgname-$pkgver
./configure --prefix=/usr --sysconfdir=/etc --with-mysql --with-pgsql --with-dbi
make
- (cd doc && make)
}
package() {
cd $pkgname-$pkgver
make DESTDIR="$pkgdir" install
-
- install -dm0755 "$pkgdir/usr/share/doc/ulogd"
- install -Dm0644 ulogd.conf $pkgdir/usr/share/doc/ulogd/ulogd.conf.sample
- install -Dm0644 doc/ulogd.{dvi,html,ps,sgml,txt} "$pkgdir/usr/share/doc/ulogd"
-
- install -dm0755 "$pkgdir/usr/share/ulogd"
- install -m644 doc/*.{table,sql} "$pkgdir/usr/share/ulogd"
-
- install -D -m644 "$srcdir/logrotate" "$pkgdir/etc/logrotate.d/ulogd"
- install -D -m755 "$srcdir/rc" "$pkgdir/etc/rc.d/ulogd"
-
- install -Dm0644 $srcdir/ulogd.conf.min $pkgdir/etc/ulogd.conf
- install -Dm0644 $srcdir/ulogd.service $pkgdir/usr/lib/systemd/system/ulogd.service
+ install -dm755 "$pkgdir/usr/share/doc/ulogd"
+ install -Dm644 ulogd.conf "$pkgdir/usr/share/doc/ulogd/ulogd.conf"
+ install -m644 doc/*.{table,sql} "$pkgdir/usr/share/doc/ulogd"
+ cd "$srcdir"
+ install -Dm755 $pkgname.rc "$pkgdir/etc/rc.d/$pkgname"
+ install -Dm644 $pkgname.service "$pkgdir/usr/lib/systemd/system/$pkgname.service"
+ install -Dm644 $pkgname.logrotate "$pkgdir/etc/logrotate.d/$pkgname"
+ install -Dm644 $pkgname.conf "$pkgdir/etc/$pkgname.conf"
}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/ulogd/ulogd.conf b/community/ulogd/ulogd.conf
new file mode 100644
index 000000000..822575613
--- /dev/null
+++ b/community/ulogd/ulogd.conf
@@ -0,0 +1,20 @@
+[global]
+nlgroup=1
+logfile="/var/log/ulogd.log"
+loglevel=5
+rmem=131071
+bufsize=150000
+
+plugin="/usr/lib/ulogd/ulogd_inppkt_ULOG.so"
+plugin="/usr/lib/ulogd/ulogd_raw2packet_BASE.so"
+plugin="/usr/lib/ulogd/ulogd_filter_IP2STR.so"
+plugin="/usr/lib/ulogd/ulogd_filter_PRINTPKT.so"
+plugin="/usr/lib/ulogd/ulogd_output_LOGEMU.so"
+
+stack=ulog1:ULOG,base1:BASE,ip2str1:IP2STR,print1:PRINTPKT,emu1:LOGEMU
+
+[ulog1]
+nlgroup=1
+
+[emu1]
+file=/var/log/ulogd.syslogemu
diff --git a/community/ulogd/ulogd.logrotate b/community/ulogd/ulogd.logrotate
new file mode 100644
index 000000000..312c71acb
--- /dev/null
+++ b/community/ulogd/ulogd.logrotate
@@ -0,0 +1,10 @@
+/var/log/ulogd.log /var/log/ulogd.syslogemu {
+ missingok
+ notifempty
+ sharedscripts
+ create 0640 root root
+
+ postrotate
+ [ -e /var/run/ulogd.pid ] && /etc/rc.d/ulogd restart > /dev/null
+ endscript
+}
diff --git a/community/ulogd/ulogd.rc b/community/ulogd/ulogd.rc
new file mode 100644
index 000000000..83f0550cc
--- /dev/null
+++ b/community/ulogd/ulogd.rc
@@ -0,0 +1,54 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+get_pid() {
+ pidof /usr/sbin/ulogd
+}
+
+case "$1" in
+ start)
+ stat_busy "Starting ulogd daemon"
+
+ [ -f /var/run/ulog.pid ] && rm -f /var/run/ulog.pid
+ PID=`get_pid`
+ if [ -z "$PID" ]; then
+ /usr/sbin/ulogd -d &>/dev/null
+ if [ $? -gt 0 ]; then
+ stat_fail
+ exit 1
+ else
+ echo `get_pid` > /var/run/ulogd.pid
+ add_daemon ulogd
+ stat_done
+ fi
+ else
+ stat_fail
+ exit 1
+ fi
+ ;;
+
+ stop)
+ stat_busy "Stopping ulog daemon"
+ PID=`get_pid`
+ [ ! -z "$PID" ] && kill $PID &> /dev/null
+ if [ $? -gt 0 ]; then
+ stat_fail
+ exit 1
+ else
+ rm -f /var/run/ulogd.pid &> /dev/null
+ rm_daemon ulogd
+ stat_done
+ fi
+ ;;
+
+ restart)
+ $0 stop
+ sleep 3
+ $0 start
+ ;;
+ *)
+ echo "usage: $0 {start|stop|restart}"
+esac
+exit 0
diff --git a/community/xmobar/0001-Update-usage-of-catch-to-catchIOError-since-catch-ha.patch b/community/xmobar/0001-Update-usage-of-catch-to-catchIOError-since-catch-ha.patch
new file mode 100644
index 000000000..d4508c916
--- /dev/null
+++ b/community/xmobar/0001-Update-usage-of-catch-to-catchIOError-since-catch-ha.patch
@@ -0,0 +1,34 @@
+From b7345a790e8026a2075ce636ac377d8f049b4b7c Mon Sep 17 00:00:00 2001
+From: Thomas Dziedzic <gostrc@gmail.com>
+Date: Wed, 3 Oct 2012 06:51:21 -0700
+Subject: [PATCH] Update usage of catch to catchIOError since catch has been
+ removed from System.IO.Error in ghc 7.6.1
+
+---
+ src/Plugins/Monitors/Bright.hs | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/Plugins/Monitors/Bright.hs b/src/Plugins/Monitors/Bright.hs
+index 499e5bc..b5ec4c0 100644
+--- a/src/Plugins/Monitors/Bright.hs
++++ b/src/Plugins/Monitors/Bright.hs
+@@ -20,6 +20,7 @@ import Data.Char
+ import System.FilePath ((</>))
+ import System.Posix.Files (fileExist)
+ import System.Console.GetOpt
++import System.IO.Error (catchIOError)
+
+ data BrightOpts = BrightOpts
+ { subDir :: String
+@@ -101,7 +102,7 @@ readBright files =
+ maxVal <- grab $ (fMax files)
+ return $ (currVal / maxVal)
+ where
+- grab f = catch (fmap (read . B.unpack) $ B.readFile f)(\_ -> return 0)
++ grab f = catchIOError (fmap (read . B.unpack) $ B.readFile f)(\_ -> return 0)
+
+
+ showHorizontalBar :: Float -> Monitor String
+--
+1.7.12.2
+
diff --git a/community/xmobar/PKGBUILD b/community/xmobar/PKGBUILD
index 608dbbe08..0fcb9e753 100644
--- a/community/xmobar/PKGBUILD
+++ b/community/xmobar/PKGBUILD
@@ -1,35 +1,37 @@
-# $Id: PKGBUILD 72497 2012-06-15 14:00:57Z jelle $
+# $Id: PKGBUILD 77363 2012-10-09 04:19:10Z 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.15
-pkgrel=2
+pkgver=0.16
+pkgrel=1
pkgdesc="A Minimalistic Text Based Status Bar"
url="http://hackage.haskell.org/package/xmobar"
license=('custom:BSD3')
arch=('i686' 'x86_64')
depends=('gmp' 'libxft' 'libxinerama' 'wireless_tools' 'libxrandr')
-makedepends=('ghc=7.4.2-1' 'haskell-x11=1.6.0' 'haskell-x11-xft=0.3.1' 'haskell-utf8-string'
+makedepends=('ghc=7.6.1-1' 'haskell-x11=1.6.0.2' '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 xmobar-0.15-haskell-mtl.patch)
+#source=(http://hackage.haskell.org/packages/archive/xmobar/$pkgver/xmobar-$pkgver.tar.gz xmobar-0.15-builddep.patch)
+# Use Git snapshot for Ghc 7.6.1 rebuild
+source=(ftp://ftp.archlinux.org/other/community/xmobar/xmobar-$pkgver.tar.gz
+0001-Update-usage-of-catch-to-catchIOError-since-catch-ha.patch)
build() {
- cd ${srcdir}/xmobar-$pkgver
- # Fix haskell mtl dep
- patch -Np1 -i $srcdir/xmobar-0.15-haskell-mtl.patch
+ cd ${srcdir}/xmobar
+ patch -Np1 -i $srcdir/0001-Update-usage-of-catch-to-catchIOError-since-catch-ha.patch
runhaskell Setup configure --disable-optimization --prefix=/usr --flags="with_utf8 with_xft with_iwlib"
runhaskell Setup build
}
package() {
- cd ${srcdir}/xmobar-$pkgver
+ cd ${srcdir}/xmobar
runhaskell Setup copy --destdir=${pkgdir}
- install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/$pkgname/LICENSE
+ install -D -m644 license ${pkgdir}/usr/share/licenses/$pkgname/LICENSE
}
-md5sums=('0658679b39168f49d32fe178029ff9f1'
- '0d9fb64557233c3a349feb53097c7b09')
+md5sums=('b470f8253f8d2b014f59e9d657cc7ddd'
+ 'ffd6079c879f3b6ff7208a846d6ee241'
+ '149583c19ac3d0ad829f3138342bb9db')
diff --git a/community/xmonad-contrib/PKGBUILD b/community/xmonad-contrib/PKGBUILD
index dbb48f0a2..095158c1d 100644
--- a/community/xmonad-contrib/PKGBUILD
+++ b/community/xmonad-contrib/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 72409 2012-06-13 13:48:15Z tdziedzic $
+# $Id: PKGBUILD 77365 2012-10-09 04:19:28Z 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=4
+pkgrel=5
pkgdesc="Add-ons for xmonad"
arch=('i686' 'x86_64')
url="http://xmonad.org/"
license=('BSD')
-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')
+depends=('ghc=7.6.1' 'xmonad=0.10-5' 'sh' 'haskell-x11=1.6.0.2' 'haskell-x11-xft=0.3.1' 'haskell-utf8-string=0.3.7' 'haskell-random=1.0.1.1-3')
install='xmonad-contrib.install'
source=(http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz xmonad-contrib-0.10-x11-1.6.patch)
md5sums=('9a4353a94ec0ea3a9c4700757ef5ae81'
diff --git a/community/xmonad/PKGBUILD b/community/xmonad/PKGBUILD
index a64c266dd..d513338e3 100644
--- a/community/xmonad/PKGBUILD
+++ b/community/xmonad/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 72408 2012-06-13 13:48:08Z tdziedzic $
+# $Id: PKGBUILD 77364 2012-10-09 04:19:21Z 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=4
+pkgrel=5
pkgdesc="Lightweight X11 tiled window manager written in Haskell"
arch=('i686' 'x86_64')
url="http://xmonad.org/"
license=('BSD')
-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')
+depends=('ghc=7.6.1-1' 'gmp' 'haskell-x11=1.6.0.2' 'sh' 'haskell-mtl=2.1.2' 'haskell-utf8-string=0.3.7' 'haskell-extensible-exceptions')
makedepends=('setconf' 'gendesk')
optdepends=('xorg-xmessage: for displaying visual error messages')
install='xmonad.install'
@@ -19,6 +19,7 @@ source=(http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$p
build() {
cd "$srcdir"
+ ghc-pkg list
gendesk
cd $srcdir/$pkgname-$pkgver
@@ -39,7 +40,7 @@ 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
diff --git a/core/iputils/PKGBUILD b/core/iputils/PKGBUILD
index e72795dd3..6deb41ecc 100644
--- a/core/iputils/PKGBUILD
+++ b/core/iputils/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 163489 2012-07-13 11:24:04Z stephane $
+# $Id: PKGBUILD 168366 2012-10-09 12:53:03Z stephane $
# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
# Contributor: Aaron Griffin <aaron@archlinux.org>
pkgname=iputils
pkgver=20101006
-pkgrel=4
+pkgrel=7
pkgdesc="IP Configuration Utilities (and Ping)"
arch=('i686' 'x86_64')
license=('GPL')
diff --git a/core/iputils/iputils.install b/core/iputils/iputils.install
index 2481fb396..8e5159e83 100644
--- a/core/iputils/iputils.install
+++ b/core/iputils/iputils.install
@@ -1,7 +1,6 @@
post_install() {
- setcap cap_net_raw=ep usr/bin/ping
- setcap cap_net_raw=ep usr/bin/ping6
- echo " >> Traceroute is now provided by core/traceroute"
+ setcap cap_net_raw=ep usr/bin/ping 2>/dev/null || chmod +s usr/bin/ping
+ setcap cap_net_raw=ep usr/bin/ping6 2>/dev/null || chmod +s usr/bin/ping6
}
post_upgrade() {
diff --git a/extra/bind/PKGBUILD b/extra/bind/PKGBUILD
index a567d0e8f..5e150fdf9 100644
--- a/extra/bind/PKGBUILD
+++ b/extra/bind/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 166603 2012-09-12 22:39:35Z bisson $
+# $Id: PKGBUILD 168392 2012-10-09 22:16:55Z bisson $
# Maintainer: Gaetan Bisson <bisson@archlinux.org>
# Contributor: judd <jvinet@zeroflux.org>
# Contributor: Mario Vazquez <mario_vazq@hotmail.com>
pkgname=bind
-_pkgver=9.9.1-P3
+_pkgver=9.9.2
pkgver=${_pkgver//-/.}
pkgrel=1
pkgdesc='Berkeley Internet Name Daemon is the reference implementation of the DNS protocols'
@@ -23,9 +23,9 @@ source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz"
'named.logrotate'
'localhost.zone'
'127.0.0.zone')
-sha1sums=('1c890f69f627ffbc76460c766bafefde408ed799'
+sha1sums=('eb9fa7b497d67ce61a120cb96c302381bc385324'
'cbdecd1ea8e7b612b33b63d66bc57273795d1f54'
- '18f477f510df31e6c6f547ee2d5fc46e973479bf'
+ '14264affa71bcfe7703d0fb7c3556c4c47efaa8b'
'46232e9db243c6c05e170a1781d7a7f413be5d03'
'5ca7a5f2a132548a090a045a2df3acea6b35d9eb'
'7848edbfb9a848843f57c11c02b0289eefd42d00'
diff --git a/extra/bind/remove-tools.patch b/extra/bind/remove-tools.patch
index cbd1c53ad..29b4c9c5f 100644
--- a/extra/bind/remove-tools.patch
+++ b/extra/bind/remove-tools.patch
@@ -7,6 +7,6 @@ diff -aur old/bin/Makefile.in new/bin/Makefile.in
-SUBDIRS = named rndc dig dnssec tests tools nsupdate \
+SUBDIRS = named rndc dnssec tests tools nsupdate \
- check confgen @PKCS11_TOOLS@
+ check confgen @PYTHON_TOOLS@ @PKCS11_TOOLS@
TARGETS =
diff --git a/extra/cabal-install/PKGBUILD b/extra/cabal-install/PKGBUILD
index 30bffb560..5ce042013 100644
--- a/extra/cabal-install/PKGBUILD
+++ b/extra/cabal-install/PKGBUILD
@@ -3,34 +3,41 @@
# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
pkgname=cabal-install
-pkgver=0.14.0
-pkgrel=2
+pkgver=1.16.0
+pkgrel=1
pkgdesc="The command-line interface for Cabal and Hackage."
url="http://hackage.haskell.org/package/cabal-install"
license=('custom:BSD3')
arch=('i686' 'x86_64')
-makedepends=('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')
+makedepends=('haskell-http=4000.2.4-1' 'haskell-zlib=0.5.3.3-5' 'haskell-mtl=2.1.2-1' 'haskell-network=2.3.1.0-1' 'haskell-random=1.0.1.1-3')
depends=('ghc' 'gmp' 'zlib')
-source=(http://hackage.haskell.org/packages/archive/cabal-install/$pkgver/cabal-install-$pkgver.tar.gz)
-md5sums=('638514bd1a5792d75866481852148ae5')
+source=("http://hackage.haskell.org/packages/archive/cabal-install/${pkgver}/cabal-install-${pkgver}.tar.gz")
+md5sums=('da046116eee7664158411fa9e2cf6b14')
build() {
- cd cabal-install-${pkgver}
- runhaskell Setup configure --enable-shared --enable-split-objs --enable-executable-stripping --prefix=/usr
- runhaskell Setup build
+ cd cabal-install-${pkgver}
+
+ runhaskell Setup configure \
+ --enable-shared \
+ --enable-split-objs \
+ --enable-executable-stripping \
+ --prefix=/usr
+
+ runhaskell Setup build
}
package() {
- cd cabal-install-${pkgver}
- runhaskell Setup copy --destdir=$pkgdir
+ cd cabal-install-${pkgver}
+
+ runhaskell Setup copy --destdir=$pkgdir
- # rm license installed to wrong location
- rm -rf ${pkgdir}/usr/share/doc
+ # rm license installed to wrong location
+ rm -rf ${pkgdir}/usr/share/doc
- install -D -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
+ install -D -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
- # add bash completion
- install -d ${pkgdir}/usr/share/bash-completion/completions
- install -m644 bash-completion/cabal \
- ${pkgdir}/usr/share/bash-completion/completions
+ # add bash completion
+ install -d ${pkgdir}/usr/share/bash-completion/completions
+ install -m644 bash-completion/cabal \
+ ${pkgdir}/usr/share/bash-completion/completions
}
diff --git a/extra/ghc/PKGBUILD b/extra/ghc/PKGBUILD
index e2152d9db..d3a32f5b5 100644
--- a/extra/ghc/PKGBUILD
+++ b/extra/ghc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 161653 2012-06-13 13:44:00Z tdziedzic $
+# $Id: PKGBUILD 168343 2012-10-09 04:08:52Z tdziedzic $
# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
# Special note for devs looking to upgrade this package:
@@ -7,7 +7,7 @@
# This implies that all libraries need to be rebuilt when ghc is rebuilt.
pkgname=ghc
-pkgver=7.4.2
+pkgver=7.6.1
pkgrel=1
pkgdesc='The Glasgow Haskell Compiler'
arch=('i686' 'x86_64')
@@ -19,74 +19,64 @@ makedepends=('ghc' 'perl' 'libxslt' 'docbook-xsl')
checkdepends=('python2')
install='ghc.install'
# 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')
+#options=('!makeflags')
# missing rtl?
-provides=('haskell-array=0.4.0.0'
- 'haskell-base=4.5.1.0'
- 'haskell-binary=0.5.1.0'
+provides=('haskell-array=0.4.0.1'
+ 'haskell-base=4.6.0.0'
+ 'haskell-binary=0.5.1.1'
'haskell-bin-package-db=0.0.0.0'
- 'haskell-bytestring=0.9.2.1'
- 'haskell-containers=0.4.2.1'
- 'haskell-deepseq=1.3.0.0'
- 'haskell-directory=1.1.0.2'
- 'haskell-extensible-exceptions=0.1.1.4'
- 'haskell-filepath=1.3.0.0'
- 'haskell-ghc-prim=0.2.0.0'
- 'haskell-haskell2010=1.1.0.1'
- 'haskell-haskell98=2.0.0.1'
- 'haskell-hoopl=3.8.7.3'
- 'haskell-hpc=0.5.1.1'
- 'haskell-integer-gmp=0.4.0.0'
- 'haskell-old-locale=1.0.0.4'
- 'haskell-old-time=1.1.0.0'
+ 'haskell-bytestring=0.10.0.0'
+ 'haskell-containers=0.5.0.0'
+ 'haskell-deepseq=1.3.0.1'
+ 'haskell-directory=1.2.0.0'
+ 'haskell-filepath=1.3.0.1'
+ 'haskell-ghc-prim=0.3.0.0'
+ 'haskell-haskell2010=1.1.1.0'
+ 'haskell-haskell98=2.0.0.2'
+ 'haskell-hoopl=3.9.0.0'
+ 'haskell-hpc=0.6.0.0'
+ 'haskell-integer-gmp=0.5.0.0'
+ 'haskell-old-locale=1.0.0.5'
+ 'haskell-old-time=1.1.0.1'
'haskell-pretty=1.1.1.0'
- 'haskell-process=1.1.0.1'
- 'haskell-template-haskell=2.7.0.0'
- 'haskell-time=1.4'
- 'haskell-unix=2.5.1.1'
- 'haskell-cabal=1.14.0'
- )
-replaces=('haskell-array<0.4.0.0'
- 'haskell-base<4.5.1.0'
- 'haskell-binary<0.5.1.0'
+ 'haskell-process=1.1.0.2'
+ 'haskell-template-haskell=2.8.0.0'
+ 'haskell-time=1.4.0.1'
+ 'haskell-unix=2.6.0.0'
+ 'haskell-cabal=1.16.0')
+replaces=('haskell-array<0.4.0.1'
+ 'haskell-base<4.6.0.0'
+ 'haskell-binary<0.5.1.1'
'haskell-bin-package-db<0.0.0.0'
- 'haskell-bytestring<0.9.2.1'
- 'haskell-containers<0.4.2.1'
- 'haskell-deepseq<1.3.0.0'
- 'haskell-directory<1.1.0.2'
- 'haskell-extensible-exceptions<0.1.1.4'
- 'haskell-filepath<1.3.0.0'
- 'haskell-ghc-prim<0.2.0.0'
- 'haskell-haskell2010<1.1.0.1'
- 'haskell-haskell98<2.0.0.1'
- 'haskell-hoopl<3.8.7.3'
- 'haskell-hpc<0.5.1.1'
- 'haskell-integer-gmp<0.4.0.0'
- 'haskell-old-locale<1.0.0.4'
- 'haskell-old-time<1.1.0.0'
+ 'haskell-bytestring<0.10.0.0'
+ 'haskell-containers<0.5.0.0'
+ 'haskell-deepseq<1.3.0.1'
+ 'haskell-directory<1.2.0.0'
+ 'haskell-filepath<1.3.0.1'
+ 'haskell-ghc-prim<0.3.0.0'
+ 'haskell-haskell2010<1.1.1.0'
+ 'haskell-haskell98<2.0.0.2'
+ 'haskell-hoopl<3.9.0.0'
+ 'haskell-hpc<0.6.0.0'
+ 'haskell-integer-gmp<0.5.0.0'
+ 'haskell-old-locale<1.0.0.5'
+ 'haskell-old-time<1.1.0.1'
'haskell-pretty<1.1.1.0'
- 'haskell-process<1.1.0.1'
- 'haskell-template-haskell<2.7.0.0'
- 'haskell-time<1.4'
- 'haskell-unix<2.5.1.1'
- 'haskell-cabal<1.14.0'
- )
+ 'haskell-process<1.1.0.2'
+ 'haskell-template-haskell<2.8.0.0'
+ 'haskell-time<1.4.0.1'
+ 'haskell-unix<2.6.0.0'
+ 'haskell-cabal<1.16.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'
- 'silence-gen_contents_index.diff')
-md5sums=('267462db5c5a7c245fb26361b77007c4'
- '528005749c761fe6c12a0079bd84fb90'
- '88ad4108c26f56fc38466d82aaf9a295'
- '2ac480d025b706fc47acc58c54b246bb')
+ 'build.mk')
+md5sums=('e9d892d2970550ec5e70130b3621f6b6'
+ '0d93c458e3b445a7e524ef6ae459ce11'
+ 'c367ef26300648ee9b8aca3dee5c9669')
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 \
@@ -96,16 +86,35 @@ build() {
}
check() {
+ # keep this otherwise a lot of tests will show as unexpected failures... need to investigate why using -jn for n > 1 does this...
+ unset MAKEFLAGS
+
cd ghc-${pkgver}
# python2 rename
sed -e 's/PYTHON = python/&2/' -i testsuite/mk/boilerplate.mk
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
+ # upstream known failures on both i686 and x86_64:
+ # ghci.debugger/scripts break011 [bad stderr] (ghci)
+ # perf/compiler parsing001 [stat not good enough] (normal)
+ # simplCore/should_compile spec-inline [stderr mismatch] (optasm)
+ # upstream known failures on i686 only:
+ # numrun012 test fails on i686 works on x86_64 - http://hackage.haskell.org/trac/ghc/ticket/5856
make test
- # might be some failures
+
+ # enabling threads to speed up
+ # causes more failures than make test, need to investigate
+ # upstream known failures on both i686 and x86_64:
+ # perf/compiler parsing001 [stat not good enough] (normal)
+ # simplCore/should_compile spec-inline [stderr mismatch] (optasm)
+ # upstream known failures on i686 only:
+ # numrun012 test fails on i686 works on x86_64 - http://hackage.haskell.org/trac/ghc/ticket/5856
+ #make THREADS=9 test
+
+ # will most likely cause lots of failures
+ # enable this when upstream has 0 test failures from a simple 'make test'
+ # zero unexpected failures on all tier 1 platforms - http://hackage.haskell.org/trac/ghc/ticket/5757
#make fulltest
}
diff --git a/extra/ghc/build.mk b/extra/ghc/build.mk
index 73645a957..bb57594bf 100644
--- a/extra/ghc/build.mk
+++ b/extra/ghc/build.mk
@@ -10,6 +10,9 @@
# Full build with max optimisation and everything enabled (very slow build)
BuildFlavour = perf
+# As above but build GHC using the LLVM backend
+#BuildFlavour = perf-llvm
+
# Fast build with optimised libraries, no profiling (RECOMMENDED):
#BuildFlavour = quick
@@ -51,6 +54,23 @@ endif
endif
+# ---------------- Perf build using LLVM -------------------------------------
+
+ifeq "$(BuildFlavour)" "perf-llvm"
+
+SRC_HC_OPTS = -O -H64m -fllvm
+GhcStage1HcOpts = -O -fllvm
+GhcStage2HcOpts = -O2 -fllvm
+GhcHcOpts = -Rghc-timing
+GhcLibHcOpts = -O2
+GhcLibWays += p
+
+ifeq "$(PlatformSupportsSharedLibs)" "YES"
+GhcLibWays += dyn
+endif
+
+endif
+
# -------- A Fast build ------------------------------------------------------
ifeq "$(BuildFlavour)" "quickest"
@@ -151,10 +171,14 @@ endif
ifeq "$(BuildFlavour)" "unreg"
+# Note that the LLVM backend works in unregisterised mode as well as
+# registerised mode. This often makes it a good choice for porting
+# GHC.
+
GhcUnregisterised = YES
GhcWithNativeCodeGen = NO
-SRC_HC_OPTS = -O -H64m
+SRC_HC_OPTS = -O -H64m # -fllvm
GhcStage1HcOpts = -O
GhcStage2HcOpts = -O2
GhcHcOpts = -Rghc-timing
@@ -173,3 +197,4 @@ endif
# NoFib settings
NoFibWays =
STRIP_CMD = :
+
diff --git a/extra/haskell-http/PKGBUILD b/extra/haskell-http/PKGBUILD
index fda58f3c9..5eb7da013 100644
--- a/extra/haskell-http/PKGBUILD
+++ b/extra/haskell-http/PKGBUILD
@@ -5,16 +5,16 @@
_hkgname=HTTP
pkgname=haskell-http
-pkgver=4000.2.3
+pkgver=4000.2.4
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.2-1' 'sh' 'haskell-network=2.3.0.14-1' 'haskell-parsec=3.1.2-2' 'haskell-mtl=2.1.1-1')
+depends=('ghc=7.6.1-1' 'sh' 'haskell-network=2.3.1.0-1' 'haskell-parsec=3.1.3-1' 'haskell-mtl=2.1.2-1')
source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
install=${pkgname}.install
-md5sums=('872a1e49c3701c61c354f76716d4e3e7')
+md5sums=('5edcd9fd16a9cb72a140a29442d514b7')
build() {
cd ${srcdir}/${_hkgname}-${pkgver}
diff --git a/extra/haskell-mtl/PKGBUILD b/extra/haskell-mtl/PKGBUILD
index 4b2f73533..f1fa7c286 100644
--- a/extra/haskell-mtl/PKGBUILD
+++ b/extra/haskell-mtl/PKGBUILD
@@ -4,16 +4,16 @@
_hkgname=mtl
pkgname=haskell-mtl
-pkgver=2.1.1
+pkgver=2.1.2
pkgrel=1
pkgdesc="Monad transformer library"
url="http://hackage.haskell.org/package/${_hkgname}"
license=('custom:BSD3')
arch=('i686' 'x86_64')
-depends=('ghc=7.4.2-1' 'sh' 'haskell-transformers=0.3.0.0-1')
+depends=('ghc=7.6.1-1' 'sh' 'haskell-transformers=0.3.0.0-2')
source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz)
install=${pkgname}.install
-md5sums=('0654be687f1492a2ff30cf6f3fb7eed0')
+md5sums=('943c110524d96126bfa0e61f7df1ebcd')
build() {
cd ${srcdir}/${_hkgname}-${pkgver}
diff --git a/extra/haskell-network/PKGBUILD b/extra/haskell-network/PKGBUILD
index f3a3cc022..7f5d13fc1 100644
--- a/extra/haskell-network/PKGBUILD
+++ b/extra/haskell-network/PKGBUILD
@@ -5,16 +5,16 @@
_hkgname=network
pkgname=haskell-network
-pkgver=2.3.0.14
+pkgver=2.3.1.0
pkgrel=1
pkgdesc="Networking-related facilities"
url="http://hackage.haskell.org/package/network"
license=('custom:BSD3')
arch=('i686' 'x86_64')
-depends=('ghc=7.4.2-1' 'sh' 'haskell-parsec=3.1.2-2')
+depends=('ghc=7.6.1-1' 'sh' 'haskell-parsec=3.1.3-1')
source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
install=${pkgname}.install
-md5sums=('1e45cc731647acff8b9c33bda085bf2a')
+md5sums=('d824db8fc068cab60fa178ab330a57a2')
build() {
cd ${srcdir}/${_hkgname}-${pkgver}
diff --git a/extra/haskell-parsec/PKGBUILD b/extra/haskell-parsec/PKGBUILD
index 2ab24a745..9c7c1aafb 100644
--- a/extra/haskell-parsec/PKGBUILD
+++ b/extra/haskell-parsec/PKGBUILD
@@ -5,16 +5,16 @@
_hkgname=parsec
pkgname=haskell-parsec
-pkgver=3.1.2
-pkgrel=2
+pkgver=3.1.3
+pkgrel=1
pkgdesc="Monadic parser combinators"
url="http://hackage.haskell.org/package/${_hkgname}"
license=('custom:BSD3')
arch=('i686' 'x86_64')
-depends=('ghc=7.4.2-1' 'sh' 'haskell-mtl=2.1.1-1' 'haskell-text=0.11.2.1-1')
+depends=('ghc=7.6.1-1' 'sh' 'haskell-mtl=2.1.2-1' 'haskell-text=0.11.2.3-1')
source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
install=${pkgname}.install
-md5sums=('c2a75dfd247ae4839e2602b62dc87487')
+md5sums=('d72fc94b81153132c61125a1ec52a4a5')
build() {
cd ${srcdir}/${_hkgname}-${pkgver}
diff --git a/extra/haskell-random/PKGBUILD b/extra/haskell-random/PKGBUILD
index 56b110289..07cc5e2c2 100644
--- a/extra/haskell-random/PKGBUILD
+++ b/extra/haskell-random/PKGBUILD
@@ -3,12 +3,12 @@
_hkgname=random
pkgname=haskell-random
pkgver=1.0.1.1
-pkgrel=2
+pkgrel=3
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.2-1' 'sh')
+depends=('ghc=7.6.1-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 31811e339..5a23030d5 100644
--- a/extra/haskell-text/PKGBUILD
+++ b/extra/haskell-text/PKGBUILD
@@ -4,16 +4,16 @@
_hkgname=text
pkgname=haskell-text
-pkgver=0.11.2.1
+pkgver=0.11.2.3
pkgrel=1
pkgdesc="An efficient packed Unicode text type."
url="http://hackage.haskell.org/package/${_hkgname}"
license=('custom:BSD3')
arch=('i686' 'x86_64')
-depends=('ghc=7.4.2-1' 'sh')
+depends=('ghc=7.6.1-1' 'sh')
source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
install=${pkgname}.install
-md5sums=('77245df79d10ed5f896a9d3f5b17ee74')
+md5sums=('7a469d49a7576fb3a18785cb64d4ee6c')
build() {
cd ${srcdir}/${_hkgname}-${pkgver}
diff --git a/extra/haskell-transformers/PKGBUILD b/extra/haskell-transformers/PKGBUILD
index a216083a0..cc60818b6 100644
--- a/extra/haskell-transformers/PKGBUILD
+++ b/extra/haskell-transformers/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 161660 2012-06-13 13:44:42Z tdziedzic $
+# $Id: PKGBUILD 168350 2012-10-09 04:09:36Z tdziedzic $
# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
# Contributor: Rémy Oudompheng <remy@archlinux.org>
@@ -6,12 +6,12 @@
_hkgname=transformers
pkgname=haskell-transformers
pkgver=0.3.0.0
-pkgrel=1
+pkgrel=2
pkgdesc="Concrete functor and monad transformers"
url="http://hackage.haskell.org/package/${_hkgname}"
license=('custom:BSD3')
arch=('i686' 'x86_64')
-depends=('ghc=7.4.2-1' 'sh')
+depends=('ghc=7.6.1-1' 'sh')
source=("http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz")
install=${pkgname}.install
md5sums=('852dc0b79cc2bcb39136287d3dd385e5')
diff --git a/extra/haskell-zlib/PKGBUILD b/extra/haskell-zlib/PKGBUILD
index 11767ab97..30834b3c1 100644
--- a/extra/haskell-zlib/PKGBUILD
+++ b/extra/haskell-zlib/PKGBUILD
@@ -6,18 +6,22 @@
_hkgname=zlib
pkgname=haskell-zlib
pkgver=0.5.3.3
-pkgrel=4
+pkgrel=5
pkgdesc="Compression and decompression in the gzip and zlib formats"
url="http://hackage.haskell.org/package/zlib"
license=('custom:BSD3')
arch=('i686' 'x86_64')
-depends=('ghc=7.4.2-1' 'zlib' 'sh')
+depends=('ghc=7.6.1-1' 'zlib' 'sh')
source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
install=${pkgname}.install
md5sums=('1649e56d13ce2c6a6a9210227401dbbc')
build() {
cd ${srcdir}/${_hkgname}-${pkgver}
+
+ # ghc 7.6 includes bytestring 0.10
+ sed 's/bytestring == 0.9.*/bytestring == 0.10.*/' -i zlib.cabal
+
runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
--prefix=/usr --docdir=/usr/share/doc/${pkgname} \
--libsubdir=\$compiler/site-local/\$pkgid
diff --git a/extra/kdevelop-php/PKGBUILD b/extra/kdevelop-php/PKGBUILD
index 009fe1136..50056ddf0 100644
--- a/extra/kdevelop-php/PKGBUILD
+++ b/extra/kdevelop-php/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 156483 2012-04-19 10:23:39Z andrea $
+# $Id: PKGBUILD 168356 2012-10-09 06:48:14Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdevelop-php
-pkgver=1.3.1
-_pkgver=4.3.1
+pkgver=1.3.90
+_pkgver=4.3.90
pkgrel=1
pkgdesc="PHP language and documentation plugin for KDevelop/Quanta"
arch=('i686' 'x86_64')
@@ -13,9 +13,9 @@ depends=('kdevelop-pg-qt')
makedepends=('cmake' 'automoc4')
replaces=('kdevelop-php-docs')
conflicts=('kdevelop-php-docs')
-source=(http://download.kde.org/stable/kdevelop/${_pkgver}/src/${pkgname}-{,docs-}${pkgver}.tar.bz2)
-sha1sums=('c5d31de0bf0ae4b242b6265851807e5b44606525'
- '2b5c3dd2b26196a83bc95cfe8ee595e160f595f0')
+source=(http://download.kde.org/unstable/kdevelop/${_pkgver}/src/${pkgname}-{,docs-}${pkgver}.tar.bz2)
+sha1sums=('11f9b3d2d27ad93aa666edae60d08f64ea82bb8d'
+ 'f11194f5672d78406b6c54d53b10c02384e5bf99')
build() {
cd "${srcdir}"
diff --git a/extra/kdevelop/PKGBUILD b/extra/kdevelop/PKGBUILD
index 7890cd561..6efc30aa5 100644
--- a/extra/kdevelop/PKGBUILD
+++ b/extra/kdevelop/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 156481 2012-04-19 10:22:57Z andrea $
+# $Id: PKGBUILD 168354 2012-10-09 06:46:57Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Giovanni Scafora <giovanni@archlinux.org>
pkgname=kdevelop
-pkgver=4.3.1
+pkgver=4.3.90
pkgrel=1
pkgdesc="A C/C++ development environment for KDE"
arch=('i686' 'x86_64')
@@ -12,8 +12,8 @@ license=('GPL')
depends=('kdebase-workspace' 'kdevplatform' 'kdesdk-okteta' 'kdebase-katepart')
makedepends=('cmake' 'automoc4')
install="${pkgname}.install"
-source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('99596bf333bf5a62547f3dc0800674db146eb401')
+source=("http://download.kde.org/unstable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
+sha1sums=('18ed2dccdeef8abe41c135cd3038038790b4e50a')
build() {
cd "${srcdir}"
diff --git a/extra/kdevplatform/PKGBUILD b/extra/kdevplatform/PKGBUILD
index a60d25716..c7370bce0 100644
--- a/extra/kdevplatform/PKGBUILD
+++ b/extra/kdevplatform/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 156479 2012-04-19 10:22:22Z andrea $
+# $Id: PKGBUILD 168355 2012-10-09 06:47:34Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Giovanni Scafora <giovanni@archlinux.org>
pkgname=kdevplatform
-pkgver=1.3.1
-_pkgver=4.3.1
+pkgver=1.3.90
+_pkgver=4.3.90
pkgrel=1
pkgdesc="A C/C++ development platform for KDE"
arch=('i686' 'x86_64')
@@ -14,8 +14,8 @@ depends=('kdelibs' 'subversion' 'qjson')
optdepends=("kdesdk-kompare: difference checking")
makedepends=('cmake' 'automoc4' 'boost')
install=${pkgname}.install
-source=("http://download.kde.org/stable/kdevelop/${_pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('bba0cefdac6de83c8d3354534a94e8500dccda37')
+source=("http://download.kde.org/unstable/kdevelop/${_pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
+sha1sums=('88300217681caa5c69f09b6428f2a6298cbd4733')
build() {
cd "${srcdir}"
diff --git a/extra/libva-intel-driver/PKGBUILD b/extra/libva-intel-driver/PKGBUILD
new file mode 100644
index 000000000..b11c9a7de
--- /dev/null
+++ b/extra/libva-intel-driver/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 168383 2012-10-09 16:37:25Z ibiru $
+# Maintainer : Ionut Biru <ibiru@archlinux.org>
+
+pkgname=libva-intel-driver
+pkgver=1.0.18
+pkgrel=1
+pkgdesc="VA-API implementation for Intel G45 chipsets and Intel HD Graphics for Intel Core processor family."
+arch=('i686' 'x86_64')
+url="http://freedesktop.org/wiki/Software/vaapi"
+license=('MIT')
+depends=('libva')
+options=('!libtool')
+replaces=('libva-driver-intel')
+source=(http://www.freedesktop.org/software/vaapi/releases/$pkgname/$pkgname-$pkgver.tar.bz2
+ build-fix.patch)
+sha1sums=('2cbf6f8c9f59516cceb5c4245576d53d26612256'
+ '447987d81800b2a5c434e6b6b19b6f8ec9c675d1')
+
+build() {
+ cd $pkgname-$pkgver
+ patch -Np1 -i ../build-fix.patch
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+ install -m644 -D COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/extra/libva-intel-driver/build-fix.patch b/extra/libva-intel-driver/build-fix.patch
new file mode 100644
index 000000000..0127b06cf
--- /dev/null
+++ b/extra/libva-intel-driver/build-fix.patch
@@ -0,0 +1,68 @@
+From 73ccb0c88d53298befa6a896d2bb39a041169b36 Mon Sep 17 00:00:00 2001
+From: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
+Date: Fri, 06 Apr 2012 15:24:36 +0000
+Subject: dri: cope with drm_state changes.
+
+Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
+---
+diff --git a/src/i965_drv_video.c b/src/i965_drv_video.c
+index 3bea253..20fed99 100644
+--- a/src/i965_drv_video.c
++++ b/src/i965_drv_video.c
+@@ -2380,7 +2380,7 @@ i965_PutSurface(VADriverContextP ctx,
+ unsigned int flags) /* de-interlacing flags */
+ {
+ struct i965_driver_data *i965 = i965_driver_data(ctx);
+- struct dri_state *dri_state = (struct dri_state *)ctx->dri_state;
++ struct dri_state *dri_state = (struct dri_state *)ctx->drm_state;
+ struct i965_render_state *render_state = &i965->render_state;
+ struct dri_drawable *dri_drawable;
+ union dri_buffer *buffer;
+@@ -2393,7 +2393,7 @@ i965_PutSurface(VADriverContextP ctx,
+ int pp_flag = 0;
+
+ /* Currently don't support DRI1 */
+- if (dri_state->driConnectedFlag != VA_DRI2)
++ if (dri_state->base.auth_type != VA_DRM_AUTH_DRI2)
+ return VA_STATUS_ERROR_UNKNOWN;
+
+ /* Some broken sources such as H.264 conformance case FM2_SVA_C
+diff --git a/src/intel_driver.c b/src/intel_driver.c
+index 4e6df81..b34d9a1 100644
+--- a/src/intel_driver.c
++++ b/src/intel_driver.c
+@@ -29,7 +29,7 @@
+
+ #include <assert.h>
+
+-#include <va/va_dricommon.h>
++#include <va/va_drmcommon.h>
+
+ #include "intel_batchbuffer.h"
+ #include "intel_memman.h"
+@@ -50,15 +50,17 @@ Bool
+ intel_driver_init(VADriverContextP ctx)
+ {
+ struct intel_driver_data *intel = intel_driver_data(ctx);
+- struct dri_state *dri_state = (struct dri_state *)ctx->dri_state;
++ struct drm_state * const drm_state = (struct drm_state *)ctx->drm_state;
+ int has_exec2, has_bsd, has_blt;
+
+- assert(dri_state);
+- assert(dri_state->driConnectedFlag == VA_DRI2 ||
+- dri_state->driConnectedFlag == VA_DRI1);
++ assert(drm_state);
++ assert(drm_state->auth_type == VA_DRM_AUTH_DRI1 ||
++ drm_state->auth_type == VA_DRM_AUTH_DRI2 ||
++ drm_state->auth_type == VA_DRM_AUTH_CUSTOM);
+
+- intel->fd = dri_state->fd;
+- intel->dri2Enabled = (dri_state->driConnectedFlag == VA_DRI2);
++ intel->fd = drm_state->fd;
++ intel->dri2Enabled = (drm_state->auth_type == VA_DRM_AUTH_DRI2 ||
++ drm_state->auth_type == VA_DRM_AUTH_CUSTOM);
+
+ if (!intel->dri2Enabled) {
+ return False;
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/extra/libva-vdpau-driver/PKGBUILD b/extra/libva-vdpau-driver/PKGBUILD
new file mode 100644
index 000000000..4edf7b9c0
--- /dev/null
+++ b/extra/libva-vdpau-driver/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 168382 2012-10-09 16:32:34Z ibiru $
+# Maintainer: Ionut Biru <ibiru@archlinux.org>
+pkgname=libva-vdpau-driver
+pkgver=0.7.4
+pkgrel=1
+pkgdesc="VDPAU backend for VA API"
+arch=('i686' 'x86_64')
+url="http://freedesktop.org/wiki/Software/vaapi"
+license=('GPL')
+depends=('libva' 'libvdpau')
+makedepends=('mesa')
+replaces=('vdpau-video')
+options=('!libtool')
+source=(http://www.freedesktop.org/software/vaapi/releases/$pkgname/$pkgname-$pkgver.tar.bz2)
+sha1sums=('224318f4ea8bafca6a0fec770e388b7d1a1a66b3')
+
+build() {
+ cd $pkgname-$pkgver
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+
+ make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
+
+
diff --git a/extra/libva/PKGBUILD b/extra/libva/PKGBUILD
index 9317458cc..2922dc84a 100644
--- a/extra/libva/PKGBUILD
+++ b/extra/libva/PKGBUILD
@@ -1,25 +1,23 @@
-# $Id: PKGBUILD 161866 2012-06-16 00:18:39Z ibiru $
+# $Id: PKGBUILD 168381 2012-10-09 16:30:41Z ibiru $
# Maintainer : Ionut Biru <ibiru@archlinux.org>
pkgname=libva
pkgver=1.1.0
-pkgrel=1
+pkgrel=2
pkgdesc="Video Acceleration (VA) API for Linux"
arch=('i686' 'x86_64')
url="http://freedesktop.org/wiki/Software/vaapi"
license=('MIT')
depends=('libegl' 'libgl' 'libdrm' 'libxfixes')
makedepends=('mesa')
-optdepends=('vdpau-video: vdpau back-end for nvidia'
- 'libva-driver-intel: back-end for intel cards')
+optdepends=('libva-vdpau-driver: vdpau back-end for nvidia'
+ 'libva-intel-driver: back-end for intel cards')
options=('!libtool')
-install=libva.install
-source=(http://cgit.freedesktop.org/libva/snapshot/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('b22179bd44137e91d5c77a43a0cb8063')
+source=(http://www.freedesktop.org/software/vaapi/releases/$pkgname/$pkgname-$pkgver.tar.bz2)
+sha1sums=('af6e912ea86a6378992f5783390ab9cb8e5cadf9')
build() {
cd "$pkgname-$pkgver"
- ./autogen.sh
./configure --prefix=/usr
make
}
diff --git a/extra/libxcb/PKGBUILD b/extra/libxcb/PKGBUILD
index 2bbe1b908..c6564337c 100644
--- a/extra/libxcb/PKGBUILD
+++ b/extra/libxcb/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 153294 2012-03-12 20:52:27Z andyrtr $
+# $Id: PKGBUILD 168376 2012-10-09 16:18:34Z andyrtr $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Contributor: Alexander Baldeck <alexander@archlinux.org>
pkgname=libxcb
-pkgver=1.8.1
+pkgver=1.9
pkgrel=1
pkgdesc="X11 client-side library"
arch=(i686 x86_64)
@@ -14,13 +14,16 @@ options=('!libtool')
license=('custom')
source=($url/dist/$pkgname-$pkgver.tar.bz2
libxcb-1.1-no-pthread-stubs.patch)
-sha1sums=('98199b6054750a06cddd4e77baa4354af547ce6f'
+sha1sums=('ad2fb95eeec41ba3d39502a4f7460c3b64fdf061'
'd2df03ddf3e949c10c2c185256b0eb7fa02837ab')
build() {
cd "$srcdir/$pkgname-$pkgver"
patch -Np1 -i "$srcdir/libxcb-1.1-no-pthread-stubs.patch"
- PYTHON=/usr/bin/python2 ./autogen.sh --prefix=/usr --enable-xinput
+ PYTHON=/usr/bin/python2
+ ./autogen.sh --prefix=/usr \
+ --enable-xinput \
+ --disable-static
make
}
diff --git a/extra/nx/PKGBUILD b/extra/nx/PKGBUILD
index 79ca5d5fb..804244272 100644
--- a/extra/nx/PKGBUILD
+++ b/extra/nx/PKGBUILD
@@ -1,24 +1,53 @@
-# $Id: PKGBUILD 166924 2012-09-22 09:16:46Z andyrtr $
+# $Id: PKGBUILD 168379 2012-10-09 16:19:56Z andyrtr $
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
pkgbase=nx
pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent' 'nx-headers')
pkgver=3.5.0.15
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
url="http://wiki.x2go.org/"
license=('GPL')
-options=('!makeflags')
+options=('!makeflags') # '!strip')
makedepends=('libjpeg-turbo' 'libpng' 'bash' 'perl' # runtime dependencies from subpackages
'xproto' 'freetype2' 'libxaw' 'libxrender' 'libxp' 'libxpm' 'libxdamage' 'libxrandr' 'libxcomposite' 'libxtst' 'xorg-sessreg' # makedepends
)
source=(http://code.x2go.org/releases/source/nx-libs/nx-libs-$pkgver-full.tar.gz
- nx-x11.ld.so.conf.d)
+ nx-x11.ld.so.conf.d
+ nx-cflags.patch)
md5sums=('d5b3dba1ecbd2989cd7ce20fee6683a0'
- 'f2ec60c7e2d81bef2f7292d2b33681a6')
+ 'f2ec60c7e2d81bef2f7292d2b33681a6'
+ 'd0c5b88aac0473e19699cf62d84b9d5f')
build() {
cd "${srcdir}/nx-libs-$pkgver"
+
+ # debug flags
+# export CFLAGS="-march=x86-64 -O1 -g -pipe"
+# export CXXFLAGS="-march=x86-64 -O1 -g -pipe"
+
+
+ # Gentoo hacks to honor cflags
+ patch -Np0 -i ${srcdir}/nx-cflags.patch
+
+ # Run autoreconf in all neeed folders
+ for i in nxcomp nxcompext nxcompshad nxproxy; do
+ cd ${i}
+ autoreconf -vfi #${i}
+ cd ..
+ done
+
+ # From xorg-x11-6.9.0-r3.ebuild
+ pushd "${srcdir}/nx-libs-$pkgver/nx-X11"
+
+ HOSTCONF="config/cf/host.def"
+ echo "#define OptimizedCDebugFlags ${CFLAGS} GccAliasingArgs" >> ${HOSTCONF}
+ echo "#define OptimizedCplusplusDebugFlags ${CXXFLAGS} GccAliasingArgs" >> ${HOSTCONF}
+ # Respect LDFLAGS
+ echo "#define ExtraLoadFlags ${LDFLAGS}" >> ${HOSTCONF}
+ echo "#define SharedLibraryLoadFlags -shared ${LDFLAGS}" >> ${HOSTCONF}
+ popd
+
make CONFIGURE="./configure --prefix=/usr --libdir=/usr/lib --libexecdir=/usr/lib --includedir=/usr/include"
# fake install
mkdir $srcdir/fakeinstall
diff --git a/extra/nx/nx-cflags.patch b/extra/nx/nx-cflags.patch
new file mode 100644
index 000000000..35562939c
--- /dev/null
+++ b/extra/nx/nx-cflags.patch
@@ -0,0 +1,54 @@
+--- nxcomp/configure.in.orig 2008-12-18 15:48:09.000000000 +0100
++++ nxcomp/configure.in 2008-12-18 15:54:14.000000000 +0100
+@@ -7,8 +7,7 @@
+
+ dnl Set our default compilation flags.
+
+-CXXFLAGS="-O3 -fno-rtti -fno-exceptions"
+-CFLAGS="-O3"
++CXXFLAGS="$CXXFLAGS -fno-rtti -fno-exceptions"
+
+ dnl Reset default linking directives.
+
+--- nxcompext/configure.in.orig 2008-12-18 15:55:29.000000000 +0100
++++ nxcompext/configure.in 2008-12-18 15:55:51.000000000 +0100
+@@ -5,11 +5,6 @@
+ AC_INIT(NXlib.h)
+ AC_PREREQ(2.13)
+
+-dnl Reset default compilation flags.
+-
+-CXXFLAGS="-O3"
+-CFLAGS="-O3"
+-
+ dnl Reset default linking directives.
+
+ LIBSTATIC=""
+--- nxcompshad/configure.in.orig 2008-12-18 15:56:13.000000000 +0100
++++ nxcompshad/configure.in 2008-12-18 15:56:22.000000000 +0100
+@@ -5,11 +5,6 @@
+ AC_INIT(Shadow.h)
+ AC_PREREQ(2.13)
+
+-dnl Reset default compilation flags.
+-
+-CXXFLAGS="-O3"
+-CPPFLAGS="-O3"
+-
+ dnl Reset default linking directives.
+
+ LIBSTATIC=""
+--- nxproxy/configure.in.orig 2008-12-18 15:57:48.000000000 +0100
++++ nxproxy/configure.in 2008-12-18 15:57:55.000000000 +0100
+@@ -5,11 +5,6 @@
+ AC_INIT(Main.c)
+ AC_PREREQ(2.13)
+
+-dnl Reset default compilation flags.
+-
+-CXXFLAGS="-O3"
+-CPPFLAGS="-O3"
+-
+ dnl Prefer headers and libraries from nx-X11 if present.
+
+ if test -d "../nx-X11/exports/include" ; then
diff --git a/gnome-unstable/farstream/PKGBUILD b/gnome-unstable/farstream/PKGBUILD
index e152cece7..2c9bf363c 100644
--- a/gnome-unstable/farstream/PKGBUILD
+++ b/gnome-unstable/farstream/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167403 2012-10-01 23:14:26Z jgc $
+# $Id: PKGBUILD 168361 2012-10-09 07:21:08Z ibiru $
# Maintainer: Ionut Biru <ibiru@archlinux.org>
pkgname=farstream
-pkgver=0.2.0
+pkgver=0.2.1
pkgrel=1
pkgdesc="Farstream (formerly Farsight) - Audio/Video Communications Framework"
arch=(i686 x86_64)
@@ -15,7 +15,7 @@ conflicts=('farsight2')
replaces=('farsight2')
options=(!libtool)
source=(http://freedesktop.org/software/$pkgname/releases/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('efedec4a885170d350b5cc43c933f1c0')
+md5sums=('479c42adf5cc606abcb47d58ed542414')
build() {
cd "$pkgname-$pkgver"
diff --git a/libre/cdfs-libre/PKGBUILD b/libre/cdfs-libre/PKGBUILD
index 9827d6813..5afccbcfb 100644
--- a/libre/cdfs-libre/PKGBUILD
+++ b/libre/cdfs-libre/PKGBUILD
@@ -6,7 +6,7 @@
_pkgname=cdfs
pkgname=cdfs-libre
pkgver=2.6.27
-pkgrel=30
+pkgrel=31
pkgdesc="File system module libre that 'exports' all tracks and boot images on a CD as normal files."
arch=(i686 x86_64)
url="http://www.elis.UGent.be/~ronsse/cdfs/"
diff --git a/libre/cdfs-libre/cdfs.install b/libre/cdfs-libre/cdfs.install
index 1c3cb4f8e..aa71a92ac 100644
--- a/libre/cdfs-libre/cdfs.install
+++ b/libre/cdfs-libre/cdfs.install
@@ -1,14 +1,14 @@
post_install() {
- EXTRAMODULES='extramodules-3.5-LIBRE'
+ EXTRAMODULES='extramodules-3.6-LIBRE'
depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
}
post_upgrade() {
- EXTRAMODULES='extramodules-3.5-LIBRE'
+ EXTRAMODULES='extramodules-3.6-LIBRE'
depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
}
post_remove() {
- EXTRAMODULES='extramodules-3.5-LIBRE'
+ EXTRAMODULES='extramodules-3.6-LIBRE'
depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
}
diff --git a/libre/linux-libre-firmware/PKGBUILD b/libre/linux-libre-firmware/PKGBUILD
new file mode 100644
index 000000000..dd43819fe
--- /dev/null
+++ b/libre/linux-libre-firmware/PKGBUILD
@@ -0,0 +1,49 @@
+# Maintainer: André Silva <emulatorman@lavabit.com>
+# Contributor: Márcio Silva <coadde@lavabit.com>
+
+pkgname=linux-libre-firmware
+pkgver=3.6
+pkgrel=1
+pkgdesc='Free Firmware files for Linux-libre'
+arch=('any')
+url='http://linux-libre.fsfla.org/'
+license=('GPL2')
+provides=('linux-firmware=20120625'
+ 'kernel26-firmware=2.6.34.99')
+conflicts=('linux-firmware'
+ 'linux-firmware-git'
+ 'kernel26-firmware'
+ 'ar9170-fw'
+ 'iwlwifi-1000-ucode'
+ 'iwlwifi-3945-ucode'
+ 'iwlwifi-4965-ucode'
+ 'iwlwifi-5000-ucode'
+ 'iwlwifi-5150-ucode'
+ 'iwlwifi-6000-ucode'
+ 'rt2870usb-fw'
+ 'rt2x00-rt61-fw'
+ 'rt2x00-rt71w-fw')
+replaces=('linux-firmware'
+ 'kernel26-firmware'
+ 'ar9170-fw'
+ 'iwlwifi-1000-ucode'
+ 'iwlwifi-3945-ucode'
+ 'iwlwifi-4965-ucode'
+ 'iwlwifi-5000-ucode'
+ 'iwlwifi-5150-ucode'
+ 'iwlwifi-6000-ucode'
+ 'rt2870usb-fw'
+ 'rt2x00-rt61-fw'
+ 'rt2x00-rt71w-fw')
+source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/$pkgver-gnu/linux-libre-$pkgver-gnu.tar.xz")
+md5sums=('a2312edd0265b5b07bd4b50afae2b380')
+
+package() {
+ cd $srcdir/linux-$pkgver
+
+ make INSTALL_FW_PATH=$pkgdir/usr/lib/firmware firmware_install
+
+ # move WHENCE file to linux-libre-firmware license folder
+ install -d -m755 $pkgdir/usr/share/licenses/$pkgname
+ mv firmware/WHENCE $pkgdir/usr/share/licenses/$pkgname
+}
diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD
index ec283afce..4feb1ac6f 100644
--- a/libre/linux-libre-lts/PKGBUILD
+++ b/libre/linux-libre-lts/PKGBUILD
@@ -154,7 +154,7 @@ build() {
_package() {
pkgdesc="The ${pkgbase} kernel and modules - stable longtime supported kernel package suitable for servers"
[ "${pkgbase}" = "linux-libre" ] && groups=('base')
- depends=('coreutils' 'kmod')
+ depends=('coreutils' 'linux-libre-firmware' 'kmod')
optdepends=('crda: to set the correct wireless channels of your country')
provides=("kernel26${_kernelname}=${pkgver}" "linux${_kernelname}=${pkgver}")
conflicts=("kernel26${_kernelname}" "kernel26-libre${_kernelname}" "linux${_kernelname}")
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index bf8eb577a..61ba504a7 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -29,9 +29,6 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
'Kbuild.platforms'
'boot-logo.patch'
'change-default-console-loglevel.patch'
- 'alsa-powersave-3.5.x.patch'
- 'watchdog-3.5.x.patch'
- 'i915-i2c-crash-3.5.x.patch'
"http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
md5sums=('a2312edd0265b5b07bd4b50afae2b380'
'62d272c8ec79bd2eb9cc56001aaf1042'
@@ -143,7 +140,7 @@ build() {
_package() {
pkgdesc="The ${pkgbase} kernel and modules"
[ "${pkgbase}" = "linux-libre" ] && groups=('base')
- depends=('coreutils' 'kmod')
+ depends=('coreutils' 'linux-libre-firmware' 'kmod')
optdepends=('crda: to set the correct wireless channels of your country')
provides=("kernel26${_kernelname}=${pkgver}" "linux${_kernelname}=${pkgver}")
conflicts=("kernel26${_kernelname}" "kernel26-libre${_kernelname}" "linux${_kernelname}")
diff --git a/libre/lirc-libre/PKGBUILD b/libre/lirc-libre/PKGBUILD
index e8f6ff5a1..d4d91c412 100644
--- a/libre/lirc-libre/PKGBUILD
+++ b/libre/lirc-libre/PKGBUILD
@@ -6,14 +6,14 @@ _pkgbase=lirc
pkgbase=lirc-libre
pkgname=('lirc-libre' 'lirc-utils-libre')
pkgver=0.9.0
-pkgrel=30
+pkgrel=31
epoch=1
-_extramodules=extramodules-3.5-LIBRE
+_extramodules=extramodules-3.6-LIBRE
arch=('i686' 'x86_64' 'mips64el')
url="http://www.lirc.org/"
license=('GPL')
### NOTICE don't forget to bump version in depends in package_lirc
-makedepends=('help2man' 'linux-libre-headers>=3.5' 'linux-libre-headers<3.6' 'alsa-lib' 'libx11' 'libftdi' 'libirman' 'python2')
+makedepends=('help2man' 'linux-libre-headers>=3.6' 'linux-libre-headers<3.7' 'alsa-lib' 'libx11' 'libftdi' 'libirman' 'python2')
options=('!makeflags' '!strip')
source=(http://prdownloads.sourceforge.net/${_pkgbase}/${_pkgbase}-${pkgver}.tar.bz2
lirc_wpc8769l.patch
@@ -56,7 +56,7 @@ build() {
package_lirc-libre() {
pkgdesc="Linux-libre Infrared Remote Control kernel modules for stock kernel libre"
- depends=('lirc-utils-libre' 'linux-libre>=3.4' 'linux-libre<3.5')
+ depends=('lirc-utils-libre' 'linux-libre>=3.6' 'linux-libre<3.7')
replaces=('lirc' 'lirc+pctv')
conflicts=('lirc')
provides=("lirc=$pkgver")
diff --git a/libre/lirc-libre/lirc.install b/libre/lirc-libre/lirc.install
index b39282da6..976f5ab8a 100644
--- a/libre/lirc-libre/lirc.install
+++ b/libre/lirc-libre/lirc.install
@@ -1,4 +1,4 @@
-EXTRAMODULES=extramodules-3.5-LIBRE
+EXTRAMODULES=extramodules-3.6-LIBRE
post_install() {
# updating module dependencies
diff --git a/libre/tp_smapi-libre/PKGBUILD b/libre/tp_smapi-libre/PKGBUILD
index 19d1b8908..4c8910c2b 100644
--- a/libre/tp_smapi-libre/PKGBUILD
+++ b/libre/tp_smapi-libre/PKGBUILD
@@ -11,13 +11,13 @@
_pkgname=tp_smapi
pkgname=tp_smapi-libre
pkgver=0.41
-pkgrel=11
+pkgrel=9
pkgdesc="Modules for ThinkPad's SMAPI functionality"
arch=('i686' 'x86_64')
url='https://github.com/evgeni/tp_smapi'
license=('GPL')
-depends=('linux-libre>=3.5' 'linux-libre<3.6')
-makedepends=('linux-libre-headers>=3.5' 'linux-libre-headers<3.6')
+depends=('linux-libre>=3.6' 'linux-libre<3.7')
+makedepends=('linux-libre-headers>=3.6' 'linux-libre-headers<3.7')
replaces=("${_pkgname}")
conflicts=("${_pkgname}")
provides=("${_pkgname}=${pkgver}")
diff --git a/libre/tp_smapi-libre/tp_smapi.install b/libre/tp_smapi-libre/tp_smapi.install
index 5fe1bab90..3662e7f34 100644
--- a/libre/tp_smapi-libre/tp_smapi.install
+++ b/libre/tp_smapi-libre/tp_smapi.install
@@ -1,4 +1,4 @@
-extramodules=/usr/lib/modules/extramodules-3.5-ARCH
+extramodules=/usr/lib/modules/extramodules-3.6-ARCH
post_install() {
depmod -v $(< "$extramodules/version") &>/dev/null
diff --git a/libre/vhba-module-libre/PKGBUILD b/libre/vhba-module-libre/PKGBUILD
index 6448d0a4e..f35ba99c9 100644
--- a/libre/vhba-module-libre/PKGBUILD
+++ b/libre/vhba-module-libre/PKGBUILD
@@ -2,17 +2,18 @@
# Maintainer: Ray Rashif <schiv@archlinux.org>
# Contributor: Mateusz Herych <heniekk@gmail.com>
# Contributor: Charles Lindsay <charles@chaoslizard.org>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
_pkgname=vhba-module
pkgname=vhba-module-libre
pkgver=20120422
-_extramodules=extramodules-3.5-LIBRE
-pkgrel=11
+_extramodules=extramodules-3.6-LIBRE
+pkgrel=12
pkgdesc="Kernel libre module that emulates SCSI devices"
arch=('i686' 'x86_64')
url="http://cdemu.sourceforge.net/"
license=('GPL')
-depends=('linux-libre>=3.5' 'linux-libre<3.6')
+depends=('linux-libre>=3.6' 'linux-libre<3.7')
makedepends=('linux-libre-headers')
options=(!makeflags)
install=$_pkgname.install
diff --git a/libre/vhba-module-libre/vhba-module.install b/libre/vhba-module-libre/vhba-module.install
index b2a49a261..8bd740943 100644
--- a/libre/vhba-module-libre/vhba-module.install
+++ b/libre/vhba-module-libre/vhba-module.install
@@ -1,6 +1,6 @@
_updatemod() {
echo " > Updating module dependencies..."
- EXTRAMODULES='extramodules-3.5-LIBRE'
+ EXTRAMODULES='extramodules-3.6-LIBRE'
depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
}
diff --git a/libre/virtualbox-libre-modules/PKGBUILD b/libre/virtualbox-libre-modules/PKGBUILD
index 270e14af9..3bd4616eb 100644
--- a/libre/virtualbox-libre-modules/PKGBUILD
+++ b/libre/virtualbox-libre-modules/PKGBUILD
@@ -7,7 +7,7 @@
pkgbase=virtualbox-libre-modules
pkgname=('virtualbox-libre-host-modules' 'virtualbox-libre-guest-modules')
pkgver=4.2.0
-pkgrel=5.3
+pkgrel=6
arch=('i686' 'x86_64')
url='http://virtualbox.org'
license=('GPL')
@@ -32,15 +32,14 @@ build() {
package_virtualbox-libre-host-modules(){
pkgdesc='Host kernel libre modules for VirtualBox'
- depends=('linux-libre>=3.5' 'linux-libre<3.6')
+ depends=('linux-libre>=3.6' 'linux-libre<3.7')
provides=("virtualbox-host-modules=${pkgver}")
replaces=('virtualbox-host-modules' 'virtualbox-modules' 'virtualbox-libre-modules')
conflicts=('virtualbox-host-modules' 'virtualbox-modules' 'virtualbox-libre-modules')
install=virtualbox-libre-host-modules.install
_kernver=$(expac -Q '%v' linux-libre-headers)-LIBRE
- #_extraver=extramodules-${_kernver%.*}-LIBRE
- _extraver=extramodules-3.5-LIBRE
+ _extraver=extramodules-${_kernver%.*}-LIBRE
install -dm755 "$pkgdir/usr/lib/modules/$_extraver"
cd "dkms/vboxhost/$pkgver/$_kernver/$CARCH/module"
@@ -52,15 +51,14 @@ package_virtualbox-libre-host-modules(){
package_virtualbox-libre-guest-modules(){
pkgdesc='Guest kernel libre modules for VirtualBox'
license=('GPL')
- depends=('linux-libre>=3.5' 'linux-libre<3.6')
+ depends=('linux-libre>=3.6' 'linux-libre<3.7')
provides=("virtualbox-guest-modules=${pkgver}")
replaces=('virtualbox-guest-modules' 'virtualbox-archlinux-modules' 'virtualbox-parabola-modules')
conflicts=('virtualbox-guest-modules' 'virtualbox-archlinux-modules' 'virtualbox-parabola-modules')
install=virtualbox-libre-guest-modules.install
_kernver=$(expac -Q '%v' linux-libre-headers)-LIBRE
- #_extraver=extramodules-${_kernver%.*}-LIBRE
- _extraver=extramodules-3.5-LIBRE
+ _extraver=extramodules-${_kernver%.*}-LIBRE
install -dm755 "$pkgdir/usr/lib/modules/$_extraver"
cd "dkms/vboxguest/$pkgver/$_kernver/$CARCH/module"
diff --git a/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install b/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install
index c3419c991..caf59aa13 100755
--- a/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install
+++ b/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install
@@ -2,16 +2,16 @@ post_install() {
cat << EOF
===> You may want to load vboxguest, vboxsf and vboxvideo
EOF
- EXTRAMODULES='extramodules-3.5-LIBRE'
+ EXTRAMODULES='extramodules-3.6-LIBRE'
depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
}
post_upgrade() {
- EXTRAMODULES='extramodules-3.5-LIBRE'
+ EXTRAMODULES='extramodules-3.6-LIBRE'
depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
}
post_remove() {
- EXTRAMODULES='extramodules-3.5-LIBRE'
+ EXTRAMODULES='extramodules-3.6-LIBRE'
depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
}
diff --git a/multilib-testing/wine/PKGBUILD b/multilib-testing/wine/PKGBUILD
new file mode 100644
index 000000000..6bffe1ffb
--- /dev/null
+++ b/multilib-testing/wine/PKGBUILD
@@ -0,0 +1,154 @@
+# $Id: PKGBUILD 77392 2012-10-09 14:39:41Z bluewind $
+# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
+# Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
+# Contributor: Eduardo Romero <eduardo@archlinux.org>
+# Contributor: Giovanni Scafora <giovanni@archlinux.org>
+
+pkgname=wine
+pkgver=1.5.14
+pkgrel=2
+
+_pkgbasever=${pkgver/rc/-rc}
+
+source=(http://prdownloads.sourceforge.net/$pkgname/$pkgname-$_pkgbasever.tar.bz2{,.sign})
+md5sums=('f84c54bd7422328e96b6cf14ee6e163c'
+ 'dd0c87e2dea529f0c898fe2ffa5390ce')
+
+pkgdesc="A compatibility layer for running Windows programs"
+url="http://www.winehq.com"
+arch=(i686 x86_64)
+license=(LGPL)
+install=wine.install
+
+depends=(
+ fontconfig lib32-fontconfig
+ mesa lib32-mesa
+ libxcursor lib32-libxcursor
+ libxrandr lib32-libxrandr
+ libxdamage lib32-libxdamage
+ libxi lib32-libxi
+ gettext lib32-gettext
+ glu lib32-glu
+ desktop-file-utils
+)
+
+makedepends=(autoconf ncurses bison perl fontforge flex prelink
+ 'gcc>=4.5.0-2' 'gcc-multilib>=4.5.0-2'
+ giflib lib32-giflib
+ libpng lib32-libpng
+ gnutls lib32-gnutls
+ libxinerama lib32-libxinerama
+ libxcomposite lib32-libxcomposite
+ libxmu lib32-libxmu
+ libxxf86vm lib32-libxxf86vm
+ libxml2 lib32-libxml2
+ libldap lib32-libldap
+ lcms lib32-lcms
+ mpg123 lib32-mpg123
+ openal lib32-openal
+ v4l-utils lib32-v4l-utils
+ alsa-lib lib32-alsa-lib
+ libxcomposite lib32-libxcomposite
+ oss
+ samba
+)
+
+optdepends=(
+ giflib lib32-giflib
+ libpng lib32-libpng
+ libldap lib32-libldap
+ gnutls lib32-gnutls
+ lcms lib32-lcms
+ libxml2 lib32-libxml2
+ mpg123 lib32-mpg123
+ openal lib32-openal
+ v4l-utils lib32-v4l-utils
+ libpulse lib32-libpulse
+ alsa-plugins lib32-alsa-plugins
+ alsa-lib lib32-alsa-lib
+ libjpeg-turbo lib32-libjpeg-turbo
+ libxcomposite lib32-libxcomposite
+ oss cups
+ samba
+)
+
+if [[ $CARCH == i686 ]]; then
+ # Strip lib32 etc. on i686
+ depends=(${depends[@]/*32-*/})
+ makedepends=(${makedepends[@]/*32-*/})
+ makedepends=(${makedepends[@]/*-multilib*/})
+ optdepends=(${optdepends[@]/*32-*/})
+else
+ provides=("bin32-wine=$pkgver" "wine-wow64=$pkgver")
+ conflicts=('bin32-wine' 'wine-wow64')
+ replaces=('bin32-wine')
+fi
+
+build() {
+ cd "$srcdir"
+
+ # Allow ccache to work
+ mv $pkgname-$_pkgbasever $pkgname
+
+ # Get rid of old build dirs
+ rm -rf $pkgname-{32,64}-build
+ mkdir $pkgname-32-build
+
+ # These additional CFLAGS solve FS#27662
+ export CFLAGS="${CFLAGS/-D_FORTIFY_SOURCE=2/} -D_FORTIFY_SOURCE=0"
+ export CXXFLAGS="${CXXFLAGS/-D_FORTIFY_SOURCE=2/} -D_FORTIFY_SOURCE=0"
+
+ if [[ $CARCH == x86_64 ]]; then
+ msg2 "Building Wine-64..."
+
+ mkdir $pkgname-64-build
+ cd "$srcdir/$pkgname-64-build"
+ ../$pkgname/configure \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --libdir=/usr/lib \
+ --with-x \
+ --enable-win64
+
+ make
+
+ _wine32opts=(
+ --libdir=/usr/lib32
+ --with-wine64="$srcdir/$pkgname-64-build"
+ )
+
+ export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+ fi
+
+ msg2 "Building Wine-32..."
+ cd "$srcdir/$pkgname-32-build"
+ ../$pkgname/configure \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --with-x \
+ "${_wine32opts[@]}"
+
+ # These additional CFLAGS solve FS#27560 and FS#23277
+ make CFLAGS+="-mstackrealign -mincoming-stack-boundary=2" CXXFLAGS+="-mstackrealign -mincoming-stack-boundary=2"
+}
+
+package() {
+ msg2 "Packaging Wine-32..."
+ cd "$srcdir/$pkgname-32-build"
+
+ if [[ $CARCH == i686 ]]; then
+ make prefix="$pkgdir/usr" install
+ else
+ make prefix="$pkgdir/usr" \
+ libdir="$pkgdir/usr/lib32" \
+ dlldir="$pkgdir/usr/lib32/wine" install
+
+ msg2 "Packaging Wine-64..."
+ cd "$srcdir/$pkgname-64-build"
+ make prefix="$pkgdir/usr" \
+ libdir="$pkgdir/usr/lib" \
+ dlldir="$pkgdir/usr/lib/wine" install
+ fi
+}
+
+# vim:set ts=8 sts=2 sw=2 et:
diff --git a/multilib-testing/wine/wine.install b/multilib-testing/wine/wine.install
new file mode 100644
index 000000000..0548b7ffd
--- /dev/null
+++ b/multilib-testing/wine/wine.install
@@ -0,0 +1,12 @@
+post_install() {
+ update-desktop-database -q
+ #echo "This wine package is wow64 enabled. This means it can run 32bit/64bit Windows apps on x86_64."
+ #echo "If you are on x86_64, the default WINEARCH will be win64."
+ #echo "This will cause a lot of Windows applications to malfunction even if they usually work in wine."
+ #echo "Please create your ~/.wine with 'WINEARCH=win32 winecfg' if you are unsure and on x86_64."
+ #echo "See the Arch wiki on wine for more information."
+}
+
+post_remove() {
+ update-desktop-database -q
+}
diff --git a/multilib/gcc-multilib/PKGBUILD b/multilib/gcc-multilib/PKGBUILD
index 652b61189..db9faeb04 100644
--- a/multilib/gcc-multilib/PKGBUILD
+++ b/multilib/gcc-multilib/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 75202 2012-08-16 01:54:15Z allan $
+# $Id: PKGBUILD 77389 2012-10-09 14:32:55Z heftig $
# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
# Contributor: Allan McRae <allan@archlinux.org>
@@ -7,10 +7,10 @@
pkgbase='gcc-multilib'
pkgname=('gcc-multilib' 'gcc-libs-multilib' 'lib32-gcc-libs' 'gcc-fortran-multilib' 'gcc-objc-multilib' 'gcc-ada-multilib' 'gcc-go-multilib')
-pkgver=4.7.1
-pkgrel=6
-_snapshot=4.7-20120721
-_libstdcppmanver=20120725 # Note: check source directory name when updating this
+pkgver=4.7.2
+pkgrel=1
+#_snapshot=4.7-20120721
+_libstdcppmanver=20120924 # Note: check source directory name when updating this
pkgdesc="The GNU Compiler Collection for multilib"
arch=('x86_64')
license=('GPL' 'LGPL' 'FDL' 'custom')
@@ -19,14 +19,14 @@ makedepends=('binutils-multilib>=2.22' 'libmpc' 'cloog' 'ppl' 'gcc-ada-multilib'
'lib32-glibc>=2.16')
checkdepends=('dejagnu')
options=('!libtool' '!emptydirs')
-source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2
- ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2
+source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2
+ #ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2
ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-api.${_libstdcppmanver}.man.tar.bz2
gcc_pure64-multilib.patch
gcc-4.7.1-libada-pic.patch
gcc-4.7.1-libgo-write.patch)
-md5sums=('a1a53fda426bc6809cede8e85bbaf2a3'
- '79c4381f983b71868c02da3379e1e8a2'
+md5sums=('cc308a0891e778cfda7a151ab8a6e762'
+ '7f3d52515daafffb57c287f427381106'
'ec24c32d3d1030c2bc8cb2ad2d1dc629'
'2acbc9d35cc9d72329dc71d6b1f162ef'
'df82dd175ac566c8a6d46b11ac21f14c')
diff --git a/multilib/lib32-dbus-core/PKGBUILD b/multilib/lib32-dbus-core/PKGBUILD
index 184ea0aae..830249945 100644
--- a/multilib/lib32-dbus-core/PKGBUILD
+++ b/multilib/lib32-dbus-core/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 74441 2012-07-28 15:06:04Z bluewind $
+# $Id: PKGBUILD 77410 2012-10-09 17:10:05Z bluewind $
# Maintainer : Ionut Biru <ibiru@archlinux.org>
pkgname=lib32-dbus-core
_pkgbasename=dbus-core
-pkgver=1.6.4
+pkgver=1.6.8
pkgrel=1
pkgdesc="Freedesktop.org message bus system (32-bit)"
arch=('x86_64')
@@ -13,7 +13,7 @@ depends=('lib32-glibc' 'lib32-expat' 'dbus-core')
makedepends=('gcc-multilib' lib32-libx11)
options=(!libtool)
source=(http://dbus.freedesktop.org/releases/dbus/dbus-${pkgver}.tar.gz)
-md5sums=('5ec43dc4554cba638917317b2b4f7640')
+md5sums=('3bf059c7dd5eda5f539a1b7cfe7a14a2')
build() {
export CC="gcc -m32"
diff --git a/multilib/lib32-gnutls/PKGBUILD b/multilib/lib32-gnutls/PKGBUILD
index f875ddae9..b5b1feb33 100644
--- a/multilib/lib32-gnutls/PKGBUILD
+++ b/multilib/lib32-gnutls/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 75845 2012-09-03 09:17:22Z bluewind $
+# $Id: PKGBUILD 77416 2012-10-09 17:45:23Z bluewind $
# Maintainer: Florian Pritz <bluewind@xinu.at>
# Contributor: Christoph Vigano <mail at cvigano dot de>
# Contributor: Biru Ionut <ionut@archlinux.ro>
@@ -6,18 +6,18 @@
# Contributor: Mikko Seppälä <t-r-a-y@mbnet.fi>
_pkgbasename=gnutls
pkgname=lib32-$_pkgbasename
-pkgver=3.1.1
+pkgver=3.1.2
pkgrel=1
pkgdesc="A library which provides a secure layer over a reliable transport layer (32-bit)"
arch=('x86_64')
license=('GPL3' 'LGPL')
url="http://www.gnu.org/software/gnutls/"
options=('!libtool')
-depends=('lib32-zlib' 'lib32-nettle>=2.4' 'lib32-p11-kit>=0.12' $_pkgbasename)
+depends=('lib32-zlib' 'lib32-nettle>=2.4' 'lib32-p11-kit>=0.12' 'lib32-libtasn1' $_pkgbasename)
makedepends=('gcc-multilib' 'lib32-libidn')
source=(ftp://ftp.gnu.org/gnu/gnutls/${_pkgbasename}-${pkgver}.tar.xz{,.sig})
-md5sums=('59c432df79108c74c34a4582c7d7e7e7'
- '00d354ec9ac8ca4329b35ea397589b6c')
+md5sums=('5d722e5850d79269ba413b0e69b9e14f'
+ '2764135bac008654a0b2fdd9fc6e62d1')
build() {
export CC="gcc -m32"
diff --git a/multilib/lib32-libtasn1/PKGBUILD b/multilib/lib32-libtasn1/PKGBUILD
new file mode 100644
index 000000000..5e5d04580
--- /dev/null
+++ b/multilib/lib32-libtasn1/PKGBUILD
@@ -0,0 +1,32 @@
+# Maintainer: Florian Pritz <bluewind@xinu.at>
+# Contributor: josephgbr <rafael.f.f1 at gmail.com>
+
+_pkgbase=libtasn1
+pkgname=lib32-${_pkgbase}
+pkgver=2.13
+pkgrel=2
+pkgdesc="The ASN.1 library used in GNUTLS (32 bit)"
+arch=('x86_64')
+license=('GPL3' 'LGPL')
+url="http://www.gnu.org/software/libtasn1/"
+depends=('lib32-glibc' ${_pkgbase})
+makedepends=('gcc-multilib')
+options=('!libtool')
+source=("http://ftp.gnu.org/gnu/libtasn1/${_pkgbase}-${pkgver}.tar.gz")
+sha1sums=('89120584bfedd244dab92df99e955a174c481851')
+
+build() {
+ export CC='gcc -m32'
+ export CXX='g++ -m32'
+ export PKG_CONFIG_PATH='/usr/lib32/pkgconfig'
+
+ cd ${_pkgbase}-${pkgver}
+ ./configure --prefix=/usr --libdir=/usr/lib32
+ make
+}
+
+package() {
+ cd ${_pkgbase}-${pkgver}
+ make DESTDIR="${pkgdir}" install
+ rm -rf "${pkgdir}/usr/"{bin,include,share}
+}
diff --git a/multilib/lib32-libtiff/PKGBUILD b/multilib/lib32-libtiff/PKGBUILD
index 1753d9ff3..d4df377fa 100644
--- a/multilib/lib32-libtiff/PKGBUILD
+++ b/multilib/lib32-libtiff/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 72978 2012-06-26 11:06:41Z bluewind $
+# $Id: PKGBUILD 77412 2012-10-09 17:13:39Z bluewind $
# Maintainer: Eric Belanger <eric@archlinux.org>
# Contributor: dorphell <dorphell@archlinux.org>
_pkgbasename=libtiff
pkgname=lib32-$_pkgbasename
-pkgver=4.0.2
+pkgver=4.0.3
pkgrel=1
pkgdesc="Library for manipulation of TIFF images (32-bit)"
arch=('x86_64')
@@ -14,7 +14,7 @@ depends=('lib32-libjpeg' 'lib32-zlib' $_pkgbasename)
makedepends=(gcc-multilib)
options=('!libtool')
source=(ftp://ftp.remotesensing.org/pub/libtiff/tiff-${pkgver}.tar.gz)
-sha1sums=('d84b7b33a6cfb3d15ca386c8c16b05047f8b5352')
+sha1sums=('652e97b78f1444237a82cbcfe014310e776eb6f0')
build() {
export CC="gcc -m32"
@@ -28,7 +28,7 @@ build() {
check() {
cd "${srcdir}/tiff-${pkgver}"
- make check
+ #make check
}
package() {
diff --git a/multilib/lib32-libxcb/PKGBUILD b/multilib/lib32-libxcb/PKGBUILD
index f0be70aa0..667ce6442 100644
--- a/multilib/lib32-libxcb/PKGBUILD
+++ b/multilib/lib32-libxcb/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 68090 2012-03-17 19:44:28Z lcarlier $
+# $Id: PKGBUILD 77408 2012-10-09 17:00:03Z bluewind $
# Maintainer: Alexander Baldeck <alexander@archlinux.org>
# Contributor: Jan de Groot <jgc@archlinux.org>
_pkgbasename=libxcb
pkgname=lib32-$_pkgbasename
-pkgver=1.8.1
-pkgrel=2
+pkgver=1.9
+pkgrel=1
pkgdesc="X11 client-side library (32-bit)"
arch=(x86_64)
url="http://xcb.freedesktop.org/"
@@ -16,7 +16,7 @@ options=('!libtool')
license=('custom')
source=(${url}/dist/${_pkgbasename}-${pkgver}.tar.bz2
libxcb-1.1-no-pthread-stubs.patch)
-sha1sums=('98199b6054750a06cddd4e77baa4354af547ce6f'
+sha1sums=('ad2fb95eeec41ba3d39502a4f7460c3b64fdf061'
'd2df03ddf3e949c10c2c185256b0eb7fa02837ab')
build() {
@@ -27,7 +27,11 @@ build() {
export CC="gcc -m32"
export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
- PYTHON=/usr/bin/python2 ./autogen.sh --prefix=/usr --enable-xinput --libdir=/usr/lib32
+ PYTHON=/usr/bin/python2 ./autogen.sh \
+ --prefix=/usr \
+ --enable-xinput \
+ --libdir=/usr/lib32 \
+ --disable-static
make
}
diff --git a/multilib/libtool-multilib/PKGBUILD b/multilib/libtool-multilib/PKGBUILD
index 093d81c0f..92af7538f 100644
--- a/multilib/libtool-multilib/PKGBUILD
+++ b/multilib/libtool-multilib/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 72674 2012-06-19 12:27:27Z allan $
+# $Id: PKGBUILD 77390 2012-10-09 14:32:58Z heftig $
# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
# Contributor: Allan McRae <allan@archlinux.org>
# Contributor: judd <jvinet@zeroflux.org>
@@ -8,12 +8,12 @@
pkgbase=libtool-multilib
pkgname=(libtool-multilib lib32-libltdl)
pkgver=2.4.2
-pkgrel=6
+pkgrel=7
pkgdesc="A generic library support script for multilib"
arch=('x86_64')
url="http://www.gnu.org/software/libtool"
license=('GPL')
-_gccver=4.7.1
+_gccver=4.7.2
makedepends=("gcc-multilib=$_gccver")
options=('!libtool')
source=(ftp://ftp.gnu.org/pub/gnu/libtool/libtool-${pkgver}.tar.xz{,.sig})
diff --git a/pcr/debootstrap/PKGBUILD b/pcr/debootstrap/PKGBUILD
new file mode 100644
index 000000000..9f03c48db
--- /dev/null
+++ b/pcr/debootstrap/PKGBUILD
@@ -0,0 +1,20 @@
+# $Id$
+# Maintainer: André Silva <emulatorman@lavabit.com>
+
+pkgname=debootstrap
+pkgver=1.0.26
+pkgrel=1
+pkgdesc="A tool used to create a gNewSense base system from scratch, without requiring the availability of dpkg or apt"
+arch=('any')
+license=('GPL')
+url="http://www.gnewsense.org"
+depends=('bash' 'wget')
+source=("http://archive.gnewsense.org/gnewsense-three/gnewsense/pool/overlays/parkes/kgoetz/${pkgname}/${pkgname}_${pkgver}+squeeze1+gnewsense1_all.deb")
+install="debootstrap.install"
+md5sums=('2049317eac54c0fac6c3201a90fadc18')
+
+build(){
+ tar -xzf "${srcdir}/data.tar.gz" -C "${pkgdir}/"
+ # doesn't work with gpg 2.x, patch to point to gpgv1
+ sed 's/gpgv/gpgv1/g;' -i "${pkgdir}/usr/sbin/debootstrap" "${pkgdir}/usr/share/debootstrap/functions"
+}
diff --git a/pcr/debootstrap/debootstrap.install b/pcr/debootstrap/debootstrap.install
new file mode 100644
index 000000000..85a99f160
--- /dev/null
+++ b/pcr/debootstrap/debootstrap.install
@@ -0,0 +1,14 @@
+post_install() {
+ if [ "$(uname -m)" = "x86_64" ]; then
+ darch="amd64"
+ elif [ "$(uname -m)" = "i386" ]; then
+ darch="i386"
+ else
+ darch="mips64el"
+ fi
+ echo "$darch" > /usr/share/debootstrap/arch
+}
+
+pre_remove() {
+ rm -f /usr/share/debootstrap/arch
+}
diff --git a/staging/python-lxml/PKGBUILD b/staging/python-lxml/PKGBUILD
new file mode 100644
index 000000000..33aa7dc70
--- /dev/null
+++ b/staging/python-lxml/PKGBUILD
@@ -0,0 +1,49 @@
+# $Id: PKGBUILD 168387 2012-10-09 21:43:30Z eric $
+# Maintainer:
+
+pkgname=('python-lxml' 'python2-lxml')
+pkgver=3.0
+pkgrel=1
+pkgdesc="Python binding for the libxml2 and libxslt libraries"
+arch=('i686' 'x86_64')
+license=('BSD' 'custom')
+url="http://lxml.de/"
+makedepends=('python2' 'python' 'libxslt')
+source=(http://pypi.python.org/packages/source/l/lxml/lxml-${pkgver}.tar.gz{,.asc})
+sha1sums=('8dbbd03a637bb563113cf07049a4d5a109369441'
+ 'b38447fd3f9cfb30b4d56ffe3bec42739afb2947')
+
+check() {
+ cd "${srcdir}"/lxml-$pkgver
+ make PYTHON=python2 test
+ make PYTHON=python test
+}
+
+package_python2-lxml() {
+ depends=('python2' 'libxslt')
+ optdepends=('python2-beautifulsoup3: support for parsing not well formed HTML')
+
+ cd "${srcdir}"/lxml-$pkgver
+ python2 setup.py install --root="${pkgdir}" --optimize=1
+
+ install -Dm644 LICENSES.txt \
+ "${pkgdir}"/usr/share/licenses/$pkgname/LICENSE
+ install -Dm644 doc/licenses/BSD.txt \
+ "${pkgdir}"/usr/share/licenses/$pkgname/BSD.txt
+ install -Dm644 doc/licenses/elementtree.txt \
+ "${pkgdir}"/usr/share/licenses/$pkgname/elementtree.txt
+}
+
+package_python-lxml() {
+ depends=('python' 'libxslt')
+
+ cd "${srcdir}"/lxml-$pkgver
+ python setup.py install --root="${pkgdir}" --optimize=1
+
+ install -Dm644 LICENSES.txt \
+ "${pkgdir}"/usr/share/licenses/$pkgname/LICENSE
+ install -Dm644 doc/licenses/BSD.txt \
+ "${pkgdir}"/usr/share/licenses/$pkgname/BSD.txt
+ install -Dm644 doc/licenses/elementtree.txt \
+ "${pkgdir}"/usr/share/licenses/$pkgname/elementtree.txt
+}
diff --git a/testing/dnsutils/PKGBUILD b/testing/dnsutils/PKGBUILD
index ca628457a..d563d0b31 100644
--- a/testing/dnsutils/PKGBUILD
+++ b/testing/dnsutils/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 166602 2012-09-12 22:38:22Z bisson $
+# $Id: PKGBUILD 168390 2012-10-09 22:10:12Z bisson $
# Maintainer: Gaetan Bisson <bisson@archlinux.org>
# Contributor: kevin <kevin@archlinux.org>
# Contributor: mario <mario_vazq@hotmail.com>
pkgname=dnsutils
-_pkgver=9.9.1-P3
+_pkgver=9.9.2
pkgver=${_pkgver//-/.}
pkgrel=1
pkgdesc='DNS utilities: dig host nslookup'
@@ -15,8 +15,8 @@ options=('!makeflags')
depends=('openssl' 'krb5' 'idnkit' 'dnssec-anchors')
source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz"
'remove-bind.patch')
-sha1sums=('1c890f69f627ffbc76460c766bafefde408ed799'
- 'b465ef6160b004838f04de9978fe1be8422af777')
+sha1sums=('eb9fa7b497d67ce61a120cb96c302381bc385324'
+ 'bb13bd54134e4d787469be25461a3cc3f5cb57f4')
replaces=('bind-tools' 'host')
diff --git a/testing/dnsutils/remove-bind.patch b/testing/dnsutils/remove-bind.patch
index 19d650964..8d4b49848 100644
--- a/testing/dnsutils/remove-bind.patch
+++ b/testing/dnsutils/remove-bind.patch
@@ -6,7 +6,7 @@ diff -aur old/bin/Makefile.in new/bin/Makefile.in
top_srcdir = @top_srcdir@
-SUBDIRS = named rndc dig dnssec tests tools nsupdate \
-- check confgen @PKCS11_TOOLS@
+- check confgen @PYTHON_TOOLS@ @PKCS11_TOOLS@
+SUBDIRS = dig
TARGETS =
diff --git a/testing/mesa/PKGBUILD b/testing/mesa/PKGBUILD
index d4516ea73..22bb0c339 100644
--- a/testing/mesa/PKGBUILD
+++ b/testing/mesa/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 168203 2012-10-06 20:05:41Z andyrtr $
+# $Id: PKGBUILD 168375 2012-10-09 16:09:24Z andyrtr $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
pkgbase=mesa
pkgname=('libglapi' 'libgl' 'mesa' 'osmesa' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel' 'ati-dri' 'intel-dri' 'svga-dri' 'nouveau-dri')
-_git=true
-_gitdate=20121006
-#_git=false
+#_git=true
+#_gitdate=20121006
+_git=false
if [ "${_git}" = "true" ]; then
pkgver=8.99.git_$_gitdate
else
- pkgver=8.0.4
+ pkgver=9.0
fi
pkgrel=1
arch=('i686' 'x86_64')
@@ -21,7 +21,8 @@ makedepends=('glproto>=1.4.16' 'libdrm>=2.4.39' 'libxxf86vm>=1.1.2' 'libxdamage>
url="http://mesa3d.sourceforge.net"
license=('custom')
options=('!libtool')
-source=(LICENSE)
+source=(LICENSE
+ git_fixes.diff)
if [ "${_git}" = "true" ]; then
# mesa git shot from 9.0 branch - see for state: http://cgit.freedesktop.org/mesa/mesa/log/?h=9.0
#source=(${source[@]} 'ftp://ftp.archlinux.org/other/mesa/mesa-41d14eaf193c6b1eb87fe1998808a887f1c6c698.tar.gz')
@@ -32,11 +33,14 @@ if [ "${_git}" = "true" ]; then
)
fi
md5sums=('5c65a0fe315dd347e09b1f2826a1df5a'
- '87039abd49bc7ada45f98cf752b9f45b')
+ '2ebce12196dbb7b69bdf7ef53b8afdee'
+ '60e557ce407be3732711da484ab3db6c')
build() {
cd ${srcdir}/?esa-*
+ patch -Np1 -i ${srcdir}/git_fixes.diff
+
COMMONOPTS="--prefix=/usr \
--sysconfdir=/etc \
--with-dri-driverdir=/usr/lib/xorg/modules/dri \
diff --git a/testing/mesa/git_fixes.diff b/testing/mesa/git_fixes.diff
new file mode 100644
index 000000000..8132d1d10
--- /dev/null
+++ b/testing/mesa/git_fixes.diff
@@ -0,0 +1,93 @@
+From 161aababc659e23c4a8523366a31f63b3d14e280 Mon Sep 17 00:00:00 2001
+From: Ian Romanick <ian.d.romanick@intel.com>
+Date: Mon, 08 Oct 2012 22:07:10 +0000
+Subject: docs: Add 9.0 release md5sums
+
+Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
+---
+diff --git a/docs/relnotes-9.0.html b/docs/relnotes-9.0.html
+index d72c5bb..02b7324 100644
+--- a/docs/relnotes-9.0.html
++++ b/docs/relnotes-9.0.html
+@@ -26,7 +26,9 @@ because GL_ARB_compatibility is not supported.
+
+ <h2>MD5 checksums</h2>
+ <pre>
+-tbd
++be4cd34c6599a7cb9d254b05c48bdb1f MesaLib-9.0.tar.gz
++60e557ce407be3732711da484ab3db6c MesaLib-9.0.tar.bz2
++16b128544cd3f7e237927bb9f8aab7ce MesaLib-9.0.zip
+ </pre>
+
+
+--
+cgit v0.9.0.2-2-gbebe
+From 32faf7ab0de8b88bb15a2cb262a73c411dce9d0d Mon Sep 17 00:00:00 2001
+From: Brian Paul <brianp@vmware.com>
+Date: Fri, 05 Oct 2012 22:47:40 +0000
+Subject: mesa: don't call TexImage driver hooks for zero-sized images
+
+This simply avoids some failed assertions but there's no reason to
+call the driver hooks for storing a tex image if its size is zero.
+
+Note: This is a candidate for the stable branches.
+(cherry picked from commit 91d84096497ff538f55591f7e6bb0b563726db8d)
+---
+diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
+index 21646cc..8004876 100644
+--- a/src/mesa/main/teximage.c
++++ b/src/mesa/main/teximage.c
+@@ -3034,13 +3034,15 @@ teximage(struct gl_context *ctx, GLboolean compressed, GLuint dims,
+ border, internalFormat, texFormat);
+
+ /* Give the texture to the driver. <pixels> may be null. */
+- if (compressed) {
+- ctx->Driver.CompressedTexImage(ctx, dims, texImage,
+- imageSize, pixels);
+- }
+- else {
+- ctx->Driver.TexImage(ctx, dims, texImage, format,
+- type, pixels, unpack);
++ if (width > 0 && height > 0 && depth > 0) {
++ if (compressed) {
++ ctx->Driver.CompressedTexImage(ctx, dims, texImage,
++ imageSize, pixels);
++ }
++ else {
++ ctx->Driver.TexImage(ctx, dims, texImage, format,
++ type, pixels, unpack);
++ }
+ }
+
+ check_gen_mipmap(ctx, target, texObj, level);
+--
+cgit v0.9.0.2-2-gbebe
+From e75051d1967350ceff0209dde24ae42696b13b5c Mon Sep 17 00:00:00 2001
+From: Brian Paul <brianp@vmware.com>
+Date: Fri, 05 Oct 2012 22:59:27 +0000
+Subject: mesa: fix error check for zero-sized compressed subtexture
+
+For glCompressedTexSubImage, width or height = 0 is legal.
+Fixes a failure in piglit's s3tc-errors test.
+
+This is for the 9.0 and 8.0 branches. Already fixed on master.
+---
+diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
+index 8004876..38fa9fa 100644
+--- a/src/mesa/main/teximage.c
++++ b/src/mesa/main/teximage.c
+@@ -3598,10 +3598,10 @@ compressed_subtexture_error_check(struct gl_context *ctx, GLint dimensions,
+ if (!_mesa_is_compressed_format(ctx, format))
+ return GL_INVALID_ENUM;
+
+- if (width < 1 || width > maxTextureSize)
++ if (width < 0 || width > maxTextureSize)
+ return GL_INVALID_VALUE;
+
+- if ((height < 1 || height > maxTextureSize)
++ if ((height < 0 || height > maxTextureSize)
+ && dimensions > 1)
+ return GL_INVALID_VALUE;
+
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/testing/subversion/PKGBUILD b/testing/subversion/PKGBUILD
index 6c5931c19..608580da8 100644
--- a/testing/subversion/PKGBUILD
+++ b/testing/subversion/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 165314 2012-08-15 13:09:50Z stephane $
+# $Id: PKGBUILD 168385 2012-10-09 20:09:57Z stephane $
# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
# Contributor: Paul Mattal <paul@archlinux.org>
# Contributor: Jason Chu <jason@archlinux.org>
pkgname=subversion
-pkgver=1.7.6
+pkgver=1.7.7
pkgrel=1
pkgdesc="A Modern Concurrent Version Control System"
arch=('i686' 'x86_64')
@@ -26,8 +26,8 @@ source=(http://apache.mirror.rafal.ca/subversion/$pkgname-$pkgver.tar.bz2{,.asc}
svnserve.service
subversion-1.7.6-kwallet-gcc47.patch
subversion.rpath.fix.patch)
-sha1sums=('5b76a9f49e2c4bf064041a7d6b1bfcc3aa4ed068'
- 'd8d99c01c49b189047389816b720923f1d9dbf2a'
+sha1sums=('c9fc0c5992eda36ba9affd93a15929e25958a951'
+ '3df83e46277f0f08868236a6b6e6c0f0d7ef9278'
'64ba3e6ebafc08ac62f59d788f7a825fdce69573'
'73b36c046c09cec2093354911c89e3ba8056af6c'
'ad117bf3b2a838a9a678a93fd8db1a066ad46c41'