summaryrefslogtreecommitdiff
path: root/dev-haskell/text-icu/files
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 /dev-haskell/text-icu/files
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.xz
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 'dev-haskell/text-icu/files')
-rw-r--r--dev-haskell/text-icu/files/text-icu-0.7.0.0-ghc-7.10.patch32
1 files changed, 32 insertions, 0 deletions
diff --git a/dev-haskell/text-icu/files/text-icu-0.7.0.0-ghc-7.10.patch b/dev-haskell/text-icu/files/text-icu-0.7.0.0-ghc-7.10.patch
new file mode 100644
index 00000000000..97afb4f2d7e
--- /dev/null
+++ b/dev-haskell/text-icu/files/text-icu-0.7.0.0-ghc-7.10.patch
@@ -0,0 +1,32 @@
+--- text-icu-0.7.0.0-orig/Data/Text/ICU/Break.hsc 2014-08-15 07:17:37.000000000 +1000
++++ text-icu-0.7.0.0/Data/Text/ICU/Break.hsc 2015-01-03 15:05:27.300927099 +1100
+@@ -64,7 +64,11 @@
+ import Foreign.Marshal.Array (allocaArray, peekArray)
+ import Foreign.Marshal.Utils (with)
+ import Foreign.Ptr (FunPtr, Ptr, nullPtr)
++#if MIN_VERSION_base(4,8,0)
++import Prelude hiding (last, Word)
++#else
+ import Prelude hiding (last)
++#endif
+ import System.IO.Unsafe (unsafePerformIO)
+
+ -- $indices
+--- text-icu-0.7.0.0-orig/Data/Text/ICU/Break/Pure.hs 2014-08-15 07:17:37.000000000 +1000
++++ text-icu-0.7.0.0/Data/Text/ICU/Break/Pure.hs 2015-01-03 15:06:16.528158894 +1100
+@@ -1,4 +1,4 @@
+-{-# LANGUAGE BangPatterns, RecordWildCards #-}
++{-# LANGUAGE BangPatterns, CPP, RecordWildCards #-}
+ -- |
+ -- Module : Data.Text.ICU.Break.Pure
+ -- Copyright : (c) 2010 Bryan O'Sullivan
+@@ -44,6 +44,9 @@
+ import Data.Text.ICU.Break (Line, Word)
+ import Data.Text.ICU.Break.Types (BreakIterator(..))
+ import Data.Text.ICU.Internal (LocaleName)
++#if MIN_VERSION_base(4,8,0)
++import Prelude hiding (Word)
++#endif
+ import System.IO.Unsafe (unsafeInterleaveIO, unsafePerformIO)
+ import qualified Data.Text.ICU.Break as IO
+