diff options
author | Michael Mair-Keimberger <m.mairkeimberger@gmail.com> | 2019-12-21 09:48:41 +0100 |
---|---|---|
committer | Sergei Trofimovich <slyfox@gentoo.org> | 2019-12-21 16:50:39 +0000 |
commit | 9d88e63e2a2757d93132ffe8ac8e32a2a4a3ba88 (patch) | |
tree | de459357ca0d55f373c46af17ac51e4621db5155 /dev-haskell | |
parent | dev-lang/erlang: Add myself as proxy co-maintainer (diff) | |
download | gentoo-9d88e63e2a2757d93132ffe8ac8e32a2a4a3ba88.tar.gz gentoo-9d88e63e2a2757d93132ffe8ac8e32a2a4a3ba88.tar.bz2 gentoo-9d88e63e2a2757d93132ffe8ac8e32a2a4a3ba88.zip |
dev-haskell/hscolour: remove unused patch(es)
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger@gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/14070
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
Diffstat (limited to 'dev-haskell')
-rw-r--r-- | dev-haskell/hscolour/files/hscolour-1.19-ghc-7.5.patch | 45 |
1 files changed, 0 insertions, 45 deletions
diff --git a/dev-haskell/hscolour/files/hscolour-1.19-ghc-7.5.patch b/dev-haskell/hscolour/files/hscolour-1.19-ghc-7.5.patch deleted file mode 100644 index 25e29728ca3a..000000000000 --- a/dev-haskell/hscolour/files/hscolour-1.19-ghc-7.5.patch +++ /dev/null @@ -1,45 +0,0 @@ ---- hscolour-1.19-orig/Language/Haskell/HsColour/Colourise.hs 2011-06-06 03:05:04.000000000 +1000 -+++ hscolour-1.19/Language/Haskell/HsColour/Colourise.hs 2012-06-24 10:29:57.990963394 +1000 -@@ -1,3 +1,7 @@ -+{-# LANGUAGE CPP #-} -+#if (__GLASGOW_HASKELL__>=705) -+{-# LANGUAGE ScopedTypeVariables #-} -+#endif - module Language.Haskell.HsColour.Colourise - ( module Language.Haskell.HsColour.ColourHighlight - , ColourPrefs(..) -@@ -9,6 +13,9 @@ - import Language.Haskell.HsColour.ColourHighlight - import Language.Haskell.HsColour.Classify (TokenType(..)) - -+#if (__GLASGOW_HASKELL__>=705) -+import Control.Exception (catch, SomeException) -+#endif - import System.IO (hPutStrLn,stderr) - import System.Environment (getEnv) - import Data.List -@@ -51,6 +58,16 @@ - -- | Read colour preferences from .hscolour file in the current directory, or failing that, - -- from \$HOME\/.hscolour, and failing that, returns a default set of prefs. - readColourPrefs :: IO ColourPrefs -+#if (__GLASGOW_HASKELL__>=705) -+readColourPrefs = catch -+ (do val <- readFile ".hscolour" -+ parseColourPrefs ".hscolour" val) -+ (\(_ :: SomeException) -> catch -+ (do home <- getEnv "HOME" -+ val <- readFile (home++"/.hscolour") -+ parseColourPrefs (home++"/.hscolour") val) -+ (\(_ :: SomeException) -> return defaultColourPrefs)) -+#else - readColourPrefs = catch - (do val <- readFile ".hscolour" - parseColourPrefs ".hscolour" val) -@@ -59,6 +76,7 @@ - val <- readFile (home++"/.hscolour") - parseColourPrefs (home++"/.hscolour") val) - (\_-> return defaultColourPrefs)) -+#endif - - -- | Convert token classification to colour highlights. - colourise :: ColourPrefs -> TokenType -> [Highlight] |