Date: Sun, 8 Oct 2017 13:15:45 +0000 (UTC) From: Adriaan de Groot <adridg@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r451527 - in head/audio/sayonara: . files Message-ID: <201710081315.v98DFjfI085843@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adridg Date: Sun Oct 8 13:15:45 2017 New Revision: 451527 URL: https://svnweb.freebsd.org/changeset/ports/451527 Log: Update audio/sayonara to 0.9.3 and take maintainership. Approved by: tcberner (mentor) Differential Revision: https://reviews.freebsd.org/D12601 Added: head/audio/sayonara/files/patch-src_Helper_Logger_Logger.h (contents, props changed) Deleted: head/audio/sayonara/files/patch-src_3rdParty_SomaFM_ui_GUI__SomaFM.h head/audio/sayonara/files/patch-src_3rdParty_Soundcloud_ui_GUI__SoundcloudArtistSearch.h head/audio/sayonara/files/patch-src_3rdParty_Soundcloud_ui_GUI__SoundcloudLibrary.h head/audio/sayonara/files/patch-src_CMakeLists.txt head/audio/sayonara/files/patch-uifiles.patch Modified: head/audio/sayonara/Makefile head/audio/sayonara/distinfo head/audio/sayonara/files/patch-CMakeLists.txt head/audio/sayonara/files/patch-src_Main.cpp head/audio/sayonara/pkg-plist Modified: head/audio/sayonara/Makefile ============================================================================== --- head/audio/sayonara/Makefile Sun Oct 8 13:11:17 2017 (r451526) +++ head/audio/sayonara/Makefile Sun Oct 8 13:15:45 2017 (r451527) @@ -2,13 +2,13 @@ # $FreeBSD$ PORTNAME= sayonara -PORTVERSION= 0.9.2 -PORTREVISION= 4 +DISTVERSIONPREFIX= player- +DISTVERSION= 0.9.3 +DISTVERSIONSUFFIX= -git2-20170509 CATEGORIES= audio MASTER_SITES= http://www.sayonara-player.com/sw/ -DISTNAME= ${PORTNAME}-player-${PORTVERSION}-git11-20161030 -MAINTAINER= ports@FreeBSD.org +MAINTAINER= adridg@FreeBSD.org COMMENT= Small, clear, and fast Qt-based audio player LICENSE= GPLv3 @@ -17,11 +17,12 @@ LICENSE_FILE= ${WRKSRC}/license.txt LIB_DEPENDS= libtag.so:audio/taglib \ libmtp.so:multimedia/libmtp -USES= cmake compiler:c++11-lib pkgconfig -USE_GSTREAMER1= flac mpg123 ogg opus vorbis # XXX: likely incomplete +USES= cmake:outsource compiler:c++11-lib desktop-file-utils \ + gettext-runtime pkgconfig +USE_GNOME= glib20 +USE_GSTREAMER1= flac mpg123 ogg opus vorbis USE_QT5= dbus core gui network sql sql-sqlite3_run widgets xml \ buildtools_build qmake_build linguisttools_build -INSTALLS_ICONS= yes WRKSRC= ${WRKDIR}/${PORTNAME}-player Modified: head/audio/sayonara/distinfo ============================================================================== --- head/audio/sayonara/distinfo Sun Oct 8 13:11:17 2017 (r451526) +++ head/audio/sayonara/distinfo Sun Oct 8 13:15:45 2017 (r451527) @@ -1,3 +1,3 @@ -TIMESTAMP = 1477828406 -SHA256 (sayonara-player-0.9.2-git11-20161030.tar.gz) = 815c2e0c64520edb99571b52c6384320c110e8a4ef5be5c13803a156f64be148 -SIZE (sayonara-player-0.9.2-git11-20161030.tar.gz) = 1706145 +TIMESTAMP = 1507272191 +SHA256 (sayonara-player-0.9.3-git2-20170509.tar.gz) = 0412c6cf7e3d9283aa37caba08b009a9df6aeddb036cfca35af7dab40f5c14f5 +SIZE (sayonara-player-0.9.3-git2-20170509.tar.gz) = 1732355 Modified: head/audio/sayonara/files/patch-CMakeLists.txt ============================================================================== --- head/audio/sayonara/files/patch-CMakeLists.txt Sun Oct 8 13:11:17 2017 (r451526) +++ head/audio/sayonara/files/patch-CMakeLists.txt Sun Oct 8 13:15:45 2017 (r451527) @@ -1,21 +1,8 @@ -CMake 3.9 compatibility. Upstreamed in a different form for -sayonara 0.9.4, which is fully patched for CMake 3.9 and FreeBSD +Adjust for changed UI search and generation paths in CMake 3.9. ---- CMakeLists.txt.orig 2016-10-30 11:53:25 UTC +--- CMakeLists.txt.orig 2017-05-09 18:52:59 UTC +++ CMakeLists.txt -@@ -1,6 +1,11 @@ - CMAKE_MINIMUM_REQUIRED(VERSION 2.7) - PROJECT("Sayonara Player") - -+IF(POLICY CMP0071) -+ CMAKE_POLICY(SET CMP0071 OLD) -+ SET(CMAKE_POLICY_DEFAULT_CMP0071 OLD) # Don't reset in subdirs -+ENDIF() -+ - set (CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}") - INCLUDE(cotire) - SET(VAR_SAYONARA_VERSION "0.9.2") -@@ -15,6 +20,10 @@ ADD_DEFINITIONS( -DSAYONARA_INSTALL_SHAR +@@ -24,6 +24,10 @@ CONFIGURE_FILE(Macros.h.in "${CMAKE_CURR MESSAGE("Build Sayonara ${VAR_SAYONARA_VERSION}") MESSAGE("Will install to ${CMAKE_INSTALL_PREFIX}") Added: head/audio/sayonara/files/patch-src_Helper_Logger_Logger.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/sayonara/files/patch-src_Helper_Logger_Logger.h Sun Oct 8 13:15:45 2017 (r451527) @@ -0,0 +1,14 @@ +Avoid adding #include <iostream> in lots of .cpp files, at the cost +of compilation time because iostream is no longer forward-declared. + +--- src/Helper/Logger/Logger.h.orig 2017-10-06 07:14:44 UTC ++++ src/Helper/Logger/Logger.h +@@ -21,7 +21,7 @@ + #ifndef LOGGER_H + #define LOGGER_H + +-#include <iosfwd> ++#include <iostream> + #include <typeinfo> + #include <type_traits> + #include <QList> Modified: head/audio/sayonara/files/patch-src_Main.cpp ============================================================================== --- head/audio/sayonara/files/patch-src_Main.cpp Sun Oct 8 13:11:17 2017 (r451526) +++ head/audio/sayonara/files/patch-src_Main.cpp Sun Oct 8 13:15:45 2017 (r451527) @@ -1,38 +1,24 @@ ---- src/Main.cpp.orig 2016-10-30 11:53:25 UTC +The #else part is ill-formed, and the multi-instance support can +work on FreeBSD as well as Linux. + +--- src/Main.cpp.orig 2017-10-06 07:17:05 UTC +++ src/Main.cpp -@@ -38,7 +38,7 @@ - #include <QtGlobal> - #include <algorithm> - --#ifdef Q_OS_LINUX -+#ifdef Q_OS_UNIX - #include <execinfo.h> // backtrace - #include <csignal> // kill/signal - #include <sys/types.h> // kill -@@ -150,7 +150,7 @@ void segfault_handler(int sig){ - - Q_UNUSED(sig) - --#ifdef Q_OS_LINUX -+#ifdef Q_OS_UNIX - - void* array[10]; - size_t size; -@@ -176,7 +176,7 @@ int main(int argc, char *argv[]) { - #endif - - --#ifdef Q_OS_LINUX -+#ifdef Q_OS_UNIX - - signal(SIGSEGV, segfault_handler); - -@@ -187,7 +187,7 @@ int main(int argc, char *argv[]) { +@@ -192,7 +192,7 @@ int main(int argc, char *argv[]) return 0; } -#ifdef Q_OS_LINUX -+#ifdef Q_OS_UNIX ++#if defined( Q_OS_LINUX ) || defined( Q_OS_FREEBSD ) int pid=0; if( !cmd_data.multiple_instances ){ +@@ -203,9 +203,6 @@ int main(int argc, char *argv[]) + notify_old_instance(cmd_data.files_to_play, pid); + return 0; + } +- +-#else +- Q_UNUSED(single_instance) + #endif + + Modified: head/audio/sayonara/pkg-plist ============================================================================== --- head/audio/sayonara/pkg-plist Sun Oct 8 13:11:17 2017 (r451526) +++ head/audio/sayonara/pkg-plist Sun Oct 8 13:15:45 2017 (r451527) @@ -35,6 +35,7 @@ share/pixmaps/sayonara.png %%DATADIR%%/translations/icons/fr.png %%DATADIR%%/translations/icons/hu.png %%DATADIR%%/translations/icons/it.png +%%DATADIR%%/translations/icons/nl.png %%DATADIR%%/translations/icons/pl.png %%DATADIR%%/translations/icons/pt.png %%DATADIR%%/translations/icons/ro.png @@ -49,6 +50,7 @@ share/pixmaps/sayonara.png %%DATADIR%%/translations/sayonara_lang_fr.qm %%DATADIR%%/translations/sayonara_lang_hu.qm %%DATADIR%%/translations/sayonara_lang_it.qm +%%DATADIR%%/translations/sayonara_lang_nl.qm %%DATADIR%%/translations/sayonara_lang_pl.qm %%DATADIR%%/translations/sayonara_lang_pt.qm %%DATADIR%%/translations/sayonara_lang_ro.qm
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201710081315.v98DFjfI085843>