--- Begin Message ---
Package: release.debian.org
Severity: normal
X-Debbugs-Cc: bluedevil@packages.debian.org, Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Control: affects -1 + src:bluedevil
User: release.debian.org@packages.debian.org
Usertags: unblock
Dear Release Team,
please unblock package bluedevil.
[ Reason ]
It contains the following changes:
* Backport upstream commits:
- Wizard: Sort devices with an actual name first.
[ Tests ]
- Bluetooth pairing, audio, network.
[ Risks ]
Only backport of upstream commits that apply cleanly. Further fixes can
easily be backported or the changes reverted.
[ Checklist ]
[x] all changes are documented in the d/changelog
[x] I reviewed all changes and I approve them
[x] attach debdiff against the package in testing
Thanks!
unblock bluedevil/4:6.3.4-2
diff -Nru bluedevil-6.3.4/debian/changelog bluedevil-6.3.4/debian/changelog
--- bluedevil-6.3.4/debian/changelog 2025-04-03 01:02:48.000000000 +0200
+++ bluedevil-6.3.4/debian/changelog 2025-06-03 10:43:54.000000000 +0200
@@ -1,3 +1,11 @@
+bluedevil (4:6.3.4-2) unstable; urgency=medium
+
+ [ Aurélien COUDERC ]
+ * Backport upstream commits:
+ - Wizard: Sort devices with an actual name first.
+
+ -- Aurélien COUDERC <coucouf@debian.org> Tue, 03 Jun 2025 10:43:54 +0200
+
bluedevil (4:6.3.4-1) unstable; urgency=medium
[ Patrick Franz ]
diff -Nru bluedevil-6.3.4/debian/patches/series bluedevil-6.3.4/debian/patches/series
--- bluedevil-6.3.4/debian/patches/series 1970-01-01 01:00:00.000000000 +0100
+++ bluedevil-6.3.4/debian/patches/series 2025-06-03 10:42:54.000000000 +0200
@@ -0,0 +1 @@
+upstream_dd36c291_Wizard-Sort-devices-with-an-actual-name-first.patch
diff -Nru bluedevil-6.3.4/debian/patches/upstream_dd36c291_Wizard-Sort-devices-with-an-actual-name-first.patch bluedevil-6.3.4/debian/patches/upstream_dd36c291_Wizard-Sort-devices-with-an-actual-name-first.patch
--- bluedevil-6.3.4/debian/patches/upstream_dd36c291_Wizard-Sort-devices-with-an-actual-name-first.patch 1970-01-01 01:00:00.000000000 +0100
+++ bluedevil-6.3.4/debian/patches/upstream_dd36c291_Wizard-Sort-devices-with-an-actual-name-first.patch 2025-06-03 10:42:54.000000000 +0200
@@ -0,0 +1,43 @@
+From dd36c29157a947e5be23bea2c6fa5ab59d670a0c Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid <aacid@kde.org>
+Date: Tue, 27 May 2025 14:55:52 +0000
+Subject: [PATCH] Wizard: Sort devices with an actual name first
+
+---
+ src/wizard/pages/discover.cpp | 20 ++++++++++++++++++--
+ 1 file changed, 18 insertions(+), 2 deletions(-)
+
+diff --git a/src/wizard/pages/discover.cpp b/src/wizard/pages/discover.cpp
+index c0220dac1..4c8fc9043 100644
+--- a/src/wizard/pages/discover.cpp
++++ b/src/wizard/pages/discover.cpp
+@@ -70,8 +70,24 @@ QVariant DevicesProxyModel::data(const QModelIndex &index, int role) const
+
+ bool DevicesProxyModel::lessThan(const QModelIndex &left, const QModelIndex &right) const
+ {
+- qint16 leftRssi = left.data(BluezQt::DevicesModel::RssiRole).toInt();
+- qint16 rightRssi = right.data(BluezQt::DevicesModel::RssiRole).toInt();
++ auto displayRoleIsAddress = [](const QModelIndex &idx) -> bool {
++ return idx.data(Qt::DisplayRole).toString() == idx.data(BluezQt::DevicesModel::AddressRole).toString().replace(':', '-');
++ };
++
++ const bool leftIsAddress = displayRoleIsAddress(left);
++ const bool rightIsAddress = displayRoleIsAddress(right);
++
++ // Sort devices whose name is not just the address first
++ if (leftIsAddress && !rightIsAddress) {
++ return true;
++ }
++ if (!leftIsAddress && rightIsAddress) {
++ return false;
++ }
++
++ // then sort them by signal power
++ const qint16 leftRssi = left.data(BluezQt::DevicesModel::RssiRole).toInt();
++ const qint16 rightRssi = right.data(BluezQt::DevicesModel::RssiRole).toInt();
+
+ return leftRssi < rightRssi;
+ }
+--
+GitLab
+
--- End Message ---