# ChangeLog for x11-wm/xmonad
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/xmonad/ChangeLog,v 1.36 2014/05/11 07:02:24 slyfox Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/xmonad/ChangeLog,v 1.37 2015/02/27 08:45:58 slyfox Exp $
+
+*xmonad-0.11-r3 (27 Feb 2015)
+
+ 27 Feb 2015; Sergei Trofimovich <slyfox@gentoo.org>
+ +files/xmonad-0.11-ghc-7.10.patch, +files/xmonad-0.11-sample.patch,
+ +files/xmonad-check-repeat.patch, +xmonad-0.11-r3.ebuild, metadata.xml:
+ x11-wm/xmonad: fix sample (thanks to NP-Hardass)
11 May 2014; Sergei Trofimovich <slyfox@gentoo.org> -xmonad-0.10.ebuild,
-xmonad-0.11.ebuild:
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
+AUX xmonad-0.11-ghc-7.10.patch 622 SHA256 9aa06537353b42725e1bf63d4304706480d1c6c82e5e76ebcb7b13cf1db95e3c SHA512 82fc07ffae272a3e87b3bf7bcbe94d815c8f5f8f6865ffa99d76f76f352d2f46cf88eefa49d6e993249a6365018e711276e782503ab76160775e4ae1411aa3ff WHIRLPOOL e4a5816b9905f5036238f1e168b05b66fac410b3f05bd4a32cd88a6d60a817d9041d504fea0f70a7c55682d519a12ca040a301af6c55225807142e388e715274
+AUX xmonad-0.11-sample.patch 3525 SHA256 22cb27276eb8f56b6edac69ac5fa1b5b1f26aa0b8757d27b8b0806005582b43d SHA512 4beb6452ac1609bd9be90f34eab87c0eee5bd02b982a88c59ad0d0efc5378de3e6a5cf4c1dd28bca6d550cff123258bfcb265b7357764a8c50b3780c5384bd7f WHIRLPOOL 015df53a2fb3f82859ed441ec90c1e17f5b9935255ccbfe6e1b7d3dc40500d9da684ad4e382f3b1dc443054fbc43d347bf1d75111241f3e578421ce0c8ec6804
+AUX xmonad-check-repeat.patch 1869 SHA256 61e3967ef3243a8629ecf3bfa1e738c0350e160f6901f7c8611fec7ac00c11b7 SHA512 531ba249222941c675ee3726f802824d7716e4a746c9fa8bc26914f4d6f4133111c2fa2c39bbcedb0cee78ddb85fdf9f80197b7db1a5587cd5b49e6070728d0c WHIRLPOOL dc7ee5d39e419ef63bfe8e8ae9d253a7ecd824ee4722824f51fd7d6121501f43ae13c2289c5fd7fa9008fe3b946b4b81343513dd60f8eda268487a525c13d51b
AUX xmonad.desktop 148 SHA256 744132aa4ba84064d3f542ebe6199df1018f7110a9ceb55b943d6a8f57bb4d08 SHA512 4099f2fcc26e6db7892c9ef53ecc8b9468bfc167b70a763ca6614d2bea81bd12d2e437c8c638d64328944179229042ae1c00c7c679dacbde654d98f4bfc6ff93 WHIRLPOOL 240b4b3ad1c3397da26c6213829d75f5551196a06076c3439913c7d47f31e4c6dc9ee19102c7616ac173287c6ee062d1df5d598bdf4e5db3a55844fa332bf858
DIST xmonad-0.11.tar.gz 59119 SHA256 e5bd36d5184facad66acf2688b02922bfc6de32b576758f4b00688253c425bdb SHA512 34740f032508584f34f6b138d21394eca17e8020bccc4d8c6e8b3cb6b7ca64b153077cfd16636a6130768ebd145fe993569f8a229862d7816d0c89c905ee08bc WHIRLPOOL 9bab495c4094f21427afa797f97b6af13d9c156484b33087b6378191b0d99255f070adc09df3da9eba3ff55a59a8f03830110a4ab2aa9ad9d93d2f1a35d5dc54
EBUILD xmonad-0.11-r1.ebuild 2071 SHA256 c510f762595a2f99016b64663e300156659ad4d982bb5777f1d26f8a25a00254 SHA512 e4936ae8343d6e4c17d219e8710589bf438bc430ff45debfb2e2eb6099a30d6531a76ab544dcd465028e52df77674ef2c8a34ce8cf8c19201621857e005182b3 WHIRLPOOL 5bba97c61530a65231ead0650ac4a0dc918b80458f29f0251ac29379187cc82e60d65eaa7123a829b606b2e370413884c8f3abcad78a3f75872ad9b215829fd5
-MISC ChangeLog 5090 SHA256 209961abb21b440d5ca52c96d8714aadcfeb1ca5e3910a4f956d211a9bddacb8 SHA512 815667d64722e13720d714c7dda4e1108e5071415f50fee9489eb3115ce5b1dafe7e361992f95c500800815a8e239324056e6c6719220bd3efead729f7aec552 WHIRLPOOL 476efc1ea406b3b140755d488dffb8ce3d2dd66a19315cb08a995cbd1294f5f1ede6414b5b9ac56d393d4d4b6b6ba9f86779783238088af72e595d1c93572f64
-MISC metadata.xml 965 SHA256 4cb135a037f1c6935524b584071dd9547cc2fa6cd0b7f2bb9c6c193078842240 SHA512 c6eade0d74665352ec240fb49d96bf8d37ce31d4a48d5d7a33bb887f7ff6b2b0a5a28919c381b7962d6e4d2e2209b0573c77b5bebf08c22e6f495d007d1abae4 WHIRLPOOL e804ae3909e01563d6f689cab65f4cca1595290924ed43a213aac103a4f14155a97929ed119a23397b9dd5510976ac0e91e19ce9ce0f8ebace978dabc7c9f810
+EBUILD xmonad-0.11-r3.ebuild 2324 SHA256 d5857da384f99fef5f33a6ba0f357b117fcac1edfd7f1cad1979564c527d999f SHA512 a45b3621a528426cc61d5a9aff57e0e6a370f553d33b0b21aefb80eabc1867ecf207ee8aa5cf12243f0905d31f9f7236ec3055d34eb0b2cdd89097aad129aed0 WHIRLPOOL d45fdec79b2bbc1afd5c4d92b7e6bf6c88177852be86ab982a572f3227aee5bb3c977c426412b9dedf8b1e7a8d359202902afdc4184631fac17f3499b9498555
+MISC ChangeLog 5371 SHA256 67028a216c04b7411723b9c6e27055d5eccea01a3888f4c7ca26b370a79b5657 SHA512 23815a3145f3d3ef0af530398aba6f90fd5367a1e2c989e74205fc3b9e5e8965e438a4f76fcbb5c34bbb9c9d75116b312ff3c28b2ad719817af82c3078ff88d0 WHIRLPOOL 9ba59a1fcf9bcad95f65d0a1825b99e8babc55aa4f2993f61b5e0e9752604f21fbdd3489e3d0364ba472af8b20bf3fc38e903d309814dac75ef1f8815cc2cf58
+MISC metadata.xml 980 SHA256 795a6cd7e5212847fa0b22e7af3ecd6b7f66447d18bc0fc694a08a34fd5e3806 SHA512 14d7ec57e52e0048608a4c28ad49bb024b4f522bc3072b2c34b2694812a54af38aae31727f2d7da11ec3fb39ce772f16d7ca51a32cb45c183cd11ae2ce1daf42 WHIRLPOOL 6a728861abedde6ca4f21002a05dd45aae47e615dff45f5c82d999af9ad2288849c7304e3e7ed35fb54a0b2c20cde0612abe1da860f2d858ff3a61576dc0c46b
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
-iEYEAREIAAYFAlNvIGEACgkQcaHudmEf86qj7gCbBH8GhCDT4yXgsY9B2KgpItm8
-rbkAnRvnNUqiTVKFaU6d1N5SLA0mxz6w
-=f1cK
+iEYEAREIAAYFAlTwLsUACgkQcaHudmEf86r/GgCffFV91e7Tkz3QAKz8m0qAQ/MB
+IdUAnjb7xQ+HGbIAWIsJKWZzhxA1VsOA
+=+cDB
-----END PGP SIGNATURE-----
--- /dev/null
+Fri May 2 06:57:43 BST 2014 Adam Vogt <vogt.adam@gmail.com>
+ * 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 +0000
++++ new-xmonad/XMonad/Core.hs 2015-01-08 21:40:45.367979193 +0000
+@@ -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
--- /dev/null
+Sun Jan 6 17:42:54 GMT 2013 Daniel Wagner <daniel@wagner-home.com>
+ * 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 +0000
++++ new-xmonad/man/xmonad.hs 2015-02-27 08:38:27.046365303 +0000
+@@ -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-p Launch dmenu",
++ "mod-Shift-p Launch gmrun",
++ "mod-Shift-c Close/kill the focused window",
++ "mod-Space Rotate through the available layout algorithms",
++ "mod-Shift-Space Reset the layouts on the current workSpace to default",
++ "mod-n Resize/refresh viewed windows to the correct size",
++ "",
++ "-- move focus up or down the window stack",
++ "mod-Tab Move 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-q Restart 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 <daniel@wagner-home.com>
+ * use "modm" instead of "modMask" in the sample config
+diff -rN -u old-xmonad/man/xmonad.hs new-xmonad/man/xmonad.hs
+--- old-xmonad/man/xmonad.hs 2015-02-27 08:39:59.280358012 +0000
++++ new-xmonad/man/xmonad.hs 2015-02-27 08:39:59.333358007 +0000
+@@ -129,7 +129,7 @@
+ , ((modm , xK_q ), spawn "xmonad --recompile; xmonad --restart")
+
+ -- Run xmessage with a summary of the default keybindings (useful for beginners)
+- , ((modMask .|. shiftMask, xK_slash ), spawn ("echo \"" ++ help ++ "\" | xmessage -file -"))
++ , ((modm .|. shiftMask, xK_slash ), spawn ("echo \"" ++ help ++ "\" | xmessage -file -"))
+ ]
+ ++
+
--- /dev/null
+--- xmonad//XMonad/Core.hs 2010-09-05 05:11:42.000000000 +0400
++++ xmonad//XMonad/Core.hs 2010-09-18 07:59:14.000000000 +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//XMonad/Main.hsc 2010-09-05 05:11:42.000000000 +0400
++++ xmonad//XMonad/Main.hsc 2010-09-18 08:03:11.000000000 +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
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>haskell</herd>
- <maintainer>
- <email>haskell@gentoo.org</email>
- </maintainer>
<use>
<flag name='default-term'>Pull terminal specified in default xmonad config
to be a bit less hostile by default.</flag>
+ <flag name="no-autorepeat-keys">Allow ignoring of keyboard autorepeat.</flag>
</use>
<longdescription>
xmonad is a tiling window manager for X. Windows are arranged
--- /dev/null
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/xmonad/xmonad-0.11-r3.ebuild,v 1.1 2015/02/27 08:45:58 slyfox Exp $
+
+EAPI=5
+
+# ebuild generated by hackport 0.3.1
+
+CABAL_FEATURES="bin lib profile haddock hscolour hoogle"
+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"
+
+RDEPEND="dev-haskell/extensible-exceptions:=[profile?]
+ dev-haskell/mtl:=[profile?]
+ >=dev-haskell/utf8-string-0.3:=[profile?]
+ >=dev-haskell/x11-1.5:=[profile?]
+ <dev-haskell/x11-1.7:=[profile?]
+ >=dev-lang/ghc-6.10.4:="
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.6"
+PDEPEND="default-term? ( x11-terms/xterm )
+ x11-apps/xmessage
+"
+
+SAMPLE_CONFIG="xmonad.hs"
+SAMPLE_CONFIG_LOC="man"
+
+src_prepare() {
+ epatch "$FILESDIR"/${P}-ghc-7.10.patch
+ epatch "$FILESDIR"/${P}-sample.patch
+ use no-autorepeat-keys && epatch "$FILESDIR"/${PN}-check-repeat.patch
+
+ cabal_chdeps \
+ "utf8-string >= 0.3 && < 0.4" "utf8-string >= 0.3 && < 1.1"
+
+ # allow user patches
+ epatch_user
+}
+
+src_install() {
+ cabal_src_install
+
+ echo -e "#!/bin/sh\n/usr/bin/xmonad" > "${T}/${PN}"
+ exeinto /etc/X11/Sessions
+ doexe "${T}/${PN}"
+
+ insinto /usr/share/xsessions
+ doins "${FILESDIR}/${PN}.desktop"
+
+ doman man/xmonad.1
+ dohtml man/xmonad.1.html
+
+ dodoc CONFIG README
+}
+
+pkg_postinst() {
+ ghc-package_pkg_postinst
+
+ elog "A sample ${SAMPLE_CONFIG} configuration file can be found here:"
+ elog " /usr/share/${PF}/ghc-$(ghc-version)/${SAMPLE_CONFIG_LOC}/${SAMPLE_CONFIG}"
+ elog "The parameters in this file are the defaults used by xmonad."
+ elog "To customize xmonad, copy this file to:"
+ elog " ~/.xmonad/${SAMPLE_CONFIG}"
+ elog "After editing, use 'mod-q' to dynamically restart xmonad "
+ elog "(where the 'mod' key defaults to 'Alt')."
+ elog ""
+ elog "Read the README or man page for more information, and to see "
+ elog "other possible configurations go to:"
+ elog " http://haskell.org/haskellwiki/Xmonad/Config_archive"
+ elog "Please note that many of these configurations will require the "
+ elog "x11-wm/xmonad-contrib package to be installed."
+}
projects / gentoo.git / commitdiff