Merge branch 'main' into jw/newcanvas

Author: jwahlstrand

GI/Project.toml

@@ -9,14 +9,13 @@ EzXML = "8f5d6c58-4d21-5cfd-889c-e3ad7ee6a615"
 Glib_jll = "7746bdde-850d-59dc-9ae8-88ece973131d"
 Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
 MacroTools = "1914dd2f-81c6-5fcd-8719-6d5c9610ff09"
-gobject_introspection_jll = "6306888c-5478-5f78-9aeb-34cb5688c579"
 
 [compat]
-julia = "1.6"
+julia = "1.10"
 BitFlags = "0.1.5"
 CEnum = "0.4, 0.5"
 EzXML = "1"
-Glib_jll = "2.74.0"
-Libdl = "1.6"
+Glib_jll = "2.82.0"
+Libdl = "1.10"
 MacroTools = "0.5"
-gobject_introspection_jll = "1.74"
+

GI/README.md

@@ -1,7 +1,7 @@
 GI.jl
 ======
 
-Julia bindings using libgobject-introspection.
+Julia bindings using GObject introspection.
 
 This builds on https://github.com/bfredl/GI.jl
 
@@ -15,7 +15,7 @@ As new functionality is added to libraries, you just have to run GI.jl again and
 The advantage over using Clang to generate wrappers is the fact that annotations provide important information, like whether outputs are "owned" or not, which arguments are closures or array lengths, and so on.
 Disadvantages: the current implementation only extracts GI information on Linux, leading to potential bugs on other platforms.
 
