diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-01-15 15:51:32 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-01-15 15:51:32 +0000 |
| commit | 21435953e16cda318a82334ddbadb3b5c36d9ea7 (patch) | |
| tree | e1810a4b135afce04b34862ef0fab2bfaeb8aeca /dev-haskell/hscolour | |
| parent | 7bc9c63c9da678a7e6fceb095d56c634afd22c56 (diff) | |
gentoo resync : 15.01.2020
Diffstat (limited to 'dev-haskell/hscolour')
| -rw-r--r-- | dev-haskell/hscolour/Manifest | 1 | ||||
| -rw-r--r-- | dev-haskell/hscolour/files/hscolour-1.19-ghc-7.5.patch | 45 |
2 files changed, 0 insertions, 46 deletions
diff --git a/dev-haskell/hscolour/Manifest b/dev-haskell/hscolour/Manifest index 1a9dfb6bb664..127d2a8901a1 100644 --- a/dev-haskell/hscolour/Manifest +++ b/dev-haskell/hscolour/Manifest @@ -1,4 +1,3 @@ -AUX hscolour-1.19-ghc-7.5.patch 1701 BLAKE2B 70c2628e3adaab9c7ec06dbf054c55d9e4f7709c09ddfe39fa578194c870e17afd2c9d78743cf929b1edd94f0948458ae8b64e6dfa68f4b774b3c3b3e1ea42e5 SHA512 302fe056e61d58537c2010c2d286ff6abf1b4eea25beb9b2069492000b1edc257830892369bd16576675d00fb376c04f83f17508b9491140ee92d062b9736c29 DIST hscolour-1.20.3.tar.gz 25810 BLAKE2B 28a394ab9f90ac4a7d311e1aa7e4f41c55b26e51e02a72ed3d869d1d9dae566c7a70f3e15c136cbb538f56c303c0a5083d4f725ce2fc6f9cadf27d21b1b563a6 SHA512 759f0a3c3c36b48db7932477468f1c5de8fddec654010dbbd0d136e0f8a8f4e3c34bc9349467766a1cb90ffb56b950ee6b7926f4f62dcb68f8e048e2c212d853 DIST hscolour-1.22.tar.gz 25979 BLAKE2B 42d974c9ffe439010df53d88c0b71397869eef64765eb60554e5bce060492a780d4bea8eeb805f271ac2b62ad4060bf5dee96f69ebe90caa9f62a572d8266207 SHA512 9762599fb4eef8f68a0a40ddfc8e7f50eb8592b1b3d7e4c8177f23f08300264c80a73dbedbe954fbcb9ff3fe1b80497b131e3f8d9adb8c1697d7195d48ef69a0 DIST hscolour-1.23.tar.gz 26027 BLAKE2B 4dba77d61aff026f515d47c0cf84bd747b28f5d00739986f8a877171860835610812b8e1827879f8bad118bb7234ccfddccc8651c819696841a35ee3229f1b48 SHA512 a1525e0827bc399c0747898c814ad4b7947620c610e6ec579afa120ddb5f1d012f7f10547f09dd10e0bba9cd89cd220ab204ee0e40c37f0048c7222db04de23f 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] |