[arch-commits] Commit in xmonad-contrib/repos (8 files)
Felix Yan
felixonmars at archlinux.org
Fri Jul 7 12:33:29 UTC 2017
Date: Friday, July 7, 2017 @ 12:33:29
Author: felixonmars
Revision: 242820
archrelease: copy trunk to community-staging-i686, community-staging-x86_64
Added:
xmonad-contrib/repos/community-staging-i686/
xmonad-contrib/repos/community-staging-i686/800ae670e2927128ea4fd0a3011a4a5b029e92ef.patch
(from rev 242819, xmonad-contrib/trunk/800ae670e2927128ea4fd0a3011a4a5b029e92ef.patch)
xmonad-contrib/repos/community-staging-i686/PKGBUILD
(from rev 242819, xmonad-contrib/trunk/PKGBUILD)
xmonad-contrib/repos/community-staging-i686/x11.patch
(from rev 242819, xmonad-contrib/trunk/x11.patch)
xmonad-contrib/repos/community-staging-x86_64/
xmonad-contrib/repos/community-staging-x86_64/800ae670e2927128ea4fd0a3011a4a5b029e92ef.patch
(from rev 242819, xmonad-contrib/trunk/800ae670e2927128ea4fd0a3011a4a5b029e92ef.patch)
xmonad-contrib/repos/community-staging-x86_64/PKGBUILD
(from rev 242819, xmonad-contrib/trunk/PKGBUILD)
xmonad-contrib/repos/community-staging-x86_64/x11.patch
(from rev 242819, xmonad-contrib/trunk/x11.patch)
-------------------------------------------------------------------------+
community-staging-i686/800ae670e2927128ea4fd0a3011a4a5b029e92ef.patch | 31 +++++++
community-staging-i686/PKGBUILD | 44 ++++++++++
community-staging-i686/x11.patch | 12 ++
community-staging-x86_64/800ae670e2927128ea4fd0a3011a4a5b029e92ef.patch | 31 +++++++
community-staging-x86_64/PKGBUILD | 44 ++++++++++
community-staging-x86_64/x11.patch | 12 ++
6 files changed, 174 insertions(+)
Copied: xmonad-contrib/repos/community-staging-i686/800ae670e2927128ea4fd0a3011a4a5b029e92ef.patch (from rev 242819, xmonad-contrib/trunk/800ae670e2927128ea4fd0a3011a4a5b029e92ef.patch)
===================================================================
--- community-staging-i686/800ae670e2927128ea4fd0a3011a4a5b029e92ef.patch (rev 0)
+++ community-staging-i686/800ae670e2927128ea4fd0a3011a4a5b029e92ef.patch 2017-07-07 12:33:29 UTC (rev 242820)
@@ -0,0 +1,31 @@
+From 800ae670e2927128ea4fd0a3011a4a5b029e92ef Mon Sep 17 00:00:00 2001
+From: Daniel Wagner <me at dmwit.com>
+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
Copied: xmonad-contrib/repos/community-staging-i686/PKGBUILD (from rev 242819, xmonad-contrib/trunk/PKGBUILD)
===================================================================
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2017-07-07 12:33:29 UTC (rev 242820)
@@ -0,0 +1,44 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Maintainer: Vesa Kaihlavirta <vegai at iki.fi>
+# Contributor: orbisvicis <gmail.com>
+
+pkgname=xmonad-contrib
+pkgver=0.13
+pkgrel=4
+pkgdesc="Add-ons for xmonad"
+arch=('i686' 'x86_64')
+url="http://xmonad.org/"
+license=('BSD')
+depends=('ghc' 'xmonad' 'sh' 'haskell-x11' 'haskell-x11-xft' 'haskell-utf8-string' 'haskell-random'
+ 'haskell-old-time')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/xmonad/xmonad-contrib/archive/v${pkgver}.tar.gz")
+md5sums=('ccda8bbc3dd0c23ec98a1c6668716f59')
+
+build() {
+ cd $srcdir/$pkgname-$pkgver
+
+ runhaskell Setup.lhs configure -O --enable-shared --enable-executable-dynamic \
+ --prefix=/usr -fuse_xft --libsubdir=\$compiler/site-local/\$pkgid \
+ --docdir=/usr/share/doc/${pkgname}
+ runhaskell Setup build
+ runhaskell Setup haddock
+ runhaskell Setup register --gen-script
+ runhaskell Setup unregister --gen-script
+ sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
+ sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+ cd $srcdir/$pkgname-$pkgver
+ install -D -m744 register.sh "${pkgdir}/usr/share/haskell/register/${pkgname}.sh"
+ install -D -m744 unregister.sh "${pkgdir}/usr/share/haskell/unregister/${pkgname}.sh"
+ runhaskell Setup.lhs copy --destdir=$pkgdir
+ install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
+ ln -s /usr/share/doc/$pkgname/html "$pkgdir/usr/share/doc/ghc/html/libraries/$pkgname"
+
+ install -D LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+
+ # Remove static libs
+ find "$pkgdir"/usr/lib -name "*.a" -delete
+}
Copied: xmonad-contrib/repos/community-staging-i686/x11.patch (from rev 242819, xmonad-contrib/trunk/x11.patch)
===================================================================
--- community-staging-i686/x11.patch (rev 0)
+++ community-staging-i686/x11.patch 2017-07-07 12:33:29 UTC (rev 242820)
@@ -0,0 +1,12 @@
+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
+
Copied: xmonad-contrib/repos/community-staging-x86_64/800ae670e2927128ea4fd0a3011a4a5b029e92ef.patch (from rev 242819, xmonad-contrib/trunk/800ae670e2927128ea4fd0a3011a4a5b029e92ef.patch)
===================================================================
--- community-staging-x86_64/800ae670e2927128ea4fd0a3011a4a5b029e92ef.patch (rev 0)
+++ community-staging-x86_64/800ae670e2927128ea4fd0a3011a4a5b029e92ef.patch 2017-07-07 12:33:29 UTC (rev 242820)
@@ -0,0 +1,31 @@
+From 800ae670e2927128ea4fd0a3011a4a5b029e92ef Mon Sep 17 00:00:00 2001
+From: Daniel Wagner <me at dmwit.com>
+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
Copied: xmonad-contrib/repos/community-staging-x86_64/PKGBUILD (from rev 242819, xmonad-contrib/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD (rev 0)
+++ community-staging-x86_64/PKGBUILD 2017-07-07 12:33:29 UTC (rev 242820)
@@ -0,0 +1,44 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Maintainer: Vesa Kaihlavirta <vegai at iki.fi>
+# Contributor: orbisvicis <gmail.com>
+
+pkgname=xmonad-contrib
+pkgver=0.13
+pkgrel=4
+pkgdesc="Add-ons for xmonad"
+arch=('i686' 'x86_64')
+url="http://xmonad.org/"
+license=('BSD')
+depends=('ghc' 'xmonad' 'sh' 'haskell-x11' 'haskell-x11-xft' 'haskell-utf8-string' 'haskell-random'
+ 'haskell-old-time')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/xmonad/xmonad-contrib/archive/v${pkgver}.tar.gz")
+md5sums=('ccda8bbc3dd0c23ec98a1c6668716f59')
+
+build() {
+ cd $srcdir/$pkgname-$pkgver
+
+ runhaskell Setup.lhs configure -O --enable-shared --enable-executable-dynamic \
+ --prefix=/usr -fuse_xft --libsubdir=\$compiler/site-local/\$pkgid \
+ --docdir=/usr/share/doc/${pkgname}
+ runhaskell Setup build
+ runhaskell Setup haddock
+ runhaskell Setup register --gen-script
+ runhaskell Setup unregister --gen-script
+ sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
+ sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+ cd $srcdir/$pkgname-$pkgver
+ install -D -m744 register.sh "${pkgdir}/usr/share/haskell/register/${pkgname}.sh"
+ install -D -m744 unregister.sh "${pkgdir}/usr/share/haskell/unregister/${pkgname}.sh"
+ runhaskell Setup.lhs copy --destdir=$pkgdir
+ install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
+ ln -s /usr/share/doc/$pkgname/html "$pkgdir/usr/share/doc/ghc/html/libraries/$pkgname"
+
+ install -D LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+
+ # Remove static libs
+ find "$pkgdir"/usr/lib -name "*.a" -delete
+}
Copied: xmonad-contrib/repos/community-staging-x86_64/x11.patch (from rev 242819, xmonad-contrib/trunk/x11.patch)
===================================================================
--- community-staging-x86_64/x11.patch (rev 0)
+++ community-staging-x86_64/x11.patch 2017-07-07 12:33:29 UTC (rev 242820)
@@ -0,0 +1,12 @@
+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
+
More information about the arch-commits
mailing list