git: 85b9b42736e0 - main - net/rssguard: the port had been updated to version 4.0.4

From: Alexey Dokuchaev <danfe_at_FreeBSD.org>
Date: Fri, 03 Dec 2021 18:11:09 UTC
The branch main has been updated by danfe:

URL: https://cgit.FreeBSD.org/ports/commit/?id=85b9b42736e0c287c8e252b9a9fe474c3bb9f19d

commit 85b9b42736e0c287c8e252b9a9fe474c3bb9f19d
Author:     Alexey Dokuchaev <danfe@FreeBSD.org>
AuthorDate: 2021-12-03 18:09:42 +0000
Commit:     Alexey Dokuchaev <danfe@FreeBSD.org>
CommitDate: 2021-12-03 18:09:43 +0000

    net/rssguard: the port had been updated to version 4.0.4
    
    Switch from using QMediaPlayer to QSoundEffect class for notification
    sounds, as the former requires `multimedia/qt5-multimedia' port built
    with GStreamer support (which is optional, albeit enabled by default).
    
    Add some more nice details about this program to the port description.
---
 net/rssguard/Makefile                              |  4 +-
 net/rssguard/distinfo                              |  6 +--
 ...-src_librssguard_miscellaneous_notification.cpp | 44 ++++++++++++++++++++++
 net/rssguard/pkg-descr                             |  4 ++
 4 files changed, 54 insertions(+), 4 deletions(-)

diff --git a/net/rssguard/Makefile b/net/rssguard/Makefile
index 2b0a3db9dc55..48d13f3fdfca 100644
--- a/net/rssguard/Makefile
+++ b/net/rssguard/Makefile
@@ -1,7 +1,7 @@
 # Created by: Alexey Dokuchaev <danfe@FreeBSD.org>
 
 PORTNAME=	rssguard
-PORTVERSION=	4.0.1
+PORTVERSION=	4.0.4
 CATEGORIES=	net www
 
 MAINTAINER=	danfe@FreeBSD.org
@@ -38,3 +38,5 @@ post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/librssguard.so
 
 .include <bsd.port.mk>
+
+PATCH_ARGS+=	-l
diff --git a/net/rssguard/distinfo b/net/rssguard/distinfo
index 5f0002d936e2..c16dfc5d491a 100644
--- a/net/rssguard/distinfo
+++ b/net/rssguard/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1630670274
-SHA256 (martinrotter-rssguard-4.0.1_GH0.tar.gz) = 658ed9f63d2e3d1b740c8c65e649b28de350f64670c85e954a093345e313a500
-SIZE (martinrotter-rssguard-4.0.1_GH0.tar.gz) = 14417555
+TIMESTAMP = 1634296436
+SHA256 (martinrotter-rssguard-4.0.4_GH0.tar.gz) = 9154a9c674b35f68486ca7e024265e044b7c7971485bafbe9b6ebbdf27463489
+SIZE (martinrotter-rssguard-4.0.4_GH0.tar.gz) = 14433147
diff --git a/net/rssguard/files/patch-src_librssguard_miscellaneous_notification.cpp b/net/rssguard/files/patch-src_librssguard_miscellaneous_notification.cpp
new file mode 100644
index 000000000000..afee28e7c4a5
--- /dev/null
+++ b/net/rssguard/files/patch-src_librssguard_miscellaneous_notification.cpp
@@ -0,0 +1,44 @@
+--- src/librssguard/miscellaneous/notification.cpp.orig	2021-10-15 11:13:56 UTC
++++ src/librssguard/miscellaneous/notification.cpp
+@@ -7,7 +7,7 @@
+ #include <QDir>
+ 
+ #if !defined(Q_OS_OS2)
+-#include <QMediaPlayer>
++#include <QSoundEffect>
+ #endif
+ 
+ Notification::Notification(Notification::Event event, bool balloon, const QString& sound_path, int volume)
+@@ -32,25 +32,25 @@ void Notification::setSoundPath(const QString& sound_p
+ void Notification::playSound(Application* app) const {
+   if (!m_soundPath.isEmpty()) {
+ #if !defined(Q_OS_OS2)
+-    QMediaPlayer* play = new QMediaPlayer(app);
++    QSoundEffect* play = new QSoundEffect(app);
+ 
+-    QObject::connect(play, &QMediaPlayer::stateChanged, play, [play](QMediaPlayer::State state) {
+-      if (state == QMediaPlayer::State::StoppedState) {
++    QObject::connect(play, &QSoundEffect::playingChanged, play, [play]() {
++      if (!play->isPlaying()) {
+         play->deleteLater();
+       }
+     });
+ 
+     if (m_soundPath.startsWith(QSL(":"))) {
+-      play->setMedia(QMediaContent(QUrl(QSL("qrc") + m_soundPath)));
++      play->setSource(QUrl(QSL("qrc") + m_soundPath));
+ 
+     }
+     else {
+-      play->setMedia(QMediaContent(
++      play->setSource(
+                        QUrl::fromLocalFile(
+-                         QDir::toNativeSeparators(app->replaceDataUserDataFolderPlaceholder(m_soundPath)))));
++                         QDir::toNativeSeparators(app->replaceDataUserDataFolderPlaceholder(m_soundPath))));
+     }
+ 
+-    play->setVolume(m_volume);
++    play->setVolume(static_cast<qreal>(m_volume) / 100);
+     play->play();
+ #endif
+   }
diff --git a/net/rssguard/pkg-descr b/net/rssguard/pkg-descr
index 641001112197..13703bea2c70 100644
--- a/net/rssguard/pkg-descr
+++ b/net/rssguard/pkg-descr
@@ -3,4 +3,8 @@ developed using Qt framework which supports online feed synchronization
 with various services, e.g. Bazqux, Feedly, FreshRSS, Gmail, Google Reader,
 Inoreader, Nextcloud News, Reedah, Tiny Tiny RSS.
 
+In contrast with many other RSS readers, heavy WebKit/WebEngine dependency
+is optional for RSS Guard: when built without it, simple text component is
+used and some features will be disabled.
+
 WWW: https://github.com/martinrotter/rssguard