public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/rust-tiny-dfr] f45: Bump dependencies to gtk-rs v0.22
@ 2026-09-21 22:27 Fabio Valentini
  0 siblings, 0 replies; only message in thread
From: Fabio Valentini @ 2026-09-21 22:27 UTC (permalink / raw)
  To: git-commits

A new commit has been pushed.

Repo   : rpms/rust-tiny-dfr
Branch : f45
Commit : 1238d6095e4128e127c621beb01fbcaa75232e96
Author : Fabio Valentini <decathorpe@gmail.com>
Date   : 2026-09-21T22:58:54+02:00
Stats  : +57/-3 in 4 file(s)
URL    : https://src.fedoraproject.org/rpms/rust-tiny-dfr/c/1238d6095e4128e127c621beb01fbcaa75232e96?branch=f45

Log:
Bump dependencies to gtk-rs v0.22

---
diff --git a/0001-Port-to-librsvg-rebind-0.3.patch b/0001-Port-to-librsvg-rebind-0.3.patch
new file mode 100644
index 0000000..be34fef
--- /dev/null
+++ b/0001-Port-to-librsvg-rebind-0.3.patch
@@ -0,0 +1,27 @@
+From ab1153c09a4a24a31b5d5461bd131b2a4df4778a Mon Sep 17 00:00:00 2001
+From: Fabio Valentini <decathorpe@gmail.com>
+Date: Mon, 21 Sep 2026 22:53:09 +0200
+Subject: [PATCH] Port to librsvg-rebind 0.3
+
+This is the non-Cargo.toml part of upstream commit
+https://github.com/AsahiLinux/tiny-dfr/commit/c3ead36
+---
+ src/main.rs | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/main.rs b/src/main.rs
+index 5be5b16..62fc57e 100644
+--- a/src/main.rs
++++ b/src/main.rs
+@@ -102,7 +102,7 @@ struct Button {
+ 
+ fn try_load_svg(path: &str) -> Result<ButtonImage> {
+     Ok(ButtonImage::Svg(
+-        Handle::from_file(path)?.ok_or(anyhow!("failed to load image"))?,
++        Handle::from_file(path).map_err(|_| anyhow!("failed to load image"))?,
+     ))
+ }
+ 
+-- 
+2.55.0
+

diff --git a/rust-tiny-dfr.spec b/rust-tiny-dfr.spec
index bfd43e5..136042d 100644
--- a/rust-tiny-dfr.spec
+++ b/rust-tiny-dfr.spec
@@ -14,9 +14,12 @@ Source:         %{crates_source}
 # Manually created patch for downstream crate metadata changes
 # * Update input dependency from 0.8 to 0.9:
 #   https://github.com/AsahiLinux/tiny-dfr/pull/83
+# * Bump gtk-rs dependencies from 0.20 to 0.22:
+#   https://github.com/AsahiLinux/tiny-dfr/pull/85
 Patch:          tiny-dfr-fix-metadata.diff
 # * Add a battery state fallback for all arches
 Patch2:         https://github.com/AsahiLinux/tiny-dfr/pull/81.patch
+Patch3:         0001-Port-to-librsvg-rebind-0.3.patch
 
 BuildRequires:  cargo-rpm-macros >= 24
 BuildRequires:  systemd-rpm-macros

diff --git a/rust2rpm.toml b/rust2rpm.toml
index 7393987..d7e2402 100644
--- a/rust2rpm.toml
+++ b/rust2rpm.toml
@@ -1,6 +1,7 @@
 [package]
 cargo-toml-patch-comments = [
   "Update input dependency from 0.8 to 0.9: https://github.com/AsahiLinux/tiny-dfr/pull/83",
+  "Bump gtk-rs dependencies from 0.20 to 0.22: https://github.com/AsahiLinux/tiny-dfr/pull/85",
 ]
 extra-files = [
   "%{_datadir}/%{crate}/",
@@ -11,6 +12,7 @@ extra-files = [
 ]
 extra-patches = [
   { number = 2, file = "https://github.com/AsahiLinux/tiny-dfr/pull/81.patch", comments = ["Add a battery state fallback for all arches"] },
+  { number = 3, file = "0001-Port-to-librsvg-rebind-0.3.patch" },
 ]
 
 [requires]

diff --git a/tiny-dfr-fix-metadata.diff b/tiny-dfr-fix-metadata.diff
index 7d6b972..1d1340f 100644
--- a/tiny-dfr-fix-metadata.diff
+++ b/tiny-dfr-fix-metadata.diff
@@ -1,7 +1,20 @@
 --- tiny-dfr-0.3.7/Cargo.toml	1970-01-01T00:00:01+00:00
-+++ tiny-dfr-0.3.7/Cargo.toml	2026-03-16T10:22:52.204008+00:00
-@@ -54,7 +54,7 @@
- version = "0.37"
++++ tiny-dfr-0.3.7/Cargo.toml	2026-09-21T20:39:41.829119+00:00
+@@ -33,7 +33,7 @@
+ version = "1"
+ 
+ [dependencies.cairo-rs]
+-version = "0.20"
++version = "0.22"
+ features = [
+     "freetype",
+     "png",
+@@ -51,10 +51,10 @@
+ version = "0.4.0"
+ 
+ [dependencies.freetype-rs]
+-version = "0.37"
++version = "0.38"
  
  [dependencies.input]
 -version = "0.8"
@@ -9,3 +22,12 @@
  
  [dependencies.input-linux]
  version = "0.7"
+@@ -67,7 +67,7 @@
+ version = "0.2"
+ 
+ [dependencies.librsvg-rebind]
+-version = "0.1"
++version = "0.3"
+ 
+ [dependencies.nix]
+ version = "0.29"

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-09-21 22:27 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-09-21 22:27 [rpms/rust-tiny-dfr] f45: Bump dependencies to gtk-rs v0.22 Fabio Valentini

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox