Date: Tuesday, October 3, 2017 @ 23:14:46 Author: anthraxx Revision: 261415
upgpkg: xmonad-contrib 0.13-7 (xmonad rebuild) Modified: xmonad-contrib/trunk/PKGBUILD Deleted: xmonad-contrib/trunk/800ae670e2927128ea4fd0a3011a4a5b029e92ef.patch xmonad-contrib/trunk/x11.patch ------------------------------------------------+ 800ae670e2927128ea4fd0a3011a4a5b029e92ef.patch | 31 ----------------------- PKGBUILD | 28 ++++++++++---------- x11.patch | 12 -------- 3 files changed, 14 insertions(+), 57 deletions(-) Deleted: 800ae670e2927128ea4fd0a3011a4a5b029e92ef.patch =================================================================== --- 800ae670e2927128ea4fd0a3011a4a5b029e92ef.patch 2017-10-03 22:10:46 UTC (rev 261414) +++ 800ae670e2927128ea4fd0a3011a4a5b029e92ef.patch 2017-10-03 23:14:46 UTC (rev 261415) @@ -1,31 +0,0 @@ -From 800ae670e2927128ea4fd0a3011a4a5b029e92ef Mon Sep 17 00:00:00 2001 -From: Daniel Wagner <[email protected]> -Date: Tue, 15 Dec 2015 07:44:36 -0800 -Subject: [PATCH] use a record pattern to be robust against additions to the - X11 library - ---- - XMonad/Util/DebugWindow.hs | 10 +++++++++- - 1 file changed, 9 insertions(+), 1 deletion(-) - -diff --git a/XMonad/Util/DebugWindow.hs b/XMonad/Util/DebugWindow.hs -index d4f5138..283297b 100644 ---- a/XMonad/Util/DebugWindow.hs -+++ b/XMonad/Util/DebugWindow.hs -@@ -41,7 +41,15 @@ debugWindow w = do - case w' of - Nothing -> - return $ "(deleted window " ++ wx ++ ")" -- Just (WindowAttributes x y wid ht bw m o) -> do -+ Just (WindowAttributes -+ { wa_x = x -+ , wa_y = y -+ , wa_width = wid -+ , wa_height = ht -+ , wa_border_width = bw -+ , wa_map_state = m -+ , wa_override_redirect = o -+ }) -> do - c' <- withDisplay $ \d -> - io (getWindowProperty8 d wM_CLASS w) - let c = case c' of Modified: PKGBUILD =================================================================== --- PKGBUILD 2017-10-03 22:10:46 UTC (rev 261414) +++ PKGBUILD 2017-10-03 23:14:46 UTC (rev 261415) @@ -1,23 +1,24 @@ -# $Id$ -# Maintainer: Sergej Pupykin <[email protected]> -# Maintainer: Vesa Kaihlavirta <[email protected]> +# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org> +# Maintainer: Jelle van der Waa <[email protected]> +# Contributor: Sergej Pupykin <[email protected]> +# Contributor: Vesa Kaihlavirta <[email protected]> # Contributor: orbisvicis <gmail.com> pkgname=xmonad-contrib pkgver=0.13 -pkgrel=6 -pkgdesc="Add-ons for xmonad" +pkgrel=7 +pkgdesc='Add-ons for xmonad' +url='http://xmonad.org/' arch=('i686' 'x86_64') -url="http://xmonad.org/"; license=('BSD') depends=('ghc-libs' 'xmonad' 'sh' 'haskell-x11' 'haskell-x11-xft' 'haskell-utf8-string' 'haskell-random' 'haskell-old-time') makedepends=('ghc') -source=("$pkgname-$pkgver.tar.gz::https://github.com/xmonad/xmonad-contrib/archive/v${pkgver}.tar.gz";) +source=(${pkgname}-${pkgver}.tar.gz::https://github.com/xmonad/xmonad-contrib/archive/v${pkgver}.tar.gz) sha512sums=('d8cc89184edd3fdc531f28de2f94a3b3c57522494dd5f1c1c899c81fbd5c0a8211777ee9b5618932f069fc025894e39e049113b7d271f13c3e3f8d21ffc566e6') build() { - cd $srcdir/$pkgname-$pkgver + cd ${pkgname}-${pkgver} runhaskell Setup.lhs configure -O --enable-shared --enable-executable-dynamic --disable-library-vanilla \ --prefix=/usr -fuse_xft --libsubdir=\$compiler/site-local/\$pkgid \ @@ -30,10 +31,9 @@ } package() { - cd $srcdir/$pkgname-$pkgver - install -D -m744 register.sh "${pkgdir}/usr/share/haskell/register/${pkgname}.sh" - install -D -m744 unregister.sh "${pkgdir}/usr/share/haskell/unregister/${pkgname}.sh" - runhaskell Setup.lhs copy --destdir=$pkgdir - - install -D LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + cd ${pkgname}-${pkgver} + install -Dm 744 register.sh "${pkgdir}/usr/share/haskell/register/${pkgname}.sh" + install -Dm 744 unregister.sh "${pkgdir}/usr/share/haskell/unregister/${pkgname}.sh" + runhaskell Setup.lhs copy --destdir="${pkgdir}" + install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}" } Deleted: x11.patch =================================================================== --- x11.patch 2017-10-03 22:10:46 UTC (rev 261414) +++ x11.patch 2017-10-03 23:14:46 UTC (rev 261415) @@ -1,12 +0,0 @@ -diff -aur xmonad-contrib-0.12/xmonad-contrib.cabal xmonad-contrib-0.12.new/xmonad-contrib.cabal ---- xmonad-contrib-0.12/xmonad-contrib.cabal 2015-12-18 21:11:11.000000000 +0100 -+++ xmonad-contrib-0.12.new/xmonad-contrib.cabal 2017-01-08 12:13:09.828927857 +0100 -@@ -64,7 +64,7 @@ - random, - mtl >= 1 && < 3, - unix, -- X11>=1.6.1 && < 1.7, -+ X11>=1.6.1 && < 1.8, - xmonad>=0.12 && < 0.13, - utf8-string -