-This package is unregistered and it only works on Linux because it uses [gobject_introspection_jll](https://github.com/JuliaPackaging/Yggdrasil/tree/master/G/gobject_introspection), which is currently only available for Linux. However, most generated code works on other platforms.
+This package is unregistered. It has only been tested and run on Linux. However, most generated code works on other platforms.
 
 ## Status
 

GI/src/GI.jl

@@ -1,9 +1,7 @@
 module GI
-    using Glib_jll, gobject_introspection_jll
+    using Glib_jll
     using MacroTools, CEnum, BitFlags, EzXML
 
-    @static gobject_introspection_jll.is_available() || error("gobject_introspection_jll is not available on this platform")
-
     include("GLibBase/GLibBase.jl")
 
     import .GLibBase as GLib
@@ -23,16 +21,18 @@ module GI
     export const_expr
     export extract_type
 
-    libgi = gobject_introspection_jll.libgirepository
-
-    global const libgi_version = VersionNumber(
-      ccall((:gi_get_major_version, libgi), Cint, ()),
-      ccall((:gi_get_minor_version, libgi), Cint, ()),
-      ccall((:gi_get_micro_version, libgi), Cint, ()))
-
+    const libgi = Glib_jll.libgirepository
+    mutable struct GIRepository
+        handle::Ptr{GIRepository}
+    end
 
+    global repo::GIRepository
     include("girepo.jl")
     include("giimport.jl")
     include("giexport.jl")
     include("gidocs.jl")
+    
+    function __init__()
+        global repo = GIRepository()
+    end
 end

GI/src/GLibBase/GLibBase.jl

@@ -20,7 +20,14 @@ export GList, _GSList, _GList
 const  AbstractStringLike = Union{AbstractString, Symbol}
 bytestring(s) = String(s)
 bytestring(s::Symbol) = s
-bytestring(s::Ptr{UInt8}) = s == C_NULL ? nothing : unsafe_string(s)
+function bytestring(s::Union{Cstring,Ptr{UInt8}}, own::Bool=false)
+    str=unsafe_string(s)
+    if own
+        g_free(s)
+    end
+    str
+end
+
 # bytestring(s::Ptr{UInt8}, own::Bool=false) = unsafe_string(s)
 
 g_free(p::Ptr) = ccall((:g_free, libglib), Nothing, (Ptr{Nothing},), p)

GI/src/giexport.jl

@@ -11,9 +11,9 @@ function _enums_and_flags(es, skiplist, incl_typeinit, const_mod, const_exports,
     end
 end
 
-function all_const_exprs!(const_mod, const_exports, ns;print_summary=true,incl_typeinit=true,skiplist=Symbol[], export_constants = true)
+function all_const_exprs!(const_mod, const_exports, ns;print_summary=true,incl_typeinit=true,skiplist=Symbol[], export_constants = true, exclude_deprecated = true)
     loaded=Symbol[]
-    c = get_consts(ns)
+    c = get_consts(ns, exclude_deprecated)
 
     for (name,val) in c
         in(name, skiplist) && continue
@@ -24,14 +24,14 @@ function all_const_exprs!(const_mod, const_exports, ns;print_summary=true,incl_t
         printstyled("Generated ",length(c)," constants\n";color=:green)
     end
 
-    es=get_all(ns,GIEnumInfo)
+    es=get_all(ns,GIEnumInfo,exclude_deprecated)
     _enums_and_flags(es, skiplist, incl_typeinit, const_mod, const_exports, loaded, export_constants)
 
     if print_summary && length(es)>0
         printstyled("Generated ",length(es)," enums\n";color=:green)
     end
 
-    es=get_all(ns,GIFlagsInfo)
+    es=get_all(ns,GIFlagsInfo,exclude_deprecated)
     _enums_and_flags(es, skiplist, incl_typeinit, const_mod, const_exports, loaded, export_constants)
 
     if print_summary && length(es)>0
@@ -40,12 +40,12 @@ function all_const_exprs!(const_mod, const_exports, ns;print_summary=true,incl_t
     loaded
 end
 
-function export_consts!(ns,path,prefix,skiplist = Symbol[]; doc_prefix = prefix, doc_xml = nothing, export_constants = true)
+function export_consts!(ns,path,prefix,skiplist = Symbol[]; doc_prefix = prefix, doc_xml = nothing, export_constants = true, exclude_deprecated = true)
     toplevel, exprs, exports = GI.output_exprs()
 
     const_mod = Expr(:block)
 
-    c = all_const_exprs!(const_mod, exports, ns; skiplist= skiplist, export_constants)
+    c = all_const_exprs!(const_mod, exports, ns; skiplist= skiplist, export_constants, exclude_deprecated)
     if doc_xml !== nothing
         GI.append_const_docs!(const_mod.args, doc_prefix, doc_xml, c)
     end
@@ -134,13 +134,10 @@ end
 
 function struct_constructor_exprs!(exprs,ns;constructor_skiplist=[], struct_skiplist=[], exclude_deprecated=true,first_list=[])
     s=get_non_skipped(ns,GIStructInfo,struct_skiplist,exclude_deprecated)
-    structs = get_name.(s)
-    for ss in vcat(first_list, structs)
+    for ss in vcat(first_list, get_name.(s))
         ssi=gi_find_by_name(ns,ss)
         constructors = get_constructors(ssi;skiplist=constructor_skiplist, struct_skiplist=struct_skiplist, exclude_deprecated=exclude_deprecated)
-        if !isempty(constructors)
-            append!(exprs,constructors)
-        end
+        append!(exprs,constructors)
     end
 end
 
@@ -191,18 +188,17 @@ function all_struct_exprs!(exprs,exports,ns;print_summary=true,excludelist=[],co
     struct_skiplist, loaded
 end
 
-function all_callbacks!(exprs, exports, ns; callback_skiplist = [])
-    callbacks=get_all(ns,GICallbackInfo)
-    for c in callbacks
+function all_callbacks!(exprs, exports, ns; callback_skiplist = [], exclude_deprecated = true)
+    for c in get_all(ns,GICallbackInfo,exclude_deprecated)
         get_name(c) in callback_skiplist && continue
         try
-        push!(exprs, decl(c))
-    catch e
-        if isa(e, NotImplementedError)
-            continue
-        else
-            rethrow(e)
-        end
+            push!(exprs, decl(c))
+        catch e
+            if isa(e, NotImplementedError)
+                continue
+            else
+                rethrow(e)
+            end
         end
         push!(exports.args, get_full_name(c))
     end
@@ -235,7 +231,7 @@ function export_struct_exprs!(ns,path,prefix, struct_skiplist, import_as_opaque;
     end
     all_object_signals!(exprs, ns;skiplist=signal_skiplist,object_skiplist=object_skiplist, exclude_deprecated = exclude_deprecated)
     if output_callbacks
-        all_callbacks!(exprs, exports, ns; callback_skiplist)
+        all_callbacks!(exprs, exports, ns; callback_skiplist, exclude_deprecated)
     end
     push!(exprs,exports)
     write_to_file(path,"$(prefix)_structs",toplevel)
@@ -268,8 +264,7 @@ function all_struct_methods!(exprs,ns;print_summary=true,print_detailed=false,sk
             (exclude_deprecated && is_deprecated(m)) && continue
             print_detailed && println(get_name(m))
             try
-                fun=create_method(m, liboverride)
-                push!(exprs, fun)
+                create_method(exprs, m, liboverride)
                 push!(handled_symbols,get_symbol(m))
                 created+=1
             catch e
@@ -314,7 +309,7 @@ function all_objects!(exprs,exports,ns;print_summary=true,handled=Symbol[],skipl
             imported -= 1
             continue
         end
-        if get_type_init(o)==:intern  # GParamSpec and children output this
+        if get_type_init_function_name(o)==:intern  # GParamSpec and children output this
             continue
         end
         obj_decl!(exprs,o,ns,handled)
@@ -332,7 +327,7 @@ function all_objects!(exprs,exports,ns;print_summary=true,handled=Symbol[],skipl
     end
     for o in objects
         constructors = get_constructors(o;skiplist=constructor_skiplist, struct_skiplist=skiplist, exclude_deprecated=exclude_deprecated)
-        isempty(constructors) || append!(exprs,constructors)
+        append!(exprs,constructors)
     end
     if print_summary
         printstyled("Created ",imported," objects out of ",length(objects),"\n";color=:green)
@@ -344,8 +339,7 @@ function all_object_methods!(exprs,ns;skiplist=Symbol[],object_skiplist=Symbol[]
     not_implemented=0
     skipped=0
     created=0
-    objects=get_non_skipped(ns,GIObjectInfo,object_skiplist,exclude_deprecated)
-    for o in objects
+    for o in get_non_skipped(ns,GIObjectInfo,object_skiplist,exclude_deprecated)
         name=get_name(o)
         methods=get_methods(o)
         for m in methods
@@ -355,8 +349,7 @@ function all_object_methods!(exprs,ns;skiplist=Symbol[],object_skiplist=Symbol[]
             end
             (exclude_deprecated && is_deprecated(m)) && continue
             try
-                fun=create_method(m, liboverride)
-                push!(exprs, fun)
+                create_method(exprs, m, liboverride)
                 created+=1
             catch e
                 if isa(e, NotImplementedError)
@@ -383,8 +376,7 @@ end
 
 function all_object_signals!(exprs,ns;skiplist=Symbol[],object_skiplist=Symbol[], liboverride=nothing, exclude_deprecated=true)
     not_implemented=0
-    objects=get_non_skipped(ns,GIObjectInfo,object_skiplist,exclude_deprecated)
-    for o in objects
+    for o in get_non_skipped(ns,GIObjectInfo,object_skiplist,exclude_deprecated)
         signals = get_all_signals(o)
         for s in signals
             (exclude_deprecated && is_deprecated(s)) && continue
@@ -423,8 +415,7 @@ function all_interface_methods!(exprs,ns;skiplist=Symbol[],interface_skiplist=Sy
             end
             (exclude_deprecated && is_deprecated(m)) && continue
             try
-                fun=create_method(m, liboverride)
-                push!(exprs, fun)
+                create_method(exprs, m, liboverride)
                 created+=1
             catch e
                 if isa(e, NotImplementedError)
@@ -462,11 +453,11 @@ function all_functions!(exprs,ns;print_summary=true,skiplist=Symbol[],symbol_ski
         unsupported = false # whatever we happen to unsupport
         for arg in get_args(i)
             try
-                bt = get_base_type(get_type(arg))
+                bt = get_base_type(get_type_info(arg))
                 if isa(bt,Ptr{GIArrayType}) || isa(bt,Ptr{GIArrayType{3}})
                     unsupported = true; break
                 end
-                if (isa(get_base_type(get_type(arg)), Nothing))
+                if (isa(get_base_type(get_type_info(arg)), Nothing))
                     unsupported = true; break
                 end
             catch e
@@ -496,8 +487,7 @@ function all_functions!(exprs,ns;print_summary=true,skiplist=Symbol[],symbol_ski
         name = get_name(i)
         name = Symbol("$name")
         try
-            fun=create_method(i, liboverride)
-            push!(exprs, fun)
+            create_method(exprs, i, liboverride)
             j+=1
         catch e
             if isa(e, NotImplementedError)