diff --git a/ChangeLog.md b/ChangeLog.md --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,3 +1,7 @@ +### 3.0.32 + ++ Update for haskell-gi(-base)-0.23 + ### 3.0.31 + Add support for inherited dependencies diff --git a/Gtk.overrides b/Gtk.overrides --- a/Gtk.overrides +++ b/Gtk.overrides @@ -18,6 +18,10 @@ # https://github.com/haskell-gi/haskell-gi/issues/104 set-attr Gtk/Builder/add_callback_symbol/@parameters/callback_symbol scope notified +# It is useful to expose these class structs when deriving new types +set-attr Gtk/WidgetClass haskell-gi-force-visible 1 +set-attr Gtk/ContainerClass haskell-gi-force-visible 1 + # Not properly annotated in older versions of gtk set-attr Gtk/CellLayoutDataFunc/@parameters/data closure 4 @@ -94,6 +98,20 @@ # We know the type of these closures set-attr Gtk/AccelGroup/connect/@parameters/closure/@type closure-type AccelGroupActivate + +# The sizes argument is an array of RequestedSize, not a pointer to a +# single one, and the function overwrites it. +set-attr Gtk/distribute_natural_allocation/@parameters/sizes direction inout +set-attr Gtk/distribute_natural_allocation/@parameters/sizes caller-allocates 1 +delete-node Gtk/distribute_natural_allocation/@parameters/sizes/@type +add-node Gtk/distribute_natural_allocation/@parameters/sizes array +add-node Gtk/distribute_natural_allocation/@parameters/sizes/@array type +set-attr Gtk/distribute_natural_allocation/@parameters/sizes/@array c:type GtkRequestedSize +set-attr Gtk/distribute_natural_allocation/@parameters/sizes/@array/@type name RequestedSize +set-attr Gtk/distribute_natural_allocation/@parameters/sizes/@array/@type name RequestedSize +set-attr Gtk/distribute_natural_allocation/@parameters/sizes/@array length 1 +set-attr Gtk/distribute_natural_allocation/@parameters/sizes/@array zero-terminated 0 +set-attr Gtk/distribute_natural_allocation/@parameters/sizes/@array/@type c:type GtkRequestedSize # Generated from gtk+ 3.22.11 with xsltproc Nullable.xslt Gtk-3.0.gir set-attr Gtk/AboutDialog/set_comments/@parameters/comments 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-gtk-3.0.31/docs/GI-Gtk.html](https://hackage.haskell.org/package/gi-gtk-3.0.31/docs/GI-Gtk.html) +[https://hackage.haskell.org/package/gi-gtk-3.0.32/docs/GI-Gtk.html](https://hackage.haskell.org/package/gi-gtk-3.0.32/docs/GI-Gtk.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/gi-gtk.cabal b/gi-gtk.cabal --- a/gi-gtk.cabal +++ b/gi-gtk.cabal @@ -1,12 +1,12 @@ name: gi-gtk -version: 3.0.31 +version: 3.0.32 synopsis: Gtk bindings description: Bindings for Gtk, 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 (inaki@blueleaf.cc) +maintainer: Iñaki García Etxebarria category: Bindings build-type: Custom cabal-version: 1.24 @@ -16,7 +16,7 @@ custom-setup setup-depends: base >= 4.9 && < 5, Cabal >= 1.24, - haskell-gi >= 0.22.5 && < 0.23, + haskell-gi >= 0.23 && < 0.24, gi-cairo == 1.0.*, gi-pango == 1.0.*, gi-gio == 2.0.*, @@ -29,13 +29,13 @@ library default-language: Haskell2010 default-extensions: NoImplicitPrelude, ScopedTypeVariables, CPP, OverloadedStrings, NegativeLiterals, ConstraintKinds, TypeFamilies, MultiParamTypeClasses, KindSignatures, FlexibleInstances, UndecidableInstances, DataKinds, FlexibleContexts, UndecidableSuperClasses - other-extensions: PatternSynonyms, ViewPatterns + other-extensions: PatternSynonyms, ViewPatterns, TypeApplications ghc-options: -fno-warn-unused-imports -fno-warn-warnings-deprecations pkgconfig-depends: gtk+-3.0 build-depends: base >= 4.7 && <5, - haskell-gi-base >= 0.22.0 && < 0.23, - haskell-gi >= 0.22.5 && < 0.23, + haskell-gi-base >= 0.23 && < 0.24, + haskell-gi >= 0.23.0 && < 0.24, haskell-gi-overloading < 1.1, gi-cairo == 1.0.*, gi-pango == 1.0.*, @@ -61,7 +61,8 @@ -- to be built will be built at configure time, based on the -- available introspection data. - exposed-modules: GI.Gtk, + exposed-modules: GI.Gtk.Config, + GI.Gtk, GI.Gtk.Callbacks, GI.Gtk.Constants, GI.Gtk.Enums, @@ -367,6 +368,7 @@ GI.Gtk.Structs.BindingSet, GI.Gtk.Structs.BindingSignal, GI.Gtk.Structs.Border, + GI.Gtk.Structs.ContainerClass, GI.Gtk.Structs.CssSection, GI.Gtk.Structs.FileFilterInfo, GI.Gtk.Structs.FixedChild, @@ -404,10 +406,12 @@ GI.Gtk.Structs.TreeIter, GI.Gtk.Structs.TreePath, GI.Gtk.Structs.TreeRowReference, + GI.Gtk.Structs.WidgetClass, GI.Gtk.Structs.WidgetPath, GI.Gtk.Structs.WindowGeometryInfo - autogen-modules: GI.Gtk, + autogen-modules: GI.Gtk.Config, + GI.Gtk, GI.Gtk.Callbacks, GI.Gtk.Constants, GI.Gtk.Enums, @@ -713,6 +717,7 @@ GI.Gtk.Structs.BindingSet, GI.Gtk.Structs.BindingSignal, GI.Gtk.Structs.Border, + GI.Gtk.Structs.ContainerClass, GI.Gtk.Structs.CssSection, GI.Gtk.Structs.FileFilterInfo, GI.Gtk.Structs.FixedChild, @@ -750,5 +755,6 @@ GI.Gtk.Structs.TreeIter, GI.Gtk.Structs.TreePath, GI.Gtk.Structs.TreeRowReference, + GI.Gtk.Structs.WidgetClass, GI.Gtk.Structs.WidgetPath, GI.Gtk.Structs.WindowGeometryInfo