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/regex-posix/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/regex-posix/files')
-rw-r--r-- | dev-haskell/regex-posix/files/regex-posix-0.95.1-control-exception.patch | 56 | ||||
-rw-r--r-- | dev-haskell/regex-posix/files/regex-posix-0.95.1-ghc-7.5.patch | 12 |
2 files changed, 68 insertions, 0 deletions
diff --git a/dev-haskell/regex-posix/files/regex-posix-0.95.1-control-exception.patch b/dev-haskell/regex-posix/files/regex-posix-0.95.1-control-exception.patch new file mode 100644 index 000000000000..dfdfa71522f5 --- /dev/null +++ b/dev-haskell/regex-posix/files/regex-posix-0.95.1-control-exception.patch @@ -0,0 +1,56 @@ +diff --git a/Text/Regex/Posix/Wrap.hsc b/Text/Regex/Posix/Wrap.hsc +index d27b756..a43bcc3 100644 +--- a/Text/Regex/Posix/Wrap.hsc ++++ b/Text/Regex/Posix/Wrap.hsc +@@ -102,7 +102,7 @@ module Text.Regex.Posix.Wrap( + -- string.h is needed for memset + + #include "myfree.h" +- ++ + #include "string.h" + + #ifndef _POSIX_C_SOURCE +@@ -131,10 +131,19 @@ import Foreign(Ptr, FunPtr, nullPtr, newForeignPtr, + addForeignPtrFinalizer, Storable(peekByteOff), allocaArray, + allocaBytes, withForeignPtr,ForeignPtr,plusPtr,peekElemOff) + import Foreign.Marshal.Alloc(mallocBytes) +-import Foreign.C(CSize,CInt,CChar) ++import Foreign.C(CChar) ++#if __GLASGOW_HASKELL__ >= 703 ++import Foreign.C(CSize(CSize),CInt(CInt)) ++#else ++import Foreign.C(CSize,CInt) ++#endif + import Foreign.C.String(peekCAString, CString) + import Text.Regex.Base.RegexLike(RegexOptions(..),RegexMaker(..),RegexContext(..),MatchArray) +-import qualified System.IO.Error as IOERROR(try) ++-- deprecated: import qualified System.IO.Error as IOERROR(try) ++import qualified Control.Exception(try,IOException) ++ ++try :: IO a -> IO (Either Control.Exception.IOException a) ++try = Control.Exception.try + + type CRegex = () -- dummy regex_t used below to read out nsub value + +@@ -349,8 +358,10 @@ foreign import ccall unsafe "&myregfree" + foreign import ccall unsafe "regcomp" + c_regcomp :: Ptr CRegex -> CString -> CompOption -> IO ReturnCode + ++{- NOT USED + foreign import ccall unsafe "®free" + c_regfree :: FunPtr (Ptr CRegex -> IO ()) ++-} + + foreign import ccall unsafe "regexec" + c_regexec :: Ptr CRegex -> CString -> CSize +@@ -460,7 +471,7 @@ wrapError errCode regex_ptr = do + ---------- + wrapCompile flags e pattern = do + nullTest pattern "wrapCompile pattern" $ do +- e_regex_ptr <- IOERROR.try $ mallocBytes (#const sizeof(regex_t)) -- ioError called if nullPtr ++ e_regex_ptr <- try $ mallocBytes (#const sizeof(regex_t)) -- ioError called if nullPtr + case e_regex_ptr of + Left ioerror -> return (Left (retOk,"Text.Regex.Posix.Wrap.wrapCompile: IOError from mallocBytes(regex_t) : "++show ioerror)) + Right raw_regex_ptr -> do + diff --git a/dev-haskell/regex-posix/files/regex-posix-0.95.1-ghc-7.5.patch b/dev-haskell/regex-posix/files/regex-posix-0.95.1-ghc-7.5.patch new file mode 100644 index 000000000000..e0de5a751637 --- /dev/null +++ b/dev-haskell/regex-posix/files/regex-posix-0.95.1-ghc-7.5.patch @@ -0,0 +1,12 @@ +--- regex-posix-0.95.1-orig/Text/Regex/Posix/Wrap.hsc 2011-05-10 01:55:41.000000000 +1000 ++++ regex-posix-0.95.1/Text/Regex/Posix/Wrap.hsc 2012-05-13 18:06:06.314466286 +1000 +@@ -133,6 +133,9 @@ + import Foreign.Marshal.Alloc(mallocBytes) + import Foreign.C(CSize,CInt,CChar) + import Foreign.C.String(peekCAString, CString) ++#if (__GLASGOW_HASKELL__>=705) ++import Foreign.C.Types(CInt(..), CSize(..)) ++#endif + import Text.Regex.Base.RegexLike(RegexOptions(..),RegexMaker(..),RegexContext(..),MatchArray) + import qualified System.IO.Error as IOERROR(try) + |