git.iko.soy/jsaddle
on master help sign in
Fix Windows
commitd348ef44488925b1530bfdaab965db7311209072 authorHamish Mackenzie <Hamish.K.Mackenzie@googlemail.com> dateWed 4 Jan 2017, 01:15 (10 years ago) parentf446802
4 files changed+21−6
compare with master
unifiedsplit
jsaddle-webkit2gtk/jsaddle-webkit2gtk.cabal+4−2 jsaddle-webkit2gtk/src/Language/Javascript/JSaddle/WebKitGTK.hs+6 jsaddle-webkitgtk/jsaddle-webkitgtk.cabal+4−2 jsaddle-webkitgtk/src/Language/Javascript/JSaddle/WebKitGTK.hs+7−2
jsaddle-webkit2gtk/jsaddle-webkit2gtk.cabal+4−2
@@ -1,5 +1,5 @@
11name: jsaddle-webkit2gtk
2−version: 0.8.2.0
2+version: 0.8.2.1
33cabal-version: >=1.10
44build-type: Simple
55license: MIT
@@ -38,8 +38,10 @@ library
3838 haskell-gi-base >=0.20 && <0.21,
3939 jsaddle >=0.8.0.0 && <0.9,
4040 text >=1.2.1.3 && <1.3,
41− unix >=2.3.1.0 && <2.8,
4241 webkit2gtk3-javascriptcore >=0.14.0.0 && <0.15
42+ if !os(windows)
43+ build-depends:
44+ unix >=2.3.1.0 && <2.8
4345 default-language: Haskell2010
4446 hs-source-dirs: src
4547 ghc-options: -ferror-spans -Wall
jsaddle-webkit2gtk/src/Language/Javascript/JSaddle/WebKitGTK.hs+6
@@ -34,7 +34,9 @@ import Control.Monad (void)
3434import Control.Monad.IO.Class (MonadIO(..), MonadIO)
3535import Control.Concurrent (forkIO, yield)
3636
37+#ifndef mingw32_HOST_OS
3738import System.Posix.Signals (installHandler, keyboardSignal, Handler(Catch))
39+#endif
3840import System.Directory (getCurrentDirectory)
3941
4042import Data.Monoid ((<>))
@@ -94,7 +96,11 @@ quitWebView wv = postGUIAsync $ do w <- widgetGetToplevel wv --TODO: Shouldn't t
9496 widgetDestroy w
9597
9698installQuitHandler :: WebView -> IO ()
99+#ifdef mingw32_HOST_OS
100+installQuitHandler wv = return () -- TODO: Maybe figure something out here for Windows users.
101+#else
97102installQuitHandler wv = void $ installHandler keyboardSignal (Catch (quitWebView wv)) Nothing
103+#endif
98104
99105postGUIAsync :: IO () -> IO ()
100106postGUIAsync action =
jsaddle-webkitgtk/jsaddle-webkitgtk.cabal+4−2
@@ -1,5 +1,5 @@
11name: jsaddle-webkitgtk
2−version: 0.8.2.0
2+version: 0.8.2.1
33cabal-version: >=1.10
44build-type: Simple
55license: MIT
@@ -34,8 +34,10 @@ library
3434 haskell-gi-base >=0.20 && <0.21,
3535 jsaddle >=0.8.0.0 && <0.9,
3636 text >=1.2.1.3 && <1.3,
37− unix >=2.3.1.0 && <2.8,
3837 webkitgtk3-javascriptcore >=0.14.0.0 && <0.15
38+ if !os(windows)
39+ build-depends:
40+ unix >=2.3.1.0 && <2.8
3941 default-language: Haskell2010
4042 hs-source-dirs: src
4143 ghc-options: -ferror-spans -Wall
jsaddle-webkitgtk/src/Language/Javascript/JSaddle/WebKitGTK.hs+7−2
@@ -35,8 +35,9 @@ import qualified Control.Exception as E (catch)
3535import Control.Exception (SomeException(..))
3636import Control.Concurrent (forkIO, yield)
3737
38−import System.Posix.Signals
39− (Handler(..), keyboardSignal, installHandler)
38+#ifndef mingw32_HOST_OS
39+import System.Posix.Signals (installHandler, keyboardSignal, Handler(Catch))
40+#endif
4041import System.Directory (getCurrentDirectory)
4142
4243import Data.Monoid ((<>))
@@ -95,7 +96,11 @@ quitWebView wv = postGUIAsync $ do w <- widgetGetToplevel wv --TODO: Shouldn't t
9596 widgetDestroy w
9697
9798installQuitHandler :: WebView -> IO ()
99+#ifdef mingw32_HOST_OS
100+installQuitHandler wv = return () -- TODO: Maybe figure something out here for Windows users.
101+#else
98102installQuitHandler wv = void $ installHandler keyboardSignal (Catch (quitWebView wv)) Nothing
103+#endif
99104
100105postGUIAsync :: IO () -> IO ()
101106postGUIAsync action =