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

[Jelle van der Waa]

    Date: Monday, March 30, 2015 @ 21:25:19
  Author: jelle
Revision: 130374

upgpkg: xmonad 0.11.1-1

ghc 7.10.1 rebuild

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

-------------------+
 PKGBUILD          |   17 +++++++++++------
 utf8-string.patch |   12 ++++++++++++
 2 files changed, 23 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-03-30 19:21:20 UTC (rev 130373)
+++ PKGBUILD	2015-03-30 19:25:19 UTC (rev 130374)
@@ -4,22 +4,24 @@
 # Contributor: shild <shildv at gmail.com>
 
 pkgname=xmonad
-pkgver=0.11
-pkgrel=10
+pkgver=0.11.1
+pkgrel=1
 pkgdesc="Lightweight X11 tiled window manager written in Haskell"
 arch=('i686' 'x86_64')
 url="http://xmonad.org/"
 license=('BSD')
-depends=('ghc=7.8.4' 'gmp' 'haskell-x11=1.6.1.2' 'sh' 'haskell-mtl=2.1.3.1' 'haskell-utf8-string=0.3.8' 'haskell-extensible-exceptions=0.1.1.4')
+depends=('ghc=7.10.1' 'gmp' 'haskell-x11=1.6.1.2' 'sh' 'haskell-mtl=2.2.1' 'haskell-utf8-string=1') # 'haskell-extensible-exceptions=0.1.1.4')
 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')
+        'xmonad.svg' 'utf8-string.patch' )
 options=('staticlibs')
-md5sums=('5ac9dc1dae5e85dcbdfb9f70cbe312c1'
-         '72bfa5e62e4e44fe7fa59b6a7593d993')
 
+prepare() {
+  patch -Np0 -i $srcdir/utf8-string.patch
+}
+
 build() {
   cd "$srcdir"
   ghc-pkg list
@@ -51,3 +53,6 @@
 
   install -D -m644 $srcdir/xmonad.desktop $pkgdir/usr/share/xsessions/xmonad.desktop
 }
+md5sums=('20792f4e428db24e6c0dbecbd77f69e0'
+         '72bfa5e62e4e44fe7fa59b6a7593d993'
+         '74d7709d8d8b76d19bd0162a9fe0346c')

Added: utf8-string.patch
===================================================================
--- utf8-string.patch	                        (rev 0)
+++ utf8-string.patch	2015-03-30 19:25:19 UTC (rev 130374)
@@ -0,0 +1,12 @@
+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 
+ 
+     if true
+         ghc-options:        -funbox-strict-fields -Wall