Skip to content

Commit a0b248d

Browse files
authored
Merge branch 'gtk-rs:main' into cairo-doc
2 parents c716ab4 + 83f2e55 commit a0b248d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+3610
-123
lines changed

.github/workflows/CI.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- { name: "gio", features: "v2_84", nightly: "--all-features", test_sys: true }
2626
- { name: "glib", features: "v2_84,log", nightly: "--all-features", test_sys: true }
2727
- { name: "graphene", features: "", nightly: "", test_sys: true }
28-
- { name: "pango", features: "v1_54", nightly: "--all-features", test_sys: true }
28+
- { name: "pango", features: "v1_56", nightly: "--all-features", test_sys: true }
2929
- { name: "pangocairo", features: "", nightly: "--all-features", test_sys: true }
3030
steps:
3131
- uses: actions/checkout@v4

.github/workflows/windows.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414

1515
env:
1616
# git revision of gvsbuild we use for to build GLib and the other dependencies
17-
gvsbuildref: bb1d2691d25c7bb1239118a907c8e21b1aa24e03
17+
gvsbuildref: 230e1074047b9654b76217c5d48b10c726fbe0f6
1818

1919
# bump this number if you want to force a rebuild of gvsbuild with the same revision
2020
gvsbuildupdate: 1

Cargo.lock

Lines changed: 40 additions & 40 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cairo/sys/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ version = "2.16"
6363
features = ["xlib"]
6464

6565
[target.'cfg(windows)'.dependencies]
66-
windows-sys = { version = "0.59", features = ["Win32_Graphics_Gdi"], optional = true }
66+
windows-sys = { version = ">=0.52, <=0.59", features = ["Win32_Graphics_Gdi"], optional = true }
6767

6868
[build-dependencies]
6969
system-deps = "7"

deny.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ allow = [
1515
"MIT",
1616
"Apache-2.0",
1717
"Apache-2.0 WITH LLVM-exception",
18-
"Unicode-DFS-2016",
18+
"Unicode-3.0",
1919
]
2020
confidence-threshold = 0.8
2121

examples/gio_dbus_register_object/main.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ enum HelloMethod {
4040
impl DBusMethodCall for HelloMethod {
4141
fn parse_call(
4242
_obj_path: &str,
43-
_interface: &str,
43+
_interface: Option<&str>,
4444
method: &str,
4545
params: glib::Variant,
4646
) -> Result<Self, glib::Error> {
@@ -65,7 +65,7 @@ fn on_startup(app: &gio::Application, tx: &Sender<gio::RegistrationId>) {
6565
.register_object("/com/github/gtk_rs/examples/HelloWorld", &example)
6666
.typed_method_call::<HelloMethod>()
6767
.invoke_and_return_future_local(|_, sender, call| {
68-
println!("Method call from {sender}");
68+
println!("Method call from {sender:?}");
6969
async {
7070
match call {
7171
HelloMethod::Hello(Hello { name }) => {

gdk-pixbuf/src/auto/versions.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Generated by gir (https://github.com/gtk-rs/gir @ 25fc925cd3da)
2-
from gir-files (https://github.com/gtk-rs/gir-files @ 3e07ae5a14c7)
1+
Generated by gir (https://github.com/gtk-rs/gir @ 1b34ebba86cb)
2+
from gir-files (https://github.com/gtk-rs/gir-files @ dfdf5ed146d5)

gdk-pixbuf/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// Take a look at the license at the top of the repository in the LICENSE file.
22

3+
#![allow(clippy::manual_c_str_literals)]
34
#![cfg_attr(docsrs, feature(doc_cfg))]
45
#![doc = include_str!("../README.md")]
56

@@ -8,7 +9,6 @@ pub use gio;
89
pub use glib;
910

1011
#[allow(clippy::too_many_arguments)]
11-
#[allow(clippy::manual_c_str_literals)]
1212
mod auto;
1313

1414
pub mod subclass;

gdk-pixbuf/sys/versions.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Generated by gir (https://github.com/gtk-rs/gir @ 25fc925cd3da)
2-
from gir-files (https://github.com/gtk-rs/gir-files @ 3e07ae5a14c7)
1+
Generated by gir (https://github.com/gtk-rs/gir @ 1b34ebba86cb)
2+
from gir-files (https://github.com/gtk-rs/gir-files @ dfdf5ed146d5)

0 commit comments

Comments
 (0)