From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1B0FE138335 for ; Sat, 21 Dec 2019 16:50:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B587AE08E8; Sat, 21 Dec 2019 16:50:47 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 74F89E08E8 for ; Sat, 21 Dec 2019 16:50:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 29BCB34DA58 for ; Sat, 21 Dec 2019 16:50:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AA91A986 for ; Sat, 21 Dec 2019 16:50:43 +0000 (UTC) From: "Sergei Trofimovich" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sergei Trofimovich" Message-ID: <1576947039.9d88e63e2a2757d93132ffe8ac8e32a2a4a3ba88.slyfox@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-haskell/hscolour/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-haskell/hscolour/files/hscolour-1.19-ghc-7.5.patch X-VCS-Directories: dev-haskell/hscolour/files/ X-VCS-Committer: slyfox X-VCS-Committer-Name: Sergei Trofimovich X-VCS-Revision: 9d88e63e2a2757d93132ffe8ac8e32a2a4a3ba88 X-VCS-Branch: master Date: Sat, 21 Dec 2019 16:50:43 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: e3da51c4-2f8c-4ea0-a3ba-71176b42c316 X-Archives-Hash: 39b923ea88242bf384c7953ede97e457 commit: 9d88e63e2a2757d93132ffe8ac8e32a2a4a3ba88 Author: Michael Mair-Keimberger gmail com> AuthorDate: Sat Dec 21 08:48:41 2019 +0000 Commit: Sergei Trofimovich gentoo org> CommitDate: Sat Dec 21 16:50:39 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d88e63e dev-haskell/hscolour: remove unused patch(es) Signed-off-by: Michael Mair-Keimberger gmail.com> Closes: https://github.com/gentoo/gentoo/pull/14070 Signed-off-by: Sergei Trofimovich gentoo.org> .../hscolour/files/hscolour-1.19-ghc-7.5.patch | 45 ---------------------- 1 file changed, 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 25e29728ca3..00000000000 --- 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]