[DHG_packages] 33/34: xmonad-contrib: Patch to build with ghc-8.0.2

[Ilias Tsitsimpis]

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

iliastsi-guest pushed a commit to branch ghc-8.0.2
in repository DHG_packages.

commit 96fb31a50bf801cd17003983e73ebead2cc0606c
Author: Ilias Tsitsimpis <i.tsitsimpis at gmail.com>
Date:   Thu Jan 26 18:34:15 2017 +0200

    xmonad-contrib: Patch to build with ghc-8.0.2
---
 p/xmonad-contrib/debian/changelog                       |  5 +++--
 p/xmonad-contrib/debian/patches/ghc-8.0.2               | 17 +++++++++++++++++
 p/xmonad-contrib/debian/patches/series                  |  1 +
 p/xmonad-contrib/debian/patches/use-x-www-browser.patch |  8 ++++----
 4 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/p/xmonad-contrib/debian/changelog b/p/xmonad-contrib/debian/changelog
index de6b0f0..c5dcfe8 100644
--- a/p/xmonad-contrib/debian/changelog
+++ b/p/xmonad-contrib/debian/changelog
@@ -1,9 +1,10 @@
-xmonad-contrib (0.12-4) UNRELEASED; urgency=medium
+xmonad-contrib (0.12-4) unstable; urgency=medium
 
   * Remove Per Olofsson from the Uploaders list per request of
     the MIA team (Closes: #847162).
+  * Patch to build with ghc-8.0.2.
 
- -- Ilias Tsitsimpis <i.tsitsimpis at gmail.com>  Tue, 06 Dec 2016 16:38:45 +0200
+ -- Ilias Tsitsimpis <i.tsitsimpis at gmail.com>  Thu, 26 Jan 2017 18:32:10 +0200
 
 xmonad-contrib (0.12-3) unstable; urgency=medium
 
diff --git a/p/xmonad-contrib/debian/patches/ghc-8.0.2 b/p/xmonad-contrib/debian/patches/ghc-8.0.2
new file mode 100644
index 0000000..17c1ad4
--- /dev/null
+++ b/p/xmonad-contrib/debian/patches/ghc-8.0.2
@@ -0,0 +1,17 @@
+Description: Fix build with GHC 8.0.2
+Author: Ilias Tsitsimpis <i.tsitsimpis at gmail.com>
+Forwarded: no
+
+Index: b/XMonad/Layout/Groups/Helpers.hs
+===================================================================
+--- a/XMonad/Layout/Groups/Helpers.hs
++++ b/XMonad/Layout/Groups/Helpers.hs
+@@ -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..0ae766f 100644
--- a/p/xmonad-contrib/debian/patches/series
+++ b/p/xmonad-contrib/debian/patches/series
@@ -1 +1,2 @@
 use-x-www-browser.patch
+ghc-8.0.2
diff --git a/p/xmonad-contrib/debian/patches/use-x-www-browser.patch b/p/xmonad-contrib/debian/patches/use-x-www-browser.patch
index 7dc696c..44585cc 100644
--- a/p/xmonad-contrib/debian/patches/use-x-www-browser.patch
+++ b/p/xmonad-contrib/debian/patches/use-x-www-browser.patch
@@ -6,11 +6,11 @@ Forwarded: not-needed
 Last-Update: 2012-07-07
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: xmonad-contrib/XMonad/Prompt/Shell.hs
+Index: b/XMonad/Prompt/Shell.hs
 ===================================================================
---- xmonad-contrib.orig/XMonad/Prompt/Shell.hs	2015-08-15 11:07:17.965480351 +0200
-+++ xmonad-contrib/XMonad/Prompt/Shell.hs	2015-08-15 11:07:17.961480259 +0200
-@@ -151,7 +151,7 @@
+--- a/XMonad/Prompt/Shell.hs
++++ b/XMonad/Prompt/Shell.hs
+@@ -155,7 +155,7 @@ env variable fallthrough = getEnv variab
     or pass it to a shell; so in that case, define $BROWSER as something like \"xterm -e elinks\"
     or as the name of a shell script doing much the same thing. -}
  getBrowser :: IO String

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