Update to xmonad-0.6. Some (not all) highligts (stolen from the
announcement on the xmonad and haskell lists):
* Make focus-follows-mouse configurable
* Better support for X11 cloned screens
* xmonad config dirs can now be shared across architectures
* New flags:
--version: print xmonad's version
--recompile: recompile xmonad.hs if it is out of date
--force-recompile: recompile xmonad.hs unconditionally
* Improved ManageDocks extension used for docking programs
* Improved documentation
* Close bug #96 relating to window unmapping (fixes gnucash bugs)
* Various other fixes and clean ups.
Please test and comment.
Ciao,
Kili
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/xmonad/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- Makefile 18 Jan 2008 21:51:13 -0000 1.6
+++ Makefile 28 Jan 2008 19:48:13 -0000
@@ -3,7 +3,7 @@
COMMENT-main= tiling window manager
COMMENT-lib= libraries for runtime configuration
-V= 0.5
+V= 0.6
DISTNAME= xmonad-$V
PKGNAME-main= xmonad-$V
PKGNAME-lib= xmonad-lib-$V
Index: distinfo
===================================================================
RCS file: /cvs/ports/x11/xmonad/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo 18 Jan 2008 21:51:13 -0000 1.5
+++ distinfo 28 Jan 2008 19:48:13 -0000
@@ -1,5 +1,5 @@
-MD5 (xmonad-0.5.tar.gz) = sjlRydG6A8ZWn9Hlc/FVCQ==
-RMD160 (xmonad-0.5.tar.gz) = jjnYoq2OjRYAa9zR9kXWoxvnIfg=
-SHA1 (xmonad-0.5.tar.gz) = rOqDGm2kha2ZbIvaemfxrL1w0/o=
-SHA256 (xmonad-0.5.tar.gz) = z8xFAbAA+nQO01pb6H3AEhbgNiGVUWMNz3HZw89X5MQ=
-SIZE (xmonad-0.5.tar.gz) = 48853
+MD5 (xmonad-0.6.tar.gz) = XkMdXhPPtcvN4vWj+BN5ag==
+RMD160 (xmonad-0.6.tar.gz) = U1E/zu3Xl56i2/qILnN6Dd2bvoA=
+SHA1 (xmonad-0.6.tar.gz) = 4iIbgOA80Jl8uEHoWsiT1tr237A=
+SHA256 (xmonad-0.6.tar.gz) = 4QfF28ZZsjQuDnNtm67g7oihQE+lFhSBsZJPI9M2fCE=
+SIZE (xmonad-0.6.tar.gz) = 49635
Index: patches/patch-XMonad_Operations_hs
===================================================================
RCS file: /cvs/ports/x11/xmonad/patches/patch-XMonad_Operations_hs,v
retrieving revision 1.1
diff -u -p -r1.1 patch-XMonad_Operations_hs
--- patches/patch-XMonad_Operations_hs 18 Jan 2008 21:51:13 -0000 1.1
+++ patches/patch-XMonad_Operations_hs 28 Jan 2008 19:48:13 -0000
@@ -2,18 +2,18 @@ $OpenBSD: patch-XMonad_Operations_hs,v 1
Backport for ghc-6.6 and X11-extras.
---- XMonad/Operations.hs.orig Mon Dec 10 00:25:43 2007
-+++ XMonad/Operations.hs Sat Jan 5 09:24:33 2008
-@@ -76,7 +76,7 @@ manage w = whenX (not <$> isClient w) $ withDisplay $
- unmanage :: Window -> X ()
- unmanage w = do
- windows (W.delete w)
-- setWMState w withdrawnState
-+ setWMState w 0
- modify (\s -> s {mapped = S.delete w (mapped s), waitingUnmap = M.delete
w (waitingUnmap s)})
+--- XMonad/Operations.hs.orig Sun Jan 27 23:02:10 2008
++++ XMonad/Operations.hs Mon Jan 28 20:37:49 2008
+@@ -170,7 +170,7 @@ windows f = do
+ -- all windows that are no longer in the windowset are marked as
+ -- withdrawn, it is important to do this after the above, otherwise 'hide'
+ -- will overwrite withdrawnState with iconicState
+- mapM_ (flip setWMState withdrawnState) (W.allWindows old \\ W.allWindows
ws)
++ mapM_ (flip setWMState 0) (W.allWindows old \\ W.allWindows ws)
- -- | Modify the size of the status gap at the top of the current screen
-@@ -185,7 +185,7 @@ hide w = whenX (gets (S.member w . mapped)) $ withDisp
+ clearEvents enterWindowMask
+
+@@ -186,7 +186,7 @@ hide w = whenX (gets (S.member w . mapped)) $ withDisp
io $ do selectInput d w (clientMask .&. complement structureNotifyMask)
unmapWindow d w
selectInput d w clientMask
@@ -22,7 +22,7 @@ Backport for ghc-6.6 and X11-extras.
-- this part is key: we increment the waitingUnmap counter to distinguish
-- between client and xmonad initiated unmaps.
modify (\s -> s { waitingUnmap = M.insertWith (+) w 1 (waitingUnmap s)
-@@ -195,7 +195,7 @@ hide w = whenX (gets (S.member w . mapped)) $ withDisp
+@@ -196,7 +196,7 @@ hide w = whenX (gets (S.member w . mapped)) $ withDisp
-- this is harmless if the window was already visible
reveal :: Window -> X ()
reveal w = withDisplay $ \d -> do
@@ -31,7 +31,7 @@ Backport for ghc-6.6 and X11-extras.
io $ mapWindow d w
modify (\s -> s { mapped = S.insert w (mapped s) })
-@@ -206,7 +206,7 @@ clientMask = structureNotifyMask .|. enterWindowMask .
+@@ -207,7 +207,7 @@ clientMask = structureNotifyMask .|. enterWindowMask .
-- | Set some properties when we initially gain control of a window
setInitialProperties :: Window -> X ()
setInitialProperties w = asks normalBorder >>= \nb -> withDisplay $ \d -> do
Index: patches/patch-xmonad_cabal
===================================================================
RCS file: /cvs/ports/x11/xmonad/patches/patch-xmonad_cabal,v
retrieving revision 1.1
diff -u -p -r1.1 patch-xmonad_cabal
--- patches/patch-xmonad_cabal 18 Jan 2008 21:51:13 -0000 1.1
+++ patches/patch-xmonad_cabal 28 Jan 2008 19:48:13 -0000
@@ -1,19 +1,30 @@
$OpenBSD: patch-xmonad_cabal,v 1.1 2008/01/18 21:51:13 kili Exp $
---- xmonad.cabal.orig Mon Dec 10 00:25:43 2007
-+++ xmonad.cabal Sat Jan 5 09:26:31 2008
-@@ -20,36 +20,15 @@ maintainer: [EMAIL PROTECTED]
+--- xmonad.cabal.orig Sun Jan 27 23:02:11 2008
++++ xmonad.cabal Mon Jan 28 20:39:03 2008
+@@ -20,57 +20,29 @@ maintainer: [EMAIL PROTECTED]
extra-source-files: README TODO CONFIG STYLE tests/loc.hs tests/Properties.hs
man/xmonad.1.in man/xmonad.1 man/xmonad.html man/xmonad.hs
util/GenerateManpage.hs
-cabal-version: >= 1.2
+build-depends: base < 3, X11>=1.2.1, X11-extras>=0.4, mtl, unix
-+exposed-modules: XMonad, XMonad.Main, XMonad.Core, XMonad.Config,
XMonad.Layout, XMonad.ManageHook, XMonad.Operations, XMonad.StackSet
-+ghc-options: -funbox-strict-fields -Wall -Werror -optl-Wl,-s
++exposed-modules: XMonad
++ XMonad.Main
++ XMonad.Core
++ XMonad.Config
++ XMonad.Layout
++ XMonad.ManageHook
++ XMonad.Operations
++ XMonad.StackSet
++ghc-options: -funbox-strict-fields -Wall -optl-Wl,-s
+ghc-prof-options: -prof -auto-all
+extensions: CPP
-flag small_base
-- description: Choose the new smaller, split-up base package.
+- description: Choose the new smaller, split-up base package.
+-
+-flag testing
+- description: Testing mode, only build minimal components
+- default: False
-
-library
- exposed-modules: XMonad
@@ -29,23 +40,47 @@ $OpenBSD: patch-xmonad_cabal,v 1.1 2008/
- build-depends: base >= 3, containers, directory, process
- else
- build-depends: base < 3
-- build-depends: X11>=1.4.0, mtl, unix
+- build-depends: X11>=1.4.1, mtl, unix
-
-- ghc-options: -funbox-strict-fields -Wall -Werror -optl-Wl,-s
+- ghc-options: -funbox-strict-fields -Wall -optl-Wl,-s
- ghc-prof-options: -prof -auto-all
- extensions: CPP
-
+- if flag(testing)
+- buildable: False
+-
-executable xmonad
- main-is: Main.hs
-- other-modules: XMonad.Core XMonad.Main XMonad.Layout
-- XMonad.Operations XMonad.StackSet XMonad
+- other-modules: XMonad
+- XMonad.Main
+- XMonad.Core
+- XMonad.Config
+- XMonad.Layout
+- XMonad.ManageHook
+- XMonad.Operations
+- XMonad.StackSet
-
-- ghc-options: -funbox-strict-fields -Wall -Werror -optl-Wl,-s
+- ghc-options: -funbox-strict-fields -Wall -optl-Wl,-s
- ghc-prof-options: -prof -auto-all
- extensions: CPP
+-
+- if flag(testing)
+- cpp-options: -DTESTING
+- hs-source-dirs: . tests/
+- build-depends: QuickCheck < 2
+- ghc-options: -Werror
+- if flag(testing) && flag(small_base)
+- build-depends: random
+executable: xmonad
+main-is: Main.hs
-+other-modules: XMonad.Core XMonad.Main XMonad.Layout XMonad.Operations
XMonad.StackSet XMonad
-+ghc-options: -funbox-strict-fields -Wall -Werror -optl-Wl,-s
++other-modules: XMonad
++ XMonad.Main
++ XMonad.Core
++ XMonad.Config
++ XMonad.Layout
++ XMonad.ManageHook
++ XMonad.Operations
++ XMonad.StackSet
++ghc-options: -funbox-strict-fields -Wall -optl-Wl,-s
+ghc-prof-options: -prof -auto-all
+extensions: CPP
