From nobody Tue Jun 11 15:39:41 2024 X-Original-To: dev-commits-ports-branches@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 4VzCXY5Wzdz5M8pL; Tue, 11 Jun 2024 15:39:41 +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 4VzCXY52KRz3wZn; Tue, 11 Jun 2024 15:39:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718120381; 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=B5K/HDbFRxFsM4ssZeze1yo+h3L1bKHGJ235ohHtJw0=; b=aaUYwt6qVYzNDXiYfESmzkdM6e1bXGdq0PdsipV8OqMKL92e057kVb3j+7fth+ElpBCGTO 2ENBIYm61OdQIJVSdbT2fRvpcrASKK7GpfrCU513neO4YzkDJuMnKiiqI/260UO6qsWiMB 8JCsp4oed6+U/8t5zploLoTUA/EnTfXWFWdfRQVf+/YmEVBXeKJX85FjcGLQhgoJhGJL92 yXjDmhB+LD/8ZDQ9XsLqGXo/nSvTiCtAowqt8RXELBTwywWq1/qM2f9KyaXFhy6HJeo3/Z svfdXxkn8XlboAn6EpYA3tzSdGXSTd5Kpa9hPgIRNFLlIZRG90Mv/8BFXmS4Zg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718120381; a=rsa-sha256; cv=none; b=QB0vbEfAC5gKA9RplVs9kxnmCQAAwVVoG2U5XTs8nAOgHmgSTxLRs2DYzaYBsx50QAkDLO 4jn8N4V6Ig/3xdnlg+T54oph6TPi2komxObwvA/c/4pR/sliXw2rdNE8OMB6Y4T/XpcQdO eJBCZDy8EqcUc7UbmQZQD88dTk6L6cppNNQ+EMM5WWLu0hsOp9LrT1Qlg8DPDigZTvSQ4U XOLfdW8lgsAeKUyyac7eR61ieIhy52jzIFxx7feraF8C1eCVPZmo+4Qf6ZWQTTDNOGkHBa yLzV+YnC659ShgMjl2UA2C/+Pq0JQo865dKQxHsxOVWZDnX5HyMCSfGXMz4TJg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718120381; 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=B5K/HDbFRxFsM4ssZeze1yo+h3L1bKHGJ235ohHtJw0=; b=mULfWQ1srzT5YnbfteloqnyAKP93tqueIxjx1nw17BYDCRYz/xXWjdbAdLeZFT9kanhFPa 7zbjGiurtFR/EaKf1AFcueCMCoAEm5L6WzWHjG23bTAX9WDs4p615ToBrbTVLbyzkrWfdI qHxIfN0mvPQ1kjmXh9FmStklxoT5yl8SM8Ev23BQ4PCK65cOJrc2CLGV4bNmyaMwhFxXIy Igy+vjyYTK0XyrthwhkW1OgMrbSDjYQaqU0vB6UgbH9lopP9MbKIZAsmB/hOkV3mvTWb1D HdQAEdgLAHSYt0X7zk6bOlabUFmf/dRxWrKzoxb4MVnWCGrrlsH3ZXJsgaSlkQ== 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 4VzCXY4ZnkzFQc; Tue, 11 Jun 2024 15:39:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45BFdfAx095823; Tue, 11 Jun 2024 15:39:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45BFdfVu095820; Tue, 11 Jun 2024 15:39:41 GMT (envelope-from git) Date: Tue, 11 Jun 2024 15:39:41 GMT Message-Id: <202406111539.45BFdfVu095820@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Adriaan de Groot Subject: git: d8a094ae6352 - 2024Q2 - audio/sayonara: update to 1.10, latest upstream List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-branches@freebsd.org Sender: owner-dev-commits-ports-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adridg X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q2 X-Git-Reftype: branch X-Git-Commit: d8a094ae635259f93f1a3f37d9c21302a724ac6a Auto-Submitted: auto-generated The branch 2024Q2 has been updated by adridg: URL: https://cgit.FreeBSD.org/ports/commit/?id=d8a094ae635259f93f1a3f37d9c21302a724ac6a commit d8a094ae635259f93f1a3f37d9c21302a724ac6a Author: Adriaan de Groot AuthorDate: 2024-06-04 15:08:07 +0000 Commit: Adriaan de Groot CommitDate: 2024-06-11 15:39:29 +0000 audio/sayonara: update to 1.10, latest upstream While here, fix up patches for i386 so that that finally builds. (cherry picked from commit 2f7c4079adcdf333cdf4393d29a84e318a899016) --- 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 + #include + ++#include ++ + using Cover::Fetcher::Audioscrobbler; + + namespace +@@ -37,7 +39,7 @@ namespace + QStringList mapToStringList(const QMap& map) + { + auto result = QStringList {}; +- const auto sizes = std::array {"mega", "extralarge", "large", "medium", "small"}; ++ const auto sizes = std::array {"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 + #include + ++#include ++ + 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;