Skip to content

Commit c5871ac

Browse files
committed
bump autogenerated code for GLib and GdkPixbuf and adjust compat entries
1 parent da46608 commit c5871ac

File tree

10 files changed

+138
-108
lines changed

10 files changed

+138
-108
lines changed

Project.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,19 +34,19 @@ Cairo_jll = "1.18.0"
3434
ColorTypes = "0.10, 0.11, 0.12"
3535
FixedPointNumbers = "0.8"
3636
GTK4_jll = "4.14.0"
37-
Glib_jll = "2.80.0"
37+
Glib_jll = "2.84"
3838
Graphene_jll = "1.10"
3939
Graphics = "1"
4040
JLLWrappers = "1.4.0"
4141
Libdl = "1.10"
4242
libpng_jll = "1.6"
4343
Librsvg_jll = "2.54"
44-
Pango_jll = "1.54"
44+
Pango_jll = "1.56"
4545
Preferences = "1"
4646
Reexport = "1.0"
4747
Scratch = "1.1.0"
4848
Xorg_xkeyboard_config_jll = "2.27.0"
4949
adwaita_icon_theme_jll = "3,43"
5050
gdk_pixbuf_jll = "2.42.0"
51-
hicolor_icon_theme_jll = "0.17.0"
51+
hicolor_icon_theme_jll = "0.17, 0.18"
5252
julia = "1.10"

gen/gen_gio.jl

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@ struct_skiplist=vcat(disguised, [:ActionEntry,:DBusAnnotationInfo,:DBusArgInfo,:
1717
:DBusNodeInfo,:InputMessage,:OutputMessage,:StaticResource,:UnixMountEntry,:UnixMountPoint,
1818
:XdpDocumentsProxy,:XdpDocumentsSkeleton,:XdpOpenURISkeleton,:XdpDocumentsProxyClass,
1919
:XdpDocumentsSkeletonClass,:XdpOpenURIProxy,:XdpOpenURIProxyClass,:XdpOpenURISkeletonClass,
20-
:XdpProxyResolverProxy,:XdpProxyResolverProxyClass,:XdpProxyResolverSkeleton,:XdpProxyResolverSkeletonClass,:XdpTrashProxy,:XdpTrashProxyClass,:XdpTrashSkeleton,:XdpTrashSkeletonClass,:_FreedesktopDBusProxyClass,:_FreedesktopDBusSkeletonClass])
20+
:XdpProxyResolverProxy,:XdpProxyResolverProxyClass,:XdpProxyResolverSkeleton,
21+
:XdpProxyResolverSkeletonClass,:XdpTrashProxy,:XdpTrashProxyClass,:XdpTrashSkeleton,
22+
:XdpTrashSkeletonClass,:_FreedesktopDBusProxyClass,:_FreedesktopDBusSkeletonClass,])
2123

2224
obj_skiplist=[:UnixMountMonitor,:UnixOutputStream,:UnixInputStream,:UnixFDList,:UnixFDMessage,:UnixSocketAddress,:DebugControllerDBus,:DBusInterfaceSkeleton,:DBusObjectSkeleton,:DBusObjectManagerServer]
2325

@@ -45,6 +47,6 @@ skiplist=[:bus_own_name_on_connection,:bus_own_name,:bus_watch_name_on_connectio
4547
:dbus_error_strip_remote_error,:dbus_error_register_error_domain,:io_modules_load_all_in_directory_with_scope,:io_modules_scan_all_in_directory_with_scope,:dbus_gvariant_to_gvalue,:unix_mount_at,:unix_mount_copy,:unix_mount_compare,:unix_mount_for,:unix_mount_free,
4648
:unix_mount_get_device_path,:unix_mount_get_fs_type,:unix_mount_get_mount_path,:unix_mount_get_options,:unix_mount_get_root_path,:unix_mount_guess_can_eject,:unix_mount_guess_icon,:unix_mount_guess_name,:unix_mount_guess_should_display,:unix_mount_guess_symbolic_icon,
4749
:unix_mount_is_readonly,:unix_mount_is_system_internal,:unix_mount_point_at,:unix_mount_points_changed_since,:unix_mount_points_get,:unix_mounts_get,:file_new_build_filenamev,:io_extension_point_implement,:io_extension_point_lookup,:io_extension_point_register,
48-
:unix_mount_points_get_from_file,:unix_mounts_get_from_file]
50+
:unix_mount_points_get_from_file,:unix_mounts_get_from_file,:unix_mount_entries_get,:unix_mount_entries_get_from_file,:unix_mount_entry_at,:unix_mount_entry_for]
4951

