on master help sign in
Remove broken encoding patch
5f9a87bMichael Snoyman
patching/patches/encoding-0.6.7.2.patchdeleted−264
@@ -1,264 +0,0 @@
1−diff -ru orig/Data/Array/Static.hs new/Data/Array/Static.hs
2−--- orig/Data/Array/Static.hs 2013-10-14 08:54:53.323237141 +0300
3−+++ new/Data/Array/Static.hs 2013-10-14 08:54:52.000000000 +0300
4−@@ -1,3 +1,4 @@
5−+{-# LANGUAGE BangPatterns #-}
6− {-# LANGUAGE MagicHash #-}
7− module Data.Array.Static where
8−
9−@@ -11,5 +12,5 @@
10− bounds (StaticArray s e _) = (s,e)
11−
12− (!) :: (StaticElement e,Ix i) => StaticArray i e -> i -> e
13−-(!) (StaticArray s e addr) i = let (I# ri) = index (s,e) i
14−+(!) (StaticArray s e addr) i = let !(I# ri) = index (s,e) i
15− in extract addr ri
16−diff -ru orig/Data/Static.hs new/Data/Static.hs
17−--- orig/Data/Static.hs 2013-10-14 08:54:53.323237141 +0300
18−+++ new/Data/Static.hs 2013-10-14 08:54:52.000000000 +0300
19−@@ -1,4 +1,4 @@
20−-{-# LANGUAGE MagicHash,FlexibleInstances,BangPatterns #-}
21−+{-# LANGUAGE CPP,MagicHash,FlexibleInstances,BangPatterns #-}
22− module Data.Static where
23−
24− import GHC.Exts
25−@@ -36,7 +36,11 @@
26−
27− instance StaticElement (Maybe Char) where
28− extract addr i = let !v = indexWord32OffAddr# addr i
29−+#if __GLASGOW_HASKELL__ >= 707
30−+ in if I# (eqWord# v (int2Word# 4294967295#)) /= 0 -- -1 in Word32
31−+#else
32− in if eqWord# v (int2Word# 4294967295#) -- -1 in Word32
33−+#endif
34− then Nothing
35− else (if (I# (word2Int# v)) > 0x10FFFF
36− then error (show (I# (word2Int# v))++" is not a valid char ("++show (I# i)++")")
37−diff -ru orig/encoding.cabal new/encoding.cabal
38−--- orig/encoding.cabal 2013-10-14 08:54:53.359237141 +0300
39−+++ new/encoding.cabal 2013-10-14 08:54:52.000000000 +0300
40−@@ -1,128 +1,97 @@
41−-Name: encoding
42−-Version: 0.6.7.2
43−-Author: Henning Günther
44−-Maintainer: daniel@wagner-home.com
45−-License: BSD3
46−-License-File: LICENSE
47−-Synopsis: A library for various character encodings
48−-Description:
49−- Haskell has excellect handling of unicode, the Char type covers all unicode chars. Unfortunatly, there's no possibility to read or write something to the outer world in an encoding other than ascii due to the lack of support for encodings. This library should help with that.
50−-Category: Codec
51−-Homepage: http://code.haskell.org/encoding/
52−-Cabal-Version: >=1.6
53−-Build-Type: Custom
54−-Extra-Source-Files:
55−- NEWS
56−- Data/Encoding/Preprocessor/Mapping.hs
57−- Data/Encoding/Preprocessor/XMLMapping.hs
58−- Data/Encoding/Preprocessor/XMLMappingBuilder.hs
59−- Data/CharMap/Builder.hs
60−- Data/Array/Static/Builder.hs
61−- Data/Map/Static/Builder.hs
62−- system_encoding.h
63−- system_encoding.c
64−-
65−-Flag splitBase
66−- description: Choose the new smaller, split-up base package.
67−-Flag newGHC
68−- description: Use ghc version > 6.10
69−-Flag systemEncoding
70−- description: Provide the getSystemEncoding action to query the locale.
71−-
72−-Source-Repository head
73−- Type: darcs
74−- Location: http://code.haskell.org/encoding
75−-
76−-Source-Repository this
77−- Type: darcs
78−- Location: http://code.haskell.org/encoding
79−- Tag: 0.6.7.1
80−-
81−-Library
82−- Build-Depends: binary < 0.6, extensible-exceptions, HaXml >= 1.22 && < 1.24
83−- if flag(splitBase)
84−- Build-Depends: bytestring, base >= 3 && < 5, mtl, containers, array, regex-compat
85−- if flag(newGHC)
86−- Build-Depends: ghc-prim, ghc >= 6.10
87−+name: encoding
88−+version: 0.6.7.2
89−+cabal-version: >=1.6
90−+build-type: Custom
91−+license: BSD3
92−+license-file: LICENSE
93−+maintainer: daniel@wagner-home.com
94−+homepage: http://code.haskell.org/encoding/
95−+synopsis: A library for various character encodings
96−+description: Haskell has excellect handling of unicode, the Char type covers all unicode chars. Unfortunatly, there's no possibility to read or write something to the outer world in an encoding other than ascii due to the lack of support for encodings. This library should help with that.
97−+category: Codec
98−+author: Henning Günther
99−+data-dir: ""
100−+extra-source-files: NEWS Data/Encoding/Preprocessor/Mapping.hs
101−+ Data/Encoding/Preprocessor/XMLMapping.hs
102−+ Data/Encoding/Preprocessor/XMLMappingBuilder.hs
103−+ Data/CharMap/Builder.hs Data/Array/Static/Builder.hs
104−+ Data/Map/Static/Builder.hs system_encoding.h system_encoding.c
105−+
106−+source-repository head
107−+ type: darcs
108−+ location: http://code.haskell.org/encoding
109−+
110−+source-repository this
111−+ type: darcs
112−+ location: http://code.haskell.org/encoding
113−+ tag: 0.6.7.1
114−+
115−+flag splitbase
116−+ Description: Choose the new smaller, split-up base package.
117−+
118−+flag newghc
119−+ Description: Use ghc version > 6.10
120−+
121−+flag systemencoding
122−+ Description: Provide the getSystemEncoding action to query the locale.
123−+
124−+library
125−+ build-depends: binary <0.8, extensible-exceptions -any,
126−+ HaXml >=1.22 && <1.24
127−+
128−+ if flag(splitbase)
129−+ build-depends: bytestring -any, base -any, mtl -any,
130−+ containers -any, array -any, regex-compat -any
131−+
132−+ if flag(newghc)
133−+ build-depends: ghc-prim -any, ghc >=6.10
134−+ exposed: True
135−+ buildable: True
136−+ else
137−+ build-depends: ghc <6.10
138−+ exposed: True
139−+ buildable: True
140−+ exposed: True
141−+ buildable: True
142− else
143−- Build-Depends: ghc < 6.10
144−- else
145−- Build-Depends: base < 3
146−-
147−- Extensions: CPP
148−-
149−- Exposed-Modules:
150−- Data.Encoding
151−- Data.Encoding.ByteSource
152−- Data.Encoding.ByteSink
153−- Data.Encoding.Exception
154−- Control.Throws
155−- Data.Encoding.ASCII
156−- Data.Encoding.UTF8
157−- Data.Encoding.UTF16
158−- Data.Encoding.UTF32
159−- Data.Encoding.KOI8R
160−- Data.Encoding.KOI8U
161−- Data.Encoding.ISO88591
162−- Data.Encoding.ISO88592
163−- Data.Encoding.ISO88593
164−- Data.Encoding.ISO88594
165−- Data.Encoding.ISO88595
166−- Data.Encoding.ISO88596
167−- Data.Encoding.ISO88597
168−- Data.Encoding.ISO88598
169−- Data.Encoding.ISO88599
170−- Data.Encoding.ISO885910
171−- Data.Encoding.ISO885911
172−- Data.Encoding.ISO885913
173−- Data.Encoding.ISO885914
174−- Data.Encoding.ISO885915
175−- Data.Encoding.ISO885916
176−- Data.Encoding.CP1250
177−- Data.Encoding.CP1251
178−- Data.Encoding.CP1252
179−- Data.Encoding.CP1253
180−- Data.Encoding.CP1254
181−- Data.Encoding.CP1255
182−- Data.Encoding.CP1256
183−- Data.Encoding.CP1257
184−- Data.Encoding.CP1258
185−- Data.Encoding.GB18030
186−- Data.Encoding.BootString
187−- Data.Encoding.MacOSRoman
188−- Data.Encoding.JISX0201
189−- Data.Encoding.JISX0208
190−- Data.Encoding.JISX0212
191−- Data.Encoding.ISO2022
192−- Data.Encoding.ISO2022JP
193−- Data.Encoding.CP437
194−- Data.Encoding.CP737
195−- Data.Encoding.CP775
196−- Data.Encoding.CP850
197−- Data.Encoding.CP852
198−- Data.Encoding.CP855
199−- Data.Encoding.CP857
200−- Data.Encoding.CP860
201−- Data.Encoding.CP861
202−- Data.Encoding.CP862
203−- Data.Encoding.CP863
204−- Data.Encoding.CP864
205−- Data.Encoding.CP865
206−- Data.Encoding.CP866
207−- Data.Encoding.CP869
208−- Data.Encoding.CP874
209−- System.IO.Encoding
210−- Other-Modules:
211−- Data.Encoding.Base
212−- Data.Array.Static
213−- Data.Map.Static
214−- Data.Static
215−- Data.CharMap
216−- if flag(systemEncoding)
217−- Includes:
218−- system_encoding.h
219−- Install-Includes:
220−- system_encoding.h
221−- C-Sources:
222−- system_encoding.c
223−- CPP-Options: -DSYSTEM_ENCODING
224−+ build-depends: base -any
225−+ exposed: True
226−+ buildable: True
227−+
228−+ if flag(systemencoding)
229−+ exposed: True
230−+ buildable: True
231−+ cpp-options: -DSYSTEM_ENCODING
232−+ c-sources: system_encoding.c
233−+ includes: system_encoding.h
234−+ install-includes: system_encoding.h
235−+ exposed-modules: Data.Encoding Data.Encoding.ByteSource
236−+ Data.Encoding.ByteSink Data.Encoding.Exception Control.Throws
237−+ Data.Encoding.ASCII Data.Encoding.UTF8 Data.Encoding.UTF16
238−+ Data.Encoding.UTF32 Data.Encoding.KOI8R Data.Encoding.KOI8U
239−+ Data.Encoding.ISO88591 Data.Encoding.ISO88592
240−+ Data.Encoding.ISO88593 Data.Encoding.ISO88594
241−+ Data.Encoding.ISO88595 Data.Encoding.ISO88596
242−+ Data.Encoding.ISO88597 Data.Encoding.ISO88598
243−+ Data.Encoding.ISO88599 Data.Encoding.ISO885910
244−+ Data.Encoding.ISO885911 Data.Encoding.ISO885913
245−+ Data.Encoding.ISO885914 Data.Encoding.ISO885915
246−+ Data.Encoding.ISO885916 Data.Encoding.CP1250 Data.Encoding.CP1251
247−+ Data.Encoding.CP1252 Data.Encoding.CP1253 Data.Encoding.CP1254
248−+ Data.Encoding.CP1255 Data.Encoding.CP1256 Data.Encoding.CP1257
249−+ Data.Encoding.CP1258 Data.Encoding.GB18030 Data.Encoding.BootString
250−+ Data.Encoding.MacOSRoman Data.Encoding.JISX0201
251−+ Data.Encoding.JISX0208 Data.Encoding.JISX0212 Data.Encoding.ISO2022
252−+ Data.Encoding.ISO2022JP Data.Encoding.CP437 Data.Encoding.CP737
253−+ Data.Encoding.CP775 Data.Encoding.CP850 Data.Encoding.CP852
254−+ Data.Encoding.CP855 Data.Encoding.CP857 Data.Encoding.CP860
255−+ Data.Encoding.CP861 Data.Encoding.CP862 Data.Encoding.CP863
256−+ Data.Encoding.CP864 Data.Encoding.CP865 Data.Encoding.CP866
257−+ Data.Encoding.CP869 Data.Encoding.CP874 System.IO.Encoding
258−+ exposed: True
259−+ buildable: True
260−+ extensions: CPP
261−+ other-modules: Data.Encoding.Base Data.Array.Static Data.Map.Static
262−+ Data.Static Data.CharMap
263−+
264−+