summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Sander van Rossem <s.vanrossem@gmail.com> 2017-04-02 22:24:10 +0200
committerAvatar Marc-Antoine Perennou <Marc-Antoine@Perennou.com> 2017-04-06 11:26:58 +0200
commit7eb855044252fa63d4349dd321715f7397b04410 (patch)
tree39cbd26d9473e80cabaa8e595fbe0444ea14c11a
parent6b845d3d1d70d76069ef642648d95a39b1393de1 (diff)
downloadhaskell-7eb855044252fa63d4349dd321715f7397b04410.tar.gz
haskell-7eb855044252fa63d4349dd321715f7397b04410.tar.xz
x11-plugins/xmonad-contrib: bump to 0.13
Change-Id: Iff9299094e07bd15d0a9f7688932e02298c230cd Reviewed-on: https://galileo.mailstation.de/gerrit/8753 Reviewed-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
-rw-r--r--packages/x11-plugins/xmonad-contrib/files/xmonad-contrib-0.12-a681e6860295089f66210f93ff2db3a5047f59b5.patch62
-rw-r--r--packages/x11-plugins/xmonad-contrib/xmonad-contrib-0.13.exheres-0 (renamed from packages/x11-plugins/xmonad-contrib/xmonad-contrib-0.12.exheres-0)8
2 files changed, 2 insertions, 68 deletions
diff --git a/packages/x11-plugins/xmonad-contrib/files/xmonad-contrib-0.12-a681e6860295089f66210f93ff2db3a5047f59b5.patch b/packages/x11-plugins/xmonad-contrib/files/xmonad-contrib-0.12-a681e6860295089f66210f93ff2db3a5047f59b5.patch
deleted file mode 100644
index 2c8a8de..0000000
--- a/packages/x11-plugins/xmonad-contrib/files/xmonad-contrib-0.12-a681e6860295089f66210f93ff2db3a5047f59b5.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-Source: https://github.com/xmonad/xmonad-contrib/commit/a681e6860295089f66210f93ff2db3a5047f59b5.patch
-Upstream: yes
-Reason: compile failure
-
-From a681e6860295089f66210f93ff2db3a5047f59b5 Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <siarheit@google.com>
-Date: Sun, 27 Nov 2016 10:03:17 +0000
-Subject: [PATCH] XMonad/Layout/Groups/Helpers.hs: drop broken
- ImpredicativeTypes extension (fixes #123)
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-ImpredicativeTypes is practically unsupported extension
-on it's way to be removed from GHC:
- https://mail.haskell.org/pipermail/ghc-devs/2016-September/012826.html
-
-GHC-8.0.2-rc1 already fails to build xmonad-contrib as:
-
- XMonad/Layout/Groups/Helpers.hs:181:22: error:
- • Couldn't match type ‘G.WithID l0 Window
- -> XMonad.Util.Stack.Zipper (G.Group l0 Window)
- -> XMonad.Util.Stack.Zipper (G.Group l0 Window)’
- with ‘G.ModifySpec’
- Expected type: (G.WithID l0 Window
- -> XMonad.Util.Stack.Zipper (G.Group l0 Window)
- -> XMonad.Util.Stack.Zipper (G.Group l0 Window))
- -> G.GroupsMessage
- Actual type: G.ModifySpec -> G.GroupsMessage
- • In the second argument of ‘(.)’, namely ‘G.Modify’
- In the expression: sendMessage . G.Modify
- In an equation for ‘wrap’: wrap = sendMessage . G.Modify
-
-The workaround is simple: add explicit types to applications
-or open-code direct application (this change).
-
-Bug: https://github.com/xmonad/xmonad-contrib/issues/123
-Signed-off-by: Sergei Trofimovich <siarheit@google.com>
----
- XMonad/Layout/Groups/Helpers.hs | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/XMonad/Layout/Groups/Helpers.hs b/XMonad/Layout/Groups/Helpers.hs
-index 4bafdd3..baf4281 100644
---- a/XMonad/Layout/Groups/Helpers.hs
-+++ b/XMonad/Layout/Groups/Helpers.hs
-@@ -1,5 +1,5 @@
- {-# OPTIONS_GHC -fno-warn-missing-signatures #-}
--{-# LANGUAGE MultiParamTypeClasses, Rank2Types, ImpredicativeTypes #-}
-+{-# LANGUAGE MultiParamTypeClasses, Rank2Types #-}
-
- -----------------------------------------------------------------------------
- -- |
-@@ -178,7 +178,7 @@ focusFloatDown = focusHelper id id
- -- ** Groups-specific actions
-
- wrap :: G.ModifySpec -> X ()
--wrap = sendMessage . G.Modify
-+wrap x = sendMessage (G.Modify x)
-
- -- | Swap the focused group with the previous one
- swapGroupUp :: X ()
diff --git a/packages/x11-plugins/xmonad-contrib/xmonad-contrib-0.12.exheres-0 b/packages/x11-plugins/xmonad-contrib/xmonad-contrib-0.13.exheres-0
index 84b9984..0daf87c 100644
--- a/packages/x11-plugins/xmonad-contrib/xmonad-contrib-0.12.exheres-0
+++ b/packages/x11-plugins/xmonad-contrib/xmonad-contrib-0.13.exheres-0
@@ -15,7 +15,7 @@ MYOPTIONS=""
DEPENDENCIES="
$(haskell_lib_dependencies "
dev-haskell/X11-xft[>=0.2]
- dev-haskell/X11[>=1.6.1&<1.7]
+ dev-haskell/X11[>=1.6.1&<1.9]
dev-haskell/containers
dev-haskell/directory
dev-haskell/extensible-exceptions
@@ -26,13 +26,9 @@ DEPENDENCIES="
dev-haskell/random
dev-haskell/unix
dev-haskell/utf8-string
- x11-wm/xmonad[>=0.12&<0.13]
+ x11-wm/xmonad[>=0.13&<0.14]
")
"
CABAL_SRC_CONFIGURE_PARAMS=( --flags=use_xft )
-DEFAULT_SRC_PREPARE_PATCHES=(
- "${FILES}"/${PNV}-a681e6860295089f66210f93ff2db3a5047f59b5.patch
-)
-