diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-03-21 16:19:00 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-03-21 16:19:00 +0100 |
| commit | bf6c93db356044781e343fe26da74d357b4beda3 (patch) | |
| tree | a640223e20b7d04679c9cbbb3404992ba24ec9df /community/xmonad-contrib | |
| parent | b12a78eb94707e8c026051243bbafded96c7c103 (diff) | |
| parent | 76b6359ba6b2c7cce2f0b0725c7ecd831563cabf (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/perl-package-stash-xs/PKGBUILD
extra/mesa/PKGBUILD
Diffstat (limited to 'community/xmonad-contrib')
| -rw-r--r-- | community/xmonad-contrib/PKGBUILD | 12 | ||||
| -rw-r--r-- | community/xmonad-contrib/xmonad-contrib-remove-getatomname.patch | 19 |
2 files changed, 26 insertions, 5 deletions
diff --git a/community/xmonad-contrib/PKGBUILD b/community/xmonad-contrib/PKGBUILD index db31b8b7e..d256fece6 100644 --- a/community/xmonad-contrib/PKGBUILD +++ b/community/xmonad-contrib/PKGBUILD @@ -1,22 +1,22 @@ -# $Id: PKGBUILD 84022 2013-02-08 04:15:51Z td123 $ +# $Id: PKGBUILD 86597 2013-03-20 11:05:24Z jelle $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: orbisvicis <gmail.com> pkgname=xmonad-contrib pkgver=0.11 -pkgrel=2 +pkgrel=5 pkgdesc="Add-ons for xmonad" arch=('i686' 'x86_64' 'mips64el') url="http://xmonad.org/" license=('BSD') -depends=('ghc=7.6.2-1' 'xmonad=0.11-2' 'sh' 'haskell-x11=1.6.0.2-2' 'haskell-x11-xft=0.3.1-6' 'haskell-utf8-string=0.3.7-4' 'haskell-random=1.0.1.1-4') +depends=('ghc=7.6.2-1' 'xmonad=0.11-4' 'sh' 'haskell-x11=1.6.1.1-1' 'haskell-x11-xft=0.3.1' 'haskell-utf8-string=0.3.7-4' 'haskell-random=1.0.1.1-4') install='xmonad-contrib.install' -source=(http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz) -md5sums=('05fba258ac6063e49b50786a0869bd1f') +source=(http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz xmonad-contrib-remove-getatomname.patch) build() { cd $srcdir/$pkgname-$pkgver + patch -Np1 -i $srcdir/xmonad-contrib-remove-getatomname.patch runhaskell Setup.lhs configure --ghc --enable-shared --enable-split-objs --prefix=/usr -fuse_xft \ --libsubdir=\$compiler/site-local/\$pkgid @@ -33,3 +33,5 @@ package() { runhaskell Setup.lhs copy --destdir=$pkgdir install -D LICENSE $pkgdir/usr/share/licenses/xmonad-contrib/LICENSE } +md5sums=('05fba258ac6063e49b50786a0869bd1f' + '1d1fab94ae24b2a8f6a5dcd9cd6d9548') diff --git a/community/xmonad-contrib/xmonad-contrib-remove-getatomname.patch b/community/xmonad-contrib/xmonad-contrib-remove-getatomname.patch new file mode 100644 index 000000000..92ea9bddf --- /dev/null +++ b/community/xmonad-contrib/xmonad-contrib-remove-getatomname.patch @@ -0,0 +1,19 @@ +diff -aur xmonad-contrib-0.11/XMonad/Hooks/DebugEvents.hs xmonad-contrib.new/XMonad/Hooks/DebugEvents.hs +--- xmonad-contrib-0.11/XMonad/Hooks/DebugEvents.hs 2013-01-01 01:32:44.000000000 +0000 ++++ xmonad-contrib.new/XMonad/Hooks/DebugEvents.hs 2013-03-18 07:54:52.082723862 +0000 +@@ -50,6 +50,7 @@ + import System.Process + + -- this should move into X11 ++{- + foreign import ccall unsafe "XGetAtomName" + xGetAtomName :: Display -> Atom -> IO CString + +@@ -63,6 +64,7 @@ + xFree n + return $ Just n' + ++-} + -- | Event hook to dump all received events. You should probably not use this + -- unconditionally; it will produce massive amounts of output. + debugEventsHook :: Event -> X All |