[arch-commits] Commit in xmonad/trunk (PKGBUILD utf8-string.patch)

[Jelle van der Waa]

    Date: Sunday, December 20, 2015 @ 17:38:14
  Author: jelle
Revision: 153783

upgpkg: xmonad 0.12-1

Modified:
  xmonad/trunk/PKGBUILD
Deleted:
  xmonad/trunk/utf8-string.patch

-------------------+
 PKGBUILD          |   35 ++++++++++++++++++-----------------
 utf8-string.patch |   12 ------------
 2 files changed, 18 insertions(+), 29 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-12-20 16:23:15 UTC (rev 153782)
+++ PKGBUILD	2015-12-20 16:38:14 UTC (rev 153783)
@@ -1,37 +1,40 @@
 # $Id$
 # Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
 # Maintainer: Vesa Kaihlavirta <vegai at iki.fi>
+# Maintainer: Jelle van der Waa <jelle at archlinux.org>
 # Contributor: shild <shildv at gmail.com>
 
 pkgname=xmonad
-pkgver=0.11.1
-pkgrel=5
+pkgver=0.12
+pkgrel=1
 pkgdesc="Lightweight X11 tiled window manager written in Haskell"
 arch=('i686' 'x86_64')
 url="http://xmonad.org/"
 license=('BSD')
-depends=('ghc=7.10.3' 'gmp' 'haskell-x11=1.6.1.2' 'sh' 'haskell-mtl=2.2.1' 'haskell-utf8-string' 'haskell-extensible-exceptions=0.1.1.4')
+depends=('ghc=7.10.3' 'gmp' 'haskell-x11=1.6.1.2' 'sh' 'haskell-mtl=2.2.1'
+         'haskell-utf8-string' 'haskell-extensible-exceptions=0.1.1.4'
+         'haskell-data-default' 'haskell-setlocale')
 makedepends=('gendesk')
 optdepends=('xorg-xmessage: for displaying visual error messages')
 install='xmonad.install'
-source=("http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz"
-        'xmonad.svg' 'utf8-string.patch' )
 options=('staticlibs')
+source=("https://github.com/xmonad/xmonad/archive/v${pkgver}.tar.gz"
+        "xmonad.svg")
 
+md5sums=('c81d688c51fa50aea0e421f4755ee2fc'
+         '72bfa5e62e4e44fe7fa59b6a7593d993')
+
 prepare() {
-  patch -Np0 -i $srcdir/utf8-string.patch
+  gendesk --pkgname "$pkgname" --pkgdesc "$pkgdesc"
 }
 
 build() {
-  cd "$srcdir"
-  ghc-pkg list
-  gendesk --pkgname "$pkgname" --pkgdesc "$pkgdesc"
-
   cd $srcdir/$pkgname-$pkgver
 
   runhaskell Setup.lhs configure --ghc --enable-shared --enable-split-objs --prefix=/usr \
-             --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
@@ -41,18 +44,16 @@
   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
+  install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
+  ln -s /usr/share/doc/$pkgname/html "$pkgdir/usr/share/doc/ghc/html/libraries/$_hkgname"
+
   runhaskell Setup.lhs copy --destdir=$pkgdir
 
+  # Requires pandoc, regex-posix, Pretty and cabal
   #runhaskell util/GenerateManpage.hs
 
   install -D -m644 man/xmonad.1 $pkgdir/usr/share/man/man1/xmonad.1
-
   install -D -m644 LICENSE $pkgdir/usr/share/licenses/xmonad/LICENSE
-
   install -D -m644 $srcdir/xmonad.svg $pkgdir/usr/share/pixmaps/xmonad.svg
-
   install -D -m644 $srcdir/xmonad.desktop $pkgdir/usr/share/xsessions/xmonad.desktop
 }
-md5sums=('20792f4e428db24e6c0dbecbd77f69e0'
-         '72bfa5e62e4e44fe7fa59b6a7593d993'
-         '5ee379d4231096c07d92a31f25f8edab')

Deleted: utf8-string.patch
===================================================================
--- utf8-string.patch	2015-12-20 16:23:15 UTC (rev 153782)
+++ utf8-string.patch	2015-12-20 16:38:14 UTC (rev 153783)
@@ -1,12 +0,0 @@
-diff -aur xmonad-0.11.1/xmonad.cabal xmonad-0.11.1.new/xmonad.cabal
---- xmonad-0.11.1/xmonad.cabal	2015-03-27 18:59:21.000000000 +0100
-+++ xmonad-0.11.1.new/xmonad.cabal	2015-03-30 21:23:28.481424344 +0200
-@@ -58,7 +58,7 @@
-     else
-         build-depends: base < 3
-     build-depends: X11>=1.5 && < 1.7, mtl, unix,
--                   utf8-string >= 0.3 && < 0.4
-+                   utf8-string >= 0.3 && < 1.1
- 
-     if true
-         ghc-options:        -funbox-strict-fields -Wall