[DHG_packages] 01/01: xmonad-contrib: fix build by bumping directory bounds

[Gianfranco Costamagna]

This is an automated email from the git hooks/post-receive script.

locutusofborg pushed a commit to branch master
in repository DHG_packages.

commit 35b869cfb726229b3ee3c253302ee7b76d57a6a1
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Wed Jun 21 09:11:43 2017 +0200

    xmonad-contrib: fix build by bumping directory bounds
---
 p/xmonad-contrib/debian/changelog                  |  8 ++-
 .../a681e6860295089f66210f93ff2db3a5047f59b5.patch | 61 ++++++++++++++++++++++
 p/xmonad-contrib/debian/patches/series             |  1 +
 3 files changed, 69 insertions(+), 1 deletion(-)

diff --git a/p/xmonad-contrib/debian/changelog b/p/xmonad-contrib/debian/changelog
index de6b0f0..1d22598 100644
--- a/p/xmonad-contrib/debian/changelog
+++ b/p/xmonad-contrib/debian/changelog
@@ -1,8 +1,14 @@
-xmonad-contrib (0.12-4) UNRELEASED; urgency=medium
+xmonad-contrib (0.12-4) unstable; urgency=medium
 
+  [ Ilias Tsitsimpis ]
   * Remove Per Olofsson from the Uploaders list per request of
     the MIA team (Closes: #847162).
 
+  [ Gianfranco Costamagna ]
+  * Team upload.
+  * debian/patches/a681e6860295089f66210f93ff2db3a5047f59b5.patch:
+    - fix build with newer ghc
+
  -- Ilias Tsitsimpis <i.tsitsimpis at gmail.com>  Tue, 06 Dec 2016 16:38:45 +0200
 
 xmonad-contrib (0.12-3) unstable; urgency=medium
diff --git a/p/xmonad-contrib/debian/patches/a681e6860295089f66210f93ff2db3a5047f59b5.patch b/p/xmonad-contrib/debian/patches/a681e6860295089f66210f93ff2db3a5047f59b5.patch
new file mode 100644
index 0000000..4e520cf
--- /dev/null
+++ b/p/xmonad-contrib/debian/patches/a681e6860295089f66210f93ff2db3a5047f59b5.patch
@@ -0,0 +1,61 @@
+## Description: add some description
+## Origin/Author: add some origin or author
+## Bug: bug URL
+From a681e6860295089f66210f93ff2db3a5047f59b5 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <siarheit at 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 at 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/p/xmonad-contrib/debian/patches/series b/p/xmonad-contrib/debian/patches/series
index 0df33a7..05092bf 100644
--- a/p/xmonad-contrib/debian/patches/series
+++ b/p/xmonad-contrib/debian/patches/series
@@ -1 +1,2 @@
 use-x-www-browser.patch
+a681e6860295089f66210f93ff2db3a5047f59b5.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-haskell/DHG_packages.git