git: 790f615ee48f - main - audio/sayonara: update to 1.7.0, latest upstream release

Adriaan de Groot adridg at FreeBSD.org
Fri Jun 11 21:38:27 UTC 2021 

The branch main has been updated by adridg:

URL: https://cgit.FreeBSD.org/ports/commit/?id=790f615ee48f133e345ec79882d08459fd2790cb

commit 790f615ee48f133e345ec79882d08459fd2790cb
Author:     Igor Pokrovsky <ip at unixway.org>
AuthorDate: 2021-06-11 21:30:51 +0000
Commit:     Adriaan de Groot <adridg at FreeBSD.org>
CommitDate: 2021-06-11 21:30:51 +0000

    audio/sayonara: update to 1.7.0, latest upstream release
    
    The release notes are at
            https://sayonara-player.com/changelog/
    with plenty of fixes and features. The default layout is
    somewhat changed, but the lightweight-music-player with
    good dynamic-playlist support is still there.
---
 audio/sayonara/Makefile                            | 16 +++++++------
 audio/sayonara/distinfo                            |  6 ++---
 ...ch-src_Components_Covers_LocalCoverSearcher.cpp | 11 ---------
 ...atch-src_Components_Streaming_LastFM_LastFM.cpp | 27 ----------------------
 .../files/patch-src_Gui_Utils_Widgets_Slider.cpp   | 10 --------
 audio/sayonara/pkg-plist                           | 22 ++++++++----------
 6 files changed, 21 insertions(+), 71 deletions(-)

diff --git a/audio/sayonara/Makefile b/audio/sayonara/Makefile
index c9f19b199b21..904a6d0fb0ab 100644
--- a/audio/sayonara/Makefile
+++ b/audio/sayonara/Makefile
@@ -1,7 +1,7 @@
 # Created by: Alexey Dokuchaev <danfe at FreeBSD.org>
 
 PORTNAME=	sayonara
-DISTVERSION=	1.5.1
+DISTVERSION=	1.7.0
 CATEGORIES=	audio
 
 MAINTAINER=	adridg at FreeBSD.org
@@ -14,21 +14,23 @@ LIB_DEPENDS=	libtag.so:audio/taglib \
 		libmtp.so:multimedia/libmtp
 
 USES=		cmake compiler:c++11-lib desktop-file-utils gnome pkgconfig \
-		qt:5
+		qt:5 python shebangfix
 USE_GNOME=	glib20
 USE_GSTREAMER1=	flac libav mpg123 ogg opus vorbis
-USE_QT=		dbus core gui network sql sql-sqlite3_run widgets xml \
+USE_QT=		dbus core gui network sql sql-sqlite3_run svg widgets xml \
 		buildtools_build qmake_build linguisttools_build
 
 USE_GITLAB=	yes
 GL_ACCOUNT=	luciocarreras
 GL_PROJECT=	${PORTNAME}-player
-GL_COMMIT=	328203669eac9156db6f72356b47ebfbfee978ef  # 1.5.1-stable5
+GL_COMMIT=	5bbf1399332d5d59362ad03bf625f9132be72206 # 1.7.0-stable1
+
+SHEBANG_FILES=	src/DBus/sayonara-ctl src/DBus/sayonara-query
 
 post-patch:
-	@${REINPLACE_CMD} -e '/man1/s,share/,,' \
+	@${REINPLACE_CMD} \
+		-e '/man1/s,share/,,' \
+		-e '/DESTINATION/s,share/metainfo,share/appdata,' \
 		${WRKSRC}/resources/CMakeLists.txt
-	@${REINPLACE_CMD} -e '/DESTINATION/s,/usr/,,' \
-		${WRKSRC}/src/Gui/Resources/Icons/CMakeLists.txt
 
 .include <bsd.port.mk>
