[gentoo-commits] repo/gentoo:master commit in: x11-wm/xmonad/files/
commit: 7ab41be7bf6cd60125443735148049be9f6c384e
Author: Michael Mair-Keimberger levelnine at>
AuthorDate: Mon Jul 25 17:20:28 2022 +
Commit: Sam James gentoo org>
CommitDate: Wed Jul 27 03:49:38 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ab41be7
x11-wm/xmonad: remove unused patch
Signed-off-by: Michael Mair-Keimberger levelnine.at>
Portage 3.0.34 / pkgdev 0.2.1 / pkgcheck 0.10.11
Signed-off-by: Sam James gentoo.org>
x11-wm/xmonad/files/xmonad-0.12-check-repeat.patch | 40 --
1 file changed, 40 deletions(-)
diff --git a/x11-wm/xmonad/files/xmonad-0.12-check-repeat.patch
b/x11-wm/xmonad/files/xmonad-0.12-check-repeat.patch
deleted file mode 100644
index 79bd2c2d21fa..
--- a/x11-wm/xmonad/files/xmonad-0.12-check-repeat.patch
+++ /dev/null
@@ -1,40 +0,0 @@
xmonad/src/XMonad/Core.hs 2010-09-05 05:11:42.0 +0400
-+++ xmonad/src/XMonad/Core.hs 2010-09-18 07:59:14.0 +0400
-@@ -65,6 +65,7 @@
- , waitingUnmap :: !(M.Map Window Int)-- ^ the number of
expected UnmapEvents
- , dragging :: !(Maybe (Position -> Position -> X (), X ()))
- , numberlockMask :: !KeyMask -- ^ The numlock
modifier
-+, keyPressed :: !KeyCode -- ^ keycode of the
key being pressed if any
- , extensibleState :: !(M.Map String (Either String StateExtension))
- -- ^ stores custom state information.
- --
xmonad/src/XMonad/Main.hs 2010-09-05 05:11:42.0 +0400
-+++ xmonad/src/XMonad/Main.hs 2010-09-18 08:03:11.0 +0400
-@@ -129,6 +129,7 @@
- , mapped = S.empty
- , waitingUnmap= M.empty
- , dragging= Nothing
-+, keyPressed = 0
- , extensibleState = extState
- }
- allocaXEvent $ \e ->
-@@ -190,10 +191,15 @@
- -- run window manager command
- handle (KeyEvent {ev_event_type = t, ev_state = m, ev_keycode = code})
- | t == keyPress = withDisplay $ \dpy -> do
--s <- io $ keycodeToKeysym dpy code 0
--mClean <- cleanMask m
--ks <- asks keyActions
--userCodeDef () $ whenJust (M.lookup (mClean, s) ks) id
-+kp <- gets keyPressed
-+if kp /= code then do
-+modify $ \s -> s { keyPressed = code }
-+s <- io $ keycodeToKeysym dpy code 0
-+mClean <- cleanMask m
-+ks <- asks keyActions
-+userCodeDef () $ whenJust (M.lookup (mClean, s) ks) id
-+else return ()
-+| t == keyRelease = modify $ \s -> s { keyPressed = 0 }
-
- -- manage a new window
- handle (MapRequestEvent{ev_window = w}) = withDisplay $ \dpy -> do
[gentoo-commits] repo/gentoo:master commit in: x11-wm/xmonad/files/
commit: be39bb5a578867782266ae3cfb6cc604d3458fa9
Author: Michael Mair-Keimberger gmail com>
AuthorDate: Wed Aug 19 17:39:09 2020 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Thu Aug 20 06:37:54 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be39bb5a
x11-wm/xmonad: remove unused patches
Package-Manager: Portage-3.0.2, Repoman-2.3.23
Signed-off-by: Michael Mair-Keimberger gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/17173
Signed-off-by: Sergei Trofimovich gentoo.org>
x11-wm/xmonad/files/xmonad-0.11-ghc-7.10.patch | 14
x11-wm/xmonad/files/xmonad-0.11-sample.patch | 74 --
x11-wm/xmonad/files/xmonad-0.12-check-repeat.patch | 40
x11-wm/xmonad/files/xmonad-check-repeat.patch | 40
4 files changed, 168 deletions(-)
diff --git a/x11-wm/xmonad/files/xmonad-0.11-ghc-7.10.patch
b/x11-wm/xmonad/files/xmonad-0.11-ghc-7.10.patch
deleted file mode 100644
index e92a31ec704..000
--- a/x11-wm/xmonad/files/xmonad-0.11-ghc-7.10.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Fri May 2 06:57:43 BST 2014 Adam Vogt
- * derive Applicative instance for Query
-diff -rN -u old-xmonad/XMonad/Core.hs new-xmonad/XMonad/Core.hs
old-xmonad/XMonad/Core.hs 2015-01-08 21:40:45.320979242 +
-+++ new-xmonad/XMonad/Core.hs 2015-01-08 21:40:45.367979193 +
-@@ -155,7 +155,7 @@
-
- type ManageHook = Query (Endo WindowSet)
- newtype Query a = Query (ReaderT Window X a)
--deriving (Functor, Monad, MonadReader Window, MonadIO)
-+deriving (Functor, Applicative, Monad, MonadReader Window, MonadIO)
-
- runQuery :: Query a -> Window -> X a
- runQuery (Query m) w = runReaderT m w
diff --git a/x11-wm/xmonad/files/xmonad-0.11-sample.patch
b/x11-wm/xmonad/files/xmonad-0.11-sample.patch
deleted file mode 100644
index 0780af8c18d..000
--- a/x11-wm/xmonad/files/xmonad-0.11-sample.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-Sun Jan 6 17:42:54 GMT 2013 Daniel Wagner
- * define the "help" string in the sample configuration bundled with xmonad
-diff -rN -u old-xmonad/man/xmonad.hs new-xmonad/man/xmonad.hs
old-xmonad/man/xmonad.hs 2015-02-27 08:38:26.993365307 +
-+++ new-xmonad/man/xmonad.hs 2015-02-27 08:38:27.046365303 +
-@@ -280,3 +280,54 @@
- logHook= myLogHook,
- startupHook= myStartupHook
- }
-+
-+-- | Finally, a copy of the default bindings in simple textual tabular format.
-+help :: String
-+help = unlines ["The default modifier key is 'alt'. Default keybindings:",
-+"",
-+"-- launching and killing programs",
-+"mod-Shift-Enter Launch xterminal",
-+"mod-pLaunch dmenu",
-+"mod-Shift-p Launch gmrun",
-+"mod-Shift-c Close/kill the focused window",
-+"mod-SpaceRotate through the available layout algorithms",
-+"mod-Shift-Space Reset the layouts on the current workSpace to default",
-+"mod-nResize/refresh viewed windows to the correct size",
-+"",
-+"-- move focus up or down the window stack",
-+"mod-TabMove focus to the next window",
-+"mod-Shift-Tab Move focus to the previous window",
-+"mod-j Move focus to the next window",
-+"mod-k Move focus to the previous window",
-+"mod-m Move focus to the master window",
-+"",
-+"-- modifying the window order",
-+"mod-Return Swap the focused window and the master window",
-+"mod-Shift-j Swap the focused window with the next window",
-+"mod-Shift-k Swap the focused window with the previous window",
-+"",
-+"-- resizing the master/slave ratio",
-+"mod-h Shrink the master area",
-+"mod-l Expand the master area",
-+"",
-+"-- floating layer support",
-+"mod-t Push window back into tiling; unfloat and re-tile it",
-+"",
-+"-- increase or decrease number of windows in the master area",
-+"mod-comma (mod-,) Increment the number of windows in the master area",
-+"mod-period (mod-.) Deincrement the number of windows in the master
area",
-+"",
-+"-- quit, or restart",
-+"mod-Shift-q Quit xmonad",
-+"mod-qRestart xmonad",
-+"mod-[1..9] Switch to workSpace N",
-+"",
-+"-- Workspaces & screens",
-+"mod-Shift-[1..9] Move client to workspace N",
-+"mod-{w,e,r}Switch to physical/Xinerama screens 1, 2, or 3",
-+"mod-Shift-{w,e,r} Move client to screen 1, 2, or 3",
-+"",
-+"-- Mouse bindings: default actions bound to mouse events",
-+"mod-button1 Set the window to floating mode and move by dragging",
-+"mod-button2 Raise the window to the top of the stack",
-+"mod-button3 Set the window to floating mode and resize by dragging"]
-Sun Jan 6 17:44:14 GMT 2013 Daniel Wagner
- * use "modm" instead of "modMask" in the sample config
-diff -rN -u old-xmonad/man/xmonad.hs new-xmonad/man/xmonad.hs
[gentoo-commits] repo/gentoo:master commit in: x11-wm/xmonad/files/
commit: b751dbba1e6ef386bc5b2eab9e425475b6ae5f58
Author: Sergei Trofimovich gentoo org>
AuthorDate: Mon Nov 11 22:34:08 2019 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Mon Nov 11 22:34:08 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b751dbba
x11-wm/xmonad: add missing xmonad-0.14-check-repeat.patch
Reported-by: Toralf Förster
Closes: https://bugs.gentoo.org/699810
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Sergei Trofimovich gentoo.org>
x11-wm/xmonad/files/xmonad-0.14-check-repeat.patch | 56 ++
1 file changed, 56 insertions(+)
diff --git a/x11-wm/xmonad/files/xmonad-0.14-check-repeat.patch
b/x11-wm/xmonad/files/xmonad-0.14-check-repeat.patch
new file mode 100644
index 000..5fb25660158
--- /dev/null
+++ b/x11-wm/xmonad/files/xmonad-0.14-check-repeat.patch
@@ -0,0 +1,56 @@
+diff --git a/src/XMonad/Core.hs b/src/XMonad/Core.hs
+index c79b992..29c7f77 100644
+--- a/src/XMonad/Core.hs
b/src/XMonad/Core.hs
+@@ -68,6 +68,7 @@ data XState = XState
+ , waitingUnmap :: !(M.Map Window Int)-- ^ the number of
expected UnmapEvents
+ , dragging :: !(Maybe (Position -> Position -> X (), X ()))
+ , numberlockMask :: !KeyMask -- ^ The numlock
modifier
++, keyPressed :: !KeyCode -- ^ keycode of the
key being pressed if any
+ , extensibleState :: !(M.Map String (Either String StateExtension))
+ -- ^ stores custom state information.
+ --
+diff --git a/src/XMonad/Main.hs b/src/XMonad/Main.hs
+index 3b6ace1..bdcab3a 100644
+--- a/src/XMonad/Main.hs
b/src/XMonad/Main.hs
+@@ -219,6 +219,7 @@ launch initxmc = do
+ , mapped = S.empty
+ , waitingUnmap= M.empty
+ , dragging= Nothing
++, keyPressed = 0
+ , extensibleState = M.empty
+ }
+
+@@ -291,10 +292,15 @@ handle :: Event -> X ()
+ -- run window manager command
+ handle (KeyEvent {ev_event_type = t, ev_state = m, ev_keycode = code})
+ | t == keyPress = withDisplay $ \dpy -> do
+-s <- io $ keycodeToKeysym dpy code 0
+-mClean <- cleanMask m
+-ks <- asks keyActions
+-userCodeDef () $ whenJust (M.lookup (mClean, s) ks) id
++ kp <- gets keyPressed
++if kp /= code then do
++modify $ \s -> s { keyPressed = code }
++s <- io $ keycodeToKeysym dpy code 0
++mClean <- cleanMask m
++ks <- asks keyActions
++userCodeDef () $ whenJust (M.lookup (mClean, s) ks) id
++else return ()
++| t == keyRelease = modify $ \s -> s { keyPressed = 0 }
+
+ -- manage a new window
+ handle (MapRequestEvent{ev_window = w}) = withDisplay $ \dpy -> do
+diff --git a/src/XMonad/Operations.hs b/src/XMonad/Operations.hs
+index aa44dcd..747cbf7 100644
+--- a/src/XMonad/Operations.hs
b/src/XMonad/Operations.hs
+@@ -482,6 +482,7 @@ readStateFile xmc = do
+ , mapped = S.empty
+ , waitingUnmap= M.empty
+ , dragging= Nothing
++, keyPressed = 0
+ , extensibleState = extState
+ }
+ where
[gentoo-commits] repo/gentoo:master commit in: x11-wm/xmonad/files/
commit: f5f6797eaa74d00812095d4056f64d49fb63083b Author: A. D protonmail com> AuthorDate: Wed Aug 1 02:06:12 2018 + Commit: Sergei Trofimovich gentoo org> CommitDate: Thu Aug 2 19:42:49 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5f6797e x11-wm/xmonad: Remove NoDisplay Newer versions of sddm display manager do not add entries from /usr/share/xsessions/ files with "NoDisplay=true". https://github.com/sddm/sddm/commit/cf4c3caf058ea81d0e61c2087493623faac56a3f After updating to new sddm the entry for xmonad session is missing. Closes: https://github.com/gentoo/gentoo/pull/9403 x11-wm/xmonad/files/xmonad.desktop | 1 - 1 file changed, 1 deletion(-) diff --git a/x11-wm/xmonad/files/xmonad.desktop b/x11-wm/xmonad/files/xmonad.desktop index 9c0bf6e44f5..0198fb18026 100644 --- a/x11-wm/xmonad/files/xmonad.desktop +++ b/x11-wm/xmonad/files/xmonad.desktop @@ -5,7 +5,6 @@ Name=xmonad Comment=A lightweight window manager Exec=/etc/X11/Sessions/xmonad TryExec=xmonad -NoDisplay=true Icon= X-GNOME-WMName=Xmonad X-GNOME-Autostart-Phase=WindowManager
[gentoo-commits] repo/gentoo:master commit in: x11-wm/xmonad/files/, x11-wm/xmonad/
commit: 362565644aee9b855b257b26de4234799fe8445d
Author: Sergei Trofimovich gentoo org>
AuthorDate: Sat Jan 16 09:46:35 2016 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Sat Jan 16 09:48:01 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36256564
x11-wm/xmonad: bump up to 0.12, bug #572018
Reported-by: Mike Limansky
Bug: https://bugs.gentoo.org/show_bug.cgi?id=572018
Package-Manager: portage-2.2.26
x11-wm/xmonad/Manifest | 1 +
x11-wm/xmonad/files/xmonad-0.12-check-repeat.patch | 40 ++
x11-wm/xmonad/xmonad-0.12.ebuild | 86 ++
3 files changed, 127 insertions(+)
diff --git a/x11-wm/xmonad/Manifest b/x11-wm/xmonad/Manifest
index e2d8ead..b0d1946 100644
--- a/x11-wm/xmonad/Manifest
+++ b/x11-wm/xmonad/Manifest
@@ -1,2 +1,3 @@
DIST xmonad-0.11.1.tar.gz 59307 SHA256
39e0bf227df782d7a5799c811ad0d8b70c9d6eaaa94e8cc395fcf25895d6d2dd SHA512
4916451d81d359dbbf508f3b20f649f956255f526f14b1eb6c0d32bc789474db30d7acac768663ca32784c7fe361195a50f45a7cb7371ee9a29c9b8f1c64d528
WHIRLPOOL
5707bd5763f525b196deea6ead806af74707e2bbd31ff67039b292f3b97f607c2351ef45e57373f0f7313e5c307335cb5f4a84820d8e658b7d864927f109891c
DIST xmonad-0.11.tar.gz 59119 SHA256
e5bd36d5184facad66acf2688b02922bfc6de32b576758f4b00688253c425bdb SHA512
34740f032508584f34f6b138d21394eca17e8020bccc4d8c6e8b3cb6b7ca64b153077cfd16636a6130768ebd145fe993569f8a229862d7816d0c89c905ee08bc
WHIRLPOOL
9bab495c4094f21427afa797f97b6af13d9c156484b33087b6378191b0d99255f070adc09df3da9eba3ff55a59a8f03830110a4ab2aa9ad9d93d2f1a35d5dc54
+DIST xmonad-0.12.tar.gz 61436 SHA256
e8f649dbd4a8d5f75fdac9ceb5ee38b64fd351910ade81c188f5dd7bc21dfdd7 SHA512
e519c038d90db037bc81e7baf7b07cfa53922509e98ffddacfc4a6cc2c7376383be1e721f613057a5febbfcc661807b6382124eb673ac7a7cda23c738d3539ab
WHIRLPOOL
f0d37d35a9730b68b38c46ec7694ccd922b2fab96b3e8d99d007ccb887a06b3f88e6f1ea818124d427378246caab1f7d3ec4338eab1007431cdf5a19fc1cc3b9
diff --git a/x11-wm/xmonad/files/xmonad-0.12-check-repeat.patch
b/x11-wm/xmonad/files/xmonad-0.12-check-repeat.patch
new file mode 100644
index 000..79bd2c2
--- /dev/null
+++ b/x11-wm/xmonad/files/xmonad-0.12-check-repeat.patch
@@ -0,0 +1,40 @@
+--- xmonad/src/XMonad/Core.hs 2010-09-05 05:11:42.0 +0400
xmonad/src/XMonad/Core.hs 2010-09-18 07:59:14.0 +0400
+@@ -65,6 +65,7 @@
+ , waitingUnmap :: !(M.Map Window Int)-- ^ the number of
expected UnmapEvents
+ , dragging :: !(Maybe (Position -> Position -> X (), X ()))
+ , numberlockMask :: !KeyMask -- ^ The numlock
modifier
++, keyPressed :: !KeyCode -- ^ keycode of the
key being pressed if any
+ , extensibleState :: !(M.Map String (Either String StateExtension))
+ -- ^ stores custom state information.
+ --
+--- xmonad/src/XMonad/Main.hs 2010-09-05 05:11:42.0 +0400
xmonad/src/XMonad/Main.hs 2010-09-18 08:03:11.0 +0400
+@@ -129,6 +129,7 @@
+ , mapped = S.empty
+ , waitingUnmap= M.empty
+ , dragging= Nothing
++, keyPressed = 0
+ , extensibleState = extState
+ }
+ allocaXEvent $ \e ->
+@@ -190,10 +191,15 @@
+ -- run window manager command
+ handle (KeyEvent {ev_event_type = t, ev_state = m, ev_keycode = code})
+ | t == keyPress = withDisplay $ \dpy -> do
+-s <- io $ keycodeToKeysym dpy code 0
+-mClean <- cleanMask m
+-ks <- asks keyActions
+-userCodeDef () $ whenJust (M.lookup (mClean, s) ks) id
++kp <- gets keyPressed
++if kp /= code then do
++modify $ \s -> s { keyPressed = code }
++s <- io $ keycodeToKeysym dpy code 0
++mClean <- cleanMask m
++ks <- asks keyActions
++userCodeDef () $ whenJust (M.lookup (mClean, s) ks) id
++else return ()
++| t == keyRelease = modify $ \s -> s { keyPressed = 0 }
+
+ -- manage a new window
+ handle (MapRequestEvent{ev_window = w}) = withDisplay $ \dpy -> do
diff --git a/x11-wm/xmonad/xmonad-0.12.ebuild b/x11-wm/xmonad/xmonad-0.12.ebuild
new file mode 100644
index 000..305a0c7
--- /dev/null
+++ b/x11-wm/xmonad/xmonad-0.12.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.
+#hackport: flags: -generatemanpage,-testing
+
+CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A tiling window manager"
+HOMEPAGE="http://xmonad.org;
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc64 ~sparc ~x86"
+IUSE="+default-term no-autorepeat-keys"
+
