git.iko.soy/jsaddle
on master help sign in
Fixes for linux
commit243d63f7ef90e79f36fdb8576ee78cd24b6e5ddd authorHamish Mackenzie <Hamish.K.Mackenzie@gmail.com> dateTue 25 May 2021, 21:05 (5 years ago) parentd5d7881
4 files changed+9−8
compare with master
unifiedsplit
cabal.project−1 jsaddle-webkit2gtk/src/Language/Javascript/JSaddle/WebKitGTK.hs+5−5 jsaddle-wkwebview/jsaddle-wkwebview.cabal+3−1 nix/hix.nix+1−1
cabal.project−1
@@ -2,7 +2,6 @@ packages:
22 jsaddle/
33 jsaddle-warp/
44 jsaddle-wkwebview/
5−-- jsaddle-webkitgtk/
65 jsaddle-webkit2gtk/
76 jsaddle-clib/
87
jsaddle-webkit2gtk/src/Language/Javascript/JSaddle/WebKitGTK.hs+5−5
@@ -55,11 +55,11 @@ import GI.GLib (timeoutAdd, idleAdd, pattern PRIORITY_HIGH, pattern PRIORITY_DEF
5555import qualified GI.Gtk as Gtk (main, init)
5656import GI.Gtk
5757 (windowSetPosition, windowSetDefaultSize, windowNew,
58− scrolledWindowNew, noAdjustment, containerAdd,
58+ scrolledWindowNew, Adjustment, containerAdd,
5959 WindowType(..), WindowPosition(..), widgetDestroy,
6060 widgetGetToplevel, widgetShowAll, onWidgetDestroy,
6161 mainQuit)
62−import GI.Gio (noCancellable)
62+import GI.Gio (Cancellable)
6363import GI.JavaScriptCore (valueToString)
6464import GI.WebKit2
6565 (scriptDialogPromptSetText, scriptDialogPromptGetDefaultText,
@@ -104,7 +104,7 @@ run main = do
104104 _ <- timeoutAdd PRIORITY_HIGH 10 (yield >> return True)
105105 windowSetDefaultSize window 900 600
106106 windowSetPosition window WindowPositionCenter
107− scrollWin <- scrolledWindowNew noAdjustment noAdjustment
107+ scrollWin <- scrolledWindowNew (Nothing :: Maybe Adjustment) (Nothing :: Maybe Adjustment)
108108 contentManager <- userContentManagerNew
109109 webView <- webViewNewWithUserContentManager contentManager
110110 settings <- webViewGetSettings webView
@@ -128,11 +128,11 @@ run main = do
128128runInWebView :: JSM () -> WebView -> IO ()
129129runInWebView f webView = do
130130 (processResults, syncResults, start) <- runJavaScript (\batch -> postGUIAsync $
131− webViewRunJavascript webView (decodeUtf8 . toStrict $ "runJSaddleBatch(" <> encode batch <> ");") noCancellable Nothing)
131+ webViewRunJavascript webView (decodeUtf8 . toStrict $ "runJSaddleBatch(" <> encode batch <> ");") (Nothing :: Maybe Cancellable) Nothing)
132132 f
133133
134134 addJSaddleHandler webView processResults syncResults
135− webViewRunJavascript webView (decodeUtf8 $ toStrict jsaddleJs) noCancellable . Just $
135+ webViewRunJavascript webView (decodeUtf8 $ toStrict jsaddleJs) (Nothing :: Maybe Cancellable) . Just $
136136 \_obj _asyncResult ->
137137 void $ forkIO start
138138
jsaddle-wkwebview/jsaddle-wkwebview.cabal+3−1
@@ -29,11 +29,13 @@ library
2929 base <5
3030 default-language: Haskell2010
3131 hs-source-dirs: src
32− frameworks: Foundation, WebKit
3332 ghc-options: -ferror-spans -Wall
33+ if os(linux)
34+ buildable: False
3435 if impl(ghcjs)
3536 hs-source-dirs: src-ghcjs
3637 else
38+ frameworks: Foundation, WebKit
3739 build-depends:
3840 aeson >=0.8.0.2 && <1.6,
3941 bytestring >=0.10.6.0 && <0.11,
nix/hix.nix+1−1
@@ -1,6 +1,6 @@
11{pkgs, ...}:
22{ modules = [({pkgs, ...}: {
3− packages.jsaddle-webkit2gtk.components.library.buildable = pkgs.lib.mkForce pkgs.stdenv.hostPlatform.isLinux;
3+ packages.webkit2gtk3-javascriptcore.components.library.doHaddock = false;
44 })];
55 shell.buildInputs = [ pkgs.nodejs ];
66 shell.tools.cabal = {};