From 05e86a6b42d8cc03928557d49dd9dbb20244b3e3 Mon Sep 17 00:00:00 2001 From: Felix Krull Date: Thu, 23 Jul 2020 16:34:50 +0200 Subject: [PATCH] gir: patch ostree_repo_finder_avahi_new Should be fixed in the next upstream release Ref: https://github.com/ostreedev/ostree/pull/2051 --- rust-bindings/rust/gir-files/OSTree-1.0.gir | 33 ++++++++++++++++--- rust-bindings/rust/src/auto/mod.rs | 4 +++ .../rust/src/auto/repo_finder_avahi.rs | 4 ++- rust-bindings/rust/src/auto/versions.txt | 2 +- rust-bindings/rust/sys/src/auto/versions.txt | 2 +- rust-bindings/rust/sys/src/lib.rs | 1 + 6 files changed, 39 insertions(+), 7 deletions(-) diff --git a/rust-bindings/rust/gir-files/OSTree-1.0.gir b/rust-bindings/rust/gir-files/OSTree-1.0.gir index 7e7b1d85..e8b7fb11 100644 --- a/rust-bindings/rust/gir-files/OSTree-1.0.gir +++ b/rust-bindings/rust/gir-files/OSTree-1.0.gir @@ -12310,15 +12310,40 @@ Pass the results to ostree_repo_pull_from_remotes_async() to pull the given glib:type-name="OstreeRepoFinderAvahi" glib:get-type="ostree_repo_finder_avahi_get_type" glib:type-struct="RepoFinderAvahiClass"> - + - - + + Create a new #OstreeRepoFinderAvahi instance. It is intended that one such +instance be created per process, and it be used to answer all resolution +requests from #OstreeRepos. + +The calling code is responsible for ensuring that @context is iterated while +the #OstreeRepoFinderAvahi is running (after ostree_repo_finder_avahi_start() +is called). This may be done from any thread. + +If @context is %NULL, the current thread-default #GMainContext is used. + + a new #OstreeRepoFinderAvahi - + + a #GMainContext for processing Avahi + events in, or %NULL to use the current thread-default diff --git a/rust-bindings/rust/src/auto/mod.rs b/rust-bindings/rust/src/auto/mod.rs index bcdead57..6a066f06 100644 --- a/rust-bindings/rust/src/auto/mod.rs +++ b/rust-bindings/rust/src/auto/mod.rs @@ -33,8 +33,11 @@ pub use self::repo_finder::{RepoFinder, NONE_REPO_FINDER}; #[cfg(any(feature = "v2018_6", feature = "dox"))] pub use self::repo_finder::RepoFinderExt; +#[cfg(any(feature = "v2018_6", feature = "dox"))] mod repo_finder_avahi; +#[cfg(any(feature = "v2018_6", feature = "dox"))] pub use self::repo_finder_avahi::{RepoFinderAvahi, RepoFinderAvahiClass, NONE_REPO_FINDER_AVAHI}; +#[cfg(any(feature = "v2018_6", feature = "dox"))] pub use self::repo_finder_avahi::RepoFinderAvahiExt; #[cfg(any(feature = "v2018_6", feature = "dox"))] @@ -160,6 +163,7 @@ pub mod traits { pub use super::RepoFileExt; #[cfg(any(feature = "v2018_6", feature = "dox"))] pub use super::RepoFinderExt; + #[cfg(any(feature = "v2018_6", feature = "dox"))] pub use super::RepoFinderAvahiExt; #[cfg(any(feature = "v2018_6", feature = "dox"))] pub use super::RepoFinderMountExt; diff --git a/rust-bindings/rust/src/auto/repo_finder_avahi.rs b/rust-bindings/rust/src/auto/repo_finder_avahi.rs index 641b9996..af9e7090 100644 --- a/rust-bindings/rust/src/auto/repo_finder_avahi.rs +++ b/rust-bindings/rust/src/auto/repo_finder_avahi.rs @@ -2,6 +2,7 @@ // from gir-files (https://github.com/gtk-rs/gir-files) // DO NOT EDIT +#[cfg(any(feature = "v2018_6", feature = "dox"))] use glib; use glib::object::IsA; use glib::translate::*; @@ -20,7 +21,8 @@ glib_wrapper! { } impl RepoFinderAvahi { - pub fn new(context: &glib::MainContext) -> RepoFinderAvahi { + #[cfg(any(feature = "v2018_6", feature = "dox"))] + pub fn new(context: Option<&glib::MainContext>) -> RepoFinderAvahi { unsafe { from_glib_full(ostree_sys::ostree_repo_finder_avahi_new(context.to_glib_none().0)) } diff --git a/rust-bindings/rust/src/auto/versions.txt b/rust-bindings/rust/src/auto/versions.txt index 2b2845ae..34a0b4e5 100644 --- a/rust-bindings/rust/src/auto/versions.txt +++ b/rust-bindings/rust/src/auto/versions.txt @@ -1,2 +1,2 @@ Generated by gir (https://github.com/gtk-rs/gir @ 60cbef05) -from gir-files (https://github.com/gtk-rs/gir-files @ e51adaf) +from gir-files (https://github.com/gtk-rs/gir-files @ 2495460+) diff --git a/rust-bindings/rust/sys/src/auto/versions.txt b/rust-bindings/rust/sys/src/auto/versions.txt index 2b2845ae..34a0b4e5 100644 --- a/rust-bindings/rust/sys/src/auto/versions.txt +++ b/rust-bindings/rust/sys/src/auto/versions.txt @@ -1,2 +1,2 @@ Generated by gir (https://github.com/gtk-rs/gir @ 60cbef05) -from gir-files (https://github.com/gtk-rs/gir-files @ e51adaf) +from gir-files (https://github.com/gtk-rs/gir-files @ 2495460+) diff --git a/rust-bindings/rust/sys/src/lib.rs b/rust-bindings/rust/sys/src/lib.rs index cf6f5a10..9dbba33b 100644 --- a/rust-bindings/rust/sys/src/lib.rs +++ b/rust-bindings/rust/sys/src/lib.rs @@ -1377,6 +1377,7 @@ extern "C" { // OstreeRepoFinderAvahi //========================================================================= pub fn ostree_repo_finder_avahi_get_type() -> GType; + #[cfg(any(feature = "v2018_6", feature = "dox"))] pub fn ostree_repo_finder_avahi_new(context: *mut glib::GMainContext) -> *mut OstreeRepoFinderAvahi; #[cfg(any(feature = "v2018_6", feature = "dox"))] pub fn ostree_repo_finder_avahi_start(self_: *mut OstreeRepoFinderAvahi, error: *mut *mut glib::GError);