[arch-commits] Commit in xmonad-contrib/repos (8 files)
Levente Polyak
anthraxx at archlinux.org
Tue Oct 3 23:14:57 UTC 2017
Date: Tuesday, October 3, 2017 @ 23:14:56
Author: anthraxx
Revision: 261416
archrelease: copy trunk to community-i686, community-x86_64
Added:
xmonad-contrib/repos/community-i686/PKGBUILD
(from rev 261415, xmonad-contrib/trunk/PKGBUILD)
xmonad-contrib/repos/community-x86_64/PKGBUILD
(from rev 261415, xmonad-contrib/trunk/PKGBUILD)
Deleted:
xmonad-contrib/repos/community-i686/800ae670e2927128ea4fd0a3011a4a5b029e92ef.patch
xmonad-contrib/repos/community-i686/PKGBUILD
xmonad-contrib/repos/community-i686/x11.patch
xmonad-contrib/repos/community-x86_64/800ae670e2927128ea4fd0a3011a4a5b029e92ef.patch
xmonad-contrib/repos/community-x86_64/PKGBUILD
xmonad-contrib/repos/community-x86_64/x11.patch
-----------------------------------------------------------------+
/PKGBUILD | 78 ++++++++++
community-i686/800ae670e2927128ea4fd0a3011a4a5b029e92ef.patch | 31 ---
community-i686/PKGBUILD | 39 -----
community-i686/x11.patch | 12 -
community-x86_64/800ae670e2927128ea4fd0a3011a4a5b029e92ef.patch | 31 ---
community-x86_64/PKGBUILD | 39 -----
community-x86_64/x11.patch | 12 -
7 files changed, 78 insertions(+), 164 deletions(-)
Deleted: community-i686/800ae670e2927128ea4fd0a3011a4a5b029e92ef.patch
===================================================================
--- community-i686/800ae670e2927128ea4fd0a3011a4a5b029e92ef.patch 2017-10-03 23:14:46 UTC (rev 261415)
+++ community-i686/800ae670e2927128ea4fd0a3011a4a5b029e92ef.patch 2017-10-03 23:14:56 UTC (rev 261416)
@@ -1,31 +0,0 @@
-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
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2017-10-03 23:14:46 UTC (rev 261415)
+++ community-i686/PKGBUILD 2017-10-03 23:14:56 UTC (rev 261416)
@@ -1,39 +0,0 @@
-# $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=6
-pkgdesc="Add-ons for xmonad"
-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")
-sha512sums=('d8cc89184edd3fdc531f28de2f94a3b3c57522494dd5f1c1c899c81fbd5c0a8211777ee9b5618932f069fc025894e39e049113b7d271f13c3e3f8d21ffc566e6')
-
-build() {
- cd $srcdir/$pkgname-$pkgver
-
- runhaskell Setup.lhs configure -O --enable-shared --enable-executable-dynamic --disable-library-vanilla \
- --prefix=/usr -fuse_xft --libsubdir=\$compiler/site-local/\$pkgid \
- --docdir=/usr/share/doc/${pkgname}
- runhaskell Setup build
- 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 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
Copied: xmonad-contrib/repos/community-i686/PKGBUILD (from rev 261415, xmonad-contrib/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2017-10-03 23:14:56 UTC (rev 261416)
@@ -0,0 +1,39 @@
+# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
+# Maintainer: Jelle van der Waa <jelle at archlinux.org>
+# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: Vesa Kaihlavirta <vegai at iki.fi>
+# Contributor: orbisvicis <gmail.com>
+
+pkgname=xmonad-contrib
+pkgver=0.13
+pkgrel=7
+pkgdesc='Add-ons for xmonad'
+url='http://xmonad.org/'
+arch=('i686' 'x86_64')
+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)
+sha512sums=('d8cc89184edd3fdc531f28de2f94a3b3c57522494dd5f1c1c899c81fbd5c0a8211777ee9b5618932f069fc025894e39e049113b7d271f13c3e3f8d21ffc566e6')
+
+build() {
+ 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 \
+ --docdir=/usr/share/doc/${pkgname}
+ runhaskell Setup build
+ 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 ${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: community-i686/x11.patch
===================================================================
--- community-i686/x11.patch 2017-10-03 23:14:46 UTC (rev 261415)
+++ community-i686/x11.patch 2017-10-03 23:14:56 UTC (rev 261416)
@@ -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
-
Deleted: community-x86_64/800ae670e2927128ea4fd0a3011a4a5b029e92ef.patch
===================================================================
--- community-x86_64/800ae670e2927128ea4fd0a3011a4a5b029e92ef.patch 2017-10-03 23:14:46 UTC (rev 261415)
+++ community-x86_64/800ae670e2927128ea4fd0a3011a4a5b029e92ef.patch 2017-10-03 23:14:56 UTC (rev 261416)
@@ -1,31 +0,0 @@
-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
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2017-10-03 23:14:46 UTC (rev 261415)
+++ community-x86_64/PKGBUILD 2017-10-03 23:14:56 UTC (rev 261416)
@@ -1,39 +0,0 @@
-# $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=6
-pkgdesc="Add-ons for xmonad"
-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")
-sha512sums=('d8cc89184edd3fdc531f28de2f94a3b3c57522494dd5f1c1c899c81fbd5c0a8211777ee9b5618932f069fc025894e39e049113b7d271f13c3e3f8d21ffc566e6')
-
-build() {
- cd $srcdir/$pkgname-$pkgver
-
- runhaskell Setup.lhs configure -O --enable-shared --enable-executable-dynamic --disable-library-vanilla \
- --prefix=/usr -fuse_xft --libsubdir=\$compiler/site-local/\$pkgid \
- --docdir=/usr/share/doc/${pkgname}
- runhaskell Setup build
- 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 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
Copied: xmonad-contrib/repos/community-x86_64/PKGBUILD (from rev 261415, xmonad-contrib/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2017-10-03 23:14:56 UTC (rev 261416)
@@ -0,0 +1,39 @@
+# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
+# Maintainer: Jelle van der Waa <jelle at archlinux.org>
+# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: Vesa Kaihlavirta <vegai at iki.fi>
+# Contributor: orbisvicis <gmail.com>
+
+pkgname=xmonad-contrib
+pkgver=0.13
+pkgrel=7
+pkgdesc='Add-ons for xmonad'
+url='http://xmonad.org/'
+arch=('i686' 'x86_64')
+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)
+sha512sums=('d8cc89184edd3fdc531f28de2f94a3b3c57522494dd5f1c1c899c81fbd5c0a8211777ee9b5618932f069fc025894e39e049113b7d271f13c3e3f8d21ffc566e6')
+
+build() {
+ 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 \
+ --docdir=/usr/share/doc/${pkgname}
+ runhaskell Setup build
+ 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 ${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: community-x86_64/x11.patch
===================================================================
--- community-x86_64/x11.patch 2017-10-03 23:14:46 UTC (rev 261415)
+++ community-x86_64/x11.patch 2017-10-03 23:14:56 UTC (rev 261416)
@@ -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
-
More information about the arch-commits
mailing list