Running this locally. Compatible with 9.6.3. OK?
>From 01e6b2155ff4ec67ae939a254547ff8330e06818 Mon Sep 17 00:00:00 2001
From: Greg Steuck <[email protected]>
Date: Sat, 11 Nov 2023 15:20:13 +0000
---
x11/xmonad/Makefile | 9 ++++-----
x11/xmonad/distinfo | 14 ++++++++------
x11/xmonad/patches/patch-man_xmonad_1 | 6 +++---
x11/xmonad/patches/patch-src_XMonad_Main_hs | 4 ++--
x11/xmonad/patches/patch-xmonad_cabal | 2 +-
5 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/x11/xmonad/Makefile b/x11/xmonad/Makefile
index 07b8033d3c4..969c81aa2ed 100644
--- a/x11/xmonad/Makefile
+++ b/x11/xmonad/Makefile
@@ -1,10 +1,9 @@
COMMENT = tiling window manager
MODCABAL_STEM = xmonad
-MODCABAL_VERSION = 0.17.0
+MODCABAL_VERSION = 0.17.2
PKGNAME = ${DISTNAME}
-REVISION = 2
CATEGORIES = x11
HOMEPAGE = http://www.xmonad.org/
@@ -16,9 +15,9 @@ WANTLIB = X11 Xext Xinerama Xrandr Xss c charset
ffi gmp \
MODULES = devel/cabal
MODCABAL_MANIFEST = \
- X11 1.10.2 0 \
- data-default-class 0.1.2.0 0 \
- hsc2hs 0.68.8 0
+ X11 1.10.3 0 \
+ data-default-class 0.1.2.0 0 \
+ hsc2hs 0.68.10 1
LIB_DEPENDS = converters/libiconv \
devel/gmp \
diff --git a/x11/xmonad/distinfo b/x11/xmonad/distinfo
index 274b94120a8..2ef058160c2 100644
--- a/x11/xmonad/distinfo
+++ b/x11/xmonad/distinfo
@@ -1,8 +1,10 @@
-SHA256 (hackage/X11-1.10.2.tar.gz) =
4S9kPaazJGNBzxe4uyIHDs2nSBE63a4a4Rbpk+gB4sY=
+SHA256 (hackage/X11-1.10.3.tar.gz) =
2ErRuPXNtloN4X+E12Xru3ruq5YIw3QIBNooEAYW0kI=
SHA256 (hackage/data-default-class-0.1.2.0.tar.gz) =
TwG0I/AAw+BpqvUqNIVkplNnl/MUmLuFw9tL0tCXPlY=
-SHA256 (hackage/hsc2hs-0.68.8.tar.gz) =
eDQe+8kXqEoH8hQ77pID4lVQcgVNSVcXqnPYnZ33elI=
-SHA256 (hackage/xmonad-0.17.0.tar.gz) =
HrdNafxi3A1BJPsWlDAyjJdUQP+iV3Zt4Lcbnn67GhM=
-SIZE (hackage/X11-1.10.2.tar.gz) = 192634
+SHA256 (hackage/hsc2hs-0.68.10.tar.gz) =
b04014j+LKcJHuChAwfuinwGChuokPK/+tFqfU1c73Y=
+SHA256 (hackage/hsc2hs-0.68.10_1.cabal) =
SIzKKheaUUHajzWjp+Zpmg72kPg09YnWsVLElHqo/i0=
+SHA256 (hackage/xmonad-0.17.2.tar.gz) =
NDJ3440nPhLU4ltE0ph1tZCjC1HMIowB+/acMYRKH6c=
+SIZE (hackage/X11-1.10.3.tar.gz) = 192921
SIZE (hackage/data-default-class-0.1.2.0.tar.gz) = 2522
-SIZE (hackage/hsc2hs-0.68.8.tar.gz) = 40207
-SIZE (hackage/xmonad-0.17.0.tar.gz) = 93489
+SIZE (hackage/hsc2hs-0.68.10.tar.gz) = 40517
+SIZE (hackage/hsc2hs-0.68.10_1.cabal) = 3013
+SIZE (hackage/xmonad-0.17.2.tar.gz) = 94730
diff --git a/x11/xmonad/patches/patch-man_xmonad_1
b/x11/xmonad/patches/patch-man_xmonad_1
index b922c3b7d85..1f97ec4aa89 100644
--- a/x11/xmonad/patches/patch-man_xmonad_1
+++ b/x11/xmonad/patches/patch-man_xmonad_1
@@ -1,12 +1,12 @@
Index: man/xmonad.1
--- man/xmonad.1.orig
+++ man/xmonad.1
-@@ -87,7 +87,7 @@ Display detailed version of \f[I]xmonad\f[R]
+@@ -87,7 +87,7 @@ mod-shift-return
Launch terminal
.TP
- .B mod\-p
+ mod-p
-Launch dmenu
+Launch dmenu_run
.TP
- .B mod\-shift\-p
+ mod-shift-p
Launch gmrun
diff --git a/x11/xmonad/patches/patch-src_XMonad_Main_hs
b/x11/xmonad/patches/patch-src_XMonad_Main_hs
index 709e69e318b..949f739bc18 100644
--- a/x11/xmonad/patches/patch-src_XMonad_Main_hs
+++ b/x11/xmonad/patches/patch-src_XMonad_Main_hs
@@ -5,7 +5,7 @@ from it.
Index: src/XMonad/Main.hs
--- src/XMonad/Main.hs.orig
+++ src/XMonad/Main.hs
-@@ -15,7 +15,6 @@
+@@ -17,7 +17,6 @@
module XMonad.Main (xmonad, launch) where
@@ -13,7 +13,7 @@ Index: src/XMonad/Main.hs
import qualified Control.Exception as E
import Data.Bits
import Data.List ((\\))
-@@ -169,8 +168,6 @@ sendReplace = do
+@@ -173,8 +172,6 @@ sendReplace = do
-- your custom binary with the resume flag set to @True@.
launch :: (LayoutClass l Window, Read (l Window)) => XConfig l -> Directories
-> IO ()
launch initxmc drs = do
diff --git a/x11/xmonad/patches/patch-xmonad_cabal
b/x11/xmonad/patches/patch-xmonad_cabal
index 3af5cf068ce..cfb61d74611 100644
--- a/x11/xmonad/patches/patch-xmonad_cabal
+++ b/x11/xmonad/patches/patch-xmonad_cabal
@@ -5,7 +5,7 @@ from it.
Index: xmonad.cabal
--- xmonad.cabal.orig
+++ xmonad.cabal
-@@ -75,7 +75,6 @@ library
+@@ -73,7 +73,6 @@ library
, filepath
, mtl
, process
--
2.42.1
