[Pkg-haskell-commits] darcs: lhs2tex: Remove unneeded patches. Refresh others.
Erik de Castro Lopo
erikd at mega-nerd.com
Tue Nov 29 10:08:07 UTC 2011
Tue Nov 29 10:06:23 UTC 2011 Erik de Castro Lopo <erikd at mega-nerd.com>
* Remove unneeded patches. Refresh others.
Ignore-this: e41740f3d636ca2bd3547df305fa41ea
R ./patches/add-typesig
M ./patches/no-n-plus-k-pattern -4 +8
R ./patches/no-utf8-string.patch
M ./patches/series -2
Tue Nov 29 10:06:23 UTC 2011 Erik de Castro Lopo <erikd at mega-nerd.com>
* Remove unneeded patches. Refresh others.
Ignore-this: e41740f3d636ca2bd3547df305fa41ea
diff -rN -u old-lhs2tex//patches/add-typesig new-lhs2tex//patches/add-typesig
--- old-lhs2tex//patches/add-typesig 2011-11-29 10:08:06.595672330 +0000
+++ new-lhs2tex//patches/add-typesig 1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-Index: lhs2tex-1.15/MathPoly.lhs
-===================================================================
---- lhs2tex-1.15.orig/MathPoly.lhs 2011-06-02 20:35:19.000000000 +0200
-+++ lhs2tex-1.15/MathPoly.lhs 2011-06-02 20:40:38.000000000 +0200
-@@ -368,6 +368,7 @@
- > Poly (((n,c),ts,ind):rs@(((nn,_),_,_):_))
- > -> mkFromTo stack n nn c ts rs ls
- >
-+> mkFromTo :: Stack -> String -> String -> Col -> [Pos Token] -> [((String, Int), [Pos Token], Bool)] -> [Line [Pos Token]] -> (Doc, Stack)
- > mkFromTo stack bn en c ts rs ls
- > | bn == en = -- dies kann am Beginn einer Zeile durch Einrueckung passieren
- > (rest,stack')
diff -rN -u old-lhs2tex//patches/no-n-plus-k-pattern new-lhs2tex//patches/no-n-plus-k-pattern
--- old-lhs2tex//patches/no-n-plus-k-pattern 2011-11-29 10:08:06.595672330 +0000
+++ new-lhs2tex//patches/no-n-plus-k-pattern 2011-11-29 10:08:06.643672863 +0000
@@ -1,7 +1,11 @@
-Index: lhs2tex-1.15/HsLexer.lhs
+Description: Fixes FTBFS: HsLexer.lhs:186:11: Parse error in pattern: n + 1
+From: Joachim Breitner <nomeata at debian.org>
+Bug-Debian: - #628319
+
+Index: lhs2tex-1.15/src/HsLexer.lhs
===================================================================
---- lhs2tex-1.15.orig/HsLexer.lhs 2011-06-02 20:34:39.000000000 +0200
-+++ lhs2tex-1.15/HsLexer.lhs 2011-06-02 20:34:49.000000000 +0200
+--- lhs2tex-1.15.orig/src/HsLexer.lhs 2011-06-02 20:34:39.000000000 +0200
++++ lhs2tex-1.15/src/HsLexer.lhs 2011-06-02 20:34:49.000000000 +0200
@@ -183,7 +183,7 @@
> nested 0 ('#' : '-' : '}' : s)
> = ([], '#':'-':'}':s)
@@ -10,4 +14,4 @@
+> nested n ('-' : '}' : s) = '-' <| '}' <| nested (n - 1) s
> nested n ('{' : '-' : s) = '{' <| '-' <| nested (n + 1) s
> nested n (c : s) = c <| nested n s
-
+
diff -rN -u old-lhs2tex//patches/no-utf8-string.patch new-lhs2tex//patches/no-utf8-string.patch
--- old-lhs2tex//patches/no-utf8-string.patch 2011-11-29 10:08:06.579672205 +0000
+++ new-lhs2tex//patches/no-utf8-string.patch 1970-01-01 00:00:00.000000000 +0000
@@ -1,85 +0,0 @@
-Description: Do not use ut8f-string
-Index: lhs2tex-1.15/FileNameUtils.lhs
-===================================================================
---- lhs2tex-1.15.orig/FileNameUtils.lhs 2010-03-25 18:52:25.000000000 +0100
-+++ lhs2tex-1.15/FileNameUtils.lhs 2010-04-11 19:18:17.000000000 +0200
-@@ -11,8 +11,7 @@
- > ) where
- >
- > import Prelude hiding ( catch, readFile )
--> import System.IO ( openFile, IOMode(..) )
--> import System.IO.UTF8
-+> import System.IO ( openFile, IOMode(..), hGetContents, hSetEncoding, utf8 )
- > import System.Directory
- > import System.Environment
- > import Data.List
-@@ -116,7 +115,9 @@
- own.
-
- > readTextFile :: FilePath -> IO String
--> readTextFile f = openFile f ReadMode >>= hGetContents
-+> readTextFile f = do h <- openFile f ReadMode
-+> hSetEncoding h utf8
-+> hGetContents h
-
- > chaseFile :: [String] {- search path -}
- > -> FilePath -> IO (String,FilePath)
-Index: lhs2tex-1.15/lhs2tex.cabal
-===================================================================
---- lhs2tex-1.15.orig/lhs2tex.cabal 2010-03-25 18:52:25.000000000 +0100
-+++ lhs2tex-1.15/lhs2tex.cabal 2010-03-25 18:52:25.000000000 +0100
-@@ -18,7 +18,7 @@
- executable lhs2TeX
- main-is: Main.lhs
- if flag(splitBase)
-- build-depends: base >= 3 && < 5, regex-compat, mtl, filepath, directory, process, utf8-string, extensible-exceptions
-+ build-depends: base >= 3 && < 5, regex-compat, mtl, filepath, directory, process, extensible-exceptions
- else
-- build-depends: base < 3, regex-compat, mtl, filepath, utf8-string
-+ build-depends: base < 3, regex-compat, mtl, filepath
-
-Index: lhs2tex-1.15/Main.lhs
-===================================================================
---- lhs2tex-1.15.orig/Main.lhs 2010-03-25 18:52:25.000000000 +0100
-+++ lhs2tex-1.15/Main.lhs 2010-04-11 19:20:10.000000000 +0200
-@@ -9,8 +9,7 @@
- >
- > import Data.Char ( isSpace )
- > import Data.List ( isPrefixOf )
--> import System.IO ( hClose, hFlush, stderr, stdout, openFile, IOMode(..), Handle(..) )
--> import System.IO.UTF8 ( hPutStr, hPutStrLn, hGetLine, getContents )
-+> import System.IO
- > import System.Directory ( copyFile )
- > import System.Console.GetOpt
- > import Text.Regex ( matchRegex, mkRegexWithOpts )
-@@ -168,17 +167,21 @@
- > case matchRegex (mkRegexWithOpts "^%include" True False) c of
- > Nothing -> if lit then
- > do h <- openFile f3 WriteMode
-+> hSetEncoding h utf8
- > lhs2TeX NewCode (flags { output = h }) (Directive Include "lhs2TeX.fmt" : dirs) [f1]
- > hClose h
- > else copyFile f2 f3
- > Just _ -> -- supposed to be an lhs2TeX file
- > do h <- openFile f3 WriteMode
-+> hSetEncoding h utf8
- > lhs2TeX NewCode (flags { output = h }) dirs [f1]
- > hClose h
- > preprocess _ _ _ _ = error "preprocess: too few arguments"
-
- > lhs2TeX :: Style -> State -> [Class] -> [String] -> IO ()
--> lhs2TeX s flags dirs files = do (str, file) <- input files
-+> lhs2TeX s flags dirs files = do hSetEncoding stdin utf8
-+> hSetEncoding stdout utf8
-+> (str, file) <- input files
- > expandedpath <- expandPath (searchpath flags)
- > toIO (do store (initState s file expandedpath flags)
- > formats (map (No 0) dirs) `handle` abort
-@@ -220,6 +223,7 @@
- > , Option [] ["agda"] (NoArg (\s -> return $ s { lang = Agda}, id, [])) "Agda lexer"
- > , Option [] ["pre"] (NoArg (return, id, [Pre])) "act as ghc preprocessor"
- > , Option ['o'] ["output"] (ReqArg (\f -> (\s -> do h <- openFile f WriteMode
-+> hSetEncoding h utf8
- > return $ s { output = h }, id, [])) "file") "specify output file"
- > , Option [] ["file-directives"]
- > (NoArg (\s -> return $ s { fldir = True }, id, [])) "generate %file directives"
diff -rN -u old-lhs2tex//patches/series new-lhs2tex//patches/series
--- old-lhs2tex//patches/series 2011-11-29 10:08:06.571673794 +0000
+++ new-lhs2tex//patches/series 2011-11-29 10:08:06.647672298 +0000
@@ -1,5 +1,3 @@
01_always_install_polytable.patch
10_fix_bashims.patch
-no-utf8-string.patch
no-n-plus-k-pattern
-add-typesig
More information about the Pkg-haskell-commits
mailing list