5052
GI.export_functions!(ns,path,"gio"; skiplist = skiplist)

src/gen/gdkpixbuf_structs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -168,52 +168,52 @@ begin
168168
gtype_wrapper_cache_init() = merge!(GLib.gtype_wrappers, gtype_wrapper_cache)
169169
function GdkPixbuf(_colorspace, _has_alpha::Bool, _bits_per_sample::Integer, _width::Integer, _height::Integer; kwargs...)
170170
obj = G_.Pixbuf_new(_colorspace, _has_alpha, _bits_per_sample, _width, _height)
171-
GLib.setproperties!(obj; kwargs...)
171+
obj !== nothing && GLib.setproperties!(obj; kwargs...)
172172
obj
173173
end
174174
function GdkPixbuf(_data::GBytes, _colorspace, _has_alpha::Bool, _bits_per_sample::Integer, _width::Integer, _height::Integer, _rowstride::Integer; kwargs...)
175175
obj = G_.Pixbuf_new_from_bytes(_data, _colorspace, _has_alpha, _bits_per_sample, _width, _height, _rowstride)
176-
GLib.setproperties!(obj; kwargs...)
176+
obj !== nothing && GLib.setproperties!(obj; kwargs...)
177177
obj
178178
end
179179
function GdkPixbuf(_data, _colorspace, _has_alpha::Bool, _bits_per_sample::Integer, _width::Integer, _height::Integer, _rowstride::Integer, _destroy_fn::Maybe(Function); kwargs...)
180180
obj = G_.Pixbuf_new_from_data(_data, _colorspace, _has_alpha, _bits_per_sample, _width, _height, _rowstride, _destroy_fn)
181-
GLib.setproperties!(obj; kwargs...)
181+
obj !== nothing && GLib.setproperties!(obj; kwargs...)
182182
obj
183183
end
184184
function GdkPixbuf(_filename::Union{AbstractString, Symbol}; kwargs...)
185185
obj = G_.Pixbuf_new_from_file(_filename)
186-
GLib.setproperties!(obj; kwargs...)
186+
obj !== nothing && GLib.setproperties!(obj; kwargs...)
187187
obj
188188
end
189189
function GdkPixbuf(_filename::Union{AbstractString, Symbol}, _width::Integer, _height::Integer, _preserve_aspect_ratio::Bool; kwargs...)
190190
obj = G_.Pixbuf_new_from_file_at_scale(_filename, _width, _height, _preserve_aspect_ratio)
191-
GLib.setproperties!(obj; kwargs...)
191+
obj !== nothing && GLib.setproperties!(obj; kwargs...)
192192
obj
193193
end
194194
function GdkPixbuf(_filename::Union{AbstractString, Symbol}, _width::Integer, _height::Integer; kwargs...)
195195
obj = G_.Pixbuf_new_from_file_at_size(_filename, _width, _height)
196-
GLib.setproperties!(obj; kwargs...)
196+
obj !== nothing && GLib.setproperties!(obj; kwargs...)
197197
obj
198198
end
199199
function GdkPixbuf(_stream::GInputStream, _cancellable::Maybe(GCancellable); kwargs...)
200200
obj = G_.Pixbuf_new_from_stream(_stream, _cancellable)
201-
GLib.setproperties!(obj; kwargs...)
201+
obj !== nothing && GLib.setproperties!(obj; kwargs...)
202202
obj
203203
end
204204
function GdkPixbuf(_stream::GInputStream, _width::Integer, _height::Integer, _preserve_aspect_ratio::Bool, _cancellable::Maybe(GCancellable); kwargs...)
205205
obj = G_.Pixbuf_new_from_stream_at_scale(_stream, _width, _height, _preserve_aspect_ratio, _cancellable)
206-
GLib.setproperties!(obj; kwargs...)
206+
obj !== nothing && GLib.setproperties!(obj; kwargs...)
207207
obj
208208
end
209209
function GdkPixbuf(_async_result::GAsyncResult; kwargs...)
210210
obj = G_.Pixbuf_new_from_stream_finish(_async_result)
211-
GLib.setproperties!(obj; kwargs...)
211+
obj !== nothing && GLib.setproperties!(obj; kwargs...)
212212
obj
213213
end
214214
function GdkPixbuf(_data; kwargs...)
215215
obj = G_.Pixbuf_new_from_xpm_data(_data)
216-
GLib.setproperties!(obj; kwargs...)
216+
obj !== nothing && GLib.setproperties!(obj; kwargs...)
217217
obj
218218
end
219219
function GdkPixbufAnimation(_filename::Union{AbstractString, Symbol})
@@ -236,7 +236,7 @@ begin
236236
end
237237
function GdkPixbufSimpleAnim(_width::Integer, _height::Integer, _rate::Real; kwargs...)
238238
obj = G_.PixbufSimpleAnim_new(_width, _height, _rate)
239-
GLib.setproperties!(obj; kwargs...)
239+
obj !== nothing && GLib.setproperties!(obj; kwargs...)
240240
obj
241241
end
242242
@doc "See the [GTK docs](https://docs.gtk.org/gdk-pixbuf/class.Pixbuf.html)." GdkPixbuf

