cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to 0.6. Thanks to Simon Kuhnle and Jona Joachim for testing.

Browse Source
This commit is contained in:
kili 2008-02-03 18:17:51 +00:00
parent 1c44a2e934
commit cf24423102
4 changed files with 70 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
x11/xmonad/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.6 2008/01/18 21:51:13 kili Exp $
# $OpenBSD: Makefile,v 1.7 2008/02/03 18:17:51 kili Exp $
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

10
x11/xmonad/distinfo
View File

@ -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

28
x11/xmonad/patches/patch-XMonad_Operations_hs
View File

@ -1,19 +1,19 @@
$OpenBSD: patch-XMonad_Operations_hs,v 1.1 2008/01/18 21:51:13 kili Exp $
$OpenBSD: patch-XMonad_Operations_hs,v 1.2 2008/02/03 18:17:51 kili Exp $
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

63
x11/xmonad/patches/patch-xmonad_cabal
View File

@ -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: xmonad@haskell.org
$OpenBSD: patch-xmonad_cabal,v 1.2 2008/02/03 18:17:51 kili Exp $
--- xmonad.cabal.orig Sun Jan 27 23:02:11 2008
+++ xmonad.cabal Mon Jan 28 20:39:03 2008
@@ -20,57 +20,29 @@ maintainer: xmonad@haskell.org
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/01/18 21:51:13 kili Exp $
- 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