From 1e6a2d2e76527246352555267908f0393a6aa0d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Mon, 8 Jul 2024 09:25:18 +0300 Subject: [PATCH 1/5] Update gir --- gir | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gir b/gir index cbffeb655c48..d7c0763cacbc 160000 --- a/gir +++ b/gir @@ -1 +1 @@ -Subproject commit cbffeb655c4817664d3f8ef5d1cc5dc69c0eed80 +Subproject commit d7c0763cacbcc3c088e994d31142bf16adad0150 From f4d96e97c68dc16ee8ff696bf61d43d03ac8fba1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Mon, 8 Jul 2024 09:25:28 +0300 Subject: [PATCH 2/5] Update gir-files --- gir-files | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gir-files b/gir-files index 6dc3ae6d2820..1de2064e7b83 160000 --- a/gir-files +++ b/gir-files @@ -1 +1 @@ -Subproject commit 6dc3ae6d28206de8e5431ea09715406001695f19 +Subproject commit 1de2064e7b830fa47dfc69854ea4651e16edf2e6 From f697f7c78e82821e30648a6a61ef0b629da973e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Mon, 8 Jul 2024 09:27:05 +0300 Subject: [PATCH 3/5] glib-sys: Add version for `q_sort_array()` --- glib/sys/Gir.toml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/glib/sys/Gir.toml b/glib/sys/Gir.toml index ba3699f2bc48..8c72ba6c3bf9 100644 --- a/glib/sys/Gir.toml +++ b/glib/sys/Gir.toml @@ -77,6 +77,9 @@ status = "generate" [[object.function]] name = "assertion_message_cmpint" version = "2.78" + [[object.function]] + name = "sort_array" + version = "2.82" [[object]] name = "GLib.LOG_DOMAIN" From 1951c6747dcf57486e599c2d7f819c4656d06b91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Mon, 8 Jul 2024 09:27:24 +0300 Subject: [PATCH 4/5] Regenerate with latest gir / gir-files --- gdk-pixbuf/src/auto/versions.txt | 4 ++-- gdk-pixbuf/sys/versions.txt | 4 ++-- gio/src/auto/versions.txt | 4 ++-- gio/sys/versions.txt | 4 ++-- glib/gobject-sys/versions.txt | 4 ++-- glib/src/auto/functions.rs | 5 +++++ glib/src/auto/versions.txt | 4 ++-- glib/sys/src/lib.rs | 23 +++++++++++++++++++---- glib/sys/versions.txt | 4 ++-- graphene/src/auto/versions.txt | 4 ++-- graphene/sys/versions.txt | 4 ++-- pango/src/auto/versions.txt | 4 ++-- pango/sys/versions.txt | 4 ++-- pangocairo/src/auto/versions.txt | 4 ++-- pangocairo/sys/versions.txt | 4 ++-- 15 files changed, 50 insertions(+), 30 deletions(-) diff --git a/gdk-pixbuf/src/auto/versions.txt b/gdk-pixbuf/src/auto/versions.txt index b59f42f8b90b..9b579c553c57 100644 --- a/gdk-pixbuf/src/auto/versions.txt +++ b/gdk-pixbuf/src/auto/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ cbffeb655c48) -from gir-files (https://github.com/gtk-rs/gir-files @ 6dc3ae6d2820) +Generated by gir (https://github.com/gtk-rs/gir @ d7c0763cacbc) +from gir-files (https://github.com/gtk-rs/gir-files @ 1de2064e7b83) diff --git a/gdk-pixbuf/sys/versions.txt b/gdk-pixbuf/sys/versions.txt index b59f42f8b90b..9b579c553c57 100644 --- a/gdk-pixbuf/sys/versions.txt +++ b/gdk-pixbuf/sys/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ cbffeb655c48) -from gir-files (https://github.com/gtk-rs/gir-files @ 6dc3ae6d2820) +Generated by gir (https://github.com/gtk-rs/gir @ d7c0763cacbc) +from gir-files (https://github.com/gtk-rs/gir-files @ 1de2064e7b83) diff --git a/gio/src/auto/versions.txt b/gio/src/auto/versions.txt index b59f42f8b90b..9b579c553c57 100644 --- a/gio/src/auto/versions.txt +++ b/gio/src/auto/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ cbffeb655c48) -from gir-files (https://github.com/gtk-rs/gir-files @ 6dc3ae6d2820) +Generated by gir (https://github.com/gtk-rs/gir @ d7c0763cacbc) +from gir-files (https://github.com/gtk-rs/gir-files @ 1de2064e7b83) diff --git a/gio/sys/versions.txt b/gio/sys/versions.txt index b59f42f8b90b..9b579c553c57 100644 --- a/gio/sys/versions.txt +++ b/gio/sys/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ cbffeb655c48) -from gir-files (https://github.com/gtk-rs/gir-files @ 6dc3ae6d2820) +Generated by gir (https://github.com/gtk-rs/gir @ d7c0763cacbc) +from gir-files (https://github.com/gtk-rs/gir-files @ 1de2064e7b83) diff --git a/glib/gobject-sys/versions.txt b/glib/gobject-sys/versions.txt index b59f42f8b90b..9b579c553c57 100644 --- a/glib/gobject-sys/versions.txt +++ b/glib/gobject-sys/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ cbffeb655c48) -from gir-files (https://github.com/gtk-rs/gir-files @ 6dc3ae6d2820) +Generated by gir (https://github.com/gtk-rs/gir @ d7c0763cacbc) +from gir-files (https://github.com/gtk-rs/gir-files @ 1de2064e7b83) diff --git a/glib/src/auto/functions.rs b/glib/src/auto/functions.rs index 95004570237d..d311b313150d 100644 --- a/glib/src/auto/functions.rs +++ b/glib/src/auto/functions.rs @@ -695,6 +695,11 @@ pub fn shell_unquote( } } +//#[doc(alias = "g_sort_array")] +//pub fn sort_array(array: /*Unimplemented*/&[&Basic: Pointer], element_size: usize, compare_func: /*Unimplemented*/FnMut(/*Unimplemented*/Option, /*Unimplemented*/Option) -> i32, user_data: /*Unimplemented*/Option) { +// unsafe { TODO: call ffi:g_sort_array() } +//} + #[doc(alias = "g_spaced_primes_closest")] pub fn spaced_primes_closest(num: u32) -> u32 { unsafe { ffi::g_spaced_primes_closest(num) } diff --git a/glib/src/auto/versions.txt b/glib/src/auto/versions.txt index b59f42f8b90b..9b579c553c57 100644 --- a/glib/src/auto/versions.txt +++ b/glib/src/auto/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ cbffeb655c48) -from gir-files (https://github.com/gtk-rs/gir-files @ 6dc3ae6d2820) +Generated by gir (https://github.com/gtk-rs/gir @ d7c0763cacbc) +from gir-files (https://github.com/gtk-rs/gir-files @ 1de2064e7b83) diff --git a/glib/sys/src/lib.rs b/glib/sys/src/lib.rs index 95c526f762e2..1125fa78d2eb 100644 --- a/glib/sys/src/lib.rs +++ b/glib/sys/src/lib.rs @@ -1183,6 +1183,12 @@ pub type GSequenceIterCompareFunc = pub type GSourceDisposeFunc = Option; pub type GSourceDummyMarshal = Option; pub type GSourceFunc = Option gboolean>; +pub type GSourceFuncsCheckFunc = Option gboolean>; +pub type GSourceFuncsDispatchFunc = + Option gboolean>; +pub type GSourceFuncsFinalizeFunc = Option; +pub type GSourceFuncsPrepareFunc = + Option gboolean>; pub type GSourceOnceFunc = Option; pub type GSpawnChildSetupFunc = Option; pub type GTestDataFunc = Option; @@ -2160,10 +2166,10 @@ impl ::std::fmt::Debug for GSourceCallbackFuncs { #[derive(Copy, Clone)] #[repr(C)] pub struct GSourceFuncs { - pub prepare: Option gboolean>, - pub check: Option gboolean>, - pub dispatch: Option gboolean>, - pub finalize: Option, + pub prepare: GSourceFuncsPrepareFunc, + pub check: GSourceFuncsCheckFunc, + pub dispatch: GSourceFuncsDispatchFunc, + pub finalize: GSourceFuncsFinalizeFunc, pub closure_callback: GSourceFunc, pub closure_marshal: GSourceDummyMarshal, } @@ -6962,6 +6968,15 @@ extern "C" { ) -> *mut i64; pub fn g_slice_set_config(ckey: GSliceConfig, value: i64); pub fn g_snprintf(string: *mut c_char, n: c_ulong, format: *const c_char, ...) -> c_int; + #[cfg(feature = "v2_82")] + #[cfg_attr(docsrs, doc(cfg(feature = "v2_82")))] + pub fn g_sort_array( + array: *mut c_void, + n_elements: size_t, + element_size: size_t, + compare_func: GCompareDataFunc, + user_data: *mut c_void, + ); pub fn g_spaced_primes_closest(num: c_uint) -> c_uint; pub fn g_spawn_async( working_directory: *const c_char, diff --git a/glib/sys/versions.txt b/glib/sys/versions.txt index b59f42f8b90b..9b579c553c57 100644 --- a/glib/sys/versions.txt +++ b/glib/sys/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ cbffeb655c48) -from gir-files (https://github.com/gtk-rs/gir-files @ 6dc3ae6d2820) +Generated by gir (https://github.com/gtk-rs/gir @ d7c0763cacbc) +from gir-files (https://github.com/gtk-rs/gir-files @ 1de2064e7b83) diff --git a/graphene/src/auto/versions.txt b/graphene/src/auto/versions.txt index b59f42f8b90b..9b579c553c57 100644 --- a/graphene/src/auto/versions.txt +++ b/graphene/src/auto/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ cbffeb655c48) -from gir-files (https://github.com/gtk-rs/gir-files @ 6dc3ae6d2820) +Generated by gir (https://github.com/gtk-rs/gir @ d7c0763cacbc) +from gir-files (https://github.com/gtk-rs/gir-files @ 1de2064e7b83) diff --git a/graphene/sys/versions.txt b/graphene/sys/versions.txt index b59f42f8b90b..9b579c553c57 100644 --- a/graphene/sys/versions.txt +++ b/graphene/sys/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ cbffeb655c48) -from gir-files (https://github.com/gtk-rs/gir-files @ 6dc3ae6d2820) +Generated by gir (https://github.com/gtk-rs/gir @ d7c0763cacbc) +from gir-files (https://github.com/gtk-rs/gir-files @ 1de2064e7b83) diff --git a/pango/src/auto/versions.txt b/pango/src/auto/versions.txt index b59f42f8b90b..9b579c553c57 100644 --- a/pango/src/auto/versions.txt +++ b/pango/src/auto/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ cbffeb655c48) -from gir-files (https://github.com/gtk-rs/gir-files @ 6dc3ae6d2820) +Generated by gir (https://github.com/gtk-rs/gir @ d7c0763cacbc) +from gir-files (https://github.com/gtk-rs/gir-files @ 1de2064e7b83) diff --git a/pango/sys/versions.txt b/pango/sys/versions.txt index b59f42f8b90b..9b579c553c57 100644 --- a/pango/sys/versions.txt +++ b/pango/sys/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ cbffeb655c48) -from gir-files (https://github.com/gtk-rs/gir-files @ 6dc3ae6d2820) +Generated by gir (https://github.com/gtk-rs/gir @ d7c0763cacbc) +from gir-files (https://github.com/gtk-rs/gir-files @ 1de2064e7b83) diff --git a/pangocairo/src/auto/versions.txt b/pangocairo/src/auto/versions.txt index b59f42f8b90b..9b579c553c57 100644 --- a/pangocairo/src/auto/versions.txt +++ b/pangocairo/src/auto/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ cbffeb655c48) -from gir-files (https://github.com/gtk-rs/gir-files @ 6dc3ae6d2820) +Generated by gir (https://github.com/gtk-rs/gir @ d7c0763cacbc) +from gir-files (https://github.com/gtk-rs/gir-files @ 1de2064e7b83) diff --git a/pangocairo/sys/versions.txt b/pangocairo/sys/versions.txt index b59f42f8b90b..9b579c553c57 100644 --- a/pangocairo/sys/versions.txt +++ b/pangocairo/sys/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ cbffeb655c48) -from gir-files (https://github.com/gtk-rs/gir-files @ 6dc3ae6d2820) +Generated by gir (https://github.com/gtk-rs/gir @ d7c0763cacbc) +from gir-files (https://github.com/gtk-rs/gir-files @ 1de2064e7b83) From 95036c81ea4131cc2c8710d6c4e1d6894fe5be96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Mon, 8 Jul 2024 09:28:04 +0300 Subject: [PATCH 5/5] Update Cargo.lock --- Cargo.lock | 72 +++++++++++++++++++++++++++--------------------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d5d799062898..875599fdece5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -103,9 +103,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cc" -version = "1.0.99" +version = "1.0.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96c51067fd44124faa7f870b4b1c969379ad32b2ba805aa959430ceaa384f695" +checksum = "5208975e568d83b6b05cc0a063c8e7e9acc2b43bee6da15616a5b73e109d7437" [[package]] name = "cfg-expr" @@ -244,9 +244,9 @@ checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" [[package]] name = "either" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "equivalent" @@ -664,9 +664,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.21" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "memchr" @@ -691,9 +691,9 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "oorandom" -version = "11.1.3" +version = "11.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" +checksum = "b410bbe7e14ab526a0e86877eb47c6996a2bd7746f027ba551028c925390e4e9" [[package]] name = "pango" @@ -978,9 +978,9 @@ dependencies = [ [[package]] name = "scc" -version = "2.1.1" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76ad2bbb0ae5100a07b7a6f2ed7ab5fd0045551a4c507989b7a620046ea3efdc" +checksum = "af947d0ca10a2f3e00c7ec1b515b7c83e5cb3fa62d4c11a64301d9eec54440e9" dependencies = [ "sdd", ] @@ -1009,18 +1009,18 @@ checksum = "b84345e4c9bd703274a082fb80caaa99b7612be48dfaa1dd9266577ec412309d" [[package]] name = "serde" -version = "1.0.203" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" +checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.203" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" +checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" dependencies = [ "proc-macro2", "quote", @@ -1029,9 +1029,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.117" +version = "1.0.120" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" +checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5" dependencies = [ "itoa", "ryu", @@ -1107,9 +1107,9 @@ checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" [[package]] name = "syn" -version = "2.0.68" +version = "2.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9" +checksum = "201fcda3845c23e8212cd466bfebf0bd20694490fc0356ae8e428e0824a915a6" dependencies = [ "proc-macro2", "quote", @@ -1411,9 +1411,9 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ "windows_aarch64_gnullvm", "windows_aarch64_msvc", @@ -1427,51 +1427,51 @@ dependencies = [ [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" [[package]] name = "windows_i686_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow"