From d6ce40ccf9438ca3bd935406b5834f63fa451eca Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Sun, 19 Jul 2015 19:32:42 -0400 Subject: [PATCH] add patch to import Control.Applicative --- ghc-xmonad-contrib.spec | 2 ++ ...d-contrib-0.11.4-applicative-imports.patch | 31 +++++++++++++++++++ 2 files changed, 33 insertions(+) create mode 100644 xmonad-contrib-0.11.4-applicative-imports.patch diff --git a/ghc-xmonad-contrib.spec b/ghc-xmonad-contrib.spec index 7565db9..2bf2e9e 100644 --- a/ghc-xmonad-contrib.spec +++ b/ghc-xmonad-contrib.spec @@ -15,6 +15,7 @@ Patch1: xmonad-contrib-0.10-xft-fonts.patch Patch2: xmonad-contrib-0.10-ewmh-set-NET_WM_STATE.patch Patch4: xmonad-contrib-0.10-PositionStore-dont-rescale-with-screen.patch Patch5: xmonad-contrib-0.11.2-xfce4-terminal.patch +Patch6: xmonad-contrib-0.11.4-applicative-imports.patch BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros @@ -66,6 +67,7 @@ This package provides the Haskell %{pkg_name} library development files. %patch2 -p1 -b .orig-NET_WM_STATE %patch4 -p1 -b .orig-rescale %patch5 -p1 -b .orig-Terminal +%patch6 -p1 -b .applicative-imports %build diff --git a/xmonad-contrib-0.11.4-applicative-imports.patch b/xmonad-contrib-0.11.4-applicative-imports.patch new file mode 100644 index 0000000..f2fafc0 --- /dev/null +++ b/xmonad-contrib-0.11.4-applicative-imports.patch @@ -0,0 +1,31 @@ +diff -u -r -U5 --no-dereference xmonad-contrib-0.11.4/XMonad/Hooks/DebugEvents.hs xmonad-contrib-0.11.4.applicative/XMonad/Hooks/DebugEvents.hs +--- xmonad-contrib-0.11.4/XMonad/Hooks/DebugEvents.hs 2015-03-27 14:00:21.000000000 -0400 ++++ xmonad-contrib-0.11.4.applicative/XMonad/Hooks/DebugEvents.hs 2015-07-19 19:30:24.855769466 -0400 +@@ -45,10 +45,11 @@ + import Foreign.C.Types + import Numeric (showHex) + import System.Exit + import System.IO + import System.Process ++import Control.Applicative + + -- | 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 + debugEventsHook e = debugEventsHook' e >> return (All True) +diff -u -r -U5 --no-dereference xmonad-contrib-0.11.4/XMonad/Util/Invisible.hs xmonad-contrib-0.11.4.applicative/XMonad/Util/Invisible.hs +--- xmonad-contrib-0.11.4/XMonad/Util/Invisible.hs 2015-03-27 14:00:21.000000000 -0400 ++++ xmonad-contrib-0.11.4.applicative/XMonad/Util/Invisible.hs 2015-07-19 19:31:04.061816912 -0400 +@@ -20,10 +20,12 @@ + Invisible (..) + , whenIJust + , 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@. + -- Invisible derives trivial definitions for Read and Show, so the wrapped data + -- type need not do so.