diff options
| -rw-r--r-- | haskell/xmonad-contrib/README | 5 | ||||
| -rw-r--r-- | haskell/xmonad-contrib/XMonad_Layout_Spiral_hs.patch | 11 | ||||
| -rw-r--r-- | haskell/xmonad-contrib/XMonad_Util_Paste_hs.patch | 12 | ||||
| -rw-r--r-- | haskell/xmonad-contrib/xmonad-contrib.SlackBuild | 12 | ||||
| -rw-r--r-- | haskell/xmonad-contrib/xmonad-contrib.info | 2 | ||||
| -rw-r--r-- | haskell/xmonad-contrib/xmonad-contrib_cabal.patch | 11 |
6 files changed, 49 insertions, 4 deletions
diff --git a/haskell/xmonad-contrib/README b/haskell/xmonad-contrib/README index 562e5985b0..9da905dd59 100644 --- a/haskell/xmonad-contrib/README +++ b/haskell/xmonad-contrib/README @@ -3,4 +3,7 @@ hooks, configurations, scripts, and other extensions to xmonad. The 'scripts' directory is copied to xmonad-contrib doc directory. -This requires xmonad and haskell-utf8-string. +This requires xmonad, haskell-random, and haskell-utf8-string. + +After uninstalling, run this command to unregister the package from +the ghc package database: ghc-pkg recache diff --git a/haskell/xmonad-contrib/XMonad_Layout_Spiral_hs.patch b/haskell/xmonad-contrib/XMonad_Layout_Spiral_hs.patch new file mode 100644 index 0000000000..0694ff8344 --- /dev/null +++ b/haskell/xmonad-contrib/XMonad_Layout_Spiral_hs.patch @@ -0,0 +1,11 @@ +--- XMonad/Layout/Spiral.hs.orig 2012-05-17 16:33:50.958000408 +0300 ++++ XMonad/Layout/Spiral.hs 2012-05-17 16:36:17.469000030 +0300 +@@ -26,7 +26,7 @@ + ) where + + import Data.Ratio +-import XMonad ++import XMonad hiding (Rotation) + import XMonad.StackSet ( integrate ) + + -- $usage diff --git a/haskell/xmonad-contrib/XMonad_Util_Paste_hs.patch b/haskell/xmonad-contrib/XMonad_Util_Paste_hs.patch new file mode 100644 index 0000000000..bc61d032d7 --- /dev/null +++ b/haskell/xmonad-contrib/XMonad_Util_Paste_hs.patch @@ -0,0 +1,12 @@ +--- XMonad/Util/Paste.hs.orig 2012-05-17 16:47:40.345000003 +0300 ++++ XMonad/Util/Paste.hs 2012-05-17 16:47:55.724000002 +0300 +@@ -89,9 +89,3 @@ + sendEvent d w True keyPressMask ev + setEventType ev keyRelease + sendEvent d w True keyReleaseMask ev +- +--- | A null 'KeyMask'. Used when you don't want a character or string shifted, control'd, or what. +--- +--- TODO: This really should be a function in the X11 binding. When noModMask shows up there, remove. +-noModMask :: KeyMask +-noModMask = 0 diff --git a/haskell/xmonad-contrib/xmonad-contrib.SlackBuild b/haskell/xmonad-contrib/xmonad-contrib.SlackBuild index 3212629e3e..fadea47434 100644 --- a/haskell/xmonad-contrib/xmonad-contrib.SlackBuild +++ b/haskell/xmonad-contrib/xmonad-contrib.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for xmonad-contrib -# Copyright 2011 Mikko Värri, Finland +# Copyright 2012 Mikko Värri, Finland # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ PRGNAM=xmonad-contrib VERSION=${VERSION:-0.10} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} GHC_VERSION=$(ghc --numeric-version) @@ -71,6 +71,13 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# Raise haskell-X11 version. +patch -p0 <$CWD/xmonad-contrib_cabal.patch +# Unambiguate Rotation type +patch -p0 <$CWD/XMonad_Layout_Spiral_hs.patch +# Remove noModMask, which is lifted to X11 bindings +patch -p0 <$CWD/XMonad_Util_Paste_hs.patch + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ runghc Setup configure \ @@ -78,6 +85,7 @@ runghc Setup configure \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --libsubdir=ghc-${GHC_VERSION}/$PRGNAM-$VERSION \ --enable-shared \ + --enable-library-profiling \ --docdir=/usr/doc/$PRGNAM-$VERSION runghc Setup build diff --git a/haskell/xmonad-contrib/xmonad-contrib.info b/haskell/xmonad-contrib/xmonad-contrib.info index 0aa6629174..92b592dd6b 100644 --- a/haskell/xmonad-contrib/xmonad-contrib.info +++ b/haskell/xmonad-contrib/xmonad-contrib.info @@ -7,4 +7,4 @@ DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="Mikko Värri" EMAIL="vmj@linuxbox.fi" -APPROVED="rworkman" +APPROVED="dsomero" diff --git a/haskell/xmonad-contrib/xmonad-contrib_cabal.patch b/haskell/xmonad-contrib/xmonad-contrib_cabal.patch new file mode 100644 index 0000000000..dd207436c0 --- /dev/null +++ b/haskell/xmonad-contrib/xmonad-contrib_cabal.patch @@ -0,0 +1,11 @@ +--- xmonad-contrib.cabal.orig 2012-05-16 02:46:22.006000000 +0300 ++++ xmonad-contrib.cabal 2012-05-16 02:47:01.352999062 +0300 +@@ -61,7 +61,7 @@ + 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 |