diff --git a/ChangeLog.md b/ChangeLog.md --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,4 +1,16 @@ -### 3.0.15 +### 6.0.5 -+ Remove enable-overloading flags, and use instead explicit CPP checks for 'haskell-gi-overloading-1.0', see [how to disable overloading](https://github.com/haskell-gi/haskell-gi/wiki/Overloading\#disabling-overloading). ++ Add some nullables, see [PR 474](https://github.com/haskell-gi/haskell-gi/pull/474). +### 6.0.3 + ++ Depend on haskell-gi >= 0.26.9 (see [issue 439](https://github.com/haskell-gi/haskell-gi/issues/439)) + +### 6.0.2 + ++ Bump base lower bound + +5.0.1 +===== + ++ Initial version of the 5.0 bindings. diff --git a/LICENSE b/LICENSE --- a/LICENSE +++ b/LICENSE @@ -1,3 +1,17 @@ +The gi-webkit library and included works are provided under the terms of the +GNU Library General Public License (LGPL) version 2.1 with the following +exception: + +Static linking of applications or any other source to the gi-webkit library +does not constitute a modified or derivative work and does not require +the author(s) to provide source code for said work, to link against the +shared gi-webkit libraries, or to link their applications against a +user-supplied version of gi-webkit. If you link applications to a modified +version of gi-webkit, then the changes to gi-webkit must be provided under the +terms of the LGPL. + +---------------------------------------------------------------------------- + GNU LESSER GENERAL PUBLIC LICENSE Version 2.1, February 1999 diff --git a/README.md b/README.md --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Documentation Autogenerated documentation for this package can be found at -[https://hackage.haskell.org/package/gi-webkit-3.0.15/docs/GI-WebKit.html](https://hackage.haskell.org/package/gi-webkit-3.0.15/docs/GI-WebKit.html) +[https://hackage.haskell.org/package/gi-webkit-6.0.5/docs/GI-WebKit.html](https://hackage.haskell.org/package/gi-webkit-6.0.5/docs/GI-WebKit.html) For general documentation on using [haskell-gi](https://github.com/haskell-gi/haskell-gi) based bindings, see [the project page](https://github.com/haskell-gi/haskell-gi) or [the Wiki](https://github.com/haskell-gi/haskell-gi/wiki). diff --git a/Setup.hs b/Setup.hs --- a/Setup.hs +++ b/Setup.hs @@ -1,11 +1,23 @@ {-# LANGUAGE OverloadedStrings #-} -import Data.GI.CodeGen.CabalHooks (setupHaskellGIBinding) +import Data.GI.CodeGen.CabalHooks (setupBinding, TaggedOverride(..)) +import qualified GI.GLib.Config as GLib +import qualified GI.GObject.Config as GObject +import qualified GI.Gdk.Config as Gdk +import qualified GI.Gio.Config as Gio +import qualified GI.Gtk.Config as Gtk +import qualified GI.JavaScriptCore.Config as JavaScriptCore +import qualified GI.Soup.Config as Soup + + main :: IO () -main = setupHaskellGIBinding name version verbose overridesFile outputDir +main = setupBinding name version pkgName pkgVersion verbose overridesFile inheritedOverrides outputDir where name = "WebKit" - version = "3.0" + version = "6.0" + pkgName = "gi-webkit" + pkgVersion = "6.0.5" overridesFile = Just "WebKit.overrides" verbose = False outputDir = Nothing + inheritedOverrides = [TaggedOverride "inherited:GLib" GLib.overrides, TaggedOverride "inherited:GObject" GObject.overrides, TaggedOverride "inherited:Gdk" Gdk.overrides, TaggedOverride "inherited:Gio" Gio.overrides, TaggedOverride "inherited:Gtk" Gtk.overrides, TaggedOverride "inherited:JavaScriptCore" JavaScriptCore.overrides, TaggedOverride "inherited:Soup" Soup.overrides] diff --git a/WebKit.overrides b/WebKit.overrides --- a/WebKit.overrides +++ b/WebKit.overrides @@ -1,55 +1,51 @@ -namespace WebKit - # PkgConfig names are slightly different to the GI namespaces pkg-config-name JavaScriptCore javascriptcoregtk -# This is a macro, but somehow it appears in the introspection data as -# a function. -ignore check_version - -# https://bugs.webkit.org/show_bug.cgi?id=152826 +# nullable, but not marked as such +set-attr WebKit/UserContentManager/register_script_message_handler/@parameters/world_name nullable 1 set-attr WebKit/WebView/get_uri/@return-value nullable 1 +set-attr WebKit/WebView/get_title/@return-value nullable 1 +set-attr WebKit/WebView/get_custom_charset/@return-value nullable 1 +set-attr WebKit/WebView/get_favicon/@return-value nullable 1 +set-attr WebKit/WebView/get_main_resource/@return-value nullable 1 -# Generated from webkitgtk 2.4.11 with xsltproc Nullable.xslt WebKit-3.0.gir -set-attr WebKit/DOMBarInfo/get_visible/@parameters/self nullable 1 -set-attr WebKit/DOMConsole/get_memory/@return-value nullable 1 -set-attr WebKit/DOMDOMImplementation/create_document/@parameters/namespaceURI nullable 1 -set-attr WebKit/DOMDOMImplementation/create_document/@parameters/doctype nullable 1 -set-attr WebKit/DOMDOMWindow/get_computed_style/@parameters/pseudoElement nullable 1 -set-attr WebKit/DOMDocument/create_attribute_ns/@parameters/namespaceURI nullable 1 -set-attr WebKit/DOMDocument/create_element_ns/@parameters/namespaceURI nullable 1 -set-attr WebKit/DOMDocument/create_entity_reference/@parameters/name nullable 1 -set-attr WebKit/DOMDocument/evaluate/@parameters/resolver nullable 1 -set-attr WebKit/DOMDocument/evaluate/@parameters/inResult nullable 1 -set-attr WebKit/DOMDocument/get_override_style/@parameters/pseudoElement nullable 1 -set-attr WebKit/DOMElement/set_attribute_ns/@parameters/namespaceURI nullable 1 -set-attr WebKit/DOMEventTarget/add_event_listener/@parameters/user_data nullable 1 -set-attr WebKit/DOMHTMLElement/get_item_type/@return-value nullable 1 -set-attr WebKit/DOMHTMLPropertiesCollection/get_length/@parameters/self nullable 1 -set-attr WebKit/DOMHTMLPropertiesCollection/get_names/@parameters/self nullable 1 -set-attr WebKit/DOMHTMLPropertiesCollection/item/@parameters/self nullable 1 -set-attr WebKit/DOMHTMLPropertiesCollection/named_item/@return-value nullable 1 -set-attr WebKit/DOMHTMLPropertiesCollection/named_item/@parameters/self nullable 1 -set-attr WebKit/DOMMemoryInfo/get_js_heap_size_limit/@parameters/self nullable 1 -set-attr WebKit/DOMMemoryInfo/get_total_js_heap_size/@parameters/self nullable 1 -set-attr WebKit/DOMMemoryInfo/get_used_js_heap_size/@parameters/self nullable 1 -set-attr WebKit/DOMNode/insert_before/@parameters/refChild nullable 1 -set-attr WebKit/DOMPerformance/get_memory/@return-value nullable 1 -set-attr WebKit/DOMPropertyNodeList/get_length/@parameters/self nullable 1 -set-attr WebKit/DOMPropertyNodeList/item/@parameters/self nullable 1 -set-attr WebKit/FaviconDatabase/get_favicon_pixbuf/@parameters/cancellable nullable 1 -set-attr WebKit/FaviconDatabase/get_favicon_pixbuf/@parameters/callback nullable 1 -set-attr WebKit/FaviconDatabase/get_favicon_pixbuf/@parameters/user_data nullable 1 -set-attr WebKit/FaviconDatabase/set_path/@parameters/path nullable 1 -set-attr WebKit/SpellChecker/get_guesses_for_word/@parameters/context nullable 1 -set-attr WebKit/SpellChecker/update_spell_checking_languages/@parameters/languages nullable 1 -set-attr WebKit/SpellChecker/get_guesses_for_word/@parameters/context nullable 1 -set-attr WebKit/SpellChecker/update_spell_checking_languages/@parameters/languages nullable 1 -set-attr WebKit/SpellCheckerInterface/get_guesses_for_word/get_guesses_for_word/@parameters/context nullable 1 -set-attr WebKit/SpellCheckerInterface/update_spell_checking_languages/update_spell_checking_languages/@parameters/languages nullable 1 -set-attr WebKit/WebFrame/resource-load-failed/@parameters/error nullable 1 -set-attr WebKit/WebResource/load-failed/@parameters/error nullable 1 -set-attr WebKit/WebView/script-confirm/@parameters/confirmed nullable 1 -set-attr WebKit/WebView/script-prompt/@parameters/text nullable 1 -set-attr WebKit/WebView/window-object-cleared/@parameters/context nullable 1 -set-attr WebKit/WebView/window-object-cleared/@parameters/window_object nullable 1 +set-attr WebKit/WebContext/get_spell_checking_languages/@return-value nullable 1 + +set-attr WebKit/URIRequest/get_http_method/@return-value nullable 1 +set-attr WebKit/URIRequest/get_http_headers/@return-value nullable 1 +set-attr WebKit/URIResponse/get_suggested_filename/@return-value nullable 1 +set-attr WebKit/URIResponse/get_http_headers/@return-value nullable 1 + +set-attr WebKit/HitTestResult/get_link_uri/@return-value nullable 1 +set-attr WebKit/HitTestResult/get_link_title/@return-value nullable 1 +set-attr WebKit/HitTestResult/get_link_label/@return-value nullable 1 +set-attr WebKit/HitTestResult/get_image_uri/@return-value nullable 1 +set-attr WebKit/HitTestResult/get_media_uri/@return-value nullable 1 + +set-attr WebKit/Download/get_response/@return-value nullable 1 +set-attr WebKit/Download/get_web_view/@return-value nullable 1 + +set-attr WebKit/WebResource/get_response/@return-value nullable 1 + +set-attr WebKit/FaviconDatabase/get_favicon_uri/@return-value nullable 1 + +set-attr WebKit/FileChooserRequest/get_mime_types/@return-value nullable 1 +set-attr WebKit/FileChooserRequest/get_mime_types_filter/@return-value nullable 1 +set-attr WebKit/FileChooserRequest/get_selected_files/@return-value nullable 1 + +set-attr WebKit/WebInspector/get_inspected_uri/@return-value nullable 1 +set-attr WebKit/WebInspector/get_web_view/@return-value nullable 1 + +set-attr WebKit/ContextMenu/first/@return-value nullable 1 +set-attr WebKit/ContextMenu/last/@return-value nullable 1 +set-attr WebKit/ContextMenu/get_item_at_position/@return-value nullable 1 +set-attr WebKit/ContextMenu/get_user_data/@return-value nullable 1 + +set-attr WebKit/ContextMenuItem/get_action/@return-value nullable 1 +set-attr WebKit/ContextMenuItem/get_gaction/@return-value nullable 1 +set-attr WebKit/ContextMenuItem/get_submenu/@return-value nullable 1 + +set-attr WebKit/OptionMenu/get_event/@return-value nullable 1 +set-attr WebKit/OptionMenu/get_item/@return-value nullable 1 + +set-attr WebKit/AutomationSession/get_application_info/@return-value nullable 1 diff --git a/gi-webkit.cabal b/gi-webkit.cabal --- a/gi-webkit.cabal +++ b/gi-webkit.cabal @@ -1,50 +1,230 @@ name: gi-webkit -version: 3.0.15 -synopsis: WebKit bindings -description: Bindings for WebKit, autogenerated by haskell-gi. +version: 6.0.5 +synopsis: WebKit 6.x bindings +description: Bindings for WebKit 6.x, autogenerated by haskell-gi. homepage: https://github.com/haskell-gi/haskell-gi license: LGPL-2.1 license-file: LICENSE -author: Will Thompson, Iñaki García Etxebarria and Jonas Platte -maintainer: Iñaki García Etxebarria (garetxe@gmail.com) +author: Iñaki García Etxebarria +maintainer: Iñaki García Etxebarria category: Bindings build-type: Custom -cabal-version: >= 1.24 +cabal-version: 2.0 extra-source-files: README.md ChangeLog.md stack.yaml WebKit.overrides custom-setup - setup-depends: base >= 4.7 && < 5, - Cabal >= 1.24, - haskell-gi == 0.21.* + setup-depends: base >= 4.11 && < 5, + Cabal >= 1.24 && < 4, + haskell-gi >= 0.26.14 && < 0.27, + gi-cairo == 1.0.*, + gi-soup3, + gi-javascriptcore6, + gi-gtk4, + gi-gio == 2.0.*, + gi-gdk4, + gi-gobject == 2.0.*, + gi-glib == 2.0.*, + gi-atk == 2.0.* library default-language: Haskell2010 - default-extensions: NoImplicitPrelude, ScopedTypeVariables, CPP, OverloadedStrings, NegativeLiterals, ConstraintKinds, TypeFamilies, MultiParamTypeClasses, KindSignatures, FlexibleInstances, UndecidableInstances, DataKinds, FlexibleContexts - other-extensions: PatternSynonyms, ViewPatterns + default-extensions: NoImplicitPrelude, ScopedTypeVariables, CPP, OverloadedStrings, NegativeLiterals, ConstraintKinds, TypeFamilies, MultiParamTypeClasses, KindSignatures, FlexibleInstances, UndecidableInstances, DataKinds, FlexibleContexts, UndecidableSuperClasses, TypeOperators + other-extensions: PatternSynonyms, ViewPatterns, TypeApplications ghc-options: -fno-warn-unused-imports -fno-warn-warnings-deprecations - pkgconfig-depends: webkitgtk-3.0 + pkgconfig-depends: webkitgtk-6.0 build-depends: base >= 4.7 && <5, - haskell-gi-base == 0.21.*, - haskell-gi == 0.21.*, + haskell-gi-base >= 0.26 && < 0.27, + haskell-gi >= 0.26.14 && < 0.27, haskell-gi-overloading < 1.1, gi-cairo == 1.0.*, - gi-soup == 2.4.*, - gi-javascriptcore == 3.0.*, - gi-gtk == 3.0.*, + gi-soup3, + gi-javascriptcore6, + gi-gtk4, gi-gio == 2.0.*, - gi-gdkpixbuf == 2.0.*, - gi-gdk == 3.0.*, + gi-gdk4, gi-gobject == 2.0.*, gi-glib == 2.0.*, gi-atk == 2.0.*, bytestring >= 0.10 && < 1, containers >= 0.5 && < 1, - text >= 1.0 && < 2, + text >= 1.0 && < 3, transformers >= 0.4 && < 1 -- Disable overloading when compiling under GHC 8.2.x -- see https://ghc.haskell.org/trac/ghc/ticket/14382 if impl(ghc == 8.2.*) build-depends: haskell-gi-overloading == 0.0 + + -- Note that the following list of exposed modules and autogen + -- modules is for documentation purposes only, so that some + -- documentation appears in hackage. The actual list of modules + -- to be built will be built at configure time, based on the + -- available introspection data. + + exposed-modules: GI.WebKit.Config, + GI.WebKit, + GI.WebKit.Callbacks, + GI.WebKit.Constants, + GI.WebKit.Enums, + GI.WebKit.Flags, + GI.WebKit.Functions, + GI.WebKit.Interfaces, + GI.WebKit.Interfaces.PermissionRequest, + GI.WebKit.Objects, + GI.WebKit.Objects.AuthenticationRequest, + GI.WebKit.Objects.AutomationSession, + GI.WebKit.Objects.BackForwardList, + GI.WebKit.Objects.BackForwardListItem, + GI.WebKit.Objects.ClipboardPermissionRequest, + GI.WebKit.Objects.ColorChooserRequest, + GI.WebKit.Objects.ContextMenu, + GI.WebKit.Objects.ContextMenuItem, + GI.WebKit.Objects.CookieManager, + GI.WebKit.Objects.DeviceInfoPermissionRequest, + GI.WebKit.Objects.Download, + GI.WebKit.Objects.EditorState, + GI.WebKit.Objects.FaviconDatabase, + GI.WebKit.Objects.FileChooserRequest, + GI.WebKit.Objects.FindController, + GI.WebKit.Objects.FormSubmissionRequest, + GI.WebKit.Objects.GeolocationManager, + GI.WebKit.Objects.GeolocationPermissionRequest, + GI.WebKit.Objects.HitTestResult, + GI.WebKit.Objects.InputMethodContext, + GI.WebKit.Objects.MediaKeySystemPermissionRequest, + GI.WebKit.Objects.NavigationPolicyDecision, + GI.WebKit.Objects.NetworkSession, + GI.WebKit.Objects.Notification, + GI.WebKit.Objects.NotificationPermissionRequest, + GI.WebKit.Objects.OptionMenu, + GI.WebKit.Objects.PointerLockPermissionRequest, + GI.WebKit.Objects.PolicyDecision, + GI.WebKit.Objects.PrintOperation, + GI.WebKit.Objects.ResponsePolicyDecision, + GI.WebKit.Objects.SecurityManager, + GI.WebKit.Objects.Settings, + GI.WebKit.Objects.URIRequest, + GI.WebKit.Objects.URIResponse, + GI.WebKit.Objects.URISchemeRequest, + GI.WebKit.Objects.URISchemeResponse, + GI.WebKit.Objects.UserContentFilterStore, + GI.WebKit.Objects.UserContentManager, + GI.WebKit.Objects.UserMediaPermissionRequest, + GI.WebKit.Objects.UserMessage, + GI.WebKit.Objects.WebContext, + GI.WebKit.Objects.WebInspector, + GI.WebKit.Objects.WebResource, + GI.WebKit.Objects.WebView, + GI.WebKit.Objects.WebViewBase, + GI.WebKit.Objects.WebsiteDataAccessPermissionRequest, + GI.WebKit.Objects.WebsiteDataManager, + GI.WebKit.Objects.WebsitePolicies, + GI.WebKit.Objects.WindowProperties, + GI.WebKit.Structs, + GI.WebKit.Structs.ApplicationInfo, + GI.WebKit.Structs.Credential, + GI.WebKit.Structs.Feature, + GI.WebKit.Structs.FeatureList, + GI.WebKit.Structs.GeolocationPosition, + GI.WebKit.Structs.ITPFirstParty, + GI.WebKit.Structs.ITPThirdParty, + GI.WebKit.Structs.InputMethodUnderline, + GI.WebKit.Structs.MemoryPressureSettings, + GI.WebKit.Structs.NavigationAction, + GI.WebKit.Structs.NetworkProxySettings, + GI.WebKit.Structs.OptionMenuItem, + GI.WebKit.Structs.PermissionStateQuery, + GI.WebKit.Structs.ScriptDialog, + GI.WebKit.Structs.ScriptMessageReply, + GI.WebKit.Structs.SecurityOrigin, + GI.WebKit.Structs.UserContentFilter, + GI.WebKit.Structs.UserScript, + GI.WebKit.Structs.UserStyleSheet, + GI.WebKit.Structs.WebExtensionMatchPattern, + GI.WebKit.Structs.WebViewSessionState, + GI.WebKit.Structs.WebsiteData + + autogen-modules: GI.WebKit.Config, + GI.WebKit, + GI.WebKit.Callbacks, + GI.WebKit.Constants, + GI.WebKit.Enums, + GI.WebKit.Flags, + GI.WebKit.Functions, + GI.WebKit.Interfaces, + GI.WebKit.Interfaces.PermissionRequest, + GI.WebKit.Objects, + GI.WebKit.Objects.AuthenticationRequest, + GI.WebKit.Objects.AutomationSession, + GI.WebKit.Objects.BackForwardList, + GI.WebKit.Objects.BackForwardListItem, + GI.WebKit.Objects.ClipboardPermissionRequest, + GI.WebKit.Objects.ColorChooserRequest, + GI.WebKit.Objects.ContextMenu, + GI.WebKit.Objects.ContextMenuItem, + GI.WebKit.Objects.CookieManager, + GI.WebKit.Objects.DeviceInfoPermissionRequest, + GI.WebKit.Objects.Download, + GI.WebKit.Objects.EditorState, + GI.WebKit.Objects.FaviconDatabase, + GI.WebKit.Objects.FileChooserRequest, + GI.WebKit.Objects.FindController, + GI.WebKit.Objects.FormSubmissionRequest, + GI.WebKit.Objects.GeolocationManager, + GI.WebKit.Objects.GeolocationPermissionRequest, + GI.WebKit.Objects.HitTestResult, + GI.WebKit.Objects.InputMethodContext, + GI.WebKit.Objects.MediaKeySystemPermissionRequest, + GI.WebKit.Objects.NavigationPolicyDecision, + GI.WebKit.Objects.NetworkSession, + GI.WebKit.Objects.Notification, + GI.WebKit.Objects.NotificationPermissionRequest, + GI.WebKit.Objects.OptionMenu, + GI.WebKit.Objects.PointerLockPermissionRequest, + GI.WebKit.Objects.PolicyDecision, + GI.WebKit.Objects.PrintOperation, + GI.WebKit.Objects.ResponsePolicyDecision, + GI.WebKit.Objects.SecurityManager, + GI.WebKit.Objects.Settings, + GI.WebKit.Objects.URIRequest, + GI.WebKit.Objects.URIResponse, + GI.WebKit.Objects.URISchemeRequest, + GI.WebKit.Objects.URISchemeResponse, + GI.WebKit.Objects.UserContentFilterStore, + GI.WebKit.Objects.UserContentManager, + GI.WebKit.Objects.UserMediaPermissionRequest, + GI.WebKit.Objects.UserMessage, + GI.WebKit.Objects.WebContext, + GI.WebKit.Objects.WebInspector, + GI.WebKit.Objects.WebResource, + GI.WebKit.Objects.WebView, + GI.WebKit.Objects.WebViewBase, + GI.WebKit.Objects.WebsiteDataAccessPermissionRequest, + GI.WebKit.Objects.WebsiteDataManager, + GI.WebKit.Objects.WebsitePolicies, + GI.WebKit.Objects.WindowProperties, + GI.WebKit.Structs, + GI.WebKit.Structs.ApplicationInfo, + GI.WebKit.Structs.Credential, + GI.WebKit.Structs.Feature, + GI.WebKit.Structs.FeatureList, + GI.WebKit.Structs.GeolocationPosition, + GI.WebKit.Structs.ITPFirstParty, + GI.WebKit.Structs.ITPThirdParty, + GI.WebKit.Structs.InputMethodUnderline, + GI.WebKit.Structs.MemoryPressureSettings, + GI.WebKit.Structs.NavigationAction, + GI.WebKit.Structs.NetworkProxySettings, + GI.WebKit.Structs.OptionMenuItem, + GI.WebKit.Structs.PermissionStateQuery, + GI.WebKit.Structs.ScriptDialog, + GI.WebKit.Structs.ScriptMessageReply, + GI.WebKit.Structs.SecurityOrigin, + GI.WebKit.Structs.UserContentFilter, + GI.WebKit.Structs.UserScript, + GI.WebKit.Structs.UserStyleSheet, + GI.WebKit.Structs.WebExtensionMatchPattern, + GI.WebKit.Structs.WebViewSessionState, + GI.WebKit.Structs.WebsiteData diff --git a/stack.yaml b/stack.yaml --- a/stack.yaml +++ b/stack.yaml @@ -1,3 +1,3 @@ packages: - '.' -resolver: lts-9.21 +resolver: lts-13.7