From 7ec8e391a44a5fbc453a42d041f9277344b378d9 Mon Sep 17 00:00:00 2001 From: Erik Schnetter Date: Mon, 15 Sep 2025 10:03:34 -0400 Subject: [PATCH 1/2] Handle transitive dependencies with Julia master --- src/Cairo.jl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Cairo.jl b/src/Cairo.jl index 541c14b..42af7c9 100644 --- a/src/Cairo.jl +++ b/src/Cairo.jl @@ -23,16 +23,16 @@ import Graphics: arc, clip, clip_preserve, close_path, creategc, device_to_user! import Base: copy, fill libcairo_version = VersionNumber(unsafe_string( - ccall((:cairo_version_string,Cairo.libcairo),Cstring,()) )) + ccall((:cairo_version_string,Cairo_jll.libcairo),Cstring,()) )) libpango_version = VersionNumber(unsafe_string( - ccall((:pango_version_string,Cairo.libpango),Cstring,()) )) + ccall((:pango_version_string,Pango_jll.libpango),Cstring,()) )) if !Sys.iswindows() libpangocairo_version = VersionNumber(unsafe_string( - ccall((:pango_version_string,Cairo.libpangocairo),Cstring,()) )) + ccall((:pango_version_string,Pango_jll.libpango),Cstring,()) )) libgobject_version = VersionNumber( - unsafe_load(cglobal((:glib_major_version, Cairo.libgobject), Cuint)), - unsafe_load(cglobal((:glib_minor_version, Cairo.libgobject), Cuint)), - unsafe_load(cglobal((:glib_micro_version, Cairo.libgobject), Cuint))) + unsafe_load(cglobal((:glib_major_version, Glib_jll.libglib), Cuint)), + unsafe_load(cglobal((:glib_minor_version, Glib_jll.libglib), Cuint)), + unsafe_load(cglobal((:glib_micro_version, Glib_jll.libglib), Cuint))) end import Base.show From 87bb3814930899d5eb544bd452e539693a77af44 Mon Sep 17 00:00:00 2001 From: Erik Schnetter Date: Tue, 16 Sep 2025 16:59:15 -0400 Subject: [PATCH 2/2] Simplify code --- src/Cairo.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Cairo.jl b/src/Cairo.jl index 42af7c9..3e1af30 100644 --- a/src/Cairo.jl +++ b/src/Cairo.jl @@ -23,7 +23,7 @@ import Graphics: arc, clip, clip_preserve, close_path, creategc, device_to_user! import Base: copy, fill libcairo_version = VersionNumber(unsafe_string( - ccall((:cairo_version_string,Cairo_jll.libcairo),Cstring,()) )) + ccall((:cairo_version_string,libcairo),Cstring,()) )) libpango_version = VersionNumber(unsafe_string( ccall((:pango_version_string,Pango_jll.libpango),Cstring,()) )) if !Sys.iswindows()