[arch-commits] Commit in xmonad-contrib/trunk (2 files)
Date: Sunday, December 20, 2015 @ 17:40:01
Author: jelle
Revision: 153785
upgpkg: xmonad-contrib 0.12-1
Modified:
xmonad-contrib/trunk/PKGBUILD
Deleted:
xmonad-contrib/trunk/xmonad-contrib-remove-getatomname.patch
-+
PKGBUILD| 18 +++---
xmonad-contrib-remove-getatomname.patch | 19 ---
2 files changed, 11 insertions(+), 26 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-12-20 16:38:30 UTC (rev 153784)
+++ PKGBUILD2015-12-20 16:40:01 UTC (rev 153785)
@@ -4,24 +4,24 @@
# Contributor: orbisvicis
pkgname=xmonad-contrib
-pkgver=0.11.4
-pkgrel=5
+pkgver=0.12
+pkgrel=1
pkgdesc="Add-ons for xmonad"
arch=('i686' 'x86_64')
url="http://xmonad.org/";
license=('BSD')
-depends=('ghc=7.10.3' 'xmonad=0.11.1' 'sh' 'haskell-x11=1.6.1.2'
'haskell-x11-xft=0.3.1' 'haskell-utf8-string' 'haskell-random=1.1'
'haskell-old-time')
+depends=('ghc=7.10.3' 'xmonad=0.12' 'sh' 'haskell-x11=1.6.1.2'
'haskell-x11-xft=0.3.1' 'haskell-utf8-string' 'haskell-random=1.1'
'haskell-old-time')
install='xmonad-contrib.install'
options=('staticlibs')
-source=(http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz)
-md5sums=('a41c886280a5414105c1cf241f0fd2f4')
+source=("https://github.com/xmonad/xmonad-contrib/archive/v${pkgver}.tar.gz";)
build() {
cd $srcdir/$pkgname-$pkgver
runhaskell Setup.lhs configure --ghc --enable-shared --enable-split-objs
--prefix=/usr -fuse_xft \
- --libsubdir=\$compiler/site-local/\$pkgid
+ --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.*unregister[^ ]* |&'--force' |" unregister.sh
@@ -32,5 +32,9 @@
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
+ 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"
}
+md5sums=('5538c34c020946016cc31b49594c7d4b')
Deleted: xmonad-contrib-remove-getatomname.patch
===
--- xmonad-contrib-remove-getatomname.patch 2015-12-20 16:38:30 UTC (rev
153784)
+++ xmonad-contrib-remove-getatomname.patch 2015-12-20 16:40:01 UTC (rev
153785)
@@ -1,19 +0,0 @@
-diff -aur xmonad-contrib-0.11/XMonad/Hooks/DebugEvents.hs
xmonad-contrib.new/XMonad/Hooks/DebugEvents.hs
xmonad-contrib-0.11/XMonad/Hooks/DebugEvents.hs2013-01-01
01:32:44.0 +
-+++ xmonad-contrib.new/XMonad/Hooks/DebugEvents.hs 2013-03-18
07:54:52.082723862 +
-@@ -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
[arch-commits] Commit in xmonad-contrib/trunk (2 files)
Date: Sunday, April 27, 2014 @ 21:36:44
Author: jelle
Revision: 110247
upgpkg: xmonad-contrib 0.11.2-3
ghc 7.8.2 rebuild
Added:
xmonad-contrib/trunk/remove_unnecessary_contexts.patch
Modified:
xmonad-contrib/trunk/PKGBUILD
---+
PKGBUILD | 15 +++
remove_unnecessary_contexts.patch | 21 +
2 files changed, 32 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-04-27 19:31:42 UTC (rev 110246)
+++ PKGBUILD2014-04-27 19:36:44 UTC (rev 110247)
@@ -5,19 +5,26 @@
pkgname=xmonad-contrib
pkgver=0.11.2
-pkgrel=2
+pkgrel=3
pkgdesc="Add-ons for xmonad"
arch=('i686' 'x86_64')
url="http://xmonad.org/";
license=('BSD')
-depends=('ghc=7.6.3-1' 'xmonad=0.11-7' 'sh' 'haskell-x11=1.6.1.1-3'
'haskell-x11-xft=0.3.1-9' 'haskell-utf8-string=0.3.7-5'
'haskell-random=1.0.1.1-5')
+depends=('ghc=7.8.2-2' 'xmonad=0.11-8' 'sh' 'haskell-x11=1.6.1.1'
'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)
-md5sums=('415a7ed9449198b0e93d49ab0a4a0f72')
+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
Added: remove_unnecessary_contexts.patch
===
--- remove_unnecessary_contexts.patch (rev 0)
+++ remove_unnecessary_contexts.patch 2014-04-27 19:36:44 UTC (rev 110247)
@@ -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.0 +0200
xmonad-contrib-new/XMonad/Layout/MultiToggle.hs2014-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.
[arch-commits] Commit in xmonad-contrib/trunk (2 files)
Date: Monday, March 18, 2013 @ 09:15:17
Author: jelle
Revision: 86482
upgpkg: xmonad-contrib 0.11-4
fixed deps
Added:
xmonad-contrib/trunk/xmonad-contrib-remove-getatomname.patch
Modified:
xmonad-contrib/trunk/PKGBUILD
-+
PKGBUILD|8 +---
xmonad-contrib-remove-getatomname.patch | 19 +++
2 files changed, 24 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-03-18 07:55:54 UTC (rev 86481)
+++ PKGBUILD2013-03-18 08:15:17 UTC (rev 86482)
@@ -10,13 +10,13 @@
arch=('i686' 'x86_64')
url="http://xmonad.org/";
license=('BSD')
-depends=('ghc=7.6.2-1' 'xmonad=0.11-3' 'sh' 'haskell-x11=1.6.0.2-2'
'haskell-x11-xft=0.3.1-7' '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 @@
runhaskell Setup.lhs copy --destdir=$pkgdir
install -D LICENSE $pkgdir/usr/share/licenses/xmonad-contrib/LICENSE
}
+md5sums=('05fba258ac6063e49b50786a0869bd1f'
+ '1d1fab94ae24b2a8f6a5dcd9cd6d9548')
Added: xmonad-contrib-remove-getatomname.patch
===
--- xmonad-contrib-remove-getatomname.patch (rev 0)
+++ xmonad-contrib-remove-getatomname.patch 2013-03-18 08:15:17 UTC (rev
86482)
@@ -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.hs2013-01-01
01:32:44.0 +
xmonad-contrib.new/XMonad/Hooks/DebugEvents.hs 2013-03-18
07:54:52.082723862 +
+@@ -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
