diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /dev-haskell/pcre-light/files | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
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/pcre-light/files')
-rw-r--r-- | dev-haskell/pcre-light/files/pcre-light-0.4-ghc-7.7.patch | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/dev-haskell/pcre-light/files/pcre-light-0.4-ghc-7.7.patch b/dev-haskell/pcre-light/files/pcre-light-0.4-ghc-7.7.patch new file mode 100644 index 000000000000..2b4181929f60 --- /dev/null +++ b/dev-haskell/pcre-light/files/pcre-light-0.4-ghc-7.7.patch @@ -0,0 +1,39 @@ +diff --git a/Text/Regex/PCRE/Light.hs b/Text/Regex/PCRE/Light.hs +index 80c28a0..7fc9581 100644 +--- a/Text/Regex/PCRE/Light.hs ++++ b/Text/Regex/PCRE/Light.hs +@@ -77,6 +77,7 @@ import qualified Data.ByteString as S + #if __GLASGOW_HASKELL__ >= 608 + import qualified Data.ByteString.Internal as S + import qualified Data.ByteString.Unsafe as S ++import qualified System.IO.Unsafe as U + #else + import qualified Data.ByteString.Base as S + #endif +@@ -193,7 +194,7 @@ compile s o = case compileM s o of + -- > Left "nothing to repeat" + -- + compileM :: S.ByteString -> [PCREOption] -> Either String Regex +-compileM str os = unsafePerformIO $ ++compileM str os = U.unsafePerformIO $ + S.useAsCString str $ \pattern -> do + alloca $ \errptr -> do + alloca $ \erroffset -> do +@@ -263,7 +264,7 @@ compileM str os = unsafePerformIO $ + -- is returned. + -- + match :: Regex -> S.ByteString -> [PCREExecOption] -> Maybe [S.ByteString] +-match (Regex pcre_fp _) subject os = unsafePerformIO $ do ++match (Regex pcre_fp _) subject os = U.unsafePerformIO $ do + withForeignPtr pcre_fp $ \pcre_ptr -> do + n_capt <- captureCount' pcre_ptr + +@@ -324,7 +325,7 @@ match (Regex pcre_fp _) subject os = unsafePerformIO $ do + + + captureCount :: Regex -> Int +-captureCount (Regex pcre_fp _) = unsafePerformIO $ do ++captureCount (Regex pcre_fp _) = U.unsafePerformIO $ do + withForeignPtr pcre_fp $ \pcre_ptr -> do + captureCount' pcre_ptr + |