Ticket #1187: c2hs-incpath-fix.dpatch

2 patches for repository http://code.haskell.org/gtk2hs:

Mon May  3 16:44:37 BST 2010  Duncan Coutts <duncan@haskell.org>
  * Fix handling of cpp flags. Allows dirs with spaces.
  Backport of the fix in mainline c2hs.

Mon May  3 19:57:22 BST 2010  Duncan Coutts <duncan@haskell.org>
  * Fix behaviour of -i flag for windows paths
  Split on the system path separator and cope with paths with spaces.

New patches:

[Fix handling of cpp flags. Allows dirs with spaces.
Duncan Coutts <duncan@haskell.org>**20100503154437
 Ignore-this: 7127f1f91ebe287b54db0e843fb48365
 Backport of the fix in mainline c2hs.
] {
hunk ./tools/c2hs/state/Switches.hs 72
 -- all switches of the toolkit (EXPORTED)
 --
 data SwitchBoard = SwitchBoard {
-                    cppOptsSB :: String,       -- cpp options
+                    cppOptsSB :: [String],     -- cpp options
                     cppSB     :: FilePath,     -- cpp executable
                     hpathsSB  :: [FilePath],   -- header file directories
                       -- since 0.11.1 `hpathsSB' isn't really needed anymore..
hunk ./tools/c2hs/state/Switches.hs 92
 --
 initialSwitchBoard :: SwitchBoard
 initialSwitchBoard  = SwitchBoard {
-                       cppOptsSB = "",
+                       cppOptsSB = [],
                        cppSB     = "cpp",
                        hpathsSB  = [],
                        keepSB    = False,
hunk ./tools/c2hs/toplevel/C2HSConfig.hs 73
 --
 -- * `-P' would suppress `#line' directives
 --
-cppopts :: String
+cppopts :: [String]
 cppopts  =
 #ifdef _C2HS_CPP_IS_GCC
hunk ./tools/c2hs/toplevel/C2HSConfig.hs 76
-  "-E "++
+  "-E":
 #endif
 #ifdef _C2HS_CPP_LANG_SINGLE
hunk ./tools/c2hs/toplevel/C2HSConfig.hs 79
-  "-xc -w"
+  ["-xc", "-w"]
 #else
hunk ./tools/c2hs/toplevel/C2HSConfig.hs 81
-  "-x c -w"
+  ["-x", "c", "-w"]
 #endif
 
 -- C preprocessor option for including only definitions (EXPORTED)
hunk ./tools/c2hs/toplevel/Main.hs 155
 import Errors    (interr)
 import UNames     (saveRootNameSupply, restoreRootNameSupply)
 import Binary    (Binary(..), putBinFileWithDict, getBinFileWithDict)
+import System.IO (openFile, IOMode(..))
+import System.Process (runProcess, waitForProcess)
 
 -- c2hs modules
 import C2HSState  (CST, nop, runC2HS, fatal, fatalsHandledBy, getId,
hunk ./tools/c2hs/toplevel/Main.hs 402
 -- * `Help' cannot occur 
 --
 processOpt                   :: Flag -> CST s ()
-processOpt (CPPOpts cppopts)  = addCPPOpts cppopts
+processOpt (CPPOpts cppopt )  = addCPPOpts [cppopt]
 processOpt (CPP     cpp    )  = setCPP     cpp
 processOpt (Dump    dt     )  = setDump    dt
 processOpt (Keep           )  = setKeep
hunk ./tools/c2hs/toplevel/Main.hs 453
 -- * any header search path that is set with `-IDIR' is also added to
 --   `hpathsSB'
 --
-addCPPOpts      :: String -> CST s ()
+addCPPOpts      :: [String] -> CST s ()
 addCPPOpts opts  = 
   do
hunk ./tools/c2hs/toplevel/Main.hs 456
-    let iopts = [opt | opt <- words opts, "-I" `isPrefixOf` opt, "-I-" /= opt]
+    let iopts = [opt | opt <- opts, "-I" `isPrefixOf` opt, "-I-" /= opt]
     addHPaths . map (drop 2) $ iopts
     addOpts opts
   where
hunk ./tools/c2hs/toplevel/Main.hs 461
     addOpts opts  = setSwitch $ 
-                     \sb -> sb {cppOptsSB = cppOptsSB sb ++ (' ':opts)}
+                     \sb -> sb {cppOptsSB = cppOptsSB sb ++ opts}
 
 -- set the program name of the C proprocessor
 --
hunk ./tools/c2hs/toplevel/Main.hs 569
        let ppFile = outFileBase ++ "_pp" ++ chssuffix
        cpp     <- getSwitch cppSB
        cppOpts <- getSwitch cppOptsSB
-       let cmd  = unwords [cpp, cppOpts, cppoptsdef, headerFile,
-                           bndFile, ">", ppFile]
-       tracePreproc cmd
-       exitCode <- systemCIO cmd
+       let args = cppOpts ++ [cppoptsdef, headerFile, bndFile]
+       tracePreproc (unwords (cpp:args))
+       exitCode <- liftIO $ do
+         preprocHnd <- openFile ppFile WriteMode
+         cppproc <- runProcess cpp args
+                       Nothing Nothing Nothing (Just preprocHnd) Nothing
+         waitForProcess cppproc
        case exitCode of 
          ExitFailure _ -> fatal "Error during preprocessing chs file"
          _             -> nop
hunk ./tools/c2hs/toplevel/Main.hs 625
         --
         cpp     <- getSwitch cppSB
         cppOpts <- getSwitch cppOptsSB
-        let cmd  = unwords [cpp, cppOpts, newHeaderFile, ">" ++ preprocFile]
-        tracePreproc cmd
-        exitCode <- systemCIO cmd
+        let args = cppOpts ++ [newHeaderFile]
+        tracePreproc (unwords (cpp:args))
+        exitCode <- liftIO $ do
+          preprocHnd <- openFile preprocFile WriteMode
+          cppproc <- runProcess cpp args
+            Nothing Nothing Nothing (Just preprocHnd) Nothing
+          waitForProcess cppproc
         case exitCode of 
           ExitFailure _ -> fatal "Error during preprocessing custom header file"
           _             -> nop
hunk ./tools/c2hs/toplevel/Main.hs 694
     --
     cpp     <- getSwitch cppSB
     cppOpts <- getSwitch cppOptsSB
-    let cmd  = unwords [cpp, cppOpts, realHeaderFile, ">" ++ preprocFile]
-    tracePreproc cmd
-    exitCode <- systemCIO cmd
+    let args = cppOpts ++ [realHeaderFile]
+    tracePreproc (unwords (cpp:args))
+    exitCode <- liftIO $ do
+      preprocHnd <- openFile preprocFile WriteMode
+      cppproc <- runProcess cpp args
+        Nothing Nothing Nothing (Just preprocHnd) Nothing
+      waitForProcess cppproc
     case exitCode of
       ExitFailure _ -> fatal "Error during preprocessing"
       _             -> nop
}
[Fix behaviour of -i flag for windows paths
Duncan Coutts <duncan@haskell.org>**20100503185722
 Ignore-this: c03f3d57d1b168f6bd6476451e267a99
 Split on the system path separator and cope with paths with spaces.
] {
hunk ./tools/c2hs/toplevel/Main.hs 157
 import Binary    (Binary(..), putBinFileWithDict, getBinFileWithDict)
 import System.IO (openFile, IOMode(..))
 import System.Process (runProcess, waitForProcess)
+import System.FilePath (splitSearchPath)
 
 -- c2hs modules
 import C2HSState  (CST, nop, runC2HS, fatal, fatalsHandledBy, getId,
hunk ./tools/c2hs/toplevel/Main.hs 496
 --
 setInclude :: String -> CST s ()
 setInclude str = do
-  let fp = makePath str ""
+  let fp = splitSearchPath str
   setSwitch $ \sb -> sb {chiPathSB = fp ++ (chiPathSB sb)}
hunk ./tools/c2hs/toplevel/Main.hs 498
-  where
-    makePath ('\\':r:em)   path = makePath em (path ++ ['\\',r])
-    makePath (' ':rem)    path = makePath rem path
-    makePath (':':rem)     ""   = makePath rem ""
-    makePath (':':rem)    path = path : makePath rem ""
-    makePath ('/':':':rem) path = path : makePath rem ""
-    makePath (r:emain)    path = makePath emain (path ++ [r])
-    makePath ""                   ""   = []
-    makePath ""                   path = [path]
 
 -- set the output file name
 --
hunk ./tools/gtk2hs-buildtools.cabal 55
 Executable gtk2hsC2hs
         main-is:        Main.hs
         build-depends:  base >= 4 && < 5,
-                        process, directory, array, containers, pretty, haskell98
+                        process, directory, array, containers, pretty,
+                        filepath, haskell98
         other-modules:  BaseVersion
                         Config
                         Errors
}

Context:

[Fix textView signals (rename `setScrollAdjustments` to `setTextViewScrollAdjustments`) and fix signal docs.
Andy Stewart <lazycat.manatee@gmail.com>**20100503140719
 Ignore-this: 3fcfbfe8659c1f01d806990a6a59e0dc
] 
[Fix TextView signals.
Andy Stewart <lazycat.manatee@gmail.com>**20100502110206
 Ignore-this: 3cc1d9c7e1452e577264f2a287852a22
] 
[Add bootstrap.sh.
Andy Stewart <lazycat.manatee@gmail.com>**20100501220434
 Ignore-this: bdcf47e2a0b99436967f6338c8f00141
] 
[Fix cairo demo.
Andy Stewart <lazycat.manatee@gmail.com>**20100501214046
 Ignore-this: bb37935be21a3414d6540d39b74d57c6
] 
[Fix scaling demo and move to `gtk2hs/glade/demo`.
Andy Stewart <lazycat.manatee@gmail.com>**20100501211752
 Ignore-this: 26b0499662347edb6067e8f8397a406c
] 
[Move profileviewer demo to `gtk2hs/glade/demo.`
Andy Stewart <lazycat.manatee@gmail.com>**20100501211335
 Ignore-this: 80f20961b905bca023b4813e7b99f2db
] 
[Fix noughty demo and move to `gtk2hs/glade/demo`.
Andy Stewart <lazycat.manatee@gmail.com>**20100501211126
 Ignore-this: 598b67397619be71313289a86c3f1dc6
] 
[Move calc demo to `gtk2hs/glade/demo` and adjust glade demo.
Andy Stewart <lazycat.manatee@gmail.com>**20100501210542
 Ignore-this: 152abe8888a55ec4a2c106292a58b6cf
] 
[Fix carsim demo.
Andy Stewart <lazycat.manatee@gmail.com>**20100501210132
 Ignore-this: 1502949718304229aa7d6d82084eb442
] 
[Remove warning for GtkInternal.
Andy Stewart <lazycat.manatee@gmail.com>**20100501205623
 Ignore-this: b1b60e69e87208431f7f287ae8174f26
] 
[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.
Andy Stewart <lazycat.manatee@gmail.com>**20100501180134
 Ignore-this: db2796b94f08260401cff17b638ef6a4
] 
[Move cairo demo to `gtk2hs/cairo/demo`.
Andy Stewart <lazycat.manatee@gmail.com>**20100501174106
 Ignore-this: 59379042dbc12ed64d7c6fa67da613a6
] 
[Move pango demo to `gtk2hs/pango/demo`.
Andy Stewart <lazycat.manatee@gmail.com>**20100501173621
 Ignore-this: f93de2952148b90d739bf4e06f31fcaa
] 
[Move svg demo to `gtk2hs/svgcairo/demo`.
Andy Stewart <lazycat.manatee@gmail.com>**20100501173518
 Ignore-this: da7867efa4d2c2c21fedd7a2335048e7
] 
[Move soe demo to `gtk2hs/soegtk/demo`.
Andy Stewart <lazycat.manatee@gmail.com>**20100501173350
 Ignore-this: f861db155bcb0b0f266ccbcac2770ef5
] 
[Move opengl demo to `gtk/gtkglext/demo`.
Andy Stewart <lazycat.manatee@gmail.com>**20100501173231
 Ignore-this: 5c11b627899153dfec86424037ad147e
] 
[Move gnomevfs demo to `gtk2hs/gnomevfs/demo`.
Andy Stewart <lazycat.manatee@gmail.com>**20100501173035
 Ignore-this: 3c4019cd021cd9349e7a794f0c73bea6
] 
[Move glade demo to `gtk2hs/glade/demo`.
Andy Stewart <lazycat.manatee@gmail.com>**20100501171808
 Ignore-this: c3cc3e5a3fb50e9c97ea4d141e993151
] 
[Move gconf demo to `gtk2hs/gconf/demo`.
Andy Stewart <lazycat.manatee@gmail.com>**20100501171629
 Ignore-this: b4011619e7e1096307d5fb9bf7212982
] 
[Remove vte and webkit demo from main repo (those demos have exist in `gtk2hs/vte/demo` and `gtk2hs/webkit/demo`)
Andy Stewart <lazycat.manatee@gmail.com>**20100501171314
 Ignore-this: 1aa0f5ed4fc91b00ded2affad59061eb
] 
[Fix compile error of soegtk.
Andy Stewart <lazycat.manatee@gmail.com>**20100501162122
 Ignore-this: f6661f25cb9a067a24d7db7242dcab3a
] 
[Fix compile error of webkit.
Andy Stewart <lazycat.manatee@gmail.com>**20100501162011
 Ignore-this: 2f6fe99208c5e17d4fd906b2f70b18b9
] 
[Fix compile error of vte.
Andy Stewart <lazycat.manatee@gmail.com>**20100501161926
 Ignore-this: b837e1f746a7f8779ec49758f9741c4c
] 
[Fix compile error of gtksourceview2.
Andy Stewart <lazycat.manatee@gmail.com>**20100501161826
 Ignore-this: d7f05977a77f1330d14915e5895b526c
] 
[Fix compile error of gnomevfs.
Andy Stewart <lazycat.manatee@gmail.com>**20100501161739
 Ignore-this: 8300370414f8840fcb7897e199025d75
] 
[Fix compile error of gio.
Andy Stewart <lazycat.manatee@gmail.com>**20100501161612
 Ignore-this: 30af23f768bf3823c55db6db33fae8e9
] 
[Fix compile error of gconf.
Andy Stewart <lazycat.manatee@gmail.com>**20100501161504
 Ignore-this: 67c9dc2b5c337476bf3fb5ef5aa3ceb4
] 
[Replace Setup.hs by the default setup files.
Axel.Simon@in.tum.de**20100501150933
 Ignore-this: b4c2102781b831bd3b787bde35ffcda6
] 
[Replace Setup.hs by the default setup files.
Axel.Simon@in.tum.de**20100501150755
 Ignore-this: cdc12e9af9b22e54ef4ac288dc8b9000
] 
[Replace Setup.hs by the default setup files.
Axel.Simon@in.tum.de**20100501150605
 Ignore-this: 58710ee1f00cd1242057f1cbdcee94ff
] 
[Make SOE a really simple package, since it is.
Axel.Simon@in.tum.de**20100501150526
 Ignore-this: f35f2729f101b34f3e9d47b60ead6171
] 
[Replace Setup.hs by the default setup files.
Axel.Simon@in.tum.de**20100501150156
 Ignore-this: 9e17194a9abf7cd0b31061249694edda
] 
[Replace Setup.hs by the default setup files.
Axel.Simon@in.tum.de**20100501145457
 Ignore-this: 90c6e9badb9b88a25c58a07e3dec6d11
] 
[Replace Setup.hs by the default setup files.
Axel.Simon@in.tum.de**20100501145419
 Ignore-this: 6becb507b1606e949d0d13720d361850
] 
[Replace Setup.hs by the default setup files.
Axel.Simon@in.tum.de**20100501144608
 Ignore-this: 43ea6510fb65dfbb2e76130cb274a364
] 
[Install the standard setup files in gio.
Axel.Simon@in.tum.de**20100501144140
 Ignore-this: a21f5c4e5e0aecc52c967a31e90c2d37
] 
[Fix the build infrastructure of gconf.
Axel.Simon@in.tum.de**20100501143402
 Ignore-this: c0f1e1e066e9a7f9f733a4b768d9196d
] 
[Expose module `System.Gnome.VFS` in gnomevfs.cabal
Andy Stewart <lazycat.manatee@gmail.com>**20100428122845
 Ignore-this: 70069732773614e4323d696cb887a2d1
] 
[gnomevfs Cabal package.
Andy Stewart <lazycat.manatee@gmail.com>**20100428100530
 Ignore-this: 5bbab11f5a0e5c0c790fd917659722c7
] 
[webkit Cabal package.
Andy Stewart <lazycat.manatee@gmail.com>**20100428101329
 Ignore-this: 3b4d27f26dcfb80aec42923906938106
] 
[vte Cabal package.
Andy Stewart <lazycat.manatee@gmail.com>**20100428101229
 Ignore-this: 2618acc76f647f454e6e1bf5f588e858
] 
[svgcairo Cabal package.
Andy Stewart <lazycat.manatee@gmail.com>**20100428100832
 Ignore-this: 5c55b0a69f3e7938712e3deb51091cac
] 
[soegtk Cabal package.
Andy Stewart <lazycat.manatee@gmail.com>**20100428100758
 Ignore-this: ad606092c1d9afbef2a70b8e9b62cc38
] 
[gtksource2 Cabal package.
Andy Stewart <lazycat.manatee@gmail.com>**20100428100657
 Ignore-this: d9c8bd42bc893928d04b132a1a6c29ae
] 
[gtkglext Cabal package.
Andy Stewart <lazycat.manatee@gmail.com>**20100428100617
 Ignore-this: 485ca74cc042b8751415c7e960650a23
] 
[gconf Cabal package.
Andy Stewart <lazycat.manatee@gmail.com>**20100428100216
 Ignore-this: 26854e53627320a7ef3a65f6823fcb60
] 
[GIO Cabal package (Fix doc, add new functions: `fileHasParent` and `fileQueryFileType`)
Andy Stewart <lazycat.manatee@gmail.com>**20100428095858
 Ignore-this: 3b53dc9cd495f92e9a7652e14d1cb05b
] 
[glade Cabal package.
Andy Stewart <lazycat.manatee@gmail.com>**20100428100433
 Ignore-this: c152a8f7de7a4622d2f8f5e6aa30b835
] 
[Always build Plug and Socket, even on Windows.
Axel.Simon@in.tum.de**20100501133611
 Ignore-this: 3d318997a29c769d415238ad7bed881b
] 
[Seperate the standard setup functionality from that necessary for specific packages.
Axel.Simon@in.tum.de**20100501133156
 Ignore-this: 326634d72596f48f1e76ffd688c0f79f
] 
[Let the default Signal template import GtkInternals.
Axel.Simon@in.tum.de**20100501133050
 Ignore-this: 2f2e8944aa1cc5a5831cabd8c86f119c
] 
[Pick the right function to load a Pixbuf on Windows.
Axel.Simon@in.tum.de**20100501132726
 Ignore-this: 3e114b00529c96bedea2cb1214dd27b2
] 
[Add `Emblem` and `EmblemedIcon` in hierarchy.list to support gio.
Andy Stewart <lazycat.manatee@gmail.com>**20100430180426
 Ignore-this: 9bb1953f8b0a82e895c7f723acf78def
] 
[Add new functions `readUTFStringArray0` for gio binding.
Andy Stewart <lazycat.manatee@gmail.com>**20100430071318
 Ignore-this: d8d756fca5e216862594e9957a178875
] 
[Add callback `NONE:OBJECT,OBJECT,ENUM` for gio.
Andy Stewart <lazycat.manatee@gmail.com>**20100430035445
 Ignore-this: e594257b6d014dd1c92132e7c6ef399c
] 
[Add callback `NONE:STRING,STRING,STRING,ENUM` to support gio.
Andy Stewart <lazycat.manatee@gmail.com>**20100429201243
 Ignore-this: 9b38ae786b5b2866764a276ec5e40b00
] 
[Add function `widgetGetAllocation` and fix version tag.
Andy Stewart <lazycat.manatee@gmail.com>**20100428151304
 Ignore-this: 74e831fd17d3f1bbd2761e2e778e4e4e
] 
[re-export `toNativeWindowId` and `fromNativeWindowId` to fix Embedded demos.
Andy Stewart <lazycat.manatee@gmail.com>**20100428151139
 Ignore-this: 6e49f7548a461e1da10c5e2a1ff385e6
] 
[Fix cycle import problem, and expose `Threading` modules for use in Signals.chs
Andy Stewart <lazycat.manatee@gmail.com>**20100428145100
 Ignore-this: 5c350d915116b87c728b69942b461bd1
 
 * Signal.chs.template : restore to "import Graphics.UI.Gtk.General.Threading".
 * GtkInternals.chs    : remove Graphics.UI.Gtk.General.Threading, otherwise cycle import when compile gtk.
 * Threading.hs        : Add nots that don't use this module in application.
 * gtk.cabal           : expose Graphics.UI.Gtk.General.Threading
 
] 
[Adjust GtkInternal.chs and Signal.chs.template to support non-core packages.
Andy Stewart <lazycat.manatee@gmail.com>**20100428094453
 Ignore-this: bf2cfe48234ea434dbb108e780dad346
 
 Becuase Signal.chs in non-core packages need import `Graphics.UI.Gtk.General.Threading`, 
 so i add it in GtkInternal and change Signa.chs template.
 
] 
[Add new callback for gconf.
Andy Stewart <lazycat.manatee@gmail.com>**20100425025913
 Ignore-this: dd81d8a5dff016895855bd947114b893
] 
[Call c2hs with the bare filename as its output.
Axel.Simon@in.tum.de**20100423152501
 Ignore-this: c9be4c390228577708614efa892a24b7
] 
[Explicitly link in gthread which is required to find g_thread_init.
Axel.Simon@in.tum.de**20100423145524
 Ignore-this: 11729966fdc935ccc3605dc51102d1f4
] 
[Move modules back to the not-exposed section and add them to the Internals module instead.
Axel.Simon@in.tum.de**20100422153008
 Ignore-this: 255f909810a01cc250790b1423643551
] 
[Ensure all end-user types names are exposed through Gtk.hs and make low-level type names available through a new module.
Axel.Simon@in.tum.de**20100422141222
 Ignore-this: c8f2000df7eb6ceb0f67bfebd3286d9c
] 
[Move the pango C lib version stuff into the Setup.hs
Duncan Coutts <duncan@haskell.org>**20100422001240
 Ignore-this: 795b62cbd00a5a29c6e2373174f0f757
 Rather than using flags in the .cabal file.
 Generate a .h file with the pango version number and
 include that in the local hspango.h.
] 
[Hack in Setup.hs for include dirs, avoiding worse hack in .cabal files
Duncan Coutts <duncan@haskell.org>**20100422000751
 Ignore-this: 1017665f67f060f7ad1a1dd663a9386d
 Ought to be fixed in Cabal lib
] 
[Minor tweaks to Setup.hs scripts
Duncan Coutts <duncan@haskell.org>**20100421233554
 Ignore-this: 5de7745bd7fc5d49d470f5a38ac8e5a9
] 
[Add build-tools dependencies to .cabal files
Duncan Coutts <duncan@haskell.org>**20100421233016
 Ignore-this: 2ca87ca412766d96c688de06e93a29dd
] 
[Change the way the type tags are handled in the .cabal and Setup.hs files
Duncan Coutts <duncan@haskell.org>**20100421211616
 Ignore-this: bcbc507af8fb3a6103e505bc6361bd38
 In particular it eliminates the need for users to specify -fgtk_x_y flags.
] 
[Add upper bounds on deps within gtk2hs packages
Duncan Coutts <duncan@haskell.org>**20100421154805
 Ignore-this: ddc073c270f471583edfcd7f5063dc83
 This is only approximate, they may need to be tighter still.
] 
[Add upper bound on base version in .cabal files
Duncan Coutts <duncan@haskell.org>**20100421154742
 Ignore-this: 940b0938c956685b9996aa01b5a4e362
] 
[Adjust hackage category of build tools
Duncan Coutts <duncan@haskell.org>**20100421152105
 Ignore-this: b0b2a6179fcff848c756d6e6d7ee4b5d
] 
[Add source repository info to package .cabal files
Duncan Coutts <duncan@haskell.org>**20100421151640
 Ignore-this: 9e55a05581df93c5642547ab964fc9be
] 
[Adjust URLs in .cabal files
Duncan Coutts <duncan@haskell.org>**20100421151036
 Ignore-this: 14fdbc10e96f0c07e85fcb37a8b92813
 Use full http:// url for the homepage. Use the root of the gtk2hs trac
 for bug reports because that has the info on how report a bug.
 Remove the package-url field because it is deprecated and useless.
] 
[Fix license name/version in .cabal files for glib, pango, gtk and tools
Duncan Coutts <duncan@haskell.org>**20100421150549
 Ignore-this: 9e316a7f7ac55dbf2ff8d6f87d8dcdfd
 glib, pango and gtk are LGPL not GPL.
 Cabal now allows us to specify the license version, so specify that too.
] 
[Fix hierarchy.list typo and make Multiline.Types expose to support Sourceview2 Cabal package
Andy Stewart <lazycat.manatee@gmail.com>**20100422075609
 Ignore-this: a81b85782f8480c633ebcd882bd8a6ba
] 
[Fix gtk.cabal, make some modules expose to support WebKit Cabal package.
Andy Stewart <lazycat.manatee@gmail.com>**20100422070445
 Ignore-this: 4e1d125b2bf655f4a502aa73b9a6a9b6
] 
[Fix WebKit name in hierarchy.list
Andy Stewart <lazycat.manatee@gmail.com>**20100421213615
 Ignore-this: 1f1d0daa69c2b9d08af7086ee6aad926
] 
[Undo moving the Types file to the exposed modules. This can't build.
Axel.Simon@in.tum.de**20100421133856
 Ignore-this: 3fd910eb3ba8f76a41d68d595c8d053b
] 
[TAG 0.10.5
Axel.Simon@in.tum.de**20100421122640
 Ignore-this: 2b933470cd14a19e695a4387c97c83e7
] 
Patch bundle hash:
85553babfb7eb237572d69b507a59751dff2d9a4