[rpms/audacious-plugins] rawhide: merge streamtuner activate() fix

[rpms/audacious-plugins] rawhide: merge streamtuner activate() fix

[Michael Schwendt]

A new commit has been pushed.

Repo   : rpms/audacious-plugins
Branch : rawhide
Commit : 0402222f034339d19eb0ca23f45bd2c55da5e56f
Author : Michael Schwendt <mschwendt@fedoraproject.org>
Date   : 2026-09-06T21:04:12+02:00
Stats  : +147/-1 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/audacious-plugins/c/0402222f034339d19eb0ca23f45bd2c55da5e56f?branch=rawhide

Log:
merge streamtuner activate() fix

---
diff --git a/audacious-plugins-streamtuner.patch b/audacious-plugins-streamtuner.patch
new file mode 100644
index 0000000..531f5ee
--- /dev/null
+++ b/audacious-plugins-streamtuner.patch
@@ -0,0 +1,141 @@
+From 85d35dd8895383ac1ded387e661bbb08cff383a9 Mon Sep 17 00:00:00 2001
+From: Thomas Lange
+Date: Sun, 6 Sep 2026 20:11:34 +0200
+Subject: [PATCH] streamtuner: Respond to selecting radio entries again.
+ Closes: #1873
+
+audqt::TreeView used to support an activate() function which
+was removed years ago. Connect to the respective signal manually.
+With override keywords this would have been cought way earlier...
+
+See also: https://github.com/audacious-media-player/audacious/commit/b52a1dcf0cb762911681e73c23974742a52f4358
+---
+ src/streamtuner/icecast-widget.cc   | 6 +++++-
+ src/streamtuner/icecast-widget.h    | 2 +-
+ src/streamtuner/ihr-widget.cc       | 6 +++++-
+ src/streamtuner/ihr-widget.h        | 2 +-
+ src/streamtuner/shoutcast-widget.cc | 6 +++++-
+ src/streamtuner/shoutcast-widget.h  | 2 +-
+ src/streamtuner/streamtuner.cc      | 1 -
+ 7 files changed, 18 insertions(+), 7 deletions(-)
+
+diff --git a/src/streamtuner/icecast-widget.cc b/src/streamtuner/icecast-widget.cc
+index 18f9beec07..319b9b0a62 100644
+--- a/src/streamtuner/icecast-widget.cc
++++ b/src/streamtuner/icecast-widget.cc
+@@ -17,11 +17,15 @@ IcecastListingWidget::IcecastListingWidget (QWidget * parent) :
+ 
+     setModel (m_model);
+     setRootIsDecorated (false);
++
++    connect (this, & QTreeView::activated, [this] (const QModelIndex & index) {
++        activate (index);
++    });
+ }
+ 
+ void IcecastListingWidget::activate (const QModelIndex & index)
+ {
+-    if (index.row () < 0)
++    if (! index.isValid ())
+         return;
+ 
+     Playlist::temporary_playlist ().activate ();
+diff --git a/src/streamtuner/icecast-widget.h b/src/streamtuner/icecast-widget.h
+index 1e2c0a4ef3..5a7edef781 100644
+--- a/src/streamtuner/icecast-widget.h
++++ b/src/streamtuner/icecast-widget.h
+@@ -31,9 +31,9 @@ class IcecastListingWidget : public audqt::TreeView {
+ public:
+      IcecastListingWidget(QWidget * parent = nullptr);
+ 
++private:
+      void activate (const QModelIndex & index);
+ 
+-private:
+      IcecastTunerModel *m_model;
+ };
+ 
+diff --git a/src/streamtuner/ihr-widget.cc b/src/streamtuner/ihr-widget.cc
+index 4df08da13a..e6447fe71b 100644
+--- a/src/streamtuner/ihr-widget.cc
++++ b/src/streamtuner/ihr-widget.cc
+@@ -29,11 +29,15 @@ IHRListingWidget::IHRListingWidget (QWidget * parent) :
+ 
+     setModel (m_model);
+     setRootIsDecorated (false);
++
++    connect (this, & QTreeView::activated, [this] (const QModelIndex & index) {
++        activate (index);
++    });
+ }
+ 
+ void IHRListingWidget::activate (const QModelIndex & index)
+ {
+-    if (index.row () < 0)
++    if (! index.isValid ())
+         return;
+ 
+     Playlist::temporary_playlist ().activate ();
+diff --git a/src/streamtuner/ihr-widget.h b/src/streamtuner/ihr-widget.h
+index ed4e4f7e6f..bb147140a0 100644
+--- a/src/streamtuner/ihr-widget.h
++++ b/src/streamtuner/ihr-widget.h
+@@ -31,9 +31,9 @@ class IHRListingWidget : public audqt::TreeView {
+ public:
+      IHRListingWidget(QWidget * parent = nullptr);
+ 
++private:
+      void activate (const QModelIndex & index);
+ 
+-private:
+      IHRTunerModel *m_model;
+ };
+ 
+diff --git a/src/streamtuner/shoutcast-widget.cc b/src/streamtuner/shoutcast-widget.cc
+index b58876d820..b3559ab768 100644
+--- a/src/streamtuner/shoutcast-widget.cc
++++ b/src/streamtuner/shoutcast-widget.cc
+@@ -36,11 +36,15 @@ ShoutcastListingWidget::ShoutcastListingWidget (QWidget * parent) :
+     auto hdr = header ();
+     hdr->setStretchLastSection (false);
+     hdr->setSectionResizeMode (0, QHeaderView::Stretch);
++
++    connect (this, & QTreeView::activated, [this] (const QModelIndex & index) {
++        activate (index);
++    });
+ }
+ 
+ void ShoutcastListingWidget::activate (const QModelIndex & index)
+ {
+-    if (index.row () < 0)
++    if (! index.isValid ())
+         return;
+ 
+     Playlist::temporary_playlist ().activate ();
+diff --git a/src/streamtuner/shoutcast-widget.h b/src/streamtuner/shoutcast-widget.h
+index bd5fdbc5ef..98c409c77d 100644
+--- a/src/streamtuner/shoutcast-widget.h
++++ b/src/streamtuner/shoutcast-widget.h
+@@ -30,9 +30,9 @@ class ShoutcastListingWidget : public audqt::TreeView {
+ public:
+      ShoutcastListingWidget(QWidget * parent = nullptr);
+ 
++private:
+      void activate (const QModelIndex & index);
+ 
+-private:
+      ShoutcastTunerModel *m_model;
+ };
+ 
+diff --git a/src/streamtuner/streamtuner.cc b/src/streamtuner/streamtuner.cc
+index b85dea14e7..aa4cae7dc0 100644
+--- a/src/streamtuner/streamtuner.cc
++++ b/src/streamtuner/streamtuner.cc
+@@ -31,7 +31,6 @@
+ #include <QJsonArray>
+ #include <QJsonObject>
+ 
+-#include "shoutcast-model.h"
+ #include "shoutcast-widget.h"
+ #include "icecast-widget.h"
+ #include "ihr-widget.h"

diff --git a/audacious-plugins.spec b/audacious-plugins.spec
index 0b6be97..fca12e1 100644
--- a/audacious-plugins.spec
+++ b/audacious-plugins.spec
@@ -9,7 +9,7 @@
 
 Name: audacious-plugins
 Version: 4.6.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 %global tar_ver %{version}
 
@@ -37,6 +37,8 @@ Patch0: audacious-plugins-3.7-alpha1-xmms-skindir.patch
 Patch2: audacious-plugins-3.6-ladspa.patch
 # upstream fix for the accidental Turkish translations in en_GB
 Patch3: audacious-plugins-4.6.1-en_GB.patch
+# upstream #1873
+Patch4: audacious-plugins-streamtuner.patch
 
 BuildRequires: gcc-c++
 BuildRequires: meson
@@ -352,6 +354,9 @@ install -p -m0644 %{SOURCE102} ${RPM_BUILD_ROOT}%{_datadir}/appdata
 
 
 %changelog
+* Sun Sep 06 2026 Michael Schwendt <mschwendt@fedoraproject.org> - 4.6.1-5
+- merge streamtuner activate() fix
+
 * Fri Sep 04 2026 Dominik Mierzejewski <dominik@greysector.net> - 4.6.1-4
 - Rebuilt for FFmpeg 9