Ticket #1231: get-rid-of-haskell98-dependency.dpatch

File get-rid-of-haskell98-dependency.dpatch, 13.3 kB (added by guest, 3 years ago)
Line 
17 patches for repository http://code.haskell.org/gtk2hs:
2
3Thu Aug 11 22:05:47 PDT 2011  Bryan O'Sullivan <bos@serpentine.com>
4  * Get rid of haskell98 dependency
5 
6  This is needed for GHC 7.2.1 compatibility.
7 
8
9Thu Aug 11 22:10:59 PDT 2011  Bryan O'Sullivan <bos@serpentine.com>
10  * Drop haskell98 dependency from glib
11
12Thu Aug 11 22:12:27 PDT 2011  Bryan O'Sullivan <bos@serpentine.com>
13  * Drop spurious dependency on haskell98 from cairo
14
15Thu Aug 11 22:13:55 PDT 2011  Bryan O'Sullivan <bos@serpentine.com>
16  * Drop spurious haskell98 dependency from pango
17
18Thu Aug 11 22:15:24 PDT 2011  Bryan O'Sullivan <bos@serpentine.com>
19  * Drop spurious haskell98 dependency from gio
20
21Thu Aug 11 22:26:02 PDT 2011  Bryan O'Sullivan <bos@serpentine.com>
22  * Drop spurious haskell98 dependency from gtk
23
24Thu Aug 11 22:26:06 PDT 2011  Bryan O'Sullivan <bos@serpentine.com>
25  * Fix a build failure under GHC 7.2
26
27New patches:
28
29[Get rid of haskell98 dependency
30Bryan O'Sullivan <bos@serpentine.com>**20110812050547
31 Ignore-this: a32cb65a458849c10fc527400637d48b
32 
33 This is needed for GHC 7.2.1 compatibility.
34 
35] hunk ./tools/c2hs/base/general/FastMutInt.hs 1
36+{-# LANGUAGE BangPatterns #-}
37 {-# OPTIONS -cpp -fglasgow-exts #-}
38 --
39 -- (c) The University of Glasgow 2002
40hunk ./tools/c2hs/base/general/FileOps.hs 35
41 where
42 
43 -- standard libs
44-import Char      (chr, ord)
45-import Directory (doesFileExist)
46-import IO       (Handle, IOMode(..), openFile)
47-import Monad    (liftM)
48-import Random    (newStdGen, randomRs)
49+import Data.Char      (chr, ord)
50+import System.Directory (doesFileExist)
51+import System.IO        (Handle, IOMode(..), openFile)
52+import Control.Monad    (liftM)
53+import System.Random    (newStdGen, randomRs)
54 
55 import FNameOps  (dirname, stripDirname, addPath)
56 
57hunk ./tools/c2hs/base/general/UNames.hs 58
58               saveRootNameSupply, restoreRootNameSupply)
59 where
60 
61-import Monad  (when)
62-import Ix
63+import Control.Monad  (when)
64+import Data.Ix
65 import System.IO.Unsafe (unsafePerformIO)
66 import Data.IORef       (IORef, newIORef, readIORef, writeIORef)
67 import Binary (Binary(..))
68hunk ./tools/c2hs/base/state/CIO.hs 75
69            fileFindInCIO, mktempCIO)
70 where
71 
72-import IO
73-import Directory
74-import System
75-#if __GLASGOW_HASKELL__ >= 612
76-import System.IO (hSetEncoding, latin1)
77-#endif
78+import System.Directory
79+import System.Environment
80+import System.Exit
81+import System.IO
82+import System.IO.Error
83+import System.Process
84 
85 import FileOps  (fileFindIn, mktemp)
86 import StateBase (PreCST, liftIO)
87hunk ./tools/c2hs/base/state/State.hs 72
88              getNameSupply)
89 where
90 
91-import Ix
92-import Monad       (when)
93-import List        (sort)
94+import Data.Ix
95+import Control.Monad       (when)
96+import Data.List        (sort)
97 
98 import BaseVersion (version, copyright, disclaimer)
99 import Config     (errorLimit)
100hunk ./tools/c2hs/base/state/StateTrans.hs 82
101                   MVar, newMV, readMV, assignMV)
102 where
103 
104-import Monad      (liftM)
105+import Control.Monad      (liftM)
106 import System.IO  (fixIO)
107 import Data.IORef (IORef, newIORef, readIORef, writeIORef)
108 
109hunk ./tools/c2hs/base/syms/Attributes.hs 91
110                   getGenAttr, setGenAttr, updGenAttr)
111 where
112 
113-import Array
114+import Data.Array
115 import Control.Exception (assert)
116 import Position   (Position, Pos(posOf), nopos, isNopos, dontCarePos,
117                   isDontCarePos)
118hunk ./tools/c2hs/base/syms/Idents.hs 66
119               getIdentAttrs, dumpIdent) 
120 where
121 
122-import Char
123+import Data.Char
124 import Position   (Position, Pos(posOf), nopos)
125 import UNames     (Name)
126 import Errors     (interr)
127hunk ./tools/c2hs/base/syntax/Lexers.hs 137
128               star, plus, quest, alt, string, LexerState, execLexer)
129 where
130 
131-import Maybe  (fromMaybe, isNothing)
132-import Array  (Ix(..), Array, array, (!), assocs, accumArray)
133+import Data.Maybe  (fromMaybe, isNothing)
134+import Data.Array  (Ix(..), Array, array, (!), assocs, accumArray)
135 
136 import Position (Position(..), Pos (posOf), nopos, incPos, tabPos, retPos)
137 import DLists (DList, openDL, zeroDL, unitDL, snocDL, joinDL, closeDL)
138hunk ./tools/c2hs/c/CAttrs.hs 71
139               CObj(..), CTag(..), CDef(..))
140 where
141 
142-import Char      (toUpper)
143-import List       (isPrefixOf)
144-import Maybe     (mapMaybe)
145+import Data.Char         (toUpper)
146+import Data.List       (isPrefixOf)
147+import Data.Maybe        (mapMaybe)
148 
149 import Position   (Position, Pos(posOf), nopos, dontCarePos, builtinPos)
150 import Errors     (interr)
151hunk ./tools/c2hs/c/CLexer.x 67
152 
153 {
154 
155+{-# LANGUAGE BangPatterns #-}
156+
157 module CLexer (lexC, parseError) where
158 
159hunk ./tools/c2hs/c/CLexer.x 71
160-import Char      (isDigit)
161+import Data.Char      (isDigit)
162 import Numeric   (readDec, readOct, readHex)
163 
164 import Position  (Position(..), Pos(posOf))
165hunk ./tools/c2hs/c/CNames.hs 40
166 module CNames (nameAnalysis)
167 where
168 
169-import Monad    (when, mapM_)
170+import Control.Monad    (when, mapM_)
171 
172 import Position  (Position, posOf)
173 import Idents   (Ident, identToLexeme)
174hunk ./tools/c2hs/c/CTrav.hs 83
175              lookupDeclOrTag)
176 where
177 
178-import List       (find)
179-import Maybe     (fromMaybe)
180-import Monad     (liftM)
181+import Data.List       (find)
182+import Data.Maybe        (fromMaybe)
183+import Control.Monad     (liftM)
184 import Control.Exception (assert)
185 
186 import Position   (Position, Pos(..), nopos)
187hunk ./tools/c2hs/chs/CHS.hs 98
188 where
189 
190 -- standard libraries
191-import Char     (isSpace, toUpper, toLower)
192-import List     (intersperse)
193-import Monad    (when, unless)
194+import Data.Char        (isSpace, toUpper, toLower)
195+import Data.List        (intersperse)
196+import Control.Monad    (when, unless)
197 
198 -- Compiler Toolkit
199 import Position  (Position(..), Pos(posOf), nopos, isBuiltinPos)
200hunk ./tools/c2hs/chs/CHSLexer.hs 172
201 module CHSLexer (CHSToken(..), lexCHS)
202 where
203 
204-import List     ((\\))
205-import Char     (isDigit)
206-import Monad    (liftM)
207+import Data.List        ((\\))
208+import Data.Char        (isDigit)
209+import Control.Monad    (liftM)
210 import Numeric   (readDec, readOct, readHex)
211 
212 import Position  (Position(..), Pos(posOf), incPos, retPos, tabPos)
213hunk ./tools/c2hs/gen/GBMonad.hs 75
214   ) where
215 
216 -- standard libraries
217-import Char      (toUpper, toLower, isSpace)
218-import List       (find)
219-import Maybe     (fromMaybe)
220+import Data.Char         (toUpper, toLower, isSpace)
221+import Data.List       (find)
222+import Data.Maybe        (fromMaybe)
223 
224 -- Compiler Toolkit
225 import Position   (Position, Pos(posOf), nopos, builtinPos)
226hunk ./tools/c2hs/gen/GenBind.hs 115
227 where
228 
229 -- standard libraries
230-import Char      (toUpper, toLower, isSpace)
231-import List       (deleteBy, intersperse, isPrefixOf, find)
232-import Maybe     (isNothing, isJust, fromJust, fromMaybe)
233-import Monad     (when, unless, liftM, mapAndUnzipM)
234+import Data.Char         (toUpper, toLower, isSpace)
235+import Data.List       (deleteBy, intersperse, isPrefixOf, find)
236+import Data.Maybe        (isNothing, isJust, fromJust, fromMaybe)
237+import Control.Monad     (when, unless, liftM, mapAndUnzipM)
238 
239 import Data.Bits  ((.&.), (.|.), xor, complement)
240 
241hunk ./tools/c2hs/gen/GenHeader.hs 51
242 ) where
243 
244 -- standard libraries
245-import Monad     (when)
246+import Control.Monad     (when)
247 
248 -- Compiler Toolkit
249 import Position  (Position, Pos(..), nopos)
250hunk ./tools/c2hs/state/C2HSState.hs 54
251                  putTraceStr, setSwitch, getSwitch)
252 where
253 
254-import Monad    (when)
255+import Control.Monad    (when)
256 
257 import State
258 
259hunk ./tools/c2hs/toplevel/C2HSConfig.hs 45
260   bitfieldDirection, bitfieldPadding, bitfieldIntSigned, bitfieldAlignment
261 ) where
262 
263-import Ix    (Ix)
264-import Array (Array, array)
265+import Data.Ix    (Ix)
266+import Data.Array (Array, array)
267 
268 import Foreign (Ptr, FunPtr)
269 import Foreign  (Storable(sizeOf, alignment), toBool)
270hunk ./tools/c2hs/toplevel/Main.hs 143
271 where
272 
273 -- standard libraries
274-import List      (isPrefixOf)
275-import IO        ()
276-import Monad      (when, unless, mapM)
277-import Maybe      (fromJust)
278+import Data.List         (isPrefixOf)
279+import Control.Monad      (when, unless, mapM)
280+import Data.Maybe      (fromJust)
281 
282 -- base libraries
283 import System.Console.GetOpt     
284hunk ./tools/gtk2hs-buildtools.cabal 55
285         main-is:        Main.hs
286         build-depends:  base >= 4 && < 5,
287                         process, directory, array, containers, pretty,
288-                        haskell98, filepath
289+                        random, filepath
290         build-tools:    alex, happy
291         other-modules:  BaseVersion
292                         Config
293[Drop haskell98 dependency from glib
294Bryan O'Sullivan <bos@serpentine.com>**20110812051059
295 Ignore-this: e4e88aca4bf564919e4c03fea52931db
296] hunk ./glib/System/Glib/FFI.hs 36
297   newForeignPtr,
298   withForeignPtrs,
299   module Foreign,
300-  module Foreign.C
301+  module Foreign.C,
302+  module System.IO.Unsafe
303   ) where
304 
305 import System.IO.Unsafe (unsafePerformIO)
306hunk ./glib/System/Glib/FFI.hs 47
307 
308 import Foreign.C
309 import qualified Foreign hiding (free)
310-import Foreign  hiding (with, newForeignPtr, free
311+import Foreign  hiding (with, newForeignPtr, free, unsafePerformIO
312 #if (__GLASGOW_HASKELL__<606)
313     , withObject
314 #endif
315hunk ./glib/System/Glib/Types.chs 55
316   toGObject         :: o -> GObject
317   -- | Unchecked downcast.
318   unsafeCastGObject :: GObject -> o
319-  {-# INLINE toGObject #-}
320-  {-# INLINE unsafeCastGObject #-}
321 
322 instance GObjectClass GObject where
323   toGObject = id
324hunk ./glib/glib.cabal 36
325 
326 Library
327         build-depends:  base >= 4 && < 5,
328-                        containers, haskell98
329+                        containers
330         build-tools:    gtk2hsC2hs
331         cpp-options:     -DHAVE_NEW_CONTROL_EXCEPTION
332         if flag(closure_signals)
333[Drop spurious dependency on haskell98 from cairo
334Bryan O'Sullivan <bos@serpentine.com>**20110812051227
335 Ignore-this: 1c779ce0fef19e5a8484004c6f6ff8f3
336] hunk ./cairo/cairo.cabal 49
337   
338 Library
339         build-depends:  base >= 4 && < 5,
340-                        bytestring, mtl, haskell98, array
341+                        bytestring, mtl, array
342         build-tools:    gtk2hsC2hs
343         exposed-modules:  Graphics.Rendering.Cairo
344                           Graphics.Rendering.Cairo.Matrix
345[Drop spurious haskell98 dependency from pango
346Bryan O'Sullivan <bos@serpentine.com>**20110812051355
347 Ignore-this: 951b198d8e71533bb2527481dc6f5e43
348] hunk ./pango/pango.cabal 44
349 
350 Library
351         build-depends:  base >= 3 && < 5,
352-                        process, directory, array, containers, pretty, mtl, haskell98,
353+                        process, directory, array, containers, pretty, mtl,
354                         glib  >= 0.12 && < 0.13,
355                         cairo >= 0.12 && < 0.13
356 
357[Drop spurious haskell98 dependency from gio
358Bryan O'Sullivan <bos@serpentine.com>**20110812051524
359 Ignore-this: 9ce85e89e84356b42555c2210eadc9f
360] hunk ./gio/gio.cabal 43
361   subdir:       gio
362 
363 Library
364-        build-depends:  base >= 4 && < 5, array, containers, haskell98, mtl, bytestring,
365+        build-depends:  base >= 4 && < 5, array, containers, mtl, bytestring,
366                         glib >= 0.12.0 && < 0.13
367         build-tools:    gtk2hsC2hs, gtk2hsHookGenerator, gtk2hsTypeGen
368 
369[Drop spurious haskell98 dependency from gtk
370Bryan O'Sullivan <bos@serpentine.com>**20110812052602
371 Ignore-this: 66a08c472d75e4c1eb874a8717e7a25f
372] hunk ./gtk/gtk.cabal 133
373 
374 Library
375         build-depends:  base >= 4 && < 5,
376-                        array, containers, haskell98, mtl, bytestring,
377+                        array, containers, mtl, bytestring,
378                         glib  >= 0.12.0 && < 0.13,
379                         pango >= 0.12.0 && < 0.13,
380                         cairo >= 0.12.0 && < 0.13
381[Fix a build failure under GHC 7.2
382Bryan O'Sullivan <bos@serpentine.com>**20110812052606
383 Ignore-this: 16498bf1d6235effbe8afadc30040de5
384] hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 1
385-{-# LANGUAGE ScopedTypeVariables, TypeSynonymInstances #-}
386+{-# LANGUAGE FlexibleInstances, ScopedTypeVariables, TypeSynonymInstances #-}
387 {-# OPTIONS_HADDOCK hide #-}
388 -- -*-haskell-*-
389 
390hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 1039
391     #{poke GdkKeymapKey, level} ptr ((fromIntegral level)::#gtk2hs_type gint)
392               
393               
394+
395
396Context:
397
398[Fix typo and add docs in INSTALL
399Andy Stewart <lazycat.manatee@gmail.com>**20101222122119
400 Ignore-this: bc363a0efc4f6c975f35a3c8ffdbca1
401]
402[Add have-quartz-gtk flag to disable linking against gdk_x11_drawable_get_xid
403Max Bolingbroke <batterseapower@hotmail.com>**20101222113914
404 Ignore-this: 3cf2009a8db78814ad5de1ed0b2173ba
405]
406[Fix docs about 'imContextRetrieveSurrounding' signal.
407Andy Stewart <lazycat.manatee@gmail.com>**20101217115003
408 Ignore-this: 26e7b7d10a3e97f7a185a0afbe72a9b9
409]
410[Don't emit an update signal with the incorrect stamp.
411Axel.Simon@in.tum.de**20101216124643
412 Ignore-this: 64b053e5495b4879923b802194b91111
413]
414[Wrap version flag make gio can compile under gio-2.18.x
415Andy Stewart <lazycat.manatee@gmail.com>**20101130130716
416 Ignore-this: 84989139d42c5790828cadaaec6a73bf
417]
418[Wrap 2.16.0 with EntryIconPosition to make gtk can compile in gtk+-2.14.x
419Andy Stewart <lazycat.manatee@gmail.com>**20101130125652
420 Ignore-this: 2853a6fc9749f123b67ddc0b10b53174
421]
422[Add functions to query and show tooltips in TreeViews.
423Axel.Simon@in.tum.de**20101123090253
424 Ignore-this: fa122105338c3b22d0ebccb8e213ebd0
425]
426[Add a note on broken binary Gtk+ installers on Windows.
427Axel.Simon@in.tum.de**20101116154707
428 Ignore-this: 30ab8f947870103cca14271237e5b423
429]
430[Added basic GString support.
431Andreas Baldeau <andreas@baldeau.net>**20101115103157
432 Ignore-this: 4fc62813b652cc6e420c7b69006dfdae
433]
434[TAG 0.12.0
435Axel.Simon@in.tum.de**20101107135304
436 Ignore-this: 14b3023f48c36eed2cb136a2b69d6dae
437]
438Patch bundle hash:
439355146f17f07786b459156b7086b5c9c38e7fb14