Control: tags -1 + patch
Hi,
On 2024-02-23 08:33, Paul Gevers wrote:
> Dose [1] is reporting a build issue with your package, it's missing a
> build dependency.
It's actually two build deps that are missing: librust-lofty-0.17-dev
and librust-mpris-server-0.6-dev. Setting both to the versions currently
available in sid fixes the FTBFS. See attached patch.
Emanuele
diff -Nru amberol-0.10.3/debian/changelog amberol-0.10.3/debian/changelog
--- amberol-0.10.3/debian/changelog 2024-01-06 12:12:15.000000000 +0100
+++ amberol-0.10.3/debian/changelog 2024-04-12 12:23:35.000000000 +0200
@@ -1,3 +1,11 @@
+amberol (0.10.3-2.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Update build dependencies: librust-lofty-0.18-dev,
+ librust-mpris-server-0.7-dev. (Closes: #1064531)
+
+ -- Emanuele Rocca <e...@debian.org> Fri, 12 Apr 2024 12:23:35 +0200
+
amberol (0.10.3-2) unstable; urgency=medium
* d/control: depend on `gstreamer1.0-plugins-good`
diff -Nru amberol-0.10.3/debian/control amberol-0.10.3/debian/control
--- amberol-0.10.3/debian/control 2024-01-06 12:12:15.000000000 +0100
+++ amberol-0.10.3/debian/control 2024-04-12 12:23:35.000000000 +0200
@@ -21,9 +21,9 @@
librust-gdk-pixbuf-0.18+v2-42-dev,
librust-gtk4-0.7+v4-10-dev,
librust-libadwaita-0.5+v1-4-dev,
- librust-lofty-0.17-dev,
+ librust-lofty-0.18-dev,
librust-log-0.4-dev,
- librust-mpris-server-0.6-dev,
+ librust-mpris-server-0.7-dev,
librust-pretty-env-logger-0.5-dev,
librust-once-cell-1-dev,
librust-rand-0.8-dev,
diff -Nru amberol-0.10.3/debian/patches/0002-Update-dependencies.patch amberol-0.10.3/debian/patches/0002-Update-dependencies.patch
--- amberol-0.10.3/debian/patches/0002-Update-dependencies.patch 2024-01-06 12:12:15.000000000 +0100
+++ amberol-0.10.3/debian/patches/0002-Update-dependencies.patch 2024-04-12 12:23:03.000000000 +0200
@@ -36,7 +36,7 @@
-gtk = { version = "0.6.6", package = "gtk4", features = ["v4_10"] }
-lofty = "0.11.0"
+gtk = { version = "0.7", package = "gtk4", features = ["v4_10"] }
-+lofty = "0.17.0"
++lofty = "0.18.0"
log = "0.4"
mpris-player = "0.6"
once_cell = "1.10"
diff -Nru amberol-0.10.3/debian/patches/0003-Replace-mpris_player-with-mpris_server-and-fix-MPRIS.patch amberol-0.10.3/debian/patches/0003-Replace-mpris_player-with-mpris_server-and-fix-MPRIS.patch
--- amberol-0.10.3/debian/patches/0003-Replace-mpris_player-with-mpris_server-and-fix-MPRIS.patch 2024-01-06 12:12:15.000000000 +0100
+++ amberol-0.10.3/debian/patches/0003-Replace-mpris_player-with-mpris_server-and-fix-MPRIS.patch 2024-04-12 12:23:35.000000000 +0200
@@ -17,23 +17,23 @@
src/audio/waveform_generator.rs | 2 +-
7 files changed, 199 insertions(+), 144 deletions(-)
-diff --git a/Cargo.toml b/Cargo.toml
-index e15d84b..4eadcfb 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -14,7 +14,7 @@ gettext-rs = { version = "0.7", features = ["gettext-system"] }
+Index: amberol-0.10.3/Cargo.toml
+===================================================================
+--- amberol-0.10.3.orig/Cargo.toml
++++ amberol-0.10.3/Cargo.toml
+@@ -14,7 +14,7 @@ gettext-rs = { version = "0.7", features
gtk = { version = "0.7", package = "gtk4", features = ["v4_10"] }
- lofty = "0.17.0"
+ lofty = "0.18.0"
log = "0.4"
-mpris-player = "0.6"
-+mpris-server = "0.6"
++mpris-server = "0.7"
once_cell = "1.10"
pretty_env_logger = "0.5"
rand = "0.8.5"
-diff --git a/src/audio/controller.rs b/src/audio/controller.rs
-index 62f89e7..e1484ae 100644
---- a/src/audio/controller.rs
-+++ b/src/audio/controller.rs
+Index: amberol-0.10.3/src/audio/controller.rs
+===================================================================
+--- amberol-0.10.3.orig/src/audio/controller.rs
++++ amberol-0.10.3/src/audio/controller.rs
@@ -7,6 +7,6 @@ pub trait Controller {
fn set_playback_state(&self, state: &PlaybackState);
@@ -42,10 +42,10 @@
+ fn set_position(&self, position: u64, notify: bool);
fn set_repeat_mode(&self, repeat: RepeatMode);
}
-diff --git a/src/audio/gst_backend.rs b/src/audio/gst_backend.rs
-index feb27c1..ff8c1c5 100644
---- a/src/audio/gst_backend.rs
-+++ b/src/audio/gst_backend.rs
+Index: amberol-0.10.3/src/audio/gst_backend.rs
+===================================================================
+--- amberol-0.10.3.orig/src/audio/gst_backend.rs
++++ amberol-0.10.3/src/audio/gst_backend.rs
@@ -21,6 +21,13 @@ pub struct GstReplayGain {
rg_volume: gst::Element,
}
@@ -82,10 +82,10 @@
self.gst_player.connect_volume_changed(
clone!(@strong self.sender as sender => move |player| {
let volume = gst_audio::StreamVolume::convert_volume(
-diff --git a/src/audio/inhibit_controller.rs b/src/audio/inhibit_controller.rs
-index e532c74..01e36a0 100644
---- a/src/audio/inhibit_controller.rs
-+++ b/src/audio/inhibit_controller.rs
+Index: amberol-0.10.3/src/audio/inhibit_controller.rs
+===================================================================
+--- amberol-0.10.3.orig/src/audio/inhibit_controller.rs
++++ amberol-0.10.3/src/audio/inhibit_controller.rs
@@ -54,6 +54,6 @@ impl Controller for InhibitController {
}
@@ -94,10 +94,10 @@
+ fn set_position(&self, _position: u64, _notify: bool) {}
fn set_repeat_mode(&self, _mode: RepeatMode) {}
}
-diff --git a/src/audio/mpris_controller.rs b/src/audio/mpris_controller.rs
-index 2089185..99a1971 100644
---- a/src/audio/mpris_controller.rs
-+++ b/src/audio/mpris_controller.rs
+Index: amberol-0.10.3/src/audio/mpris_controller.rs
+===================================================================
+--- amberol-0.10.3.orig/src/audio/mpris_controller.rs
++++ amberol-0.10.3/src/audio/mpris_controller.rs
@@ -1,12 +1,15 @@
// SPDX-FileCopyrightText: 2022 Emmanuele Bassi
// SPDX-License-Identifier: GPL-3.0-or-later
@@ -461,10 +461,10 @@
+ }
+ }));
+}
-diff --git a/src/audio/player.rs b/src/audio/player.rs
-index 60edcb9..4fb732b 100644
---- a/src/audio/player.rs
-+++ b/src/audio/player.rs
+Index: amberol-0.10.3/src/audio/player.rs
+===================================================================
+--- amberol-0.10.3.orig/src/audio/player.rs
++++ amberol-0.10.3/src/audio/player.rs
@@ -27,10 +27,10 @@ pub enum PlaybackAction {
SkipPrevious,
SkipNext,
@@ -523,10 +523,10 @@
}
}
-diff --git a/src/audio/waveform_generator.rs b/src/audio/waveform_generator.rs
-index 0f16770..4ff8732 100644
---- a/src/audio/waveform_generator.rs
-+++ b/src/audio/waveform_generator.rs
+Index: amberol-0.10.3/src/audio/waveform_generator.rs
+===================================================================
+--- amberol-0.10.3.orig/src/audio/waveform_generator.rs
++++ amberol-0.10.3/src/audio/waveform_generator.rs
@@ -74,7 +74,7 @@ impl Controller for WaveformGenerator {
self.load_peaks();
}
