Gentoo Archives: gentoo-commits

From: "Mark Wright (gienah)" <gienah@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-haskell/text-icu/files: text-icu-0.7.0.0-ghc-7.10.patch
Date: Sat, 03 Jan 2015 04:22:42
Message-Id: 20150103042238.93881AE31@oystercatcher.gentoo.org
1 gienah 15/01/03 04:22:38
2
3 Added: text-icu-0.7.0.0-ghc-7.10.patch
4 Log:
5 Patch text-icu-0.7.0.0 for ghc 7.10
6
7 (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 618E971F)
8
9 Revision Changes Path
10 1.1 dev-haskell/text-icu/files/text-icu-0.7.0.0-ghc-7.10.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/text-icu/files/text-icu-0.7.0.0-ghc-7.10.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/text-icu/files/text-icu-0.7.0.0-ghc-7.10.patch?rev=1.1&content-type=text/plain
14
15 Index: text-icu-0.7.0.0-ghc-7.10.patch
16 ===================================================================
17 --- text-icu-0.7.0.0-orig/Data/Text/ICU/Break.hsc 2014-08-15 07:17:37.000000000 +1000
18 +++ text-icu-0.7.0.0/Data/Text/ICU/Break.hsc 2015-01-03 15:05:27.300927099 +1100
19 @@ -64,7 +64,11 @@
20 import Foreign.Marshal.Array (allocaArray, peekArray)
21 import Foreign.Marshal.Utils (with)
22 import Foreign.Ptr (FunPtr, Ptr, nullPtr)
23 +#if MIN_VERSION_base(4,8,0)
24 +import Prelude hiding (last, Word)
25 +#else
26 import Prelude hiding (last)
27 +#endif
28 import System.IO.Unsafe (unsafePerformIO)
29
30 -- $indices
31 --- text-icu-0.7.0.0-orig/Data/Text/ICU/Break/Pure.hs 2014-08-15 07:17:37.000000000 +1000
32 +++ text-icu-0.7.0.0/Data/Text/ICU/Break/Pure.hs 2015-01-03 15:06:16.528158894 +1100
33 @@ -1,4 +1,4 @@
34 -{-# LANGUAGE BangPatterns, RecordWildCards #-}
35 +{-# LANGUAGE BangPatterns, CPP, RecordWildCards #-}
36 -- |
37 -- Module : Data.Text.ICU.Break.Pure
38 -- Copyright : (c) 2010 Bryan O'Sullivan
39 @@ -44,6 +44,9 @@
40 import Data.Text.ICU.Break (Line, Word)
41 import Data.Text.ICU.Break.Types (BreakIterator(..))
42 import Data.Text.ICU.Internal (LocaleName)
43 +#if MIN_VERSION_base(4,8,0)
44 +import Prelude hiding (Word)
45 +#endif
46 import System.IO.Unsafe (unsafeInterleaveIO, unsafePerformIO)
47 import qualified Data.Text.ICU.Break as IO