[arch-commits] Commit in xmonad-contrib/trunk (2 files)

[Jelle van der Waa]

    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
===================================================================
--- PKGBUILD	2015-12-20 16:38:30 UTC (rev 153784)
+++ PKGBUILD	2015-12-20 16:40:01 UTC (rev 153785)
@@ -4,24 +4,24 @@
 # Contributor: orbisvicis <gmail.com>
 
 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.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