Date: Wednesday, April 1, 2015 @ 21:19:16 Author: jelle Revision: 130493
upgpkg: xmobar 0.23-2 ghc 7.10.1 rebuild Added: xmobar/trunk/disable-ewmh-plugin.patch xmobar/trunk/ghc-7.10.1-update-haskell-deps.patch Modified: xmobar/trunk/PKGBUILD --------------------------------------+ PKGBUILD | 19 +++++++++---- disable-ewmh-plugin.patch | 46 +++++++++++++++++++++++++++++++++ ghc-7.10.1-update-haskell-deps.patch | 18 ++++++++++++ 3 files changed, 77 insertions(+), 6 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2015-04-01 19:17:41 UTC (rev 130492) +++ PKGBUILD 2015-04-01 19:19:16 UTC (rev 130493) @@ -4,22 +4,26 @@ pkgname=xmobar pkgver=0.23 -pkgrel=1 +pkgrel=2 pkgdesc="A Minimalistic Text Based Status Bar" url="http://hackage.haskell.org/package/xmobar"; license=('custom:BSD3') arch=('i686' 'x86_64') depends=('gmp' 'libxft' 'libxinerama' 'wireless_tools' 'libxrandr' 'libxpm') -makedepends=('ghc=7.8.4-1' 'haskell-x11=1.6.1.2' 'haskell-x11-xft=0.3.1' 'haskell-utf8-string=0.3.8' 'haskell-network-uri' - 'haskell-stm=2.4.3' 'haskell-parsec=3.1.7' 'haskell-mtl=2.1.3.1' 'haskell-regex-base' 'haskell-regex-compat' 'haskell-http') +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) -md5sums=('5ab73783a6a8f97753a263652e1c141c') +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) +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 - runhaskell Setup configure --disable-optimization --prefix=/usr --flags="with_utf8 with_xft with_iwlib with_xpm" + runhaskell Setup configure --disable-optimization --prefix=/usr --flags="with_utf8 with_xft with_iwlib with_xpm" runhaskell Setup build } @@ -29,3 +33,6 @@ install -D -m644 license ${pkgdir}/usr/share/licenses/$pkgname/LICENSE } +md5sums=('5ab73783a6a8f97753a263652e1c141c' + 'c2229e749626ae28132129fc2cb80bad' + '9d3951d4a6e12f48b5bd9735575ee2a4') Added: disable-ewmh-plugin.patch =================================================================== --- disable-ewmh-plugin.patch (rev 0) +++ disable-ewmh-plugin.patch 2015-04-01 19:19:16 UTC (rev 130493) @@ -0,0 +1,46 @@ +diff --git a/src/Config.hs b/src/Config.hs +index 59d6bd4..c788e6a 100644 +--- a/src/Config.hs ++++ b/src/Config.hs +@@ -34,7 +34,6 @@ import Plugins.MarqueePipeReader + import Plugins.CommandReader + import Plugins.StdinReader + import Plugins.XMonadLog +-import Plugins.EWMH + import Plugins.Kbd + import Plugins.Locks + +@@ -147,7 +146,7 @@ infixr :*: + -- the 'Runnable.Runnable' Read instance. To install a plugin just add + -- the plugin's type to the list of types (separated by ':*:') appearing in + -- this function's type signature. +-runnableTypes :: Command :*: Monitors :*: Date :*: PipeReader :*: BufferedPipeReader :*: CommandReader :*: StdinReader :*: XMonadLog :*: EWMH :*: Kbd :*: Locks :*: ++runnableTypes :: Command :*: Monitors :*: Date :*: PipeReader :*: BufferedPipeReader :*: CommandReader :*: StdinReader :*: XMonadLog :*: Kbd :*: Locks :*: + Mail :*: MBox :*: + DateZone :*: MarqueePipeReader :*: + () +diff --git a/src/Plugins/Date.hs b/src/Plugins/Date.hs +index a263536..37e603f 100644 +--- a/src/Plugins/Date.hs ++++ b/src/Plugins/Date.hs +@@ -20,7 +20,6 @@ module Plugins.Date (Date(..)) where + + import Plugins + +-import System.Locale + import Control.Monad (liftM) + import Data.Time + +diff --git a/xmobar.cabal b/xmobar.cabal +index db0d130..c76b355 100644 +--- a/xmobar.cabal ++++ b/xmobar.cabal +@@ -81,7 +81,7 @@ executable xmobar + Xmobar, Actions, Bitmap, Config, Parsers, Commands, Localize, + XUtil, XPMFile, StatFS, Runnable, ColorCache, Window, Signal, + Plugins, Plugins.BufferedPipeReader, +- Plugins.CommandReader, Plugins.Date, Plugins.EWMH, ++ Plugins.CommandReader, Plugins.Date, + Plugins.PipeReader, Plugins.MarqueePipeReader, + Plugins.StdinReader, Plugins.XMonadLog, + Plugins.Utils, Plugins.Kbd, Plugins.Locks, Plugins.Monitors, Added: ghc-7.10.1-update-haskell-deps.patch =================================================================== --- ghc-7.10.1-update-haskell-deps.patch (rev 0) +++ ghc-7.10.1-update-haskell-deps.patch 2015-04-01 19:19:16 UTC (rev 130493) @@ -0,0 +1,18 @@ +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)
