Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Regen with latest gir/gir-files #1285

Merged
merged 13 commits into from
Jan 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ jobs:
conf:
- { name: "cairo", features: "png,pdf,svg,ps,use_glib,v1_18,freetype,script,xcb,xlib,win32-surface", nightly: "--features 'png,pdf,svg,ps,use_glib,v1_18,freetype,script,xcb,xlib,win32-surface'", test_sys: true }
- { name: "gdk-pixbuf", features: "v2_42", nightly: "--all-features", test_sys: true }
- { name: "gio", features: "v2_78", nightly: "--all-features", test_sys: true }
- { name: "glib", features: "v2_78", nightly: "--all-features", test_sys: true }
- { name: "gio", features: "v2_80", nightly: "--all-features", test_sys: true }
- { name: "glib", features: "v2_80", nightly: "--all-features", test_sys: false }
- { name: "graphene", features: "v1_12", nightly: "", test_sys: true }
- { name: "pango", features: "v1_50", nightly: "--all-features", test_sys: true }
- { name: "pangocairo", features: "", nightly: "--all-features", test_sys: true }
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:

env:
# git revision of gvsbuild we use for to build GLib and the other dependencies
gvsbuildref: 1b3c28a3aa2312e7796f5f91b0a897a7a38b9292
gvsbuildref: de70bfe8f540249aafbf8247ac6886019262917f

