Package: gnome-decoder Version: 0.6.1-1 Severity: serious Tags: ftbfs patch User: debian-ri...@lists.debian.org Usertags: riscv64 X-Debbugs-Cc: debian-ri...@lists.debian.org
Dear Maintainer,
When I was looking the timeout issue on riscv64, I found it has one
FTBFS(BD-uninstallable) issue like:
```
...
The following information may help to resolve the situation:
The following packages have unmet dependencies:
sbuild-build-depends-main-dummy : Depends: librust-ashpd-0.9+gtk4-dev but it
is not installable
E: Unable to correct problems, you have held broken packages.
apt-get failed.
E: Package installation failed
Not removing build depends: cloned chroot in use
...
```
This is due to librust-ashpd-0.9 has been rename librust-ashpd-dev[0].
I have refreshed 0002-Cargo.toml-relax-build-dependencies.patch to as a
workaround but please review it carefully because I am not sure this
is correctly fixing or not.
For test timeout issue on riscv64, see:
https://buildd.debian.org/status/fetch.php?pkg=gnome-decoder&arch=riscv64&ver=0.6.1-1&stamp=1739376739&raw=0
In fact, if only to increase the timeout-multiplier to 6, the Cargo
tests will pass, but it does not work for Cargo clippy test. From my
experimential, it almost need ~1h IIUC, so I have to increase the
timeout for clippy on riscv64 again separately. Could you have a look at
this?
[0]: https://tracker.debian.org/pkg/rust-ashpd
--
Regards,
--
Bo YU
diff -Nru gnome-decoder-0.6.1/debian/changelog
gnome-decoder-0.6.1/debian/changelog
--- gnome-decoder-0.6.1/debian/changelog 2025-02-10 17:45:38.000000000
+0000
+++ gnome-decoder-0.6.1/debian/changelog 2025-02-14 02:50:17.000000000
+0000
@@ -1,3 +1,14 @@
+gnome-decoder (0.6.1-1.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Use librust-ashpd-dev instead of librust-ashpd-0.9+gtk4-dev on B-D.
+ (Closes: #-1)
+ * Increase timeout-multiplier to 8 to fix timeout on riscv64.
+ * Add 0003-increase-timeout-clippy-riscv64.patch to increase test timeout
+ for clippy separately.
+
+ -- Bo YU <vi...@debian.org> Fri, 14 Feb 2025 02:50:17 +0000
+
gnome-decoder (0.6.1-1) unstable; urgency=medium
* New upstream version
diff -Nru gnome-decoder-0.6.1/debian/control gnome-decoder-0.6.1/debian/control
--- gnome-decoder-0.6.1/debian/control 2025-02-10 17:45:38.000000000 +0000
+++ gnome-decoder-0.6.1/debian/control 2025-02-14 02:50:17.000000000 +0000
@@ -10,7 +10,7 @@
libgstreamer-plugins-bad1.0-dev,
librust-anyhow-1-dev,
librust-aperture-0.7-dev,
- librust-ashpd-0.9+gtk4-dev,
+ librust-ashpd-dev,
librust-async-lock-3-dev,
librust-async-std-1-dev,
librust-chrono-0.4-dev,
diff -Nru
gnome-decoder-0.6.1/debian/patches/0002-Cargo.toml-relax-build-dependencies.patch
gnome-decoder-0.6.1/debian/patches/0002-Cargo.toml-relax-build-dependencies.patch
---
gnome-decoder-0.6.1/debian/patches/0002-Cargo.toml-relax-build-dependencies.patch
2025-02-10 17:45:38.000000000 +0000
+++
gnome-decoder-0.6.1/debian/patches/0002-Cargo.toml-relax-build-dependencies.patch
2025-02-14 02:50:17.000000000 +0000
@@ -7,20 +7,22 @@
Cargo.toml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
-diff --git a/Cargo.toml b/Cargo.toml
-index 5ace189..d239032 100644
+Index: b/Cargo.toml
+===================================================================
--- a/Cargo.toml
+++ b/Cargo.toml
-@@ -9,7 +9,7 @@ lto = true
+@@ -9,8 +9,8 @@
[dependencies]
anyhow = "1.0"
-aperture = "0.8"
+-ashpd = { version = "0.9", features = ["gtk4", "tracing"] }
+aperture = "0.7"
- ashpd = { version = "0.9", features = ["gtk4", "tracing"] }
++ashpd = { version = "0.10.2", features = ["gtk4", "tracing"] }
async-lock = "3.3"
async-std = "1.12"
-@@ -18,7 +18,7 @@ gettext-rs = { version = "0.7", features =
["gettext-system"] }
+ chrono = "0.4"
+@@ -18,7 +18,7 @@
gtk = { package = "gtk4", version = "0.9", features = ["gnome_47"] }
image = { version = "0.25", default-features = false, features = ["png"] }
adw = {package = "libadwaita", version = "0.7", features = ["v1_6"]}
diff -Nru
gnome-decoder-0.6.1/debian/patches/0003-increase-timeout-clippy-riscv64.patch
gnome-decoder-0.6.1/debian/patches/0003-increase-timeout-clippy-riscv64.patch
---
gnome-decoder-0.6.1/debian/patches/0003-increase-timeout-clippy-riscv64.patch
1970-01-01 00:00:00.000000000 +0000
+++
gnome-decoder-0.6.1/debian/patches/0003-increase-timeout-clippy-riscv64.patch
2025-02-14 02:50:17.000000000 +0000
@@ -0,0 +1,24 @@
+Description: increase clippy test timeout on riscv64
+Author: Bo YU <vi...@debian.org>
+Bug:
https://buildd.debian.org/status/fetch.php?pkg=gnome-decoder&arch=riscv64&ver=0.6.1-1&stamp=1739376739&raw=0
+Last-Update: 2025-02-15
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: b/src/meson.build
+===================================================================
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -32,7 +32,12 @@
+ message('Building in debug mode')
+ endif
+
+-timeout = 400
++
++if host_machine.cpu_family() == 'riscv64'
++ timeout = 800
++else
++ timeout = 400
++endif
+
+ cargo_build = custom_target(
+ 'cargo-build',
diff -Nru gnome-decoder-0.6.1/debian/patches/series
gnome-decoder-0.6.1/debian/patches/series
--- gnome-decoder-0.6.1/debian/patches/series 2025-02-10 17:45:38.000000000
+0000
+++ gnome-decoder-0.6.1/debian/patches/series 2025-02-14 02:50:17.000000000
+0000
@@ -1,2 +1,3 @@
0001-meson.build-fix-build-for-Debian.patch
0002-Cargo.toml-relax-build-dependencies.patch
+0003-increase-timeout-clippy-riscv64.patch
diff -Nru gnome-decoder-0.6.1/debian/rules gnome-decoder-0.6.1/debian/rules
--- gnome-decoder-0.6.1/debian/rules 2025-02-10 17:45:38.000000000 +0000
+++ gnome-decoder-0.6.1/debian/rules 2025-02-14 02:50:17.000000000 +0000
@@ -31,7 +31,7 @@
dh_auto_configure -- -Dhost_arch="$(DEB_HOST_RUST_TYPE)"
override_dh_auto_test:
- dh_auto_test -- --timeout-multiplier 4
+ dh_auto_test -- --timeout-multiplier 8
execute_after_dh_auto_install:
mv debian/Cargo.lock .
signature.asc
Description: PGP signature
