[arch-commits] Commit in xmobar/trunk (PKGBUILD ghc-7.10.1-update-haskell-deps.patch)

[Jelle van der Waa]

    Date: Wednesday, April 15, 2015 @ 16:12:15
  Author: jelle
Revision: 131412

upgpkg: xmobar 0.23.1-1

Modified:
  xmobar/trunk/PKGBUILD
Deleted:
  xmobar/trunk/ghc-7.10.1-update-haskell-deps.patch

--------------------------------------+
 PKGBUILD                             |   15 ++++-----------
 ghc-7.10.1-update-haskell-deps.patch |   18 ------------------
 2 files changed, 4 insertions(+), 29 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-04-15 14:09:24 UTC (rev 131411)
+++ PKGBUILD	2015-04-15 14:12:15 UTC (rev 131412)
@@ -3,8 +3,8 @@
 # Contributor: Arch Haskell Team <arch-haskell at haskell.org>
 
 pkgname=xmobar
-pkgver=0.23
-pkgrel=2
+pkgver=0.23.1
+pkgrel=1
 pkgdesc="A Minimalistic Text Based Status Bar"
 url="http://hackage.haskell.org/package/xmobar"
 license=('custom:BSD3')
@@ -13,13 +13,8 @@
 makedepends=('ghc=7.10.1' 'haskell-x11=1.6.1.2' 'haskell-x11-xft=0.3.1' 'haskell-utf8-string=1' 'haskell-network-uri'
 	     'haskell-stm=2.4.4' 'haskell-parsec=3.1.9' 'haskell-mtl=2.2.1' 'haskell-regex-base' 'haskell-regex-compat' 'haskell-http')
 options=('strip')
-source=(http://hackage.haskell.org/packages/archive/xmobar/$pkgver/xmobar-$pkgver.tar.gz ghc-7.10.1-update-haskell-deps.patch disable-ewmh-plugin.patch)
+source=(http://hackage.haskell.org/packages/archive/xmobar/$pkgver/xmobar-$pkgver.tar.gz)
 
-prepare() {
-  cd ${srcdir}/xmobar-$pkgver
-  patch -Np1 -i $srcdir/ghc-7.10.1-update-haskell-deps.patch
-  patch -Np1 -i $srcdir/disable-ewmh-plugin.patch
-}
 build() {
     cd ${srcdir}/xmobar-$pkgver
 
@@ -33,6 +28,4 @@
     install -D -m644 license ${pkgdir}/usr/share/licenses/$pkgname/LICENSE
 }
 
-md5sums=('5ab73783a6a8f97753a263652e1c141c'
-         'c2229e749626ae28132129fc2cb80bad'
-         '9d3951d4a6e12f48b5bd9735575ee2a4')
+md5sums=('f97a10f049796f55cc3d13ee68d07eac')

Deleted: ghc-7.10.1-update-haskell-deps.patch
===================================================================
--- ghc-7.10.1-update-haskell-deps.patch	2015-04-15 14:09:24 UTC (rev 131411)
+++ ghc-7.10.1-update-haskell-deps.patch	2015-04-15 14:12:15 UTC (rev 131412)
@@ -1,18 +0,0 @@
-diff -aur xmobar-0.23/xmobar.cabal xmobar-0.23.new/xmobar.cabal
---- xmobar-0.23/xmobar.cabal	2015-03-08 14:08:58.000000000 +0100
-+++ xmobar-0.23.new/xmobar.cabal	2015-03-31 21:05:35.035293814 +0200
-@@ -128,12 +128,12 @@
-        cpp-options: -DGHC6
- 
-     if flag(with_xft) || flag(all_extensions)
--       build-depends: utf8-string == 0.3.*, X11-xft >= 0.2 && < 0.4
-+       build-depends: utf8-string == 1.*, X11-xft >= 0.2 && < 0.4
-        other-modules: MinXft
-        cpp-options: -DXFT
- 
-     if flag(with_utf8) || flag(all_extensions)
--       build-depends: utf8-string == 0.3.*
-+       build-depends: utf8-string == 1.*
-        cpp-options: -DUTF8
- 
-     if flag(with_inotify) || flag(all_extensions)