# bump this number if you want to force a rebuild of gvsbuild with the same revision
gvsbuildupdate: 1
Expand Down Expand Up @@ -80,8 +80,8 @@ jobs:
conf:
- { name: "cairo", test: true, args: "--features png,pdf,svg,ps,use_glib,v1_16,freetype,script,win32-surface" }
- { name: "gdk-pixbuf", test: true, args: "--features v2_42" }
- { name: "gio", test: true, args: "--features v2_74" }
- { name: "glib", test: true, args: "--features v2_74" }
- { name: "gio", test: true, args: "--features v2_80" }
- { name: "glib", test: true, args: "--features v2_80" }
- { name: "glib-build-tools", test: false, args: "" }
- { name: "graphene", test: false, args: "" }
- { name: "pango", test: true, args: "--features v1_50" }
Expand Down
4 changes: 2 additions & 2 deletions gdk-pixbuf/src/auto/versions.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Generated by gir (https://github.com/gtk-rs/gir @ a2f936b77195)
from gir-files (https://github.com/gtk-rs/gir-files @ 20031a537e40)
Generated by gir (https://github.com/gtk-rs/gir @ 1c7a6b57a5fc)
from gir-files (https://github.com/gtk-rs/gir-files @ 21b29d0e0c1a)
2 changes: 1 addition & 1 deletion gdk-pixbuf/sys/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ pub struct _GdkPixbufSimpleAnimClass {
_marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
}

pub type GdkPixbufSimpleAnimClass = *mut _GdkPixbufSimpleAnimClass;
pub type GdkPixbufSimpleAnimClass = _GdkPixbufSimpleAnimClass;

// Classes
#[repr(C)]
Expand Down
4 changes: 2 additions & 2 deletions gdk-pixbuf/sys/versions.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Generated by gir (https://github.com/gtk-rs/gir @ a2f936b77195)
from gir-files (https://github.com/gtk-rs/gir-files @ 20031a537e40)
Generated by gir (https://github.com/gtk-rs/gir @ 1c7a6b57a5fc)
from gir-files (https://github.com/gtk-rs/gir-files @ 21b29d0e0c1a)
1 change: 1 addition & 0 deletions gio/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ v2_72 = ["v2_70", "ffi/v2_72", "glib/v2_72"]
v2_74 = ["v2_72", "ffi/v2_74", "glib/v2_74"]
v2_76 = ["v2_74", "ffi/v2_76", "glib/v2_76"]
v2_78 = ["v2_76", "ffi/v2_78", "glib/v2_78"]
v2_80 = ["v2_78", "ffi/v2_80", "glib/v2_80"]

[package.metadata.docs.rs]
all-features = true
Expand Down
30 changes: 27 additions & 3 deletions gio/Gir.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ girs_directories = ["../gir-files"]
library = "Gio"
version = "2.0"
min_cfg_version = "2.56"
use_gi_docgen = true
target_path = "."
work_mode = "normal"
single_version_file = true
Expand Down Expand Up @@ -60,7 +61,6 @@ generate = [
"Gio.FileAttributeInfoFlags",
"Gio.FileAttributeStatus",
"Gio.FileAttributeType",
"Gio.FileCopyFlags",
"Gio.FileCreateFlags",
"Gio.FileIcon",
"Gio.FileInputStream",
Expand Down Expand Up @@ -98,10 +98,8 @@ generate = [
"Gio.Proxy",
"Gio.ProxyResolver",
"Gio.RemoteActionGroup",
"Gio.Resolver",
"Gio.ResolverError",
"Gio.ResolverNameLookupFlags",
"Gio.ResolverRecordType",
"Gio.ResourceError",
"Gio.ResourceLookupFlags",
"Gio.Seekable",
Expand Down Expand Up @@ -799,6 +797,13 @@ status = "generate"
# Better API with `IntoIter`
ignore = true

[[object]]
name = "Gio.FileCopyFlags"
status = "generate"
[[object.member]]
name = "target_default_modified_time"
version = "2.80"
bilelmoussaoui marked this conversation as resolved.
Show resolved Hide resolved

[[object]]
name = "Gio.FileDescriptorBased"
status = "manual"
Expand Down Expand Up @@ -910,6 +915,9 @@ status = "generate"
[[object.member]]
name = "no_such_device"
version = "2.72"
[[object.member]]
name = "destination_unset"
version = "2.80"

[[object]]
name = "Gio.IOStream"
Expand Down Expand Up @@ -1129,6 +1137,22 @@ name = "Gio.ProxyAddress"
status = "generate"
concurrency = "send+sync"

[[object]]
name = "Gio.Resolver"
status = "generate"
[[object.function]]
# see https://gitlab.gnome.org/GNOME/glib/-/issues/3231
name = "records_from_res_query"
ignore = true
bilelmoussaoui marked this conversation as resolved.
Show resolved Hide resolved

[[object]]
name = "Gio.ResolverRecordType"
status = "generate"
[[object.function]]
# see https://gitlab.gnome.org/GNOME/glib/-/issues/3231
name = "to_rrtype"
ignore = true

[[object]]
name = "Gio.Resource"
status = "generate"
Expand Down
33 changes: 33 additions & 0 deletions gio/src/auto/application_command_line.rs
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,15 @@ pub trait ApplicationCommandLineExt:
}
}

#[cfg(feature = "v2_80")]
#[cfg_attr(docsrs, doc(cfg(feature = "v2_80")))]
#[doc(alias = "g_application_command_line_done")]
fn done(&self) {
unsafe {
ffi::g_application_command_line_done(self.as_ref().to_glib_none().0);
}
}

#[doc(alias = "g_application_command_line_get_arguments")]
#[doc(alias = "get_arguments")]
fn arguments(&self) -> Vec<std::ffi::OsString> {
Expand Down Expand Up @@ -138,11 +147,35 @@ pub trait ApplicationCommandLineExt:
// unsafe { TODO: call ffi:g_application_command_line_print() }
//}

#[cfg(feature = "v2_80")]
#[cfg_attr(docsrs, doc(cfg(feature = "v2_80")))]
#[doc(alias = "g_application_command_line_print_literal")]
fn print_literal(&self, message: &str) {
unsafe {
ffi::g_application_command_line_print_literal(
self.as_ref().to_glib_none().0,
message.to_glib_none().0,
);
}
}

//#[doc(alias = "g_application_command_line_printerr")]
//fn printerr(&self, format: &str, : /*Unknown conversion*//*Unimplemented*/Basic: VarArgs) {
// unsafe { TODO: call ffi:g_application_command_line_printerr() }
//}

#[cfg(feature = "v2_80")]
#[cfg_attr(docsrs, doc(cfg(feature = "v2_80")))]
#[doc(alias = "g_application_command_line_printerr_literal")]
fn printerr_literal(&self, message: &str) {
unsafe {
ffi::g_application_command_line_printerr_literal(
self.as_ref().to_glib_none().0,
message.to_glib_none().0,
);
}
}

#[doc(alias = "g_application_command_line_set_exit_status")]
fn set_exit_status(&self, exit_status: i32) {
unsafe {
Expand Down
8 changes: 8 additions & 0 deletions gio/src/auto/dbus_message.rs
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,14 @@ impl DBusMessage {
unsafe { from_glib_none(ffi::g_dbus_message_get_arg0(self.to_glib_none().0)) }
}

#[cfg(feature = "v2_80")]
#[cfg_attr(docsrs, doc(cfg(feature = "v2_80")))]
#[doc(alias = "g_dbus_message_get_arg0_path")]
#[doc(alias = "get_arg0_path")]
pub fn arg0_path(&self) -> Option<glib::GString> {
unsafe { from_glib_none(ffi::g_dbus_message_get_arg0_path(self.to_glib_none().0)) }
}

#[doc(alias = "g_dbus_message_get_body")]
#[doc(alias = "get_body")]
pub fn body(&self) -> Option<glib::Variant> {
Expand Down
8 changes: 8 additions & 0 deletions gio/src/auto/enums.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1606,6 +1606,10 @@ pub enum IOErrorEnum {
#[cfg_attr(docsrs, doc(cfg(feature = "v2_72")))]
#[doc(alias = "G_IO_ERROR_NO_SUCH_DEVICE")]
NoSuchDevice,
#[cfg(feature = "v2_80")]
#[cfg_attr(docsrs, doc(cfg(feature = "v2_80")))]
#[doc(alias = "G_IO_ERROR_DESTINATION_UNSET")]
DestinationUnset,
bilelmoussaoui marked this conversation as resolved.
Show resolved Hide resolved
#[doc(hidden)]
__Unknown(i32),
}
Expand Down Expand Up @@ -1665,6 +1669,8 @@ impl IntoGlib for IOErrorEnum {
Self::MessageTooLarge => ffi::G_IO_ERROR_MESSAGE_TOO_LARGE,
#[cfg(feature = "v2_72")]
Self::NoSuchDevice => ffi::G_IO_ERROR_NO_SUCH_DEVICE,
#[cfg(feature = "v2_80")]
Self::DestinationUnset => ffi::G_IO_ERROR_DESTINATION_UNSET,
Self::__Unknown(value) => value,
}
}
Expand Down Expand Up @@ -1723,6 +1729,8 @@ impl FromGlib<ffi::GIOErrorEnum> for IOErrorEnum {
ffi::G_IO_ERROR_MESSAGE_TOO_LARGE => Self::MessageTooLarge,
#[cfg(feature = "v2_72")]
ffi::G_IO_ERROR_NO_SUCH_DEVICE => Self::NoSuchDevice,
#[cfg(feature = "v2_80")]
ffi::G_IO_ERROR_DESTINATION_UNSET => Self::DestinationUnset,
value => Self::__Unknown(value),
}
}
Expand Down
4 changes: 4 additions & 0 deletions gio/src/auto/flags.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1590,6 +1590,10 @@ bitflags! {
const NO_FALLBACK_FOR_MOVE = ffi::G_FILE_COPY_NO_FALLBACK_FOR_MOVE as _;
#[doc(alias = "G_FILE_COPY_TARGET_DEFAULT_PERMS")]
const TARGET_DEFAULT_PERMS = ffi::G_FILE_COPY_TARGET_DEFAULT_PERMS as _;
#[cfg(feature = "v2_80")]
#[cfg_attr(docsrs, doc(cfg(feature = "v2_80")))]
#[doc(alias = "G_FILE_COPY_TARGET_DEFAULT_MODIFIED_TIME")]
const TARGET_DEFAULT_MODIFIED_TIME = ffi::G_FILE_COPY_TARGET_DEFAULT_MODIFIED_TIME as _;
bilelmoussaoui marked this conversation as resolved.
Show resolved Hide resolved
}
}

Expand Down
4 changes: 2 additions & 2 deletions gio/src/auto/subprocess_launcher.rs
Original file line number Diff line number Diff line change
Expand Up @@ -108,11 +108,11 @@ impl SubprocessLauncher {
#[cfg(unix)]
#[cfg_attr(docsrs, doc(cfg(unix)))]
#[doc(alias = "g_subprocess_launcher_set_stdin_file_path")]
pub fn set_stdin_file_path(&self, path: &str) {
pub fn set_stdin_file_path(&self, path: Option<impl AsRef<std::path::Path>>) {
unsafe {
ffi::g_subprocess_launcher_set_stdin_file_path(
self.to_glib_none().0,
path.to_glib_none().0,
path.as_ref().map(|p| p.as_ref()).to_glib_none().0,
);
}
}
Expand Down
4 changes: 2 additions & 2 deletions gio/src/auto/versions.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Generated by gir (https://github.com/gtk-rs/gir @ a2f936b77195)
from gir-files (https://github.com/gtk-rs/gir-files @ 20031a537e40)
Generated by gir (https://github.com/gtk-rs/gir @ 1c7a6b57a5fc)
from gir-files (https://github.com/gtk-rs/gir-files @ 21b29d0e0c1a)
4 changes: 4 additions & 0 deletions gio/sys/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ v2_72 = ["v2_70"]
v2_74 = ["v2_72"]
v2_76 = ["v2_74"]
v2_78 = ["v2_76"]
v2_80 = ["v2_78"]
bilelmoussaoui marked this conversation as resolved.
Show resolved Hide resolved

[lib]
name = "gio_sys"
Expand Down Expand Up @@ -86,6 +87,9 @@ version = "2.76"
[package.metadata.system-deps.gio_2_0.v2_78]
version = "2.77"

[package.metadata.system-deps.gio_2_0.v2_80]
version = "2.79"

[package.metadata.docs.rs]
rustc-args = ["--cfg", "docsrs"]
rustdoc-args = ["--cfg", "docsrs", "--generate-link-to-definition"]
Expand Down
18 changes: 18 additions & 0 deletions gio/sys/Gir.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ external_libraries = [
"GObject",
]

ignore = [
"Gio.ThreadedResolverClass"
]

[[object]]
name = "Gio.SocketFamily"
status = "manual"
Expand Down Expand Up @@ -44,3 +48,17 @@ status = "generate"
[[object.function]]
name = "close"
cfg_condition = "unix"

[[object]]
name = "Gio.Resolver"
status = "generate"
[[object.function]]
name = "records_from_res_query"
ignore = true

[[object]]
name = "Gio.ResolverRecordType"
status = "generate"
[[object.function]]
name = "to_rrtype"
ignore = true
Loading
Loading