Merge pull request #366 from nokyan/gnome-47

Update to GNOME SDK 47
nokyan · Sep 30, 2024 · ede7df3 · ede7df3
2 parents 46a50ba + c7f3a5e
commit ede7df3
Show file tree

Hide file tree

Showing 10 changed files with 245 additions and 234 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -14,15 +14,15 @@ strip = true
 opt-level = 3
 
 [dependencies]
-adw = { version = "0.7.0", features = ["v1_5"], package = "libadwaita" }
-anyhow = { version = "1.0.86", features = ["backtrace"] }
+adw = { version = "0.7.0", features = ["v1_6"], package = "libadwaita" }
+anyhow = { version = "1.0.89", features = ["backtrace"] }
 async-channel = "2.3.1"
-clap = { version = "4.5.16", features = ["derive"] }
-gettext-rs = { version = "0.7", features = ["gettext-system"] }
+clap = { version = "4.5.18", features = ["derive"] }
+gettext-rs = { version = "0.7.1", features = ["gettext-system"] }
 glob = "0.3.1"
-gtk = { version = "0.9.0", features = ["v4_10"], package = "gtk4" }
+gtk = { version = "0.9.2", features = ["v4_10"], package = "gtk4" }
 gtk-macros = "0.3.0"
-libc = { version = "0.2.158", features = ["extra_traits"] }
+libc = { version = "0.2.159", features = ["extra_traits"] }
 log = "0.4.22"
 nix = { version = "0.29.0", default-features = false, features = [
     "signal",
@@ -31,13 +31,13 @@ nix = { version = "0.29.0", default-features = false, features = [
 num_cpus = "1.16.0"
 nvml-wrapper = "0.10.0"
 paste = "1.0.15"
-plotters = { version = "0.3.6", default-features = false, features = [
+plotters = { version = "0.3.7", default-features = false, features = [
     "area_series",
 ] }
 plotters-cairo = "0.7.0"
 pretty_env_logger = "0.5"
 process-data = { path = "lib/process_data" }
-regex = "1.10.6"
+regex = "1.11.0"
 rmp-serde = "1.3.0"
 ron = "0.8.1"
 rust-ini = "0.21.1"

diff --git a/README.md b/README.md
@@ -68,7 +68,7 @@ You can also build Resources yourself using either Meson directly or preferably
 - `glib-2.0` ≥ 2.66
 - `gio-2.0` ≥ 2.66
 - `gtk-4` ≥ 4.10
-- `libadwaita-1` ≥ 1.5
+- `libadwaita-1` ≥ 1.6
 - `cargo`
 
 Other dependencies are handled by `cargo`.
@@ -84,7 +84,7 @@ These dependencies are not needed to build Resources but Resources may lack cert
 ### Building Using Flatpak Builder
 
 ```sh
-flatpak install org.gnome.Sdk//46 org.freedesktop.Sdk.Extension.rust-stable//23.08 org.gnome.Platform//46 org.freedesktop.Sdk.Extension.llvm18//23.08
+flatpak install org.gnome.Sdk//47 org.freedesktop.Sdk.Extension.rust-stable//24.08 org.gnome.Platform//47 org.freedesktop.Sdk.Extension.llvm18//24.08
 flatpak-builder --user flatpak_app build-aux/net.nokyan.Resources.Devel.json
 ```
 

diff --git a/build-aux/net.nokyan.Resources.Devel.json b/build-aux/net.nokyan.Resources.Devel.json
@@ -1,7 +1,7 @@
 {
     "id": "net.nokyan.Resources.Devel",
     "runtime": "org.gnome.Platform",
-    "runtime-version": "46",
+    "runtime-version": "47",
     "sdk": "org.gnome.Sdk",
     "sdk-extensions": [
         "org.freedesktop.Sdk.Extension.rust-stable",

diff --git a/lib/process_data/Cargo.toml b/lib/process_data/Cargo.toml
@@ -14,15 +14,15 @@ strip = true
 opt-level = 3
 
 [dependencies]
-anyhow = "1.0.86"
+anyhow = "1.0.89"
 glob = "0.3.1"
-libc = "0.2.158"
+libc = "0.2.159"
 num_cpus = "1.16.0"
-nutype = { version = "0.4.3", features = ["serde"] }
+nutype = { version = "0.5.0", features = ["serde"] }
 nvml-wrapper = "0.10.0"
-once_cell = "1.19.0"
-regex = "1.10.6"
-serde = { version = "1.0.208", features = ["serde_derive"] }
+once_cell = "1.20.1"
+regex = "1.11.0"
+serde = { version = "1.0.210", features = ["serde_derive"] }
 syscalls = { version = "0.6.18", features = ["all"] }
 sysconf = "0.3.4"
 unescape = "0.1.0"

diff --git a/src/ui/pages/applications/application_name_cell.rs b/src/ui/pages/applications/application_name_cell.rs
@@ -1,4 +1,4 @@
-use adw::{prelude::*, subclass::prelude::*};
+use adw::{glib::property::PropertySet, prelude::*, subclass::prelude::*};
 use gtk::{gio::Icon, glib};
 
 mod imp {

diff --git a/src/ui/pages/drive.rs b/src/ui/pages/drive.rs
@@ -1,6 +1,6 @@
 use std::time::{Duration, SystemTime};
 
-use adw::{prelude::*, subclass::prelude::*};
+use adw::{glib::property::PropertySet, prelude::*, subclass::prelude::*};
 use gtk::glib;
 
 use crate::config::PROFILE;

diff --git a/src/ui/pages/network.rs b/src/ui/pages/network.rs
@@ -1,6 +1,6 @@
 use std::time::{Duration, SystemTime};
 
-use adw::{prelude::*, subclass::prelude::*};
+use adw::{glib::property::PropertySet, prelude::*, subclass::prelude::*};
 use gtk::glib;
 
 use crate::config::PROFILE;

diff --git a/src/ui/pages/processes/process_name_cell.rs b/src/ui/pages/processes/process_name_cell.rs
@@ -1,4 +1,4 @@
-use adw::{prelude::*, subclass::prelude::*};
+use adw::{glib::property::PropertySet, prelude::*, subclass::prelude::*};
 use gtk::{gio::Icon, glib};
 
 mod imp {

diff --git a/src/ui/widgets/stack_sidebar_item.rs b/src/ui/widgets/stack_sidebar_item.rs
@@ -1,4 +1,4 @@
-use adw::{prelude::*, subclass::prelude::*};
+use adw::{glib::property::PropertySet, prelude::*, subclass::prelude::*};
 use gtk::{
     gio::Icon,
     glib::{self},