update to 0.11.1 which has xmonad-contrib-0.11-DebugEvents-getAtomName.patch
This commit is contained in:
parent
bab015079d
commit
9eed1effec
1
.gitignore
vendored
1
.gitignore
vendored
@ -2,3 +2,4 @@ xmonad-contrib-0.9.1.tar.gz
|
||||
/xmonad-contrib-0.9.2.tar.gz
|
||||
/xmonad-contrib-0.10.tar.gz
|
||||
/xmonad-contrib-0.11.tar.gz
|
||||
/xmonad-contrib-0.11.1.tar.gz
|
||||
|
@ -17,8 +17,8 @@ extensions, see "XMonad.Doc". In particular:\
|
||||
your own extensions.
|
||||
|
||||
Name: ghc-%{pkg_name}
|
||||
Version: 0.11
|
||||
Release: 3%{?dist}
|
||||
Version: 0.11.1
|
||||
Release: 1%{?dist}
|
||||
Summary: %{common_summary}
|
||||
|
||||
License: BSD
|
||||
@ -28,7 +28,6 @@ Patch0: xmonad-contrib-use_xft-flag.patch
|
||||
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-DebugEvents-getAtomName.patch
|
||||
|
||||
BuildRequires: ghc-Cabal-devel
|
||||
BuildRequires: ghc-rpm-macros
|
||||
@ -58,9 +57,6 @@ BuildRequires: ghc-xmonad-devel
|
||||
%patch1 -p1 -b .orig-misc-fixed
|
||||
%patch2 -p1 -b .orig-NET_WM_STATE
|
||||
%patch4 -p1 -b .orig-rescale
|
||||
%patch5 -p1 -b .orig-getAtomName
|
||||
|
||||
cabal-tweak-dep-ver X11 "=1.6" "=1.6.1"
|
||||
|
||||
|
||||
%build
|
||||
@ -84,6 +80,9 @@ cabal-tweak-dep-ver X11 "=1.6" "=1.6.1"
|
||||
|
||||
|
||||
%changelog
|
||||
* Thu Mar 21 2013 Jens Petersen <petersen@redhat.com> - 0.11.1-1
|
||||
- update to 0.11.1
|
||||
|
||||
* Tue Mar 19 2013 Jens Petersen <petersen@redhat.com> - 0.11-3
|
||||
- fix build with X11-1.6.1
|
||||
|
||||
|
2
sources
2
sources
@ -1 +1 @@
|
||||
05fba258ac6063e49b50786a0869bd1f xmonad-contrib-0.11.tar.gz
|
||||
20241f077ce796fae5c6e04123f1c911 xmonad-contrib-0.11.1.tar.gz
|
||||
|
@ -1,30 +0,0 @@
|
||||
--- xmonad-contrib-0.11/XMonad/Hooks/DebugEvents.hs~ 2013-01-01 10:32:44.000000000 +0900
|
||||
+++ xmonad-contrib-0.11/XMonad/Hooks/DebugEvents.hs 2013-03-19 13:48:30.678663498 +0900
|
||||
@@ -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
|
Loading…
Reference in New Issue
Block a user