summaryrefslogtreecommitdiffstats
path: root/wm-addons
diff options
context:
space:
mode:
authorFlorian Franzmann2013-09-04 21:15:53 +0200
committerFlorian Franzmann2013-09-07 13:52:15 +0200
commit6e620b4e5471caf7fa9a9142a94f0dd7e42aaa68 (patch)
tree20885c3ff80e62436e6f80df3b464e8514a1b541 /wm-addons
parentb90bf68725851d4ebdeb08d84086e57a8c5457a4 (diff)
wm-addons/xmonad-contrib: version 0.11.2
Diffstat (limited to 'wm-addons')
-rw-r--r--wm-addons/xmonad-contrib/0001-getAtomName-is-now-defined-in-the-X11-library.patch51
-rwxr-xr-xwm-addons/xmonad-contrib/DETAILS4
-rw-r--r--wm-addons/xmonad-contrib/HISTORY3
-rwxr-xr-xwm-addons/xmonad-contrib/PRE_BUILD3
4 files changed, 5 insertions, 56 deletions
diff --git a/wm-addons/xmonad-contrib/0001-getAtomName-is-now-defined-in-the-X11-library.patch b/wm-addons/xmonad-contrib/0001-getAtomName-is-now-defined-in-the-X11-library.patch
deleted file mode 100644
index 02ab7967c0..0000000000
--- a/wm-addons/xmonad-contrib/0001-getAtomName-is-now-defined-in-the-X11-library.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From edd8e17babfd93dd92557d09150cac8eb30f3f3f Mon Sep 17 00:00:00 2001
-From: Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
-Date: Sun, 3 Mar 2013 20:13:36 +0100
-Subject: [PATCH] getAtomName is now defined in the X11 library
-
----
- XMonad/Hooks/DebugEvents.hs | 14 --------------
- xmonad-contrib.cabal | 2 +-
- 2 files changed, 1 insertion(+), 15 deletions(-)
-
-diff --git a/XMonad/Hooks/DebugEvents.hs b/XMonad/Hooks/DebugEvents.hs
-index 6256444..2301425 100644
---- a/XMonad/Hooks/DebugEvents.hs
-+++ b/XMonad/Hooks/DebugEvents.hs
-@@ -49,20 +49,6 @@ 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
-diff --git a/xmonad-contrib.cabal b/xmonad-contrib.cabal
-index a83bac6..4b1d369 100644
---- a/xmonad-contrib.cabal
-+++ b/xmonad-contrib.cabal
-@@ -72,7 +72,7 @@ library
- extensions: ForeignFunctionInterface
- cpp-options: -DXFT
-
-- build-depends: mtl >= 1 && < 3, unix, X11>=1.6 && < 1.7, xmonad>=0.11 && < 0.12, utf8-string
-+ build-depends: mtl >= 1 && < 3, unix, X11>=1.6.1 && < 1.7, xmonad>=0.11 && < 0.12, utf8-string
-
- if true
- ghc-options: -fwarn-tabs -Wall
---
-1.8.1.3
-
diff --git a/wm-addons/xmonad-contrib/DETAILS b/wm-addons/xmonad-contrib/DETAILS
index 996f465a14..b128246e21 100755
--- a/wm-addons/xmonad-contrib/DETAILS
+++ b/wm-addons/xmonad-contrib/DETAILS
@@ -1,8 +1,8 @@
SPELL=xmonad-contrib
- VERSION=0.11
+ VERSION=0.11.2
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]=http://hackage.haskell.org/packages/archive/${SPELL}/${VERSION}/${SOURCE}
- SOURCE_HASH=sha512:ed6c72de3aa5ca652cc8f0c1d69799c9d77f38b37c2763e8a07b0cbc6bd0d18ad57a3f4914a9e7084668a8901df0e98820900f057bb1e42ce224541e56a2b748
+ SOURCE_HASH=sha512:373e1ed1744cbdf26902402d74b4efafa043a4ccf1953c26ec55a03ef8de31818b0c4cfced08b43e664e5f052e52923c6dfb08d68be86726e9f0ed1d96ad7910
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://xmonad.org"
LICENSE[0]=BSD3
diff --git a/wm-addons/xmonad-contrib/HISTORY b/wm-addons/xmonad-contrib/HISTORY
index abf5693531..2e8b1210bd 100644
--- a/wm-addons/xmonad-contrib/HISTORY
+++ b/wm-addons/xmonad-contrib/HISTORY
@@ -1,3 +1,6 @@
+2013-09-04 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+ * DETAILS: version 0.11.2
+
2012-01-10 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
* DETAILS: version 0.11
* DEPENDS: added dependency on haskell-extensible-exceptions
diff --git a/wm-addons/xmonad-contrib/PRE_BUILD b/wm-addons/xmonad-contrib/PRE_BUILD
deleted file mode 100755
index 371b761a3e..0000000000
--- a/wm-addons/xmonad-contrib/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-default_pre_build &&
-cd ${SOURCE_DIRECTORY} &&
-patch -p1 < $SPELL_DIRECTORY/0001-getAtomName-is-now-defined-in-the-X11-library.patch