webkit 0.12.3 → 0.12.4

raw patch · 5 files changed

+25/−13 lines, 5 filesdep ~glibnew-uploader

Dependency ranges changed: glib

Files

• Graphics/UI/Gtk/WebKit/Types.chs +5/−0
• Graphics/UI/Gtk/WebKit/WebFrame.chs +1/−1
• Gtk2HsSetup.hs +8/−5
• SetupMain.hs +8/−5
• webkit.cabal +3/−2

@@ -1,4 +1,5 @@ {-# OPTIONS_HADDOCK hide #-}+{-# LANGUAGE CPP #-} -- -*-haskell-*- -- -------------------- automatically generated file - do not edit ---------- --  Object hierarchy for the GIMP Toolkit (GTK) Binding for Haskell@@ -114,7 +115,11 @@   ) where  import Foreign.ForeignPtr (ForeignPtr, castForeignPtr, unsafeForeignPtrToPtr)+#if __GLASGOW_HASKELL__>=704+import Foreign.C.Types    (CULong(..), CUInt(..))+#else import Foreign.C.Types    (CULong, CUInt)+#endif import System.Glib.GType	(GType, typeInstanceIsA) {#import Graphics.UI.GtkInternals#} 

@@ -153,7 +153,7 @@  -- | Determines the current status of the load. ----- frame :   a WebKitWebView +-- frame :   a WebKitWebView --                           -- * Since 1.1.7 webFrameGetLoadStatus ::

@@ -9,7 +9,10 @@ module Gtk2HsSetup (    gtk2hsUserHooks,    getPkgConfigPackages, -  checkGtk2hsBuildtools+  checkGtk2hsBuildtools,+  typeGenProgram,+  signalGenProgram,+  c2hsLocal   ) where  import Distribution.Simple@@ -411,11 +414,11 @@             (out',visited') = foldl visit (out, m `S.insert` visited) (mdRequires md)  -- Check user whether install gtk2hs-buildtools correctly.-checkGtk2hsBuildtools :: [String] -> IO ()+checkGtk2hsBuildtools :: [Program] -> IO () checkGtk2hsBuildtools programs = do-  programInfos <- mapM (\ name -> do-                         location <- programFindLocation (simpleProgram name) normal-                         return (name, location)+  programInfos <- mapM (\ prog -> do+                         location <- programFindLocation prog normal+                         return (programName prog, location)                       ) programs   let printError name = do         putStrLn $ "Cannot find " ++ name ++ "\n" 

@@ -1,10 +1,13 @@--- Setup file for a Gtk2Hs module. Contains only adjustments specific to this module,--- all Gtk2Hs-specific boilerplate is stored in Gtk2HsSetup.hs which should be kept--- identical across all modules.-import Gtk2HsSetup ( gtk2hsUserHooks, checkGtk2hsBuildtools )+-- The real Setup file for a Gtk2Hs package (invoked via the SetupWrapper).+-- It contains only adjustments specific to this package,+-- all Gtk2Hs-specific boilerplate is kept in Gtk2HsSetup.hs+-- which should be kept identical across all packages.+--+import Gtk2HsSetup ( gtk2hsUserHooks, checkGtk2hsBuildtools,+                     typeGenProgram, signalGenProgram, c2hsLocal) import Distribution.Simple ( defaultMainWithHooks )  main = do-  checkGtk2hsBuildtools ["gtk2hsC2hs", "gtk2hsTypeGen", "gtk2hsHookGenerator"]+  checkGtk2hsBuildtools [typeGenProgram, signalGenProgram, c2hsLocal]   defaultMainWithHooks gtk2hsUserHooks   

@@ -1,5 +1,5 @@ Name:           webkit-Version:        0.12.3+Version:        0.12.4 License:        LGPL-2.1 License-file:   COPYING Copyright:      (c) 2001-2010 The Gtk2Hs Team@@ -42,7 +42,7 @@  Library         build-depends:  base >= 4 && < 5,-                        glib  >= 0.12 && < 0.13, +                        glib  >= 0.12.1 && < 0.13,                         pango >= 0.12 && < 0.13,                          cairo >= 0.12 && < 0.13,                         gtk   >= 0.12 && < 0.13@@ -77,6 +77,7 @@           Graphics.UI.Gtk.WebKit.Signals          extensions:     ForeignFunctionInterface+        include-dirs: . 		         x-Signals-File:  Graphics/UI/Gtk/WebKit/Signals.chs         x-Signals-Modname: Graphics.UI.Gtk.WebKit.Signals