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

Let it build with dcoppa's upcoming update to hs-X11.

Browse Source 
Gypped from Arch Linux.
This commit is contained in:
kili 2012-06-19 17:46:25 +00:00
parent 135c62319b
commit 2cdc66c5b1
3 changed files with 46 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
x11/hs-xmonad-contrib/patches/patch-XMonad_Layout_Spiral_hs Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-XMonad_Layout_Spiral_hs,v 1.1 2012/06/19 17:46:25 kili Exp $
Avoid name clashes with X11-1.6. From Arch Linux.
--- XMonad/Layout/Spiral.hs.orig Sat Nov 19 00:26:06 2011
+++ XMonad/Layout/Spiral.hs Tue Jun 19 18:51:36 2012
@@ -26,7 +26,7 @@ module XMonad.Layout.Spiral (
) where
import Data.Ratio
-import XMonad
+import XMonad (LayoutClass(..), Rectangle(..), fromMessage, Resize(..))
import XMonad.StackSet ( integrate )
-- $usage

16
x11/hs-xmonad-contrib/patches/patch-XMonad_Util_Paste_hs Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-XMonad_Util_Paste_hs,v 1.1 2012/06/19 17:46:25 kili Exp $
Avoid name clashes with X11-1.6. From Arch Linux.
--- XMonad/Util/Paste.hs.orig Sat Nov 19 00:26:06 2011
+++ XMonad/Util/Paste.hs Tue Jun 19 18:51:36 2012
@@ -23,7 +23,8 @@ module XMonad.Util.Paste ( -- * Usage
where
import XMonad (io, theRoot, withDisplay, X ())
-import Graphics.X11
+import Graphics.X11 (Window, shiftMask, KeyMask, stringToKeysym, KeySym, keysymToKeycode)
+import Graphics.X11 (allocaXEvent, keyPress, sendEvent, keyPressMask, keyRelease, keyReleaseMask)
import Graphics.X11.Xlib.Extras (none, setEventType, setKeyEvent)
import Control.Monad.Reader (asks)
import XMonad.Operations (withFocused)

15
x11/hs-xmonad-contrib/patches/patch-xmonad-contrib_cabal Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-xmonad-contrib_cabal,v 1.1 2012/06/19 17:46:25 kili Exp $
Allow building against X11-1.6. From Arch Linux.
--- xmonad-contrib.cabal.orig Sat Nov 19 00:26:06 2011
+++ xmonad-contrib.cabal Tue Jun 19 18:51:36 2012
@@ -61,7 +61,7 @@ library
extensions: ForeignFunctionInterface
cpp-options: -DXFT
- build-depends: mtl >= 1 && < 3, unix, X11>=1.5.0.0 && < 1.6, xmonad>=0.10, xmonad<0.11, utf8-string
+ build-depends: mtl >= 1 && < 3, unix, X11>=1.5.0.0 && < 1.7, xmonad>=0.10, xmonad<0.11, utf8-string
if true
ghc-options: -fwarn-tabs -Wall