diff options
| author | Florian Franzmann | 2013-03-03 20:17:34 +0100 |
|---|---|---|
| committer | Florian Franzmann | 2013-03-03 20:18:13 +0100 |
| commit | 773272f203d0397f52733f2c068b3ff8397523a7 (patch) | |
| tree | 4a8af28bae2084960267cf3a615c05efca095eac /wm-addons | |
| parent | a90f0b4a641ef5248eae7deca83f3b0c7ac781ca (diff) | |
wm-addons/xmonad-contrib: fix compile error
Diffstat (limited to 'wm-addons')
| -rw-r--r-- | wm-addons/xmonad-contrib/0001-getAtomName-is-now-defined-in-the-X11-library.patch | 51 | ||||
| -rw-r--r-- | wm-addons/xmonad-contrib/HISTORY | 2 | ||||
| -rwxr-xr-x | wm-addons/xmonad-contrib/PRE_BUILD | 3 |
3 files changed, 56 insertions, 0 deletions
diff --git a/wm-addons/xmonad-contrib/0001-getAtomName-is-now-defined-in-the-X11-library.patch b/wm-addons/xmonad-contrib/0001-getAtomName-is-now-defined-in-the-X11-library.patch new file mode 100644 index 0000000000..02ab7967c0 --- /dev/null +++ b/wm-addons/xmonad-contrib/0001-getAtomName-is-now-defined-in-the-X11-library.patch @@ -0,0 +1,51 @@ +From edd8e17babfd93dd92557d09150cac8eb30f3f3f Mon Sep 17 00:00:00 2001 +From: Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> +Date: Sun, 3 Mar 2013 20:13:36 +0100 +Subject: [PATCH] getAtomName is now defined in the X11 library + +--- + XMonad/Hooks/DebugEvents.hs | 14 -------------- + xmonad-contrib.cabal | 2 +- + 2 files changed, 1 insertion(+), 15 deletions(-) + +diff --git a/XMonad/Hooks/DebugEvents.hs b/XMonad/Hooks/DebugEvents.hs +index 6256444..2301425 100644 +--- a/XMonad/Hooks/DebugEvents.hs ++++ b/XMonad/Hooks/DebugEvents.hs +@@ -49,20 +49,6 @@ 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 +diff --git a/xmonad-contrib.cabal b/xmonad-contrib.cabal +index a83bac6..4b1d369 100644 +--- a/xmonad-contrib.cabal ++++ b/xmonad-contrib.cabal +@@ -72,7 +72,7 @@ library + extensions: ForeignFunctionInterface + cpp-options: -DXFT + +- build-depends: mtl >= 1 && < 3, unix, X11>=1.6 && < 1.7, xmonad>=0.11 && < 0.12, utf8-string ++ build-depends: mtl >= 1 && < 3, unix, X11>=1.6.1 && < 1.7, xmonad>=0.11 && < 0.12, utf8-string + + if true + ghc-options: -fwarn-tabs -Wall +-- +1.8.1.3 + diff --git a/wm-addons/xmonad-contrib/HISTORY b/wm-addons/xmonad-contrib/HISTORY index d4a094af00..abf5693531 100644 --- a/wm-addons/xmonad-contrib/HISTORY +++ b/wm-addons/xmonad-contrib/HISTORY @@ -1,6 +1,8 @@ 2012-01-10 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> * DETAILS: version 0.11 * DEPENDS: added dependency on haskell-extensible-exceptions + * PRE_BUILD, 0001-getAtomName-is-now-defined-in-the-X11-library.patch: + fix compile error 2011-11-24 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> * DETAILS: version 0.10 diff --git a/wm-addons/xmonad-contrib/PRE_BUILD b/wm-addons/xmonad-contrib/PRE_BUILD new file mode 100755 index 0000000000..371b761a3e --- /dev/null +++ b/wm-addons/xmonad-contrib/PRE_BUILD @@ -0,0 +1,3 @@ +default_pre_build && +cd ${SOURCE_DIRECTORY} && +patch -p1 < $SPELL_DIRECTORY/0001-getAtomName-is-now-defined-in-the-X11-library.patch |