Commit 318487ff authored by James T. Lee's avatar James T. Lee
Browse files

haskell: Patch xmonad-contrib for GHC 9

parent 735a10ff
Pipeline #545 passed with stage
in 23 seconds
AUX xmonad-contrib-0.16-ghc-9-compatibility.patch 1555 BLAKE2B e498b6bd5dd113b94b468afdf1902c2146d1c5c28218cbcfa2ea0e3e166c9f05facbcc010668c9fc8dc4ba45692a7f2ffd2816934448536a004a9e5b6d88b9ee SHA512 e468c19d7bbe8636fe637d14a82ab3e893d6a010f3aab2475b9ede2c283f562370e82da979f761f28383b17a7bc19232cb256152f52d628ba35226416f0d3254
DIST xmonad-contrib-0.16.tar.gz 540237 BLAKE2B 7ddf8730481c39e9b5e40a548f3cbe36f301901656c57cc5ffdd11e05ad516019dc0b82c7dcf77665c152c390f7b7ae49c04ec6ae39347565b11a23aef23cce3 SHA512 22a18b4045cbfca0229cbf6c0bf1dfa595cbffbe6b82fd58b1fcf941cbfd306642160995b55859cead3cf574df696d2a3cea6507cac4d5c7c58cf09b3a86bc25
EBUILD xmonad-contrib-0.16.ebuild 1216 BLAKE2B 0bc49fd48c53b508abed2f214eb54d41006d160d8a6c0a94af37d50147d93620ae5733081667da3584b1732a423e983a1c223f051250d09707d3b22744d10a27 SHA512 0e0b1285aa75ba50cc399f84e316f80583431d6fe4a92255c122a70593046c4375ede8dfb1a00c2d307cdb52b434bb37dabee971168cc830832d585467b0f581
diff -ur xmonad-contrib-0.16.orig/XMonad/Actions/GridSelect.hs xmonad-contrib-0.16/XMonad/Actions/GridSelect.hs
--- xmonad-contrib-0.16.orig/XMonad/Actions/GridSelect.hs 2021-02-21 20:18:07.351620832 -0500
+++ xmonad-contrib-0.16/XMonad/Actions/GridSelect.hs 2021-02-21 20:18:38.112453444 -0500
@@ -394,8 +394,8 @@
stdHandle :: Event -> TwoD a (Maybe a) -> TwoD a (Maybe a)
stdHandle (ButtonEvent { ev_event_type = t, ev_x = x, ev_y = y }) contEventloop
| t == buttonRelease = do
- s @ TwoDState { td_paneX = px, td_paneY = py,
- td_gsconfig = (GSConfig ch cw _ _ _ _ _ _ _ _) } <- get
+ s@TwoDState { td_paneX = px, td_paneY = py,
+ td_gsconfig = (GSConfig ch cw _ _ _ _ _ _ _ _) } <- get
let gridX = (fi x - (px - cw) `div` 2) `div` cw
gridY = (fi y - (py - ch) `div` 2) `div` ch
case lookup (gridX,gridY) (td_elementmap s) of
diff -ur xmonad-contrib-0.16.orig/XMonad/Layout/NoBorders.hs xmonad-contrib-0.16/XMonad/Layout/NoBorders.hs
--- xmonad-contrib-0.16.orig/XMonad/Layout/NoBorders.hs 2021-02-21 20:18:07.355620810 -0500
+++ xmonad-contrib-0.16/XMonad/Layout/NoBorders.hs 2021-02-21 20:19:29.704172572 -0500
@@ -38,7 +38,7 @@
import qualified XMonad.StackSet as W
import qualified XMonad.Util.Rectangle as R
-import Data.List
+import Data.List hiding (singleton)
import Data.Monoid
import qualified Data.Map as M
import Data.Function (on)
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
# ebuild generated by hackport 0.6.1
#hackport: flags: -testing,use_xft:xft
CABAL_FEATURES="lib profile haddock hoogle hscolour"
inherit haskell-cabal
DESCRIPTION="Third party extensions for xmonad"
HOMEPAGE="http://xmonad.org/"
SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
KEYWORDS="~amd64 ~x86"
IUSE="+xft"
RDEPEND="dev-haskell/extensible-exceptions:=[profile?]
>=dev-haskell/mtl-1:=[profile?] <dev-haskell/mtl-3:=[profile?]
dev-haskell/old-locale:=[profile?]
dev-haskell/old-time:=[profile?]
dev-haskell/random:=[profile?]
dev-haskell/semigroups:=[profile?]
dev-haskell/utf8-string:=[profile?]
>=dev-haskell/x11-1.6.1:=[profile?] <dev-haskell/x11-1.10:=[profile?]
>=dev-lang/ghc-8.0.1:=
>=x11-wm/xmonad-0.15:=[profile?] <x11-wm/xmonad-0.16:=[profile?]
xft? ( >=dev-haskell/x11-xft-0.2:=[profile?] )
"
DEPEND="${RDEPEND}
>=dev-haskell/cabal-1.24.0.0
"
src_prepare() {
default
eapply "${FILESDIR}"/${PN}-0.16-ghc-9-compatibility.patch
}
src_configure() {
haskell-cabal_src_configure \
--flag=-testing \
$(cabal_flag xft use_xft)
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment