Ticket #1101: patch.txt

1 patch for repository http://code.haskell.org/gtk2hs:

Wed Nov 14 02:31:12 CST 2012  jacksjy@gmail.com
  * c2hs bug #7 workaround
  cpp(The C preprocessor), will generate out diffrent infomation by diffent locale
  and parseHeader can't handle multi-byte char encoding language translation
  to the <command-line> etc. this workaround call cpp in LANG=C enviroment every time.


New patches:

[c2hs bug #7 workaround
jacksjy@gmail.com**20121113183112
 Ignore-this: 41481e2d2b0d6a5070e0aa4cb07ee176
 cpp(The C preprocessor), will generate out diffrent infomation by diffent locale
 and parseHeader can't handle multi-byte char encoding language translation
 to the <command-line> etc. this workaround call cpp in LANG=C enviroment every time.
] hunk ./tools/c2hs/toplevel/Main.hs 143
 where
 
 -- standard libraries
-import Data.List         (isPrefixOf)
-import System.IO         (openFile)
-import System.Process    (runProcess, waitForProcess)
-import Control.Monad      (when, unless, mapM)
-import Data.Maybe      (fromJust)
+import           Control.Monad         (mapM, unless, when)
+import           Data.List             (isPrefixOf)
+import           Data.Maybe            (fromJust)
+import           System.IO             (openFile)
+import           System.Process        (CreateProcess(..), StdStream(..), createProcess, shell,
+                                        waitForProcess)
 
 -- base libraries
 import System.Console.GetOpt     
hunk ./tools/c2hs/toplevel/Main.hs 565
         tracePreproc (unwords (cpp:args))
        exitCode <- liftIO $ do
           ppHnd <- openFile ppFile WriteMode
-          process <- runProcess cpp args
-            Nothing Nothing Nothing (Just ppHnd) Nothing
+          let cppShellCreate = shell $ unwords ("LANG=C":cpp:args)
+          (_, _, _, process) <- createProcess cppShellCreate {std_in = Inherit ,
+                                                  std_out = UseHandle ppHnd,
+                                                  std_err = Inherit}
           waitForProcess process
        case exitCode of 
          ExitFailure _ -> fatal "Error during preprocessing chs file"
hunk ./tools/c2hs/toplevel/Main.hs 623
         tracePreproc (unwords (cpp:args))
         exitCode <- liftIO $ do
           preprocHnd <- openFile preprocFile WriteMode
-          process <- runProcess cpp args
-            Nothing Nothing Nothing (Just preprocHnd) Nothing
+          let cppShellCreate = shell $ unwords ("LANG=C":cpp:args)
+          (_, _, _, process) <- createProcess cppShellCreate {std_in = Inherit ,
+                                                  std_out = UseHandle preprocHnd,
+                                                  std_err = Inherit}
           waitForProcess process
         case exitCode of 
           ExitFailure _ -> fatal "Error during preprocessing custom header file"
hunk ./tools/c2hs/toplevel/Main.hs 694
     tracePreproc (unwords (cpp:args))
     exitCode <- liftIO $ do
       preprocHnd <- openFile preprocFile WriteMode
-      process <- runProcess cpp args
-        Nothing Nothing Nothing (Just preprocHnd) Nothing
+      let cppShellCreate = shell $ unwords ("LANG=C":cpp:args)
+      (_, _, _, process) <- createProcess cppShellCreate {std_in = Inherit ,
+                                                  std_out = UseHandle preprocHnd,
+                                                  std_err = Inherit}
       waitForProcess process
     case exitCode of
       ExitFailure _ -> fatal "Error during preprocessing"
hunk ./tools/gtk2hs-buildtools.cabal 56
 Executable gtk2hsC2hs
         main-is:        Main.hs
         build-depends:  base >= 4 && < 5,
-                        process, directory, array, containers, pretty,
+                        process >= 1.0.1.1, directory, array, containers, pretty,
                         filepath, random
         build-tools:    alex, happy
         other-modules:  BaseVersion

Context:

[version bumps
Daniel Wagner <daniel@wagner-home.com>**20121104202904
 Ignore-this: b960ee20608d17c3574e40e8a454b80a
] 
[whitespace only
Daniel Wagner <daniel@wagner-home.com>**20121103135304
 Ignore-this: b76ab22da8e3f076d92952ee54a14d20
] 
[modify foreign import functions for ghc-7.6 compatibility
jwlato@gmail.com**20120926005409
 Ignore-this: 5d912e2b7782f0f002e88e76d0b52b26
 
 ghc-7.6 appears to be much more restrictive when coercing types of functions
 imported via the FFI than previous versions.  Before, unused arguments could be
 omitted, and types such as 'Ptr NewtypeWrapper' were allowed.  ghc-7.6 no
 longer seems to accept these, so some wrapped functions needed to have
 arguments added or argument types changed.
 
 The changed argument types are strictly in internal APIs, so a major version
 bump is not necessary.
] 
[fix 'catch' statements for ghc-7.6 compatibility
jwlato@gmail.com**20120926010051
 Ignore-this: cb638480bc10f2b446c6e0b251b35a10
] 
[tools/c2hs: import foreign data constructors (CInt)
jwlato@gmail.com**20120926010119
 Ignore-this: 7660daffca37235fda0f8cc47426a70
] 
[fix documentation bug: mention widgetTooltipText instead of widgetSetTooltipText
Daniel Wagner <daniel@wagner-home.com>**20121010232556
 Ignore-this: f9b29cc7376afc3312852126bc2a65b9
] 
[Fix for finding the .dll names for ghci
Duncan Coutts <duncan@community.haskell.org>**20120902165131
 Ignore-this: f2ca3b6959a1355ca708e8b7c091a50d
 Should fix the problem that the cairo package fails to load in ghci on Windows
] 
[Gergely Risko's patch to make tryEvent more useful
Daniel Wagner <daniel@wagner-home.com>**20120708094322
 Ignore-this: 526940ab1b2222de547f24dce4d95db4
 
 Previously, tryEvent would catch pattern-match failure exceptions and Do The
 Right Thing. However, it didn't catch the exception thrown when calling
 "guard". This patch lets it behave the same when guards fail as when patterns
 are exhausted.
 
] 
[forgot to bump the gtk package number -- which explains why the build fixes didn't make it to Hackage
Daniel Wagner <daniel@wagner-home.com>**20120617214149
 Ignore-this: bf0869569fbe3a78a3ac57317b78fcec
] 
[add a small demo of DND code
Daniel Wagner <daniel@wagner-home.com>**20120611224157
 Ignore-this: 7f6658e7f84c4ad5292b20042b7757b8
] 
[change gdk_threads_enter import from unsafe to safe
Daniel Wagner <daniel@wagner-home.com>**20120602235822
 Ignore-this: cae9259155505b623b1afe09f4df2143
 
 Safe imports have two uses: when a function may call back into Haskell, it must
 be marked safe; and when a function may block (or take a long time to compute),
 it may be marked safe to avoid blocking all other Haskell threads from making
 progress. The cost of marking a function safe is decreased (serial)
 performance.
 
 Since the typical use case for gdk_threads_enter is to grab a lock in
 concurrent code, it is important to ensure that other Haskell threads can make
 progress -- especially since one of them may be holding the lock.
 
] 
[use forward-compatible Foreign.C.Types imports
Daniel Wagner <daniel@wagner-home.com>**20120528182742
 Ignore-this: 6c4a618a653ddbaef4bd6974e7177d45
 
 Previously, the hierarchy generator used #if in an attempt to choose between
 two choices for an import line. The one choice gives warnings on old GHC's; the
 other gives warnings on new GHC's. However, the symbol used in the #if isn't
 defined by gtk2hs' custom build system, so one of the two choices was the
 defacto code. Until this patch, the defacto code was the one that produced
 warnings on new GHC's.
 
 It should be possible to revise the build system to define this symbol, but it
 is becoming less and less likely I will have the energy to work out how to do
 this correctly. Instead this patch makes the choice to prefer the import that
 compiles cleanly on new GHC's, and let old GHC's print warnings.
 
] 
[remove TreeStoreStatic
Daniel Wagner <daniel@wagner-home.com>**20120527215117
 Ignore-this: 87504218d1864b1239985ee7fb4e3495
 
 This module hasn't been touched in over five years; doesn't build; and wasn't
 mentioned in the cabal file anyway.
 
] 
[rename the HCAR report per Janis' instructions
Daniel Wagner <daniel@wagner-home.com>**20120517225052
 Ignore-this: f687965d8d6149ff6dfb95e0ae64f55d
] 
[Fix a memory leak in customStoreNew (#1251)
Takano Akio <aljee@hyper.cx>**20120423230920
 Ignore-this: 3940fee6a1c17c2a5951a7d9f6a6573b
] 
[some "darcs log name -> real world name" translations to remember
Daniel Wagner <daniel@wagner-home.com>**20120426165039
 Ignore-this: db0b53c299aa90ffcad5f1ce4fa9a758
] 
[record carefully what I'm supposed to do when it comes time to make a release
Daniel Wagner <daniel@wagner-home.com>**20120422231212
 Ignore-this: 74beca0a3c44929e5db7d03681b7e3ed
] 
[add a surface type for raw data, plus a demo program showing how to use this with SDL (code supplied by Eli Frey)
Daniel Wagner <daniel@wagner-home.com>**20120422195206
 Ignore-this: 254fd58bd2322a9fecb5449741d7a697
] 
[Add entryGet/SetBuffer functions.
adstark1982@yahoo.com**20120420133554
 Ignore-this: 5e083fd21fc5e63986fa0bae6a7d5442
] 
[Bindings for gtk_menu_item_get_label, gtk_menu_item_get_use_underline, and the associated setters.
adstark1982@yahoo.com**20120411140517
 Ignore-this: cc9d70d06e02b6ae93fe8e39daf96ea7
] 
[added pixbufNewFromData
blackredtree@gmail.com**20120320190411
 Ignore-this: e3bd65acdcad39fbe22258e53ec4ed22
] 
[Add a note on how to connect to bufferInsertText.
Axel.Simon@in.tum.de**20120313141311
 Ignore-this: c9a6011fbae46b14c6c18d92de9e6732
] 
[TAG 0.12.3.1
Daniel Wagner <daniel@wagner-home.com>**20120527221608
 Ignore-this: fba81e067f20815572c143782547944e
] 
Patch bundle hash:
b3431b690df2b291c64494188afbbcc86bae4a1d