From nobody Sun Jan 9 06:34:15 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id D3C441946F9A; Sun, 9 Jan 2022 06:34:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JWnHC3Z6Fz3Fpt; Sun, 9 Jan 2022 06:34:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4F9E1515D; Sun, 9 Jan 2022 06:34:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2096YFr4015556; Sun, 9 Jan 2022 06:34:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2096YFwF015555; Sun, 9 Jan 2022 06:34:15 GMT (envelope-from git) Date: Sun, 9 Jan 2022 06:34:15 GMT Message-Id: <202201090634.2096YFwF015555@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: 4549fc4efa52 - main - net/rssguard: the port had been updated to version 4.1.1 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4549fc4efa5292326f8e85437f5464bec6352250 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641710055; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ba9J2ZphTgxb2H+TJBTmCYAj4gCGOqKMA0e90AV7ZQ0=; b=pIOdwP8mirc44CCJaxNBsY9GhLP7gLphWh9P2nZFIJGNQJQeGmiEnTzeZgGWps1zBO1Hsh YbzFy+wWeBlZ0FCIeXD2b+1WQYsF2KMqWayBD3sF3XdPrve0qwLRofE+P7TP/gvL1B1qYY 2mnZo+iq4KmkDpRNzxBnGt4mPSbdmDBv+yKR/lkNSD1rAOYBqk5oUbRkDZLvlT1bJkz5yy atU8yJJsTvBXy8dk4t7mvjz9ufZaxJJ4a3SxTgvoHLm3u8KNnYR8Zc27cTGis7bzfMmDVf rUp3VKvAZTRjpq1U+gF/CLrFixk4PG25G3a57sPsBrwY2AIjf/Bgj5vj+IOumg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641710055; a=rsa-sha256; cv=none; b=WxvPVaLdg3I04nVB3tXTNs8X6NPlaBXeWSW+lvwvnxWZLcvNl8YSU/gNtAWbYq3vTmnIoj oHzXNyW27fHEMsT1t7HI+wLuoRNEcpMK96KEe0an03SmqJN+p2DbcgkY9BPN2FIsX3JNgh lwkscWiGb0NVKp7SCSdkGME8popBzsz0kQ+v7JteMrcGKDBFzaKQDLqSHnz+BHaD2EnYDI sx44ps6vCMykliZUgFEIzM23ZhH18BNFcCIQEjBvZ+DaO+uvrqvndCJ3KkkQCo3tRM5Mk3 zTGKoBuYXCBT+C0eP+Iyr+CqUf7swlF99jHBrXymCpqsrjl0I/9P3ICVo1Lpgw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=4549fc4efa5292326f8e85437f5464bec6352250 commit 4549fc4efa5292326f8e85437f5464bec6352250 Author: Alexey Dokuchaev AuthorDate: 2022-01-09 06:33:10 +0000 Commit: Alexey Dokuchaev CommitDate: 2022-01-09 06:33:10 +0000 net/rssguard: the port had been updated to version 4.1.1 Remove the QMediaPlayer -> QSoundEffect patch, it had been accepted upstream in the modified form: QSoundEffect, which does not require GStreamer, is used for *.wav files, and QMediaPlayer for *.mp3, etc. Ditto for the sed(1) call which no longer does anything useful. --- net/rssguard/Makefile | 7 +--- net/rssguard/distinfo | 6 +-- ...-src_librssguard_miscellaneous_notification.cpp | 44 ---------------------- 3 files changed, 4 insertions(+), 53 deletions(-) diff --git a/net/rssguard/Makefile b/net/rssguard/Makefile index 48d13f3fdfca..340601f2aad1 100644 --- a/net/rssguard/Makefile +++ b/net/rssguard/Makefile @@ -1,7 +1,7 @@ # Created by: Alexey Dokuchaev PORTNAME= rssguard -PORTVERSION= 4.0.4 +PORTVERSION= 4.1.1 CATEGORIES= net www MAINTAINER= danfe@FreeBSD.org @@ -28,11 +28,6 @@ WEBENGINE_QMAKE_OFF= USE_WEBENGINE=false post-patch: @${GREP} -Rl --null Q_OS_LINUX ${WRKSRC}/src | ${XARGS} -0 \ ${REINPLACE_CMD} -e 's,Q_OS_LINUX,Q_OS_UNIX,' -# Avoid potential linking errors when previous version of the port -# is installed. - @${REINPLACE_CMD} -e '/^unix: LIBS/ { s,-L,, ; \ - s, -lrssguard,librssguard.so, ; }' \ - ${WRKSRC}/src/rssguard/rssguard.pro post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/librssguard.so diff --git a/net/rssguard/distinfo b/net/rssguard/distinfo index c16dfc5d491a..ca9f95fd02f1 100644 --- a/net/rssguard/distinfo +++ b/net/rssguard/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1634296436 -SHA256 (martinrotter-rssguard-4.0.4_GH0.tar.gz) = 9154a9c674b35f68486ca7e024265e044b7c7971485bafbe9b6ebbdf27463489 -SIZE (martinrotter-rssguard-4.0.4_GH0.tar.gz) = 14433147 +TIMESTAMP = 1641564291 +SHA256 (martinrotter-rssguard-4.1.1_GH0.tar.gz) = 2f9a846f12a1c70ec2d8d474daff4e7caeb14ade332b75f40a9900aa7fbc4994 +SIZE (martinrotter-rssguard-4.1.1_GH0.tar.gz) = 21717154 diff --git a/net/rssguard/files/patch-src_librssguard_miscellaneous_notification.cpp b/net/rssguard/files/patch-src_librssguard_miscellaneous_notification.cpp deleted file mode 100644 index afee28e7c4a5..000000000000 --- a/net/rssguard/files/patch-src_librssguard_miscellaneous_notification.cpp +++ /dev/null @@ -1,44 +0,0 @@ ---- src/librssguard/miscellaneous/notification.cpp.orig 2021-10-15 11:13:56 UTC -+++ src/librssguard/miscellaneous/notification.cpp -@@ -7,7 +7,7 @@ - #include - - #if !defined(Q_OS_OS2) --#include -+#include - #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(m_volume) / 100); - play->play(); - #endif - }