diff --git a/ChangeLog.md b/ChangeLog.md --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,3 +1,7 @@ +### 3.0.25 + ++ Update to haskell-gi(-base)-0.26 + ### 3.0.24 + Update to haskell-gi(-base)-0.25 diff --git a/Gdk.overrides b/Gdk.overrides --- a/Gdk.overrides +++ b/Gdk.overrides @@ -7,6 +7,7 @@ # Generated from gdk 3.20.3 with xsltproc Nullable.xslt Gdk-3.0.gir set-attr Gdk/AppLaunchContext/set_icon/@parameters/icon nullable 1 set-attr Gdk/AppLaunchContext/set_icon_name/@parameters/icon_name nullable 1 +set-attr Gdk/Cursor/new_for_display/@return-value nullable 1 set-attr Gdk/Cursor/new_from_name/@return-value nullable 1 set-attr Gdk/Cursor/get_image/@return-value nullable 1 set-attr Gdk/Cursor/get_surface/@return-value nullable 1 @@ -25,13 +26,19 @@ set-attr Gdk/Display/open_default_libgtk_only/@return-value nullable 1 set-attr Gdk/Display/get_device_manager/@return-value nullable 1 set-attr Gdk/Display/get_event/@return-value nullable 1 +set-attr Gdk/Display/get_monitor/@return-value nullable 1 +set-attr Gdk/Display/get_primary_monitor/@return-value nullable 1 set-attr Gdk/Display/get_window_at_pointer/@return-value nullable 1 set-attr Gdk/Display/peek_event/@return-value nullable 1 +set-attr Gdk/Display/store_clipboard/@parameters/targets nullable 1 set-attr Gdk/DisplayManager/get_default_display/@return-value nullable 1 set-attr Gdk/DisplayManager/open_display/@return-value nullable 1 +set-attr Gdk/DragContext/get_drag_window/@return-value nullable 1 +set-attr Gdk/DrawingContext/get_clip/@return-value nullable 1 set-attr Gdk/Event/get_device/@return-value nullable 1 set-attr Gdk/Event/get_source_device/@return-value nullable 1 set-attr Gdk/Event/get_state/@parameters/event nullable 1 +set-attr Gdk/Event/set_device_tool/@parameters/tool nullable 1 set-attr Gdk/Event/get/@return-value nullable 1 set-attr Gdk/Event/handler_set/@parameters/data nullable 1 set-attr Gdk/Event/peek/@return-value nullable 1 @@ -39,8 +46,14 @@ set-attr Gdk/FilterFunc/@parameters/data nullable 1 set-attr Gdk/FrameClock/get_current_timings/@return-value nullable 1 set-attr Gdk/FrameClock/get_timings/@return-value nullable 1 +set-attr Gdk/GLContext/get_current/@return-value nullable 1 +set-attr Gdk/GLContext/get_display/@return-value nullable 1 set-attr Gdk/GLContext/get_required_version/@parameters/major nullable 1 set-attr Gdk/GLContext/get_required_version/@parameters/minor nullable 1 +set-attr Gdk/GLContext/get_shared_context/@return-value nullable 1 +set-attr Gdk/GLContext/get_window/@return-value nullable 1 +set-attr Gdk/Monitor/get_manufacturer/@return-value nullable 1 +set-attr Gdk/Monitor/get_model/@return-value nullable 1 set-attr Gdk/Screen/get_default/@return-value nullable 1 set-attr Gdk/Screen/get_active_window/@return-value nullable 1 set-attr Gdk/Screen/get_font_options/@return-value nullable 1 @@ -80,8 +93,11 @@ set-attr Gdk/Window/set_opaque_region/@parameters/region nullable 1 set-attr Gdk/Window/set_user_data/@parameters/user_data nullable 1 set-attr Gdk/Window/shape_combine_region/@parameters/shape_region nullable 1 +set-attr Gdk/Window/moved-to-rect/@parameters/flipped_rect nullable 1 +set-attr Gdk/Window/moved-to-rect/@parameters/final_rect nullable 1 set-attr Gdk/Window/pick-embedded-child/@return-value nullable 1 set-attr Gdk/WindowChildFunc/@parameters/user_data nullable 1 +set-attr Gdk/cairo_get_drawing_context/@return-value nullable 1 set-attr Gdk/cairo_surface_create_from_pixbuf/@parameters/for_window nullable 1 set-attr Gdk/event_get/@return-value nullable 1 set-attr Gdk/event_handler_set/@parameters/data nullable 1 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-gdk-3.0.24/docs/GI-Gdk.html](https://hackage.haskell.org/package/gi-gdk-3.0.24/docs/GI-Gdk.html) +[https://hackage.haskell.org/package/gi-gdk-3.0.25/docs/GI-Gdk.html](https://hackage.haskell.org/package/gi-gdk-3.0.25/docs/GI-Gdk.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 @@ -15,7 +15,7 @@ where name = "Gdk" version = "3.0" pkgName = "gi-gdk" - pkgVersion = "3.0.24" + pkgVersion = "3.0.25" overridesFile = Just "Gdk.overrides" verbose = False outputDir = Nothing diff --git a/gi-gdk.cabal b/gi-gdk.cabal --- a/gi-gdk.cabal +++ b/gi-gdk.cabal @@ -1,11 +1,11 @@ name: gi-gdk -version: 3.0.24 +version: 3.0.25 synopsis: Gdk bindings description: Bindings for Gdk, 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 +author: Iñaki García Etxebarria maintainer: Iñaki García Etxebarria category: Bindings build-type: Custom @@ -16,7 +16,7 @@ custom-setup setup-depends: base >= 4.9 && < 5, Cabal >= 1.24, - haskell-gi >= 0.25 && < 0.26, + haskell-gi >= 0.26 && < 0.27, gi-cairo == 1.0.*, gi-pango == 1.0.*, gi-gio == 2.0.*, @@ -32,8 +32,8 @@ pkgconfig-depends: gdk-3.0 build-depends: base >= 4.7 && <5, - haskell-gi-base >= 0.25 && < 0.26, - haskell-gi >= 0.25 && < 0.26, + haskell-gi-base >= 0.26 && < 0.27, + haskell-gi >= 0.26 && < 0.27, haskell-gi-overloading < 1.1, gi-cairo == 1.0.*, gi-pango == 1.0.*,