[arch-commits] Commit in xmonad-contrib/repos (10 files)
Jelle van der Waa
jelle at nymeria.archlinux.org
Sat Jul 12 14:51:34 UTC 2014
Date: Saturday, July 12, 2014 @ 16:51:34
Author: jelle
Revision: 115588
archrelease: copy trunk to community-staging-i686, community-staging-x86_64
Added:
xmonad-contrib/repos/community-staging-i686/
xmonad-contrib/repos/community-staging-i686/PKGBUILD
(from rev 115587, xmonad-contrib/trunk/PKGBUILD)
xmonad-contrib/repos/community-staging-i686/remove_unnecessary_contexts.patch
(from rev 115587, xmonad-contrib/trunk/remove_unnecessary_contexts.patch)
xmonad-contrib/repos/community-staging-i686/xmonad-contrib-remove-getatomname.patch
(from rev 115587, xmonad-contrib/trunk/xmonad-contrib-remove-getatomname.patch)
xmonad-contrib/repos/community-staging-i686/xmonad-contrib.install
(from rev 115587, xmonad-contrib/trunk/xmonad-contrib.install)
xmonad-contrib/repos/community-staging-x86_64/
xmonad-contrib/repos/community-staging-x86_64/PKGBUILD
(from rev 115587, xmonad-contrib/trunk/PKGBUILD)
xmonad-contrib/repos/community-staging-x86_64/remove_unnecessary_contexts.patch
(from rev 115587, xmonad-contrib/trunk/remove_unnecessary_contexts.patch)
xmonad-contrib/repos/community-staging-x86_64/xmonad-contrib-remove-getatomname.patch
(from rev 115587, xmonad-contrib/trunk/xmonad-contrib-remove-getatomname.patch)
xmonad-contrib/repos/community-staging-x86_64/xmonad-contrib.install
(from rev 115587, xmonad-contrib/trunk/xmonad-contrib.install)
------------------------------------------------------------------+
community-staging-i686/PKGBUILD | 42 ++++++++++
community-staging-i686/remove_unnecessary_contexts.patch | 21 +++++
community-staging-i686/xmonad-contrib-remove-getatomname.patch | 19 ++++
community-staging-i686/xmonad-contrib.install | 17 ++++
community-staging-x86_64/PKGBUILD | 42 ++++++++++
community-staging-x86_64/remove_unnecessary_contexts.patch | 21 +++++
community-staging-x86_64/xmonad-contrib-remove-getatomname.patch | 19 ++++
community-staging-x86_64/xmonad-contrib.install | 17 ++++
8 files changed, 198 insertions(+)
Copied: xmonad-contrib/repos/community-staging-i686/PKGBUILD (from rev 115587, xmonad-contrib/trunk/PKGBUILD)
===================================================================
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2014-07-12 14:51:34 UTC (rev 115588)
@@ -0,0 +1,42 @@
+# $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.11.2
+pkgrel=3
+pkgdesc="Add-ons for xmonad"
+arch=('i686' 'x86_64')
+url="http://xmonad.org/"
+license=('BSD')
+depends=('ghc=7.8.3-1' 'xmonad=0.11-9' 'sh' 'haskell-x11=1.6.1.2' 'haskell-x11-xft=0.3.1' 'haskell-utf8-string=0.3.7' 'haskell-random=1.0.1.1')
+install='xmonad-contrib.install'
+options=('staticlibs')
+source=(http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz 'remove_unnecessary_contexts.patch')
+md5sums=('415a7ed9449198b0e93d49ab0a4a0f72'
+ '724a45ea306054ddb7f8a42b185e708f')
+
+prepare() {
+ cd $srcdir/$pkgname-$pkgver
+ patch -Np1 -i $srcdir/remove_unnecessary_contexts.patch
+}
+
+build() {
+ cd $srcdir/$pkgname-$pkgver
+
+ runhaskell Setup.lhs configure --ghc --enable-shared --enable-split-objs --prefix=/usr -fuse_xft \
+ --libsubdir=\$compiler/site-local/\$pkgid
+ runhaskell Setup build
+ runhaskell Setup register --gen-script
+ runhaskell Setup unregister --gen-script
+ 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/$pkgname/register.sh
+ install -m744 unregister.sh $pkgdir/usr/share/haskell/$pkgname/unregister.sh
+ runhaskell Setup.lhs copy --destdir=$pkgdir
+ install -D LICENSE $pkgdir/usr/share/licenses/xmonad-contrib/LICENSE
+}
Copied: xmonad-contrib/repos/community-staging-i686/remove_unnecessary_contexts.patch (from rev 115587, xmonad-contrib/trunk/remove_unnecessary_contexts.patch)
===================================================================
--- community-staging-i686/remove_unnecessary_contexts.patch (rev 0)
+++ community-staging-i686/remove_unnecessary_contexts.patch 2014-07-12 14:51:34 UTC (rev 115588)
@@ -0,0 +1,21 @@
+diff -aur xmonad-contrib-0.11.2/XMonad/Layout/MultiToggle.hs xmonad-contrib-new/XMonad/Layout/MultiToggle.hs
+--- xmonad-contrib-0.11.2/XMonad/Layout/MultiToggle.hs 2013-07-16 04:52:11.000000000 +0200
++++ xmonad-contrib-new/XMonad/Layout/MultiToggle.hs 2014-04-27 21:26:20.746206511 +0200
+@@ -99,7 +99,7 @@
+ transform :: (LayoutClass l a) => t -> l a ->
+ (forall l'. (LayoutClass l' a) => l' a -> (l' a -> l a) -> b) -> b
+
+-data (LayoutClass l a) => EL l a = forall l'. (LayoutClass l' a) => EL (l' a) (l' a -> l a)
++data EL l a = forall l'. (LayoutClass l' a) => EL (l' a) (l' a -> l a)
+
+ unEL :: (LayoutClass l a) => EL l a -> (forall l'. (LayoutClass l' a) => l' a -> b) -> b
+ unEL (EL x _) k = k x
+@@ -159,7 +159,7 @@
+ infixr 0 ??
+ -- | Prepend an element to a heterogeneous list. Used to build transformer
+ -- tables for 'mkToggle'.
+-(??) :: (HList b w) => a -> b -> HCons a b
++(??) :: a -> b -> HCons a b
+ (??) = HCons
+
+ -- | Construct a singleton transformer table.
Copied: xmonad-contrib/repos/community-staging-i686/xmonad-contrib-remove-getatomname.patch (from rev 115587, xmonad-contrib/trunk/xmonad-contrib-remove-getatomname.patch)
===================================================================
--- community-staging-i686/xmonad-contrib-remove-getatomname.patch (rev 0)
+++ community-staging-i686/xmonad-contrib-remove-getatomname.patch 2014-07-12 14:51:34 UTC (rev 115588)
@@ -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
Copied: xmonad-contrib/repos/community-staging-i686/xmonad-contrib.install (from rev 115587, xmonad-contrib/trunk/xmonad-contrib.install)
===================================================================
--- community-staging-i686/xmonad-contrib.install (rev 0)
+++ community-staging-i686/xmonad-contrib.install 2014-07-12 14:51:34 UTC (rev 115588)
@@ -0,0 +1,17 @@
+HS_DIR=usr/share/haskell/xmonad-contrib
+
+post_install() {
+ ${HS_DIR}/register.sh
+}
+
+pre_upgrade() {
+ ${HS_DIR}/unregister.sh
+}
+
+post_upgrade() {
+ ${HS_DIR}/register.sh
+}
+
+pre_remove() {
+ ${HS_DIR}/unregister.sh
+}
Copied: xmonad-contrib/repos/community-staging-x86_64/PKGBUILD (from rev 115587, xmonad-contrib/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD (rev 0)
+++ community-staging-x86_64/PKGBUILD 2014-07-12 14:51:34 UTC (rev 115588)
@@ -0,0 +1,42 @@
+# $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.11.2
+pkgrel=3
+pkgdesc="Add-ons for xmonad"
+arch=('i686' 'x86_64')
+url="http://xmonad.org/"
+license=('BSD')
+depends=('ghc=7.8.3-1' 'xmonad=0.11-9' 'sh' 'haskell-x11=1.6.1.2' 'haskell-x11-xft=0.3.1' 'haskell-utf8-string=0.3.7' 'haskell-random=1.0.1.1')
+install='xmonad-contrib.install'
+options=('staticlibs')
+source=(http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz 'remove_unnecessary_contexts.patch')
+md5sums=('415a7ed9449198b0e93d49ab0a4a0f72'
+ '724a45ea306054ddb7f8a42b185e708f')
+
+prepare() {
+ cd $srcdir/$pkgname-$pkgver
+ patch -Np1 -i $srcdir/remove_unnecessary_contexts.patch
+}
+
+build() {
+ cd $srcdir/$pkgname-$pkgver
+
+ runhaskell Setup.lhs configure --ghc --enable-shared --enable-split-objs --prefix=/usr -fuse_xft \
+ --libsubdir=\$compiler/site-local/\$pkgid
+ runhaskell Setup build
+ runhaskell Setup register --gen-script
+ runhaskell Setup unregister --gen-script
+ 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/$pkgname/register.sh
+ install -m744 unregister.sh $pkgdir/usr/share/haskell/$pkgname/unregister.sh
+ runhaskell Setup.lhs copy --destdir=$pkgdir
+ install -D LICENSE $pkgdir/usr/share/licenses/xmonad-contrib/LICENSE
+}
Copied: xmonad-contrib/repos/community-staging-x86_64/remove_unnecessary_contexts.patch (from rev 115587, xmonad-contrib/trunk/remove_unnecessary_contexts.patch)
===================================================================
--- community-staging-x86_64/remove_unnecessary_contexts.patch (rev 0)
+++ community-staging-x86_64/remove_unnecessary_contexts.patch 2014-07-12 14:51:34 UTC (rev 115588)
@@ -0,0 +1,21 @@
+diff -aur xmonad-contrib-0.11.2/XMonad/Layout/MultiToggle.hs xmonad-contrib-new/XMonad/Layout/MultiToggle.hs
+--- xmonad-contrib-0.11.2/XMonad/Layout/MultiToggle.hs 2013-07-16 04:52:11.000000000 +0200
++++ xmonad-contrib-new/XMonad/Layout/MultiToggle.hs 2014-04-27 21:26:20.746206511 +0200
+@@ -99,7 +99,7 @@
+ transform :: (LayoutClass l a) => t -> l a ->
+ (forall l'. (LayoutClass l' a) => l' a -> (l' a -> l a) -> b) -> b
+
+-data (LayoutClass l a) => EL l a = forall l'. (LayoutClass l' a) => EL (l' a) (l' a -> l a)
++data EL l a = forall l'. (LayoutClass l' a) => EL (l' a) (l' a -> l a)
+
+ unEL :: (LayoutClass l a) => EL l a -> (forall l'. (LayoutClass l' a) => l' a -> b) -> b
+ unEL (EL x _) k = k x
+@@ -159,7 +159,7 @@
+ infixr 0 ??
+ -- | Prepend an element to a heterogeneous list. Used to build transformer
+ -- tables for 'mkToggle'.
+-(??) :: (HList b w) => a -> b -> HCons a b
++(??) :: a -> b -> HCons a b
+ (??) = HCons
+
+ -- | Construct a singleton transformer table.
Copied: xmonad-contrib/repos/community-staging-x86_64/xmonad-contrib-remove-getatomname.patch (from rev 115587, xmonad-contrib/trunk/xmonad-contrib-remove-getatomname.patch)
===================================================================
--- community-staging-x86_64/xmonad-contrib-remove-getatomname.patch (rev 0)
+++ community-staging-x86_64/xmonad-contrib-remove-getatomname.patch 2014-07-12 14:51:34 UTC (rev 115588)
@@ -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
Copied: xmonad-contrib/repos/community-staging-x86_64/xmonad-contrib.install (from rev 115587, xmonad-contrib/trunk/xmonad-contrib.install)
===================================================================
--- community-staging-x86_64/xmonad-contrib.install (rev 0)
+++ community-staging-x86_64/xmonad-contrib.install 2014-07-12 14:51:34 UTC (rev 115588)
@@ -0,0 +1,17 @@
+HS_DIR=usr/share/haskell/xmonad-contrib
+
+post_install() {
+ ${HS_DIR}/register.sh
+}
+
+pre_upgrade() {
+ ${HS_DIR}/unregister.sh
+}
+
+post_upgrade() {
+ ${HS_DIR}/register.sh
+}
+
+pre_remove() {
+ ${HS_DIR}/unregister.sh
+}
More information about the arch-commits
mailing list