From fe03ad1feeeefece3634eb733795a0dcd1a14c81 Mon Sep 17 00:00:00 2001 From: Felix Krull Date: Fri, 4 Sep 2020 14:08:12 +0200 Subject: [PATCH] Update gir file to 2020.6 --- rust-bindings/rust/Makefile | 4 +- rust-bindings/rust/gir-files/OSTree-1.0.gir | 168 +++++++++---------- rust-bindings/rust/src/auto/versions.txt | 4 +- rust-bindings/rust/sys/src/auto/versions.txt | 4 +- 4 files changed, 90 insertions(+), 90 deletions(-) diff --git a/rust-bindings/rust/Makefile b/rust-bindings/rust/Makefile index 6b25dbb9..defd291c 100644 --- a/rust-bindings/rust/Makefile +++ b/rust-bindings/rust/Makefile @@ -1,7 +1,7 @@ GIR_REPO := https://github.com/gtk-rs/gir.git GIR_VERSION := 2d1ffab19eb5f9a2f0d7a294dbf07517dab4d989 -OSTREE_REPO := https://github.com/fkrull/ostree.git -OSTREE_VERSION := patch-v2020.5 +OSTREE_REPO := https://github.com/ostreedev/ostree.git +OSTREE_VERSION := v2020.6 RUSTDOC_STRIPPER_VERSION := 0.1.13 all: gir diff --git a/rust-bindings/rust/gir-files/OSTree-1.0.gir b/rust-bindings/rust/gir-files/OSTree-1.0.gir index 0e5f3ddd..27e35257 100644 --- a/rust-bindings/rust/gir-files/OSTree-1.0.gir +++ b/rust-bindings/rust/gir-files/OSTree-1.0.gir @@ -4164,7 +4164,7 @@ content, the other types are metadata. version="2018.6"> Find reachable remote URIs which claim to provide any of the given named + line="4933">Find reachable remote URIs which claim to provide any of the given named @refs. This will search for configured remotes (#OstreeRepoFinderConfig), mounted volumes (#OstreeRepoFinderMount) and (if enabled at compile time) local network peers (#OstreeRepoFinderAvahi). In order to use a custom @@ -5273,13 +5273,13 @@ This will use the thread-default #GMainContext, but will not iterate it. an #OstreeRepo + line="4935">an #OstreeRepo non-empty array of collection–ref pairs to find remotes for + line="4936">non-empty array of collection–ref pairs to find remotes for @@ -5290,13 +5290,13 @@ This will use the thread-default #GMainContext, but will not iterate it. allow-none="1"> a GVariant `a{sv}` with an extensible set of flags + line="4937">a GVariant `a{sv}` with an extensible set of flags non-empty array of + line="4938">non-empty array of #OstreeRepoFinder instances to use, or %NULL to use the system defaults @@ -5308,7 +5308,7 @@ This will use the thread-default #GMainContext, but will not iterate it. allow-none="1"> an #OstreeAsyncProgress to update with the operation’s + line="4940">an #OstreeAsyncProgress to update with the operation’s progress, or %NULL @@ -5318,7 +5318,7 @@ This will use the thread-default #GMainContext, but will not iterate it. allow-none="1"> a #GCancellable, or %NULL + line="4942">a #GCancellable, or %NULL closure="6"> asynchronous completion callback + line="4943">asynchronous completion callback allow-none="1"> data to pass to @callback + line="4944">data to pass to @callback @@ -5349,13 +5349,13 @@ This will use the thread-default #GMainContext, but will not iterate it. throws="1"> Finish an asynchronous pull operation started with + line="5730">Finish an asynchronous pull operation started with ostree_repo_find_remotes_async(). a potentially empty array + line="5739">a potentially empty array of #OstreeRepoFinderResults, followed by a %NULL terminator element; or %NULL on error @@ -5366,13 +5366,13 @@ ostree_repo_find_remotes_async(). an #OstreeRepo + line="5732">an #OstreeRepo the asynchronous result + line="5733">the asynchronous result @@ -7193,7 +7193,7 @@ one around this call. version="2018.6"> Pull refs from multiple remotes which have been found using + line="5778">Pull refs from multiple remotes which have been found using ostree_repo_find_remotes_async(). @results are expected to be in priority order, with the best remotes to pull @@ -7243,13 +7243,13 @@ The following @options are currently defined: an #OstreeRepo + line="5780">an #OstreeRepo %NULL-terminated array of remotes to + line="5781">%NULL-terminated array of remotes to pull from, including the refs to pull from each @@ -7261,7 +7261,7 @@ The following @options are currently defined: allow-none="1"> A GVariant `a{sv}` with an extensible set of flags + line="5783">A GVariant `a{sv}` with an extensible set of flags an #OstreeAsyncProgress to update with the operation’s + line="5784">an #OstreeAsyncProgress to update with the operation’s progress, or %NULL @@ -7280,7 +7280,7 @@ The following @options are currently defined: allow-none="1"> a #GCancellable, or %NULL + line="5786">a #GCancellable, or %NULL asynchronous completion callback + line="5787">asynchronous completion callback data to pass to @callback + line="5788">data to pass to @callback @@ -7311,26 +7311,26 @@ The following @options are currently defined: throws="1"> Finish an asynchronous pull operation started with + line="6031">Finish an asynchronous pull operation started with ostree_repo_pull_from_remotes_async(). %TRUE on success, %FALSE otherwise + line="6040">%TRUE on success, %FALSE otherwise an #OstreeRepo + line="6033">an #OstreeRepo the asynchronous result + line="6034">the asynchronous result @@ -7407,7 +7407,7 @@ subpath. throws="1"> Like ostree_repo_pull(), but supports an extensible set of flags. + line="3265">Like ostree_repo_pull(), but supports an extensible set of flags. The following are currently defined: * `refs` (`as`): Array of string refs @@ -7464,19 +7464,19 @@ The following are currently defined: Repo + line="3267">Repo Name of remote or file:// url + line="3268">Name of remote or file:// url A GVariant a{sv} with an extensible set of flags. + line="3269">A GVariant a{sv} with an extensible set of flags. Progress + line="3270">Progress Cancellable + line="3271">Cancellable @@ -7965,7 +7965,7 @@ with #OSTREE_SUMMARY_GVARIANT_FORMAT as the format string. throws="1"> Like ostree_repo_remote_fetch_summary(), but supports an extensible set of flags. + line="6056">Like ostree_repo_remote_fetch_summary(), but supports an extensible set of flags. The following are currently defined: - override-url (s): Fetch summary from this URL if remote specifies no metalink in options @@ -7978,20 +7978,20 @@ The following are currently defined: %TRUE on success, %FALSE on failure + line="6078">%TRUE on success, %FALSE on failure Self + line="6058">Self name of a remote + line="6059">name of a remote A GVariant a{sv} with an extensible set of flags + line="6060">A GVariant a{sv} with an extensible set of flags return location for raw summary data, or + line="6061">return location for raw summary data, or %NULL @@ -8023,7 +8023,7 @@ The following are currently defined: allow-none="1"> return location for raw summary + line="6063">return location for raw summary signature data, or %NULL @@ -8033,7 +8033,7 @@ The following are currently defined: allow-none="1"> a #GCancellable + line="6065">a #GCancellable @@ -8448,7 +8448,7 @@ ostree_repo_resolve_rev_ext() but for collection-refs. throws="1"> Find the GPG keyring for the given @collection_id, using the local + line="1394">Find the GPG keyring for the given @collection_id, using the local configuration from the given #OstreeRepo. This will search the configured remotes for ones whose `collection-id` key matches @collection_id, and will return the first matching remote. @@ -8462,7 +8462,7 @@ If no match can be found, a %G_IO_ERROR_NOT_FOUND error will be returned. #OstreeRemote containing the GPG keyring for + line="1412">#OstreeRemote containing the GPG keyring for @collection_id @@ -8470,13 +8470,13 @@ If no match can be found, a %G_IO_ERROR_NOT_FOUND error will be returned. an #OstreeRepo + line="1396">an #OstreeRepo the collection ID to look up a keyring for + line="1397">the collection ID to look up a keyring for allow-none="1"> a #GCancellable, or %NULL + line="1398">a #GCancellable, or %NULL @@ -15443,7 +15443,7 @@ Locking: exclusive throws="1"> Check out deployment tree with revision @revision, performing a 3 + line="2850">Check out deployment tree with revision @revision, performing a 3 way merge with @provided_merge_deployment for configuration. When booted into the sysroot, you should use the @@ -15456,7 +15456,7 @@ ostree_sysroot_stage_tree() API instead. Sysroot + line="2852">Sysroot allow-none="1"> osname to use for merge deployment + line="2853">osname to use for merge deployment Checksum to add + line="2854">Checksum to add allow-none="1"> Origin to use for upgrades + line="2855">Origin to use for upgrades allow-none="1"> Use this deployment for merge path + line="2856">Use this deployment for merge path allow-none="1"> Use these as kernel arguments; if %NULL, inherit options from provided_merge_deployment + line="2857">Use these as kernel arguments; if %NULL, inherit options from provided_merge_deployment @@ -15509,7 +15509,7 @@ ostree_sysroot_stage_tree() API instead. transfer-ownership="full"> The new deployment path + line="2858">The new deployment path allow-none="1"> Cancellable + line="2859">Cancellable @@ -15528,7 +15528,7 @@ ostree_sysroot_stage_tree() API instead. throws="1"> Entirely replace the kernel arguments of @deployment with the + line="3191">Entirely replace the kernel arguments of @deployment with the values in @new_kargs. @@ -15538,19 +15538,19 @@ values in @new_kargs. Sysroot + line="3193">Sysroot A deployment + line="3194">A deployment Replace deployment's kernel arguments + line="3195">Replace deployment's kernel arguments @@ -15561,7 +15561,7 @@ values in @new_kargs. allow-none="1"> Cancellable + line="3196">Cancellable @@ -15571,7 +15571,7 @@ values in @new_kargs. throws="1"> By default, deployment directories are not mutable. This function + line="3240">By default, deployment directories are not mutable. This function will allow making them temporarily mutable, for example to allow layering additional non-OSTree content. @@ -15582,19 +15582,19 @@ layering additional non-OSTree content. Sysroot + line="3242">Sysroot A deployment + line="3243">A deployment Whether or not deployment's files can be changed + line="3244">Whether or not deployment's files can be changed allow-none="1"> Cancellable + line="3245">Cancellable @@ -16445,7 +16445,7 @@ later, instead. throws="1"> Like ostree_sysroot_deploy_tree(), but "finalization" only occurs at OS + line="2954">Like ostree_sysroot_deploy_tree(), but "finalization" only occurs at OS shutdown time. @@ -16455,7 +16455,7 @@ shutdown time. Sysroot + line="2956">Sysroot allow-none="1"> osname to use for merge deployment + line="2957">osname to use for merge deployment Checksum to add + line="2958">Checksum to add allow-none="1"> Origin to use for upgrades + line="2959">Origin to use for upgrades allow-none="1"> Use this deployment for merge path + line="2960">Use this deployment for merge path allow-none="1"> Use these as kernel arguments; if %NULL, inherit options from provided_merge_deployment + line="2961">Use these as kernel arguments; if %NULL, inherit options from provided_merge_deployment @@ -16508,7 +16508,7 @@ shutdown time. transfer-ownership="full"> The new deployment path + line="2962">The new deployment path allow-none="1"> Cancellable + line="2963">Cancellable @@ -16602,7 +16602,7 @@ acquired. throws="1"> Older version of ostree_sysroot_write_deployments_with_options(). This + line="2226">Older version of ostree_sysroot_write_deployments_with_options(). This version will perform post-deployment cleanup by default. @@ -16612,13 +16612,13 @@ version will perform post-deployment cleanup by default. Sysroot + line="2228">Sysroot List of new deployments + line="2229">List of new deployments @@ -16629,7 +16629,7 @@ version will perform post-deployment cleanup by default. allow-none="1"> Cancellable + line="2230">Cancellable @@ -16640,7 +16640,7 @@ version will perform post-deployment cleanup by default. throws="1"> Assuming @new_deployments have already been deployed in place on disk via + line="2352">Assuming @new_deployments have already been deployed in place on disk via ostree_sysroot_deploy_tree(), atomically update bootloader configuration. By default, no post-transaction cleanup will be performed. You should invoke ostree_sysroot_cleanup() at some point after the transaction, or specify @@ -16654,13 +16654,13 @@ if for example you want to control pruning of the repository. Sysroot + line="2354">Sysroot List of new deployments + line="2355">List of new deployments @@ -16668,7 +16668,7 @@ if for example you want to control pruning of the repository. Options + line="2356">Options @@ -16678,7 +16678,7 @@ if for example you want to control pruning of the repository. allow-none="1"> Cancellable + line="2357">Cancellable @@ -17310,7 +17310,7 @@ users who had been using zero before.