src/gen/gio_functions

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -699,6 +699,11 @@ begin
699699
_flags = m_flags[]
700700
(ret2, _size, _flags)
701701
end
702+
function resources_has_children(_path::Union{AbstractString, Symbol})
703+
ret = ccall(("g_resources_has_children", libgio), Cint, (Cstring,), _path)
704+
ret2 = convert(Bool, ret)
705+
ret2
706+
end
702707
function resources_lookup_data(_path::Union{AbstractString, Symbol}, _lookup_flags)
703708
err = err_buf()
704709
ret = ccall(("g_resources_lookup_data", libgio), Ptr{GBytes}, (Cstring, UInt32, Ptr{Ptr{GError}}), _path, _lookup_flags, err)
@@ -789,8 +794,8 @@ begin
789794
ret2 = convert(Bool, ret)
790795
ret2
791796
end
792-
function unix_mounts_changed_since(_time::Integer)
793-
ret = ccall(("g_unix_mounts_changed_since", libgio), Cint, (UInt64,), _time)
797+
function unix_mount_entries_changed_since(_time::Integer)
798+
ret = ccall(("g_unix_mount_entries_changed_since", libgio), Cint, (UInt64,), _time)
794799
ret2 = convert(Bool, ret)
795800
ret2
796801
end

src/gen/gio_methods

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,11 @@ begin
110110
_flags = m_flags[]
111111
(ret2, _size, _flags)
112112
end
113+
function has_children(instance::GResource, _path::Union{AbstractString, Symbol})
114+
ret = ccall(("g_resource_has_children", libgio), Cint, (Ptr{GResource}, Cstring), instance, _path)
115+
ret2 = convert(Bool, ret)
116+
ret2
117+
end
113118
function lookup_data(instance::GResource, _path::Union{AbstractString, Symbol}, _lookup_flags)
114119
err = err_buf()
115120
ret = ccall(("g_resource_lookup_data", libgio), Ptr{GBytes}, (Ptr{GResource}, Cstring, UInt32, Ptr{Ptr{GError}}), instance, _path, _lookup_flags, err)

0 commit comments

Comments
 (0)