[packages/ghc-xmonad-contrib] up to 0.11.4

[atler]

commit ba05fffe8236d9b4f4d606373703622fc55215ea
Author: Jan Palus <atler at pld-linux.org>
Date:   Sun Mar 29 20:40:53 2015 +0200

    up to 0.11.4
    
    - added patch for missing import of Applicative
    - dropped no longer used getAtomName patch
    - adapterized

 applicative.patch                | 23 +++++++++++++++++++++++
 ghc-xmonad-contrib.spec          | 12 +++++++-----
 xmonad-contrib-getAtomName.patch | 33 ---------------------------------
 3 files changed, 30 insertions(+), 38 deletions(-)
---
diff --git a/ghc-xmonad-contrib.spec b/ghc-xmonad-contrib.spec
index c04db01..ff905b8 100644
--- a/ghc-xmonad-contrib.spec
+++ b/ghc-xmonad-contrib.spec
@@ -1,27 +1,28 @@
 %define		pkgname	xmonad-contrib
 Summary:	Third party extensions for xmonad
 Name:		ghc-%{pkgname}
-Version:	0.11.3
+Version:	0.11.4
 Release:	1
 License:	BSD
 Group:		Development/Languages
-Source0:	http://hackage.haskell.org/packages/archive/%{pkgname}/%{version}/%{pkgname}-%{version}.tar.gz
-# Source0-md5:	285617f4c832d6df77087604c7160757
+Source0:	http://hackage.haskell.org/package/%{pkgname}-%{version}/%{pkgname}-%{version}.tar.gz
+# Source0-md5:	a41c886280a5414105c1cf241f0fd2f4
+Patch0:		applicative.patch
 URL:		http://www.xmonad.org
 BuildRequires:	ghc >= 6.12.3
+BuildRequires:	ghc-X11 >= 1.6
 BuildRequires:	ghc-extensible-exceptions
 BuildRequires:	ghc-mtl
 BuildRequires:	ghc-random
 BuildRequires:	ghc-utf8-string
-BuildRequires:	ghc-X11 >= 1.6
 BuildRequires:	rpmbuild(macros) >= 1.608
 BuildRequires:	xmonad >= 0.11
 %requires_eq	ghc
+Requires:	ghc-X11 >= 1.6
 Requires:	ghc-extensible-exceptions
 Requires:	ghc-mtl
 Requires:	ghc-random
 Requires:	ghc-utf8-string
-Requires:	ghc-X11 >= 1.6
 Requires:	xmonad >= 0.11
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -44,6 +45,7 @@ Dokumentacja w formacie HTML dla %{pkgname}.
 
 %prep
 %setup -q -n %{pkgname}-%{version}
+%patch0 -p1
 
 %build
 runhaskell Setup.lhs configure -v2 \
diff --git a/applicative.patch b/applicative.patch
new file mode 100644
index 0000000..eeae761
--- /dev/null
+++ b/applicative.patch
@@ -0,0 +1,23 @@
+diff -urN xmonad-contrib-0.11.4.orig/XMonad/Hooks/DebugEvents.hs xmonad-contrib-0.11.4/XMonad/Hooks/DebugEvents.hs
+--- xmonad-contrib-0.11.4.orig/XMonad/Hooks/DebugEvents.hs	2015-03-29 20:31:49.750052992 +0200
++++ xmonad-contrib-0.11.4/XMonad/Hooks/DebugEvents.hs	2015-03-29 20:33:37.373383041 +0200
+@@ -30,6 +30,7 @@
+ 
+ -- import           Graphics.X11.Xlib.Extras.GetAtomName        (getAtomName)
+ 
++import           Control.Applicative
+ import           Control.Exception.Extensible         as E
+ import           Control.Monad.State
+ import           Control.Monad.Reader
+diff -urN xmonad-contrib-0.11.4.orig/XMonad/Util/Invisible.hs xmonad-contrib-0.11.4/XMonad/Util/Invisible.hs
+--- xmonad-contrib-0.11.4.orig/XMonad/Util/Invisible.hs	2015-03-29 20:32:10.070052372 +0200
++++ xmonad-contrib-0.11.4/XMonad/Util/Invisible.hs	2015-03-29 20:31:03.553387735 +0200
+@@ -22,6 +22,8 @@
+                             , fromIMaybe
+                             ) where
+ 
++import Control.Applicative
++
+ -- $usage
+ -- A wrapper data type to store layout state that shouldn't be persisted across
+ -- restarts. A common wrapped type to use is @Maybe a at .
diff --git a/xmonad-contrib-getAtomName.patch b/xmonad-contrib-getAtomName.patch
deleted file mode 100644
index ef4b907..0000000
--- a/xmonad-contrib-getAtomName.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Mon Feb 25 21:03:23 FET 2013  Daniel Wagner <daniel at wagner-home.com>
-  * getAtomName is now defined in the X11 library
-diff -rN -u old-XMonadContrib/XMonad/Hooks/DebugEvents.hs new-XMonadContrib/XMonad/Hooks/DebugEvents.hs
---- old-XMonadContrib/XMonad/Hooks/DebugEvents.hs	2013-02-26 17:41:10.187127142 +0300
-+++ new-XMonadContrib/XMonad/Hooks/DebugEvents.hs	2013-02-26 17:41:10.207127143 +0300
-@@ -42,27 +42,12 @@
- import           Data.Maybe                                  (fromMaybe)
- import           Data.Monoid
- import           Foreign
--import           Foreign.C.String
- import           Foreign.C.Types
- import           Numeric                                     (showHex)
- import           System.Exit
- import           System.IO
- import           System.Process
- 
---- this should move into X11
--foreign import ccall unsafe "XGetAtomName"
--  xGetAtomName :: Display -> Atom -> IO CString
--
--getAtomName     :: Display -> Atom -> IO (Maybe String)
--getAtomName d a =  do
--  n <- xGetAtomName d a
--  if n == nullPtr
--    then return Nothing
--    else do
--      n' <- peekCString n
--      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
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ghc-xmonad-contrib.git/commitdiff/ba05fffe8236d9b4f4d606373703622fc55215ea