aboutsummaryrefslogtreecommitdiffstats
path: root/x11-wm
diff options
context:
space:
mode:
Diffstat (limited to 'x11-wm')
-rw-r--r--x11-wm/hs-xmonad-contrib/Makefile4
-rw-r--r--x11-wm/hs-xmonad-contrib/files/patch-8.4.2-support95
-rw-r--r--x11-wm/hs-xmonad/Makefile4
-rw-r--r--x11-wm/hs-xmonad/files/patch-8.4.1-support61
4 files changed, 160 insertions, 4 deletions
diff --git a/x11-wm/hs-xmonad-contrib/Makefile b/x11-wm/hs-xmonad-contrib/Makefile
index 41185b2f7cc7..5667b080bca6 100644
--- a/x11-wm/hs-xmonad-contrib/Makefile
+++ b/x11-wm/hs-xmonad-contrib/Makefile
@@ -3,7 +3,7 @@
PORTNAME= xmonad-contrib
PORTVERSION= 0.13
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-wm haskell
MAINTAINER= haskell@FreeBSD.org
@@ -12,7 +12,7 @@ COMMENT= Third-party extensions for xmonad
LICENSE= BSD3CLAUSE
USE_CABAL= extensible-exceptions mtl>=1 old-time random utf8-string \
- X11>=1.6.1 X11-xft>=0.2 xmonad==0.13_2
+ X11>=1.6.1 X11-xft>=0.2 xmonad
USE_XORG= x11
RUN_DEPENDS+= bash:shells/bash
diff --git a/x11-wm/hs-xmonad-contrib/files/patch-8.4.2-support b/x11-wm/hs-xmonad-contrib/files/patch-8.4.2-support
new file mode 100644
index 000000000000..f54d82cd682a
--- /dev/null
+++ b/x11-wm/hs-xmonad-contrib/files/patch-8.4.2-support
@@ -0,0 +1,95 @@
+diff --git XMonad/Hooks/FadeWindows.hs XMonad/Hooks/FadeWindows.hs
+index 4b8e62b6..01d06792 100644
+--- XMonad/Hooks/FadeWindows.hs
++++ XMonad/Hooks/FadeWindows.hs
+@@ -61,7 +61,8 @@ import Control.Monad.Reader (ask
+ ,asks)
+ import Control.Monad.State (gets)
+ import qualified Data.Map as M
+-import Data.Monoid
++import Data.Monoid hiding ((<>))
++import Data.Semigroup
+
+ import Graphics.X11.Xlib.Extras (Event(..))
+
+@@ -134,6 +135,9 @@ instance Monoid Opacity where
+ r `mappend` OEmpty = r
+ _ `mappend` r = r
+
++instance Semigroup Opacity where
++ (<>) = mappend
++
+ -- | A FadeHook is similar to a ManageHook, but records window opacity.
+ type FadeHook = Query Opacity
+
+diff --git XMonad/Hooks/WallpaperSetter.hs XMonad/Hooks/WallpaperSetter.hs
+index 00a3b1c3..d4f5ccb2 100644
+--- XMonad/Hooks/WallpaperSetter.hs
++++ XMonad/Hooks/WallpaperSetter.hs
+@@ -41,7 +41,8 @@ import Data.Ord (comparing)
+ import Control.Monad
+ import Control.Applicative
+ import Data.Maybe
+-import Data.Monoid
++import Data.Monoid hiding ((<>))
++import Data.Semigroup
+
+ -- $usage
+ -- This module requires imagemagick and feh to be installed, as these are utilized
+@@ -86,6 +87,9 @@ instance Monoid WallpaperList where
+ mappend (WallpaperList w1) (WallpaperList w2) =
+ WallpaperList $ M.toList $ (M.fromList w2) `M.union` (M.fromList w1)
+
++instance Semigroup WallpaperList where
++ (<>) = mappend
++
+ -- | Complete wallpaper configuration passed to the hook
+ data WallpaperConf = WallpaperConf {
+ wallpaperBaseDir :: FilePath -- ^ Where the wallpapers reside (if empty, will look in \~\/.wallpapers/)
+diff --git XMonad/Layout/Mosaic.hs XMonad/Layout/Mosaic.hs
+index 05655d4c..da44fc50 100644
+--- XMonad/Layout/Mosaic.hs
++++ XMonad/Layout/Mosaic.hs
+@@ -38,7 +38,8 @@ import Control.Monad(mplus)
+ import Data.Foldable(Foldable,foldMap, sum)
+ import Data.Function(on)
+ import Data.List(sortBy)
+-import Data.Monoid(Monoid,mempty, mappend)
++import Data.Monoid(Monoid,mempty, mappend, (<>))
++import Data.Semigroup
+
+
+ -- $usage
+@@ -202,6 +203,9 @@ instance Monoid (Tree a) where
+ mappend x Empty = x
+ mappend x y = Branch x y
+
++instance Semigroup (Tree a) where
++ (<>) = mappend
++
+ makeTree :: (Num a1, Ord a1) => (a -> a1) -> [a] -> Tree a
+ makeTree _ [] = Empty
+ makeTree _ [x] = Leaf x
+diff --git xmonad-contrib.cabal xmonad-contrib.cabal
+index dde3ccda..c401c6e6 100644
+--- xmonad-contrib.cabal
++++ xmonad-contrib.cabal
+@@ -36,7 +36,7 @@ cabal-version: >= 1.6
+ build-type: Simple
+ bug-reports: https://github.com/xmonad/xmonad-contrib/issues
+
+-tested-with: GHC==7.6.3, GHC==7.8.4, GHC==7.10.3, GHC==8.0.1
++tested-with: GHC==7.6.3, GHC==7.8.4, GHC==7.10.3, GHC==8.0.1, GHC==8.2.2, GHC==8.4.1
+
+ source-repository head
+ type: git
+@@ -66,7 +66,8 @@ library
+ unix,
+ X11>=1.6.1 && < 1.9,
+ xmonad>=0.13 && < 0.14,
+- utf8-string
++ utf8-string,
++ semigroups
+
+ if flag(use_xft)
+ build-depends: X11-xft >= 0.2
diff --git a/x11-wm/hs-xmonad/Makefile b/x11-wm/hs-xmonad/Makefile
index a2c19f0ad174..9f7367d4742a 100644
--- a/x11-wm/hs-xmonad/Makefile
+++ b/x11-wm/hs-xmonad/Makefile
@@ -3,7 +3,7 @@
PORTNAME= xmonad
PORTVERSION= 0.13
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-wm haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +11,7 @@ COMMENT= Tiling window manager
LICENSE= BSD3CLAUSE
-USE_CABAL= extensible-exceptions mtl setlocale utf8-string X11
+USE_CABAL= extensible-exceptions mtl semigroups setlocale utf8-string X11
USE_XORG= x11
MAN1PAGES= xmonad.1
diff --git a/x11-wm/hs-xmonad/files/patch-8.4.1-support b/x11-wm/hs-xmonad/files/patch-8.4.1-support
new file mode 100644
index 000000000000..2dcf5baf645b
--- /dev/null
+++ b/x11-wm/hs-xmonad/files/patch-8.4.1-support
@@ -0,0 +1,61 @@
+--- src/XMonad/Core.hs.orig 2017-02-09 02:46:45 UTC
++++ src/XMonad/Core.hs
+@@ -39,6 +39,7 @@ import qualified Control.Exception.Extensible as E
+ import Control.Applicative
+ import Control.Monad.State
+ import Control.Monad.Reader
++import Data.Semigroup
+ import Data.Default
+ import System.FilePath
+ import System.IO
+@@ -56,7 +57,7 @@ import Graphics.X11.Xlib.Extras (getWindowAttributes,
+ import Data.Typeable
+ import Data.List ((\\))
+ import Data.Maybe (isJust,fromMaybe)
+-import Data.Monoid
++import Data.Monoid hiding ((<>))
+
+ import qualified Data.Map as M
+ import qualified Data.Set as S
+@@ -151,6 +152,9 @@ instance Applicative X where
+ pure = return
+ (<*>) = ap
+
++instance Semigroup a => Semigroup (X a) where
++ (<>) = liftM2 (<>)
++
+ instance (Monoid a) => Monoid (X a) where
+ mempty = return mempty
+ mappend = liftM2 mappend
+@@ -164,6 +168,9 @@ newtype Query a = Query (ReaderT Window X a)
+
+ runQuery :: Query a -> Window -> X a
+ runQuery (Query m) w = runReaderT m w
++
++instance Semigroup a => Semigroup (Query a) where
++ (<>) = liftM2 (<>)
+
+ instance Monoid a => Monoid (Query a) where
+ mempty = return mempty
+--- xmonad.cabal.orig 2017-02-10 22:07:40 UTC
++++ xmonad.cabal
+@@ -32,7 +32,8 @@ tested-with:
+ GHC==7.6.3,
+ GHC==7.8.4,
+ GHC==7.10.3,
+- GHC==8.0.1
++ GHC==8.0.1,
++ GHC==8.2.2
+
+ data-files: man/xmonad.hs, man/xmonad.1, man/xmonad.1.html
+
+@@ -78,7 +79,8 @@ library
+ process,
+ unix,
+ utf8-string >= 0.3 && < 1.1,
+- X11>=1.8 && < 1.9
++ X11>=1.8 && < 1.9,
++ semigroups
+
+ if true
+ ghc-options: -funbox-strict-fields -Wall
generated by cgit (git 2.34.1) at 2025-01-19 21:02:51 +0800