mirror of
https://github.com/ostreedev/ostree.git
synced 2024-10-26 17:25:36 +03:00
Bump gir version
This commit is contained in:
parent
b1a41e90bd
commit
5b6991af9c
@ -5,7 +5,7 @@ all: gir
|
|||||||
|
|
||||||
# -- gir generation --
|
# -- gir generation --
|
||||||
target/tools/bin/gir:
|
target/tools/bin/gir:
|
||||||
cargo install --root target/tools --git https://github.com/gtk-rs/gir.git --rev f511aaeee8a324dc8d23b7a854121739b9bfcd2e -- gir
|
cargo install --root target/tools --git https://github.com/gtk-rs/gir.git --rev 20feecf4fe8b4f3524715a0d4111f8c279666324 -- gir
|
||||||
|
|
||||||
gir: target/tools/bin/gir
|
gir: target/tools/bin/gir
|
||||||
target/tools/bin/gir -c conf/ostree-sys.toml
|
target/tools/bin/gir -c conf/ostree-sys.toml
|
||||||
|
@ -147,6 +147,12 @@ impl<O: IsA<AsyncProgress>> AsyncProgressExt for O {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fn connect_changed<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId {
|
fn connect_changed<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId {
|
||||||
|
unsafe extern "C" fn changed_trampoline<P, F: Fn(&P) + 'static>(this: *mut ostree_sys::OstreeAsyncProgress, f: glib_sys::gpointer)
|
||||||
|
where P: IsA<AsyncProgress>
|
||||||
|
{
|
||||||
|
let f: &F = &*(f as *const F);
|
||||||
|
f(&AsyncProgress::from_glib_borrow(this).unsafe_cast())
|
||||||
|
}
|
||||||
unsafe {
|
unsafe {
|
||||||
let f: Box_<F> = Box_::new(f);
|
let f: Box_<F> = Box_::new(f);
|
||||||
connect_raw(self.as_ptr() as *mut _, b"changed\0".as_ptr() as *const _,
|
connect_raw(self.as_ptr() as *mut _, b"changed\0".as_ptr() as *const _,
|
||||||
@ -155,12 +161,6 @@ impl<O: IsA<AsyncProgress>> AsyncProgressExt for O {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
unsafe extern "C" fn changed_trampoline<P, F: Fn(&P) + 'static>(this: *mut ostree_sys::OstreeAsyncProgress, f: glib_sys::gpointer)
|
|
||||||
where P: IsA<AsyncProgress> {
|
|
||||||
let f: &F = &*(f as *const F);
|
|
||||||
f(&AsyncProgress::from_glib_borrow(this).unsafe_cast())
|
|
||||||
}
|
|
||||||
|
|
||||||
impl fmt::Display for AsyncProgress {
|
impl fmt::Display for AsyncProgress {
|
||||||
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
|
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
|
||||||
write!(f, "AsyncProgress")
|
write!(f, "AsyncProgress")
|
||||||
|
@ -987,6 +987,10 @@ impl Repo {
|
|||||||
//}
|
//}
|
||||||
|
|
||||||
pub fn connect_gpg_verify_result<F: Fn(&Repo, &str, &GpgVerifyResult) + 'static>(&self, f: F) -> SignalHandlerId {
|
pub fn connect_gpg_verify_result<F: Fn(&Repo, &str, &GpgVerifyResult) + 'static>(&self, f: F) -> SignalHandlerId {
|
||||||
|
unsafe extern "C" fn gpg_verify_result_trampoline<F: Fn(&Repo, &str, &GpgVerifyResult) + 'static>(this: *mut ostree_sys::OstreeRepo, checksum: *mut libc::c_char, result: *mut ostree_sys::OstreeGpgVerifyResult, f: glib_sys::gpointer) {
|
||||||
|
let f: &F = &*(f as *const F);
|
||||||
|
f(&from_glib_borrow(this), &GString::from_glib_borrow(checksum), &from_glib_borrow(result))
|
||||||
|
}
|
||||||
unsafe {
|
unsafe {
|
||||||
let f: Box_<F> = Box_::new(f);
|
let f: Box_<F> = Box_::new(f);
|
||||||
connect_raw(self.as_ptr() as *mut _, b"gpg-verify-result\0".as_ptr() as *const _,
|
connect_raw(self.as_ptr() as *mut _, b"gpg-verify-result\0".as_ptr() as *const _,
|
||||||
@ -995,11 +999,6 @@ impl Repo {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
unsafe extern "C" fn gpg_verify_result_trampoline<F: Fn(&Repo, &str, &GpgVerifyResult) + 'static>(this: *mut ostree_sys::OstreeRepo, checksum: *mut libc::c_char, result: *mut ostree_sys::OstreeGpgVerifyResult, f: glib_sys::gpointer) {
|
|
||||||
let f: &F = &*(f as *const F);
|
|
||||||
f(&from_glib_borrow(this), &GString::from_glib_borrow(checksum), &from_glib_borrow(result))
|
|
||||||
}
|
|
||||||
|
|
||||||
impl fmt::Display for Repo {
|
impl fmt::Display for Repo {
|
||||||
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
|
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
|
||||||
write!(f, "Repo")
|
write!(f, "Repo")
|
||||||
|
@ -23,7 +23,7 @@ impl RepoFinder {
|
|||||||
|
|
||||||
//#[cfg(feature = "futures")]
|
//#[cfg(feature = "futures")]
|
||||||
//#[cfg(any(feature = "v2018_6", feature = "dox"))]
|
//#[cfg(any(feature = "v2018_6", feature = "dox"))]
|
||||||
//pub fn resolve_all_async_future(finders: &[RepoFinder], refs: &[&CollectionRef], parent_repo: &Repo) -> Box_<future::Future<Output = Result</*Unimplemented*/PtrArray TypeId { ns_id: 1, id: 2 }, Error>> + std::marker::Unpin> {
|
//pub fn resolve_all_async_future(finders: &[RepoFinder], refs: &[&CollectionRef], parent_repo: &Repo) -> Box_<dyn future::Future<Output = Result</*Unimplemented*/PtrArray TypeId { ns_id: 1, id: 2 }, Error>> + std::marker::Unpin> {
|
||||||
//use gio::GioFuture;
|
//use gio::GioFuture;
|
||||||
//use fragile::Fragile;
|
//use fragile::Fragile;
|
||||||
|
|
||||||
@ -56,7 +56,7 @@ pub trait RepoFinderExt: 'static {
|
|||||||
|
|
||||||
//#[cfg(feature = "futures")]
|
//#[cfg(feature = "futures")]
|
||||||
//#[cfg(any(feature = "v2018_6", feature = "dox"))]
|
//#[cfg(any(feature = "v2018_6", feature = "dox"))]
|
||||||
//fn resolve_async_future(&self, refs: &[&CollectionRef], parent_repo: &Repo) -> Box_<future::Future<Output = Result</*Unimplemented*/PtrArray TypeId { ns_id: 1, id: 2 }, Error>> + std::marker::Unpin>;
|
//fn resolve_async_future(&self, refs: &[&CollectionRef], parent_repo: &Repo) -> Box_<dyn future::Future<Output = Result</*Unimplemented*/PtrArray TypeId { ns_id: 1, id: 2 }, Error>> + std::marker::Unpin>;
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<O: IsA<RepoFinder>> RepoFinderExt for O {
|
impl<O: IsA<RepoFinder>> RepoFinderExt for O {
|
||||||
@ -67,7 +67,7 @@ impl<O: IsA<RepoFinder>> RepoFinderExt for O {
|
|||||||
|
|
||||||
//#[cfg(feature = "futures")]
|
//#[cfg(feature = "futures")]
|
||||||
//#[cfg(any(feature = "v2018_6", feature = "dox"))]
|
//#[cfg(any(feature = "v2018_6", feature = "dox"))]
|
||||||
//fn resolve_async_future(&self, refs: &[&CollectionRef], parent_repo: &Repo) -> Box_<future::Future<Output = Result</*Unimplemented*/PtrArray TypeId { ns_id: 1, id: 2 }, Error>> + std::marker::Unpin> {
|
//fn resolve_async_future(&self, refs: &[&CollectionRef], parent_repo: &Repo) -> Box_<dyn future::Future<Output = Result</*Unimplemented*/PtrArray TypeId { ns_id: 1, id: 2 }, Error>> + std::marker::Unpin> {
|
||||||
//use gio::GioFuture;
|
//use gio::GioFuture;
|
||||||
//use fragile::Fragile;
|
//use fragile::Fragile;
|
||||||
|
|
||||||
|
@ -238,7 +238,7 @@ impl Sysroot {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(feature = "futures")]
|
#[cfg(feature = "futures")]
|
||||||
pub fn lock_async_future(&self) -> Box_<future::Future<Output = Result<(), Error>> + std::marker::Unpin> {
|
pub fn lock_async_future(&self) -> Box_<dyn future::Future<Output = Result<(), Error>> + std::marker::Unpin> {
|
||||||
use gio::GioFuture;
|
use gio::GioFuture;
|
||||||
use fragile::Fragile;
|
use fragile::Fragile;
|
||||||
|
|
||||||
@ -351,6 +351,10 @@ impl Sysroot {
|
|||||||
|
|
||||||
#[cfg(any(feature = "v2017_10", feature = "dox"))]
|
#[cfg(any(feature = "v2017_10", feature = "dox"))]
|
||||||
pub fn connect_journal_msg<F: Fn(&Sysroot, &str) + 'static>(&self, f: F) -> SignalHandlerId {
|
pub fn connect_journal_msg<F: Fn(&Sysroot, &str) + 'static>(&self, f: F) -> SignalHandlerId {
|
||||||
|
unsafe extern "C" fn journal_msg_trampoline<F: Fn(&Sysroot, &str) + 'static>(this: *mut ostree_sys::OstreeSysroot, msg: *mut libc::c_char, f: glib_sys::gpointer) {
|
||||||
|
let f: &F = &*(f as *const F);
|
||||||
|
f(&from_glib_borrow(this), &GString::from_glib_borrow(msg))
|
||||||
|
}
|
||||||
unsafe {
|
unsafe {
|
||||||
let f: Box_<F> = Box_::new(f);
|
let f: Box_<F> = Box_::new(f);
|
||||||
connect_raw(self.as_ptr() as *mut _, b"journal-msg\0".as_ptr() as *const _,
|
connect_raw(self.as_ptr() as *mut _, b"journal-msg\0".as_ptr() as *const _,
|
||||||
@ -359,12 +363,6 @@ impl Sysroot {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(any(feature = "v2017_10", feature = "dox"))]
|
|
||||||
unsafe extern "C" fn journal_msg_trampoline<F: Fn(&Sysroot, &str) + 'static>(this: *mut ostree_sys::OstreeSysroot, msg: *mut libc::c_char, f: glib_sys::gpointer) {
|
|
||||||
let f: &F = &*(f as *const F);
|
|
||||||
f(&from_glib_borrow(this), &GString::from_glib_borrow(msg))
|
|
||||||
}
|
|
||||||
|
|
||||||
impl fmt::Display for Sysroot {
|
impl fmt::Display for Sysroot {
|
||||||
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
|
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
|
||||||
write!(f, "Sysroot")
|
write!(f, "Sysroot")
|
||||||
|
@ -1,2 +1,2 @@
|
|||||||
Generated by gir (https://github.com/gtk-rs/gir @ f511aae)
|
Generated by gir (https://github.com/gtk-rs/gir @ 20feecf)
|
||||||
from gir-files (https://github.com/gtk-rs/gir-files @ ???)
|
from gir-files (https://github.com/gtk-rs/gir-files @ ???)
|
||||||
|
@ -1,2 +1,2 @@
|
|||||||
Generated by gir (https://github.com/gtk-rs/gir @ f511aae)
|
Generated by gir (https://github.com/gtk-rs/gir @ 20feecf)
|
||||||
from gir-files (https://github.com/gtk-rs/gir-files @ ???)
|
from gir-files (https://github.com/gtk-rs/gir-files @ ???)
|
||||||
|
Loading…
Reference in New Issue
Block a user