diff --git a/audio/sayonara/distinfo b/audio/sayonara/distinfo
index 7d8cc5d37d59..10811d765435 100644
--- a/audio/sayonara/distinfo
+++ b/audio/sayonara/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1617884296
-SHA256 (luciocarreras-sayonara-player-328203669eac9156db6f72356b47ebfbfee978ef_GL0.tar.gz) = 014f164e7846fd35aa760464da2fb24a6502bad4ab13e8321554f0ab292a3db3
-SIZE (luciocarreras-sayonara-player-328203669eac9156db6f72356b47ebfbfee978ef_GL0.tar.gz) = 2035792
+TIMESTAMP = 1623128617
+SHA256 (luciocarreras-sayonara-player-5bbf1399332d5d59362ad03bf625f9132be72206_GL0.tar.gz) = d320bcff0595a9d030932b31e7a86f6533a2a8fc443d982697009c30c9fdad5f
+SIZE (luciocarreras-sayonara-player-5bbf1399332d5d59362ad03bf625f9132be72206_GL0.tar.gz) = 1890837
diff --git a/audio/sayonara/files/patch-src_Components_Covers_LocalCoverSearcher.cpp b/audio/sayonara/files/patch-src_Components_Covers_LocalCoverSearcher.cpp
deleted file mode 100644
index b6c2826c28a0..000000000000
--- a/audio/sayonara/files/patch-src_Components_Covers_LocalCoverSearcher.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Components/Covers/LocalCoverSearcher.cpp.orig	2019-12-30 12:19:50 UTC
-+++ src/Components/Covers/LocalCoverSearcher.cpp
-@@ -75,7 +75,7 @@ QStringList LocalSearcher::cover_paths_from_path_hint(
- 			continue;
- 		}
- 
--		double d = std::abs(height - width) / (width * 1.0) + 1.0;
-+		double d = std::abs(static_cast<double>(height - width)) / (width * 1.0) + 1.0;
- 		double pixels = double(width * height);
- 
- 		d = (d * d * std::max(width, height)) / pixels;
diff --git a/audio/sayonara/files/patch-src_Components_Streaming_LastFM_LastFM.cpp b/audio/sayonara/files/patch-src_Components_Streaming_LastFM_LastFM.cpp
deleted file mode 100644
index d5e551062a5d..000000000000
--- a/audio/sayonara/files/patch-src_Components_Streaming_LastFM_LastFM.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
---- src/Components/Streaming/LastFM/LastFM.cpp.orig	2019-12-30 14:17:48 UTC
-+++ src/Components/Streaming/LastFM/LastFM.cpp
-@@ -51,6 +51,7 @@
- #include <QUrl>
- 
- #include <ctime>
-+#include <random>
- 
- namespace Algorithm=Util::Algorithm;
- 
-@@ -320,14 +321,14 @@ void Base::similar_artists_fetched(IdList artist_ids)
- 
- 	const MetaDataList& v_md = active_playlist->tracks();
- 
--	std::random_shuffle(artist_ids.begin(), artist_ids.end());
-+	std::shuffle(artist_ids.begin(), artist_ids.end(), std::default_random_engine());
- 
- 	for( auto it=artist_ids.begin(); it != artist_ids.end(); it++ )
- 	{
- 		MetaDataList artist_tracks;
- 		lib_db->getAllTracksByArtist(IdList{*it}, artist_tracks);
- 
--		std::random_shuffle(artist_tracks.begin(), artist_tracks.end());
-+		std::shuffle(artist_tracks.begin(), artist_tracks.end(), std::default_random_engine());
- 
- 		// try all songs of artist
- 		for(int rounds=0; rounds < artist_tracks.count(); rounds++)
diff --git a/audio/sayonara/files/patch-src_Gui_Utils_Widgets_Slider.cpp b/audio/sayonara/files/patch-src_Gui_Utils_Widgets_Slider.cpp
deleted file mode 100644
index e645e0a2bdc7..000000000000
--- a/audio/sayonara/files/patch-src_Gui_Utils_Widgets_Slider.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/Gui/Utils/Widgets/Slider.cpp.orig	2020-05-21 10:59:45 UTC
-+++ src/Gui/Utils/Widgets/Slider.cpp
-@@ -22,6 +22,7 @@
- #include "Gui/Utils/Style.h"
- 
- #include <QPainter>
-+#include <QPainterPath>
- #include <QMouseEvent>
- 
- using Gui::Slider;
diff --git a/audio/sayonara/pkg-plist b/audio/sayonara/pkg-plist
index be7122f0722b..89dc59caec48 100644
--- a/audio/sayonara/pkg-plist
+++ b/audio/sayonara/pkg-plist
@@ -1,7 +1,11 @@
 bin/sayonara
+bin/sayonara-ctl
+bin/sayonara-query
+man/man1/sayonara-ctl.1.gz
+man/man1/sayonara-query.1.gz
 man/man1/sayonara.1.gz
 share/appdata/sayonara.appdata.xml
-share/applications/sayonara.desktop
+share/applications/com.sayonara-player.Sayonara.desktop
 share/icons/hicolor/128x128/apps/sayonara.png
 share/icons/hicolor/16x16/apps/sayonara.png
 share/icons/hicolor/192x192/apps/sayonara.png
@@ -9,25 +13,16 @@ share/icons/hicolor/22x22/apps/sayonara.png
 share/icons/hicolor/24x24/apps/sayonara.png
 share/icons/hicolor/256x256/apps/sayonara.png
 share/icons/hicolor/32x32/apps/sayonara.png
-share/icons/hicolor/32x32/apps/sayonara.xpm
 share/icons/hicolor/36x36/apps/sayonara.png
 share/icons/hicolor/48x48/apps/sayonara.png
 share/icons/hicolor/64x64/apps/sayonara.png
 share/icons/hicolor/72x72/apps/sayonara.png
 share/icons/hicolor/96x96/apps/sayonara.png
-share/icons/sayonara.png
-share/pixmaps/sayonara.png
-%%DATADIR%%/bg-checker.png
-%%DATADIR%%/dark.css
-%%DATADIR%%/favicon.ico
-%%DATADIR%%/logo.png
-%%DATADIR%%/player.db
-%%DATADIR%%/soundcloud.db
-%%DATADIR%%/standard.css
 %%DATADIR%%/translations/icons/ar_SA.png
 %%DATADIR%%/translations/icons/cs_CZ.png
 %%DATADIR%%/translations/icons/de_DE.png
-%%DATADIR%%/translations/icons/en_US.png
+%%DATADIR%%/translations/icons/el.png
+%%DATADIR%%/translations/icons/en.png
 %%DATADIR%%/translations/icons/es_ES.png
 %%DATADIR%%/translations/icons/fi_FI.png
 %%DATADIR%%/translations/icons/fr_FR.png
@@ -47,7 +42,8 @@ share/pixmaps/sayonara.png
 %%DATADIR%%/translations/sayonara_lang_ar_SA.qm
 %%DATADIR%%/translations/sayonara_lang_cs_CZ.qm
 %%DATADIR%%/translations/sayonara_lang_de_DE.qm
-%%DATADIR%%/translations/sayonara_lang_en_US.qm
+%%DATADIR%%/translations/sayonara_lang_el.qm
+%%DATADIR%%/translations/sayonara_lang_en.qm
 %%DATADIR%%/translations/sayonara_lang_es_ES.qm
 %%DATADIR%%/translations/sayonara_lang_fi_FI.qm
 %%DATADIR%%/translations/sayonara_lang_fr_FR.qm

More information about the dev-commits-ports-all mailing list