Date: Tue, 4 Jun 2024 19:30:18 GMT From: Adriaan de Groot <adridg@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 2f7c4079adcd - main - audio/sayonara: update to 1.10, latest upstream Message-ID: <202406041930.454JUIaQ016588@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by adridg: URL: https://cgit.FreeBSD.org/ports/commit/?id=2f7c4079adcdf333cdf4393d29a84e318a899016 commit 2f7c4079adcdf333cdf4393d29a84e318a899016 Author: Adriaan de Groot <adridg@FreeBSD.org> AuthorDate: 2024-06-04 15:08:07 +0000 Commit: Adriaan de Groot <adridg@FreeBSD.org> CommitDate: 2024-06-04 19:30:16 +0000 audio/sayonara: update to 1.10, latest upstream While here, fix up patches for i386 so that that finally builds. --- audio/sayonara/Makefile | 3 +-- audio/sayonara/distinfo | 6 +++--- ...-src_Components_Covers_Fetcher_Audioscrobbler.cpp | 20 ++++++++++++++++++++ ...atch-src_Components_Lyrics_LyricWebpageParser.cpp | 11 +++++++++++ ...tch-src_Components_Playlist_PlaylistModifiers.cpp | 11 +++++++++++ 5 files changed, 46 insertions(+), 5 deletions(-) diff --git a/audio/sayonara/Makefile b/audio/sayonara/Makefile index b23f3d09172b..70a43737ab04 100644 --- a/audio/sayonara/Makefile +++ b/audio/sayonara/Makefile @@ -1,7 +1,6 @@ PORTNAME= sayonara -DISTVERSION= 1.9.0 +DISTVERSION= 1.10.0 DISTVERSIONSUFFIX= -stable1 -PORTREVISION= 3 CATEGORIES= audio MAINTAINER= adridg@FreeBSD.org diff --git a/audio/sayonara/distinfo b/audio/sayonara/distinfo index 3a4269f6a7df..5ae6b2a67185 100644 --- a/audio/sayonara/distinfo +++ b/audio/sayonara/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1709061996 -SHA256 (sayonara-player-1.9.0-stable1.tar.bz2) = 5843e8c278ba660a245979a67835b3d1514cde35b1e748082a5c255e0785def8 -SIZE (sayonara-player-1.9.0-stable1.tar.bz2) = 1718006 +TIMESTAMP = 1717362640 +SHA256 (sayonara-player-1.10.0-stable1.tar.bz2) = f4635796da02bfc67232459475806b0d52dc991b827fb11982a708504a500a6c +SIZE (sayonara-player-1.10.0-stable1.tar.bz2) = 1740393 diff --git a/audio/sayonara/files/patch-src_Components_Covers_Fetcher_Audioscrobbler.cpp b/audio/sayonara/files/patch-src_Components_Covers_Fetcher_Audioscrobbler.cpp new file mode 100644 index 000000000000..ab2ed553fb5d --- /dev/null +++ b/audio/sayonara/files/patch-src_Components_Covers_Fetcher_Audioscrobbler.cpp @@ -0,0 +1,20 @@ +--- src/Components/Covers/Fetcher/Audioscrobbler.cpp.orig 2024-06-04 15:10:26 UTC ++++ src/Components/Covers/Fetcher/Audioscrobbler.cpp +@@ -30,6 +30,8 @@ + #include <QStringList> + #include <QUrl> + ++#include <array> ++ + using Cover::Fetcher::Audioscrobbler; + + namespace +@@ -37,7 +39,7 @@ namespace + QStringList mapToStringList(const QMap<QString, QString>& map) + { + auto result = QStringList {}; +- const auto sizes = std::array {"mega", "extralarge", "large", "medium", "small"}; ++ const auto sizes = std::array<char *, 5> {"mega", "extralarge", "large", "medium", "small"}; + for(const auto size: sizes) + { + result.push_back(map[size]); diff --git a/audio/sayonara/files/patch-src_Components_Lyrics_LyricWebpageParser.cpp b/audio/sayonara/files/patch-src_Components_Lyrics_LyricWebpageParser.cpp new file mode 100644 index 000000000000..10a01bc6aadd --- /dev/null +++ b/audio/sayonara/files/patch-src_Components_Lyrics_LyricWebpageParser.cpp @@ -0,0 +1,11 @@ +--- src/Components/Lyrics/LyricWebpageParser.cpp.orig 2024-06-04 15:17:38 UTC ++++ src/Components/Lyrics/LyricWebpageParser.cpp +@@ -27,6 +27,8 @@ + #include <QTextBlock> + #include <QTextDocument> + ++#include <array> ++ + using namespace Lyrics; + + namespace diff --git a/audio/sayonara/files/patch-src_Components_Playlist_PlaylistModifiers.cpp b/audio/sayonara/files/patch-src_Components_Playlist_PlaylistModifiers.cpp new file mode 100644 index 000000000000..10724e9ced95 --- /dev/null +++ b/audio/sayonara/files/patch-src_Components_Playlist_PlaylistModifiers.cpp @@ -0,0 +1,11 @@ +--- src/Components/Playlist/PlaylistModifiers.cpp.orig 2024-06-04 19:25:08 UTC ++++ src/Components/Playlist/PlaylistModifiers.cpp +@@ -179,7 +179,7 @@ namespace Playlist + const auto& tracks = playlist.tracks(); + const auto durationMs = + std::accumulate(tracks.begin(), tracks.end(), 0, [](const auto timeMs, const auto& track) { +- return timeMs + std::max(0L, track.durationMs()); ++ return timeMs + std::max(MilliSeconds(0), track.durationMs()); + }); + + return durationMs;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202406041930.454JUIaQ016588>