summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /x11-wm/xmonad-contrib/files
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'x11-wm/xmonad-contrib/files')
-rw-r--r--x11-wm/xmonad-contrib/files/xmonad-contrib-0.11.2-ghc-7.8.patch23
-rw-r--r--x11-wm/xmonad-contrib/files/xmonad-contrib-0.11.4-import-Applicative.patch21
2 files changed, 44 insertions, 0 deletions
diff --git a/x11-wm/xmonad-contrib/files/xmonad-contrib-0.11.2-ghc-7.8.patch b/x11-wm/xmonad-contrib/files/xmonad-contrib-0.11.2-ghc-7.8.patch
new file mode 100644
index 000000000000..67e1f8cd8def
--- /dev/null
+++ b/x11-wm/xmonad-contrib/files/xmonad-contrib-0.11.2-ghc-7.8.patch
@@ -0,0 +1,23 @@
+Sun Feb 17 19:33:56 FET 2013 Adam Vogt <vogt.adam@gmail.com>
+ * Remove unnecessary contexts from L.MultiToggle
+diff -rN -u old-XMonadContrib/XMonad/Layout/MultiToggle.hs new-XMonadContrib/XMonad/Layout/MultiToggle.hs
+--- old-XMonadContrib/XMonad/Layout/MultiToggle.hs 2014-02-06 00:58:32.422844682 +0300
++++ new-XMonadContrib/XMonad/Layout/MultiToggle.hs 2014-02-06 00:58:32.462844684 +0300
+@@ -99,7 +99,7 @@
+ transform :: (LayoutClass l a) => t -> l a ->
+ (forall l'. (LayoutClass l' a) => l' a -> (l' a -> l a) -> b) -> b
+
+-data (LayoutClass l a) => EL l a = forall l'. (LayoutClass l' a) => EL (l' a) (l' a -> l a)
++data EL l a = forall l'. (LayoutClass l' a) => EL (l' a) (l' a -> l a)
+
+ unEL :: (LayoutClass l a) => EL l a -> (forall l'. (LayoutClass l' a) => l' a -> b) -> b
+ unEL (EL x _) k = k x
+@@ -159,7 +159,7 @@
+ infixr 0 ??
+ -- | Prepend an element to a heterogeneous list. Used to build transformer
+ -- tables for 'mkToggle'.
+-(??) :: (HList b w) => a -> b -> HCons a b
++(??) :: a -> b -> HCons a b
+ (??) = HCons
+
+ -- | Construct a singleton transformer table.
diff --git a/x11-wm/xmonad-contrib/files/xmonad-contrib-0.11.4-import-Applicative.patch b/x11-wm/xmonad-contrib/files/xmonad-contrib-0.11.4-import-Applicative.patch
new file mode 100644
index 000000000000..d887e857da03
--- /dev/null
+++ b/x11-wm/xmonad-contrib/files/xmonad-contrib-0.11.4-import-Applicative.patch
@@ -0,0 +1,21 @@
+--- xmonad-contrib-0.11.4-orig/XMonad/Util/Invisible.hs 2015-03-28 05:00:21.000000000 +1100
++++ xmonad-contrib-0.11.4/XMonad/Util/Invisible.hs 2015-04-03 15:12:17.485143018 +1100
+@@ -22,6 +22,8 @@
+ , fromIMaybe
+ ) where
+
++import Control.Applicative
++
+ -- $usage
+ -- A wrapper data type to store layout state that shouldn't be persisted across
+ -- restarts. A common wrapped type to use is @Maybe a@.
+--- xmonad-contrib-0.11.4-orig/XMonad/Hooks/DebugEvents.hs 2015-03-28 05:00:21.000000000 +1100
++++ xmonad-contrib-0.11.4/XMonad/Hooks/DebugEvents.hs 2015-04-03 15:17:02.207816322 +1100
+@@ -30,6 +30,7 @@
+
+ -- import Graphics.X11.Xlib.Extras.GetAtomName (getAtomName)
+
++import Control.Applicative
+ import Control.Exception.Extensible as E
+ import Control.Monad.State
+ import Control.Monad.Reader