Ticket #1187: c2hs-incpath-fix.dpatch

File c2hs-incpath-fix.dpatch, 19.9 kB (added by duncan, 5 years ago)

Fix behaviour of -i flag for windows paths

Line 
12 patches for repository http://code.haskell.org/gtk2hs:
2
3Mon May  3 16:44:37 BST 2010  Duncan Coutts <duncan@haskell.org>
4  * Fix handling of cpp flags. Allows dirs with spaces.
5  Backport of the fix in mainline c2hs.
6
7Mon May  3 19:57:22 BST 2010  Duncan Coutts <duncan@haskell.org>
8  * Fix behaviour of -i flag for windows paths
9  Split on the system path separator and cope with paths with spaces.
10
11New patches:
12
13[Fix handling of cpp flags. Allows dirs with spaces.
14Duncan Coutts <duncan@haskell.org>**20100503154437
15 Ignore-this: 7127f1f91ebe287b54db0e843fb48365
16 Backport of the fix in mainline c2hs.
17] {
18hunk ./tools/c2hs/state/Switches.hs 72
19 -- all switches of the toolkit (EXPORTED)
20 --
21 data SwitchBoard = SwitchBoard {
22-                    cppOptsSB :: String,       -- cpp options
23+                    cppOptsSB :: [String],     -- cpp options
24                     cppSB     :: FilePath,     -- cpp executable
25                     hpathsSB  :: [FilePath],   -- header file directories
26                       -- since 0.11.1 `hpathsSB' isn't really needed anymore..
27hunk ./tools/c2hs/state/Switches.hs 92
28 --
29 initialSwitchBoard :: SwitchBoard
30 initialSwitchBoard  = SwitchBoard {
31-                       cppOptsSB = "",
32+                       cppOptsSB = [],
33                        cppSB     = "cpp",
34                        hpathsSB  = [],
35                        keepSB    = False,
36hunk ./tools/c2hs/toplevel/C2HSConfig.hs 73
37 --
38 -- * `-P' would suppress `#line' directives
39 --
40-cppopts :: String
41+cppopts :: [String]
42 cppopts  =
43 #ifdef _C2HS_CPP_IS_GCC
44hunk ./tools/c2hs/toplevel/C2HSConfig.hs 76
45-  "-E "++
46+  "-E":
47 #endif
48 #ifdef _C2HS_CPP_LANG_SINGLE
49hunk ./tools/c2hs/toplevel/C2HSConfig.hs 79
50-  "-xc -w"
51+  ["-xc", "-w"]
52 #else
53hunk ./tools/c2hs/toplevel/C2HSConfig.hs 81
54-  "-x c -w"
55+  ["-x", "c", "-w"]
56 #endif
57 
58 -- C preprocessor option for including only definitions (EXPORTED)
59hunk ./tools/c2hs/toplevel/Main.hs 155
60 import Errors    (interr)
61 import UNames     (saveRootNameSupply, restoreRootNameSupply)
62 import Binary    (Binary(..), putBinFileWithDict, getBinFileWithDict)
63+import System.IO (openFile, IOMode(..))
64+import System.Process (runProcess, waitForProcess)
65 
66 -- c2hs modules
67 import C2HSState  (CST, nop, runC2HS, fatal, fatalsHandledBy, getId,
68hunk ./tools/c2hs/toplevel/Main.hs 402
69 -- * `Help' cannot occur
70 --
71 processOpt                   :: Flag -> CST s ()
72-processOpt (CPPOpts cppopts)  = addCPPOpts cppopts
73+processOpt (CPPOpts cppopt )  = addCPPOpts [cppopt]
74 processOpt (CPP     cpp    )  = setCPP     cpp
75 processOpt (Dump    dt     )  = setDump    dt
76 processOpt (Keep           )  = setKeep
77hunk ./tools/c2hs/toplevel/Main.hs 453
78 -- * any header search path that is set with `-IDIR' is also added to
79 --   `hpathsSB'
80 --
81-addCPPOpts      :: String -> CST s ()
82+addCPPOpts      :: [String] -> CST s ()
83 addCPPOpts opts  =
84   do
85hunk ./tools/c2hs/toplevel/Main.hs 456
86-    let iopts = [opt | opt <- words opts, "-I" `isPrefixOf` opt, "-I-" /= opt]
87+    let iopts = [opt | opt <- opts, "-I" `isPrefixOf` opt, "-I-" /= opt]
88     addHPaths . map (drop 2) $ iopts
89     addOpts opts
90   where
91hunk ./tools/c2hs/toplevel/Main.hs 461
92     addOpts opts  = setSwitch $
93-                     \sb -> sb {cppOptsSB = cppOptsSB sb ++ (' ':opts)}
94+                     \sb -> sb {cppOptsSB = cppOptsSB sb ++ opts}
95 
96 -- set the program name of the C proprocessor
97 --
98hunk ./tools/c2hs/toplevel/Main.hs 569
99        let ppFile = outFileBase ++ "_pp" ++ chssuffix
100        cpp     <- getSwitch cppSB
101        cppOpts <- getSwitch cppOptsSB
102-       let cmd  = unwords [cpp, cppOpts, cppoptsdef, headerFile,
103-                           bndFile, ">", ppFile]
104-       tracePreproc cmd
105-       exitCode <- systemCIO cmd
106+       let args = cppOpts ++ [cppoptsdef, headerFile, bndFile]
107+       tracePreproc (unwords (cpp:args))
108+       exitCode <- liftIO $ do
109+         preprocHnd <- openFile ppFile WriteMode
110+         cppproc <- runProcess cpp args
111+                       Nothing Nothing Nothing (Just preprocHnd) Nothing
112+         waitForProcess cppproc
113        case exitCode of
114          ExitFailure _ -> fatal "Error during preprocessing chs file"
115          _             -> nop
116hunk ./tools/c2hs/toplevel/Main.hs 625
117         --
118         cpp     <- getSwitch cppSB
119         cppOpts <- getSwitch cppOptsSB
120-        let cmd  = unwords [cpp, cppOpts, newHeaderFile, ">" ++ preprocFile]
121-        tracePreproc cmd
122-        exitCode <- systemCIO cmd
123+        let args = cppOpts ++ [newHeaderFile]
124+        tracePreproc (unwords (cpp:args))
125+        exitCode <- liftIO $ do
126+          preprocHnd <- openFile preprocFile WriteMode
127+          cppproc <- runProcess cpp args
128+            Nothing Nothing Nothing (Just preprocHnd) Nothing
129+          waitForProcess cppproc
130         case exitCode of
131           ExitFailure _ -> fatal "Error during preprocessing custom header file"
132           _             -> nop
133hunk ./tools/c2hs/toplevel/Main.hs 694
134     --
135     cpp     <- getSwitch cppSB
136     cppOpts <- getSwitch cppOptsSB
137-    let cmd  = unwords [cpp, cppOpts, realHeaderFile, ">" ++ preprocFile]
138-    tracePreproc cmd
139-    exitCode <- systemCIO cmd
140+    let args = cppOpts ++ [realHeaderFile]
141+    tracePreproc (unwords (cpp:args))
142+    exitCode <- liftIO $ do
143+      preprocHnd <- openFile preprocFile WriteMode
144+      cppproc <- runProcess cpp args
145+        Nothing Nothing Nothing (Just preprocHnd) Nothing
146+      waitForProcess cppproc
147     case exitCode of
148       ExitFailure _ -> fatal "Error during preprocessing"
149       _             -> nop
150}
151[Fix behaviour of -i flag for windows paths
152Duncan Coutts <duncan@haskell.org>**20100503185722
153 Ignore-this: c03f3d57d1b168f6bd6476451e267a99
154 Split on the system path separator and cope with paths with spaces.
155] {
156hunk ./tools/c2hs/toplevel/Main.hs 157
157 import Binary    (Binary(..), putBinFileWithDict, getBinFileWithDict)
158 import System.IO (openFile, IOMode(..))
159 import System.Process (runProcess, waitForProcess)
160+import System.FilePath (splitSearchPath)
161 
162 -- c2hs modules
163 import C2HSState  (CST, nop, runC2HS, fatal, fatalsHandledBy, getId,
164hunk ./tools/c2hs/toplevel/Main.hs 496
165 --
166 setInclude :: String -> CST s ()
167 setInclude str = do
168-  let fp = makePath str ""
169+  let fp = splitSearchPath str
170   setSwitch $ \sb -> sb {chiPathSB = fp ++ (chiPathSB sb)}
171hunk ./tools/c2hs/toplevel/Main.hs 498
172-  where
173-    makePath ('\\':r:em)   path = makePath em (path ++ ['\\',r])
174-    makePath (' ':rem)    path = makePath rem path
175-    makePath (':':rem)     ""   = makePath rem ""
176-    makePath (':':rem)    path = path : makePath rem ""
177-    makePath ('/':':':rem) path = path : makePath rem ""
178-    makePath (r:emain)    path = makePath emain (path ++ [r])
179-    makePath ""                   ""   = []
180-    makePath ""                   path = [path]
181 
182 -- set the output file name
183 --
184hunk ./tools/gtk2hs-buildtools.cabal 55
185 Executable gtk2hsC2hs
186         main-is:        Main.hs
187         build-depends:  base >= 4 && < 5,
188-                        process, directory, array, containers, pretty, haskell98
189+                        process, directory, array, containers, pretty,
190+                        filepath, haskell98
191         other-modules:  BaseVersion
192                         Config
193                         Errors
194}
195
196Context:
197
198[Fix textView signals (rename `setScrollAdjustments` to `setTextViewScrollAdjustments`) and fix signal docs.
199Andy Stewart <lazycat.manatee@gmail.com>**20100503140719
200 Ignore-this: 3fcfbfe8659c1f01d806990a6a59e0dc
201]
202[Fix TextView signals.
203Andy Stewart <lazycat.manatee@gmail.com>**20100502110206
204 Ignore-this: 3cc1d9c7e1452e577264f2a287852a22
205]
206[Add bootstrap.sh.
207Andy Stewart <lazycat.manatee@gmail.com>**20100501220434
208 Ignore-this: bdcf47e2a0b99436967f6338c8f00141
209]
210[Fix cairo demo.
211Andy Stewart <lazycat.manatee@gmail.com>**20100501214046
212 Ignore-this: bb37935be21a3414d6540d39b74d57c6
213]
214[Fix scaling demo and move to `gtk2hs/glade/demo`.
215Andy Stewart <lazycat.manatee@gmail.com>**20100501211752
216 Ignore-this: 26b0499662347edb6067e8f8397a406c
217]
218[Move profileviewer demo to `gtk2hs/glade/demo.`
219Andy Stewart <lazycat.manatee@gmail.com>**20100501211335
220 Ignore-this: 80f20961b905bca023b4813e7b99f2db
221]
222[Fix noughty demo and move to `gtk2hs/glade/demo`.
223Andy Stewart <lazycat.manatee@gmail.com>**20100501211126
224 Ignore-this: 598b67397619be71313289a86c3f1dc6
225]
226[Move calc demo to `gtk2hs/glade/demo` and adjust glade demo.
227Andy Stewart <lazycat.manatee@gmail.com>**20100501210542
228 Ignore-this: 152abe8888a55ec4a2c106292a58b6cf
229]
230[Fix carsim demo.
231Andy Stewart <lazycat.manatee@gmail.com>**20100501210132
232 Ignore-this: 1502949718304229aa7d6d82084eb442
233]
234[Remove warning for GtkInternal.
235Andy Stewart <lazycat.manatee@gmail.com>**20100501205623
236 Ignore-this: b1b60e69e87208431f7f287ae8174f26
237]
238[Axel, Gtk2HsSetup.hs can't works with pango, so i rollback your patche to make pango can compile pass. Please push new patches when you fix it.
239Andy Stewart <lazycat.manatee@gmail.com>**20100501180134
240 Ignore-this: db2796b94f08260401cff17b638ef6a4
241]
242[Move cairo demo to `gtk2hs/cairo/demo`.
243Andy Stewart <lazycat.manatee@gmail.com>**20100501174106
244 Ignore-this: 59379042dbc12ed64d7c6fa67da613a6
245]
246[Move pango demo to `gtk2hs/pango/demo`.
247Andy Stewart <lazycat.manatee@gmail.com>**20100501173621
248 Ignore-this: f93de2952148b90d739bf4e06f31fcaa
249]
250[Move svg demo to `gtk2hs/svgcairo/demo`.
251Andy Stewart <lazycat.manatee@gmail.com>**20100501173518
252 Ignore-this: da7867efa4d2c2c21fedd7a2335048e7
253]
254[Move soe demo to `gtk2hs/soegtk/demo`.
255Andy Stewart <lazycat.manatee@gmail.com>**20100501173350
256 Ignore-this: f861db155bcb0b0f266ccbcac2770ef5
257]
258[Move opengl demo to `gtk/gtkglext/demo`.
259Andy Stewart <lazycat.manatee@gmail.com>**20100501173231
260 Ignore-this: 5c11b627899153dfec86424037ad147e
261]
262[Move gnomevfs demo to `gtk2hs/gnomevfs/demo`.
263Andy Stewart <lazycat.manatee@gmail.com>**20100501173035
264 Ignore-this: 3c4019cd021cd9349e7a794f0c73bea6
265]
266[Move glade demo to `gtk2hs/glade/demo`.
267Andy Stewart <lazycat.manatee@gmail.com>**20100501171808
268 Ignore-this: c3cc3e5a3fb50e9c97ea4d141e993151
269]
270[Move gconf demo to `gtk2hs/gconf/demo`.
271Andy Stewart <lazycat.manatee@gmail.com>**20100501171629
272 Ignore-this: b4011619e7e1096307d5fb9bf7212982
273]
274[Remove vte and webkit demo from main repo (those demos have exist in `gtk2hs/vte/demo` and `gtk2hs/webkit/demo`)
275Andy Stewart <lazycat.manatee@gmail.com>**20100501171314
276 Ignore-this: 1aa0f5ed4fc91b00ded2affad59061eb
277]
278[Fix compile error of soegtk.
279Andy Stewart <lazycat.manatee@gmail.com>**20100501162122
280 Ignore-this: f6661f25cb9a067a24d7db7242dcab3a
281]
282[Fix compile error of webkit.
283Andy Stewart <lazycat.manatee@gmail.com>**20100501162011
284 Ignore-this: 2f6fe99208c5e17d4fd906b2f70b18b9
285]
286[Fix compile error of vte.
287Andy Stewart <lazycat.manatee@gmail.com>**20100501161926
288 Ignore-this: b837e1f746a7f8779ec49758f9741c4c
289]
290[Fix compile error of gtksourceview2.
291Andy Stewart <lazycat.manatee@gmail.com>**20100501161826
292 Ignore-this: d7f05977a77f1330d14915e5895b526c
293]
294[Fix compile error of gnomevfs.
295Andy Stewart <lazycat.manatee@gmail.com>**20100501161739
296 Ignore-this: 8300370414f8840fcb7897e199025d75
297]
298[Fix compile error of gio.
299Andy Stewart <lazycat.manatee@gmail.com>**20100501161612
300 Ignore-this: 30af23f768bf3823c55db6db33fae8e9
301]
302[Fix compile error of gconf.
303Andy Stewart <lazycat.manatee@gmail.com>**20100501161504
304 Ignore-this: 67c9dc2b5c337476bf3fb5ef5aa3ceb4
305]
306[Replace Setup.hs by the default setup files.
307Axel.Simon@in.tum.de**20100501150933
308 Ignore-this: b4c2102781b831bd3b787bde35ffcda6
309]
310[Replace Setup.hs by the default setup files.
311Axel.Simon@in.tum.de**20100501150755
312 Ignore-this: cdc12e9af9b22e54ef4ac288dc8b9000
313]
314[Replace Setup.hs by the default setup files.
315Axel.Simon@in.tum.de**20100501150605
316 Ignore-this: 58710ee1f00cd1242057f1cbdcee94ff
317]
318[Make SOE a really simple package, since it is.
319Axel.Simon@in.tum.de**20100501150526
320 Ignore-this: f35f2729f101b34f3e9d47b60ead6171
321]
322[Replace Setup.hs by the default setup files.
323Axel.Simon@in.tum.de**20100501150156
324 Ignore-this: 9e17194a9abf7cd0b31061249694edda
325]
326[Replace Setup.hs by the default setup files.
327Axel.Simon@in.tum.de**20100501145457
328 Ignore-this: 90c6e9badb9b88a25c58a07e3dec6d11
329]
330[Replace Setup.hs by the default setup files.
331Axel.Simon@in.tum.de**20100501145419
332 Ignore-this: 6becb507b1606e949d0d13720d361850
333]
334[Replace Setup.hs by the default setup files.
335Axel.Simon@in.tum.de**20100501144608
336 Ignore-this: 43ea6510fb65dfbb2e76130cb274a364
337]
338[Install the standard setup files in gio.
339Axel.Simon@in.tum.de**20100501144140
340 Ignore-this: a21f5c4e5e0aecc52c967a31e90c2d37
341]
342[Fix the build infrastructure of gconf.
343Axel.Simon@in.tum.de**20100501143402
344 Ignore-this: c0f1e1e066e9a7f9f733a4b768d9196d
345]
346[Expose module `System.Gnome.VFS` in gnomevfs.cabal
347Andy Stewart <lazycat.manatee@gmail.com>**20100428122845
348 Ignore-this: 70069732773614e4323d696cb887a2d1
349]
350[gnomevfs Cabal package.
351Andy Stewart <lazycat.manatee@gmail.com>**20100428100530
352 Ignore-this: 5bbab11f5a0e5c0c790fd917659722c7
353]
354[webkit Cabal package.
355Andy Stewart <lazycat.manatee@gmail.com>**20100428101329
356 Ignore-this: 3b4d27f26dcfb80aec42923906938106
357]
358[vte Cabal package.
359Andy Stewart <lazycat.manatee@gmail.com>**20100428101229
360 Ignore-this: 2618acc76f647f454e6e1bf5f588e858
361]
362[svgcairo Cabal package.
363Andy Stewart <lazycat.manatee@gmail.com>**20100428100832
364 Ignore-this: 5c55b0a69f3e7938712e3deb51091cac
365]
366[soegtk Cabal package.
367Andy Stewart <lazycat.manatee@gmail.com>**20100428100758
368 Ignore-this: ad606092c1d9afbef2a70b8e9b62cc38
369]
370[gtksource2 Cabal package.
371Andy Stewart <lazycat.manatee@gmail.com>**20100428100657
372 Ignore-this: d9c8bd42bc893928d04b132a1a6c29ae
373]
374[gtkglext Cabal package.
375Andy Stewart <lazycat.manatee@gmail.com>**20100428100617
376 Ignore-this: 485ca74cc042b8751415c7e960650a23
377]
378[gconf Cabal package.
379Andy Stewart <lazycat.manatee@gmail.com>**20100428100216
380 Ignore-this: 26854e53627320a7ef3a65f6823fcb60
381]
382[GIO Cabal package (Fix doc, add new functions: `fileHasParent` and `fileQueryFileType`)
383Andy Stewart <lazycat.manatee@gmail.com>**20100428095858
384 Ignore-this: 3b53dc9cd495f92e9a7652e14d1cb05b
385]
386[glade Cabal package.
387Andy Stewart <lazycat.manatee@gmail.com>**20100428100433
388 Ignore-this: c152a8f7de7a4622d2f8f5e6aa30b835
389]
390[Always build Plug and Socket, even on Windows.
391Axel.Simon@in.tum.de**20100501133611
392 Ignore-this: 3d318997a29c769d415238ad7bed881b
393]
394[Seperate the standard setup functionality from that necessary for specific packages.
395Axel.Simon@in.tum.de**20100501133156
396 Ignore-this: 326634d72596f48f1e76ffd688c0f79f
397]
398[Let the default Signal template import GtkInternals.
399Axel.Simon@in.tum.de**20100501133050
400 Ignore-this: 2f2e8944aa1cc5a5831cabd8c86f119c
401]
402[Pick the right function to load a Pixbuf on Windows.
403Axel.Simon@in.tum.de**20100501132726
404 Ignore-this: 3e114b00529c96bedea2cb1214dd27b2
405]
406[Add `Emblem` and `EmblemedIcon` in hierarchy.list to support gio.
407Andy Stewart <lazycat.manatee@gmail.com>**20100430180426
408 Ignore-this: 9bb1953f8b0a82e895c7f723acf78def
409]
410[Add new functions `readUTFStringArray0` for gio binding.
411Andy Stewart <lazycat.manatee@gmail.com>**20100430071318
412 Ignore-this: d8d756fca5e216862594e9957a178875
413]
414[Add callback `NONE:OBJECT,OBJECT,ENUM` for gio.
415Andy Stewart <lazycat.manatee@gmail.com>**20100430035445
416 Ignore-this: e594257b6d014dd1c92132e7c6ef399c
417]
418[Add callback `NONE:STRING,STRING,STRING,ENUM` to support gio.
419Andy Stewart <lazycat.manatee@gmail.com>**20100429201243
420 Ignore-this: 9b38ae786b5b2866764a276ec5e40b00
421]
422[Add function `widgetGetAllocation` and fix version tag.
423Andy Stewart <lazycat.manatee@gmail.com>**20100428151304
424 Ignore-this: 74e831fd17d3f1bbd2761e2e778e4e4e
425]
426[re-export `toNativeWindowId` and `fromNativeWindowId` to fix Embedded demos.
427Andy Stewart <lazycat.manatee@gmail.com>**20100428151139
428 Ignore-this: 6e49f7548a461e1da10c5e2a1ff385e6
429]
430[Fix cycle import problem, and expose `Threading` modules for use in Signals.chs
431Andy Stewart <lazycat.manatee@gmail.com>**20100428145100
432 Ignore-this: 5c350d915116b87c728b69942b461bd1
433 
434 * Signal.chs.template : restore to "import Graphics.UI.Gtk.General.Threading".
435 * GtkInternals.chs    : remove Graphics.UI.Gtk.General.Threading, otherwise cycle import when compile gtk.
436 * Threading.hs        : Add nots that don't use this module in application.
437 * gtk.cabal           : expose Graphics.UI.Gtk.General.Threading
438 
439]
440[Adjust GtkInternal.chs and Signal.chs.template to support non-core packages.
441Andy Stewart <lazycat.manatee@gmail.com>**20100428094453
442 Ignore-this: bf2cfe48234ea434dbb108e780dad346
443 
444 Becuase Signal.chs in non-core packages need import `Graphics.UI.Gtk.General.Threading`,
445 so i add it in GtkInternal and change Signa.chs template.
446 
447]
448[Add new callback for gconf.
449Andy Stewart <lazycat.manatee@gmail.com>**20100425025913
450 Ignore-this: dd81d8a5dff016895855bd947114b893
451]
452[Call c2hs with the bare filename as its output.
453Axel.Simon@in.tum.de**20100423152501
454 Ignore-this: c9be4c390228577708614efa892a24b7
455]
456[Explicitly link in gthread which is required to find g_thread_init.
457Axel.Simon@in.tum.de**20100423145524
458 Ignore-this: 11729966fdc935ccc3605dc51102d1f4
459]
460[Move modules back to the not-exposed section and add them to the Internals module instead.
461Axel.Simon@in.tum.de**20100422153008
462 Ignore-this: 255f909810a01cc250790b1423643551
463]
464[Ensure all end-user types names are exposed through Gtk.hs and make low-level type names available through a new module.
465Axel.Simon@in.tum.de**20100422141222
466 Ignore-this: c8f2000df7eb6ceb0f67bfebd3286d9c
467]
468[Move the pango C lib version stuff into the Setup.hs
469Duncan Coutts <duncan@haskell.org>**20100422001240
470 Ignore-this: 795b62cbd00a5a29c6e2373174f0f757
471 Rather than using flags in the .cabal file.
472 Generate a .h file with the pango version number and
473 include that in the local hspango.h.
474]
475[Hack in Setup.hs for include dirs, avoiding worse hack in .cabal files
476Duncan Coutts <duncan@haskell.org>**20100422000751
477 Ignore-this: 1017665f67f060f7ad1a1dd663a9386d
478 Ought to be fixed in Cabal lib
479]
480[Minor tweaks to Setup.hs scripts
481Duncan Coutts <duncan@haskell.org>**20100421233554
482 Ignore-this: 5de7745bd7fc5d49d470f5a38ac8e5a9
483]
484[Add build-tools dependencies to .cabal files
485Duncan Coutts <duncan@haskell.org>**20100421233016
486 Ignore-this: 2ca87ca412766d96c688de06e93a29dd
487]
488[Change the way the type tags are handled in the .cabal and Setup.hs files
489Duncan Coutts <duncan@haskell.org>**20100421211616
490 Ignore-this: bcbc507af8fb3a6103e505bc6361bd38
491 In particular it eliminates the need for users to specify -fgtk_x_y flags.
492]
493[Add upper bounds on deps within gtk2hs packages
494Duncan Coutts <duncan@haskell.org>**20100421154805
495 Ignore-this: ddc073c270f471583edfcd7f5063dc83
496 This is only approximate, they may need to be tighter still.
497]
498[Add upper bound on base version in .cabal files
499Duncan Coutts <duncan@haskell.org>**20100421154742
500 Ignore-this: 940b0938c956685b9996aa01b5a4e362
501]
502[Adjust hackage category of build tools
503Duncan Coutts <duncan@haskell.org>**20100421152105
504 Ignore-this: b0b2a6179fcff848c756d6e6d7ee4b5d
505]
506[Add source repository info to package .cabal files
507Duncan Coutts <duncan@haskell.org>**20100421151640
508 Ignore-this: 9e55a05581df93c5642547ab964fc9be
509]
510[Adjust URLs in .cabal files
511Duncan Coutts <duncan@haskell.org>**20100421151036
512 Ignore-this: 14fdbc10e96f0c07e85fcb37a8b92813
513 Use full http:// url for the homepage. Use the root of the gtk2hs trac
514 for bug reports because that has the info on how report a bug.
515 Remove the package-url field because it is deprecated and useless.
516]
517[Fix license name/version in .cabal files for glib, pango, gtk and tools
518Duncan Coutts <duncan@haskell.org>**20100421150549
519 Ignore-this: 9e316a7f7ac55dbf2ff8d6f87d8dcdfd
520 glib, pango and gtk are LGPL not GPL.
521 Cabal now allows us to specify the license version, so specify that too.
522]
523[Fix hierarchy.list typo and make Multiline.Types expose to support Sourceview2 Cabal package
524Andy Stewart <lazycat.manatee@gmail.com>**20100422075609
525 Ignore-this: a81b85782f8480c633ebcd882bd8a6ba
526]
527[Fix gtk.cabal, make some modules expose to support WebKit Cabal package.
528Andy Stewart <lazycat.manatee@gmail.com>**20100422070445
529 Ignore-this: 4e1d125b2bf655f4a502aa73b9a6a9b6
530]
531[Fix WebKit name in hierarchy.list
532Andy Stewart <lazycat.manatee@gmail.com>**20100421213615
533 Ignore-this: 1f1d0daa69c2b9d08af7086ee6aad926
534]
535[Undo moving the Types file to the exposed modules. This can't build.
536Axel.Simon@in.tum.de**20100421133856
537 Ignore-this: 3fd910eb3ba8f76a41d68d595c8d053b
538]
539[TAG 0.10.5
540Axel.Simon@in.tum.de**20100421122640
541 Ignore-this: 2b933470cd14a19e695a4387c97c83e7
542]
543Patch bundle hash:
54485553babfb7eb237572d69b507a59751dff2d9a4