Attachment 169754 Details for Bug 209095 – Patch.diff

[patch] Patch.diff

patch-cantata.diff (text/plain), 14.44 KB, created by Andriy Voskoboinyk on 2016-04-27 12:11:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andriy Voskoboinyk

Created: 2016-04-27 12:11:49 UTC

Size: 14.44 KB

patch

obsolete

>Index: audio/cantata/Makefile
>===================================================================
>--- audio/cantata/Makefile	(revision 414066)
>+++ audio/cantata/Makefile	(working copy)
>@@ -1,10 +1,9 @@
> # $FreeBSD$
> 
> PORTNAME=		cantata
>-PORTVERSION=		1.5.1
>-PORTREVISION=		3
>+PORTVERSION=		2.0.0
>+DISTVERSIONPREFIX=	v
> CATEGORIES=		audio kde
>-MASTER_SITES=		https://drive.google.com/uc?export=download&id=0Bzghs6gQWi60UktwaTRMTjRIUW8&dummy=
> 
> MAINTAINER=		kde@FreeBSD.org
> COMMENT=		Graphical client for MPD using Qt5
>@@ -12,16 +11,13 @@
> LICENSE=		GPLv3
> LICENSE_FILE=		${WRKSRC}/LICENSE
> 
>-USE_KDE4=		oxygen
>-USE_QT5=		buildtools_build concurrent core dbus gui \
>-			network qmake_build linguisttools svg widgets xml
>+USE_QT5=		buildtools_build concurrent core dbus gui network \
>+			qmake_build svg sql sql-sqlite3_run widgets xml
>+USE_GITHUB=		yes
>+GH_ACCOUNT=		cdrummond
> 
>-FETCH_BEFORE_ARGS=	-o ${DISTFILES}
>-
> CMAKE_ARGS=		-DENABLE_QT5:BOOL=TRUE	\
>-			-DENABLE_KDE:BOOL=FALSE	\
>-			-DLCONVERT_EXECUTABLE:STRING=${QT_BINDIR}/lconvert \
>-			-DLRELEASE_EXECUTABLE:STRING=${QT_BINDIR}/lrelease
>+			-DENABLE_KDE:BOOL=FALSE
> 
> USES=			cmake:outsource cpe pkgconfig shebangfix tar:bzip2
> SHEBANG_FILES=		dynamic/cantata-dynamic cantata-remote.cmake
>@@ -30,37 +26,73 @@
> 
> INSTALLS_ICONS=		yes
> 
>-OPTIONS_DEFINE=		CDDB CDPARANOIA FFMPEG MPG123 MTP MUSICBRAINZ TAGLIB
>+OPTIONS_DEFINE=		CDPARANOIA MTP NLS PROXY TAGLIB
>+OPTIONS_GROUP=		CDINFO REPLAYGAIN
>+OPTIONS_GROUP_CDINFO=	CDDB MUSICBRAINZ
>+OPTIONS_GROUP_REPLAYGAIN=	FFMPEG MPG123
>+OPTIONS_RADIO=		HSP
>+OPTIONS_RADIO_HSP=	QT5 VLC
> OPTIONS_DEFAULT=	TAGLIB
> OPTIONS_SUB=		yes
> 
>+CDINFO_DESC=		AudioCD support
>+REPLAYGAIN_DESC=	Replaygain calculation support
>+HSP_DESC=		MPD HTTP stream playback
>+
>+QT5_USE=		QT5=multimedia
>+QT5_DESC=		HTTP streams support via QtMultimedia
>+
>+VLC_LIB_DEPENDS=	libvlc.so:multimedia/vlc
>+VLC_CMAKE_ON=		-DENABLE_LIBVLC:BOOL=TRUE
>+VLC_CMAKE_OFF=		-DENABLE_LIBVLC:BOOL=FALSE
>+VLC_DESC=		HTTP streams support via libVLC
>+
>+CDDB_IMPLIES=		CDPARANOIA
> CDDB_LIB_DEPENDS=	libcddb.so:audio/libcddb
> CDDB_CMAKE_ON=		-DENABLE_CDDB:BOOL=TRUE
> CDDB_CMAKE_OFF=		-DENABLE_CDDB:BOOL=FALSE
>+CDDB_DESC=		CD info retrieval via CDDB
> 
>+CDPARANOIA_IMPLIES=	TAGLIB
> CDPARANOIA_LIB_DEPENDS=	libcdda_interface.so:audio/cdparanoia
> CDPARANOIA_CMAKE_ON=	-DENABLE_CDPARANOIA:BOOL=TRUE
> CDPARANOIA_CMAKE_OFF=	-DENABLE_CDPARANOIA:BOOL=FALSE
> 
>+FFMPEG_IMPLIES=		TAGLIB
> FFMPEG_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg
> FFMPEG_CMAKE_ON=	-DENABLE_FFMPEG:BOOL=TRUE
> FFMPEG_CMAKE_OFF=	-DENABLE_FFMPEG:BOOL=FALSE
>+FFMPEG_DESC=		ReplayGain calculation support via FFmpeg
> 
>+MPG123_IMPLIES=		TAGLIB
> MPG123_LIB_DEPENDS=	libmpg123.so:audio/mpg123
> MPG123_CMAKE_ON=	-DENABLE_MPG123:BOOL=TRUE
> MPG123_CMAKE_OFF=	-DENABLE_MPG123:BOOL=FALSE
>+MPG123_DESC=		ReplayGain calculation support via mpg123
> 
> MTP_LIB_DEPENDS=	libmtp.so:multimedia/libmtp
> MTP_CMAKE_ON=		-DENABLE_MTP:BOOL=TRUE
> MTP_CMAKE_OFF=		-DENABLE_MTP:BOOL=FALSE
> 
>+MUSICBRAINZ_IMPLIES=	CDPARANOIA
> MUSICBRAINZ_LIB_DEPENDS=libmusicbrainz5.so:audio/libmusicbrainz5
> MUSICBRAINZ_CMAKE_ON=	-DENABLE_MUSICBRAINZ:BOOL=TRUE
> MUSICBRAINZ_CMAKE_OFF=	-DENABLE_MUSICBRAINZ:BOOL=FALSE
>-MUSICBRAINZ_DESC=	Access MusicBrainz database for metadata lookup
>+MUSICBRAINZ_DESC=	CD info retrieval via MusicBrainz
> 
>-TAGLIB_LIB_DEPENDS=	libtag.so:audio/taglib\
>+NLS_USE=		QT5=linguisttools_build
>+NLS_CMAKE_ON=		-DLCONVERT_EXECUTABLE:STRING=${QT_BINDIR}/lconvert \
>+			-DLRELEASE_EXECUTABLE:STRING=${QT_BINDIR}/lrelease
>+NLS_CMAKE_OFF=		-DLCONVERT_EXECUTABLE:BOOL=FALSE \
>+			-DLRELEASE_EXECUTABLE:BOOL=FALSE
>+
>+PROXY_CMAKE_ON=		-DENABLE_PROXY_CONFIG:BOOL=TRUE
>+PROXY_CMAKE_OFF=	-DENABLE_PROXY_CONFIG:BOOL=FALSE
>+PROXY_DESC=		Proxy configuration in settings dialog
>+
>+TAGLIB_LIB_DEPENDS=	libtag.so:audio/taglib \
> 			libtag-extras.so:audio/taglib-extras
>+TAGLIB_USES=		localbase
> TAGLIB_CMAKE_ON=	-DENABLE_TAGLIB_EXTRAS:BOOL=TRUE \
> 			-DENABLE_TAGLIB:BOOL=TRUE
> TAGLIB_CMAKE_OFF=	-DENABLE_TAGLIB_EXTRAS:BOOL=FALSE \
>@@ -69,10 +101,17 @@
> 
> .include <bsd.port.options.mk>
> 
>-.if ${PORT_OPTIONS:MTAGLIB} && ( ${PORT_OPTIONS:MFFMPEG} || ${PORT_OPTIONS:MMPG123} )
>+.if ${PORT_OPTIONS:MFFMPEG} || ${PORT_OPTIONS:MMPG123}
>+LIB_DEPENDS+=		libebur128.so:audio/libebur128
> PLIST_SUB+=		REPLAYGAIN=""
> .else
> PLIST_SUB+=		REPLAYGAIN="@comment "
> .endif
> 
>+.if ${PORT_OPTIONS:MQT5} || ${PORT_OPTIONS:MVLC}
>+CMAKE_ARGS+=		-DENABLE_HTTP_STREAM_PLAYBACK:BOOL=TRUE
>+.else
>+CMAKE_ARGS+=		-DENABLE_HTTP_STREAM_PLAYBACK:BOOL=FALSE
>+.endif
>+
> .include <bsd.port.mk>
>Index: audio/cantata/distinfo
>===================================================================
>--- audio/cantata/distinfo	(revision 414066)
>+++ audio/cantata/distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (cantata-1.5.1.tar.bz2) = 57173bdd0033a2c0c2829a6e05f7579b0f13ae7794d843167c013e1c971dfe78
>-SIZE (cantata-1.5.1.tar.bz2) = 1986772
>+SHA256 (cdrummond-cantata-v2.0.0_GH0.tar.gz) = 5f280306c9a52d42bbcd976aef2b547d5242faadcce4cf8fc02ad2760060e55b
>+SIZE (cdrummond-cantata-v2.0.0_GH0.tar.gz) = 2704951
>Index: audio/cantata/files/patch-git_c0a75da
>===================================================================
>--- audio/cantata/files/patch-git_c0a75da	(revision 414066)
>+++ audio/cantata/files/patch-git_c0a75da	(nonexistent)
>@@ -1,26 +0,0 @@
>-diff --git a/cmake/FindTaglib.cmake b/cmake/FindTaglib.cmake
>-index 132b311..5d8c3db 100644
>---- cmake/FindTaglib.cmake
>-+++ cmake/FindTaglib.cmake
>-@@ -31,10 +31,10 @@ if(TAGLIBCONFIG_EXECUTABLE)
>- 
>-   exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_VERSION)
>- 
>--  if(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
>-+  if(TAGLIB_VERSION VERSION_LESS "${TAGLIB_MIN_VERSION}")
>-      message(STATUS "TagLib version too old: version searched :${TAGLIB_MIN_VERSION}, found ${TAGLIB_VERSION}")
>-      set(TAGLIB_FOUND FALSE)
>--  else(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
>-+  else(TAGLIB_VERSION VERSION_LESS "${TAGLIB_MIN_VERSION}")
>- 
>-      exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES)
>- 
>-@@ -44,7 +44,7 @@ if(TAGLIBCONFIG_EXECUTABLE)
>-         set(TAGLIB_FOUND TRUE)
>-      endif(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS)
>-      string(REGEX REPLACE " *-I" ";" TAGLIB_INCLUDES "${TAGLIB_CFLAGS}")
>--  endif(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}") 
>-+  endif(TAGLIB_VERSION VERSION_LESS "${TAGLIB_MIN_VERSION}") 
>-   mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES)
>- 
>- else(TAGLIBCONFIG_EXECUTABLE)
>
>Property changes on: audio/cantata/files/patch-git_c0a75da
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: audio/cantata/files/patch-replaygain_ffmpeginput.cpp
>===================================================================
>--- audio/cantata/files/patch-replaygain_ffmpeginput.cpp	(revision 414066)
>+++ audio/cantata/files/patch-replaygain_ffmpeginput.cpp	(nonexistent)
>@@ -1,10 +0,0 @@
>---- replaygain/ffmpeginput.cpp.orig	2015-01-21 18:44:15 UTC
>-+++ replaygain/ffmpeginput.cpp
>-@@ -8,7 +8,6 @@
>-  */
>- 
>- /* See LICENSE file for copyright and license details. */
>--#define _POSIX_C_SOURCE 1
>- #ifdef __cplusplus
>- #define __STDC_CONSTANT_MACROS
>- #ifdef _STDINT_H
>
>Property changes on: audio/cantata/files/patch-replaygain_ffmpeginput.cpp
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: audio/cantata/files/patch-replaygain_mpg123input.cpp
>===================================================================
>--- audio/cantata/files/patch-replaygain_mpg123input.cpp	(revision 414066)
>+++ audio/cantata/files/patch-replaygain_mpg123input.cpp	(nonexistent)
>@@ -1,10 +0,0 @@
>---- replaygain/mpg123input.cpp.orig	2015-01-21 18:46:32 UTC
>-+++ replaygain/mpg123input.cpp
>-@@ -8,7 +8,6 @@
>-  */
>- 
>- /* See LICENSE file for copyright and license details. */
>--#define _POSIX_C_SOURCE 1
>- #ifdef __cplusplus
>- extern "C" {
>- #endif
>
>Property changes on: audio/cantata/files/patch-replaygain_mpg123input.cpp
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: audio/cantata/files/patch-svn-5739-gui__application_qt.cpp
>===================================================================
>--- audio/cantata/files/patch-svn-5739-gui__application_qt.cpp	(revision 414066)
>+++ audio/cantata/files/patch-svn-5739-gui__application_qt.cpp	(nonexistent)
>@@ -1,39 +0,0 @@
>-Look for icons in more than just /usr/share -- upstream svn patch:
>-Log message
>-
>-- When checking for icon themes, also check in $PREFIX
>-- Also ensure path is in QIcon's theme path
>-
>-https://code.google.com/p/cantata/source/detail?r=5740
>-
>-
>-Index: gui/application_qt.cpp
>-===================================================================
>---- gui/application_qt.cpp	(revision 5739)
>-+++ gui/application_qt.cpp	(working copy)
>-@@ -45,11 +45,21 @@
>-     // or gnome icon themes are installed, and set theme to one of those.
>-     if (!QIcon::hasThemeIcon("document-save-as")) {
>-         QStringList themes=QStringList() << QLatin1String("oxygen") << QLatin1String("gnome");
>-+        QStringList prefixes=QStringList() << QLatin1String("/usr") << QLatin1String("/usr/local");
>-+        if (!prefixes.contains(QLatin1String(INSTALL_PREFIX))) {
>-+            prefixes+=QLatin1String(INSTALL_PREFIX);
>-+        }
>-         foreach (const QString &theme, themes) {
>--            QString dir(QLatin1String("/usr/share/icons/")+theme);
>--            if (QDir(dir).exists()) {
>--                QIcon::setThemeName(theme);
>--                return;
>-+            foreach (const QString &prefix, prefixes) {
>-+                QString dir(prefix+QLatin1String("/share/icons/")+theme);
>-+                if (QDir(dir).exists()) {
>-+                    QIcon::setThemeName(theme);
>-+                    // Add to theme search paths, if it is not there already...
>-+                    if (!QIcon::themeSearchPaths().contains(prefix+QLatin1String("/share/icons"))) {
>-+                        QIcon::setThemeSearchPaths(QIcon::themeSearchPaths() << QString(prefix+QLatin1String("/share/icons")));
>-+                    }
>-+                    return;
>-+                }
>-             }
>-         }
>-     }
>
>Property changes on: audio/cantata/files/patch-svn-5739-gui__application_qt.cpp
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: audio/cantata/pkg-descr
>===================================================================
>--- audio/cantata/pkg-descr	(revision 414066)
>+++ audio/cantata/pkg-descr	(working copy)
>@@ -1,3 +1,3 @@
> Cantata is a graphical client for MPD.
> 
>-WWW: https://code.google.com/p/cantata/
>+WWW: https://github.com/cdrummond/cantata
>Index: audio/cantata/pkg-plist
>===================================================================
>--- audio/cantata/pkg-plist	(revision 414066)
>+++ audio/cantata/pkg-plist	(working copy)
>@@ -7,6 +7,7 @@
> share/cantata/config/scrobblers.xml
> share/cantata/config/tag_fixes.xml
> share/cantata/config/weblinks.xml
>+share/cantata/fonts/fontawesome-4.3.0.ttf
> share/cantata/icons/bbc.svg
> share/cantata/icons/cbc.svg
> share/cantata/icons/npr.svg
>@@ -13,6 +14,28 @@
> share/cantata/icons/podcasts.png
> share/cantata/icons/soundcloud.png
> share/cantata/icons/stream.png
>+share/cantata/icons/cantata/AUTHORS
>+share/cantata/icons/cantata/LICENSE
>+share/cantata/icons/cantata/index.theme
>+share/cantata/icons/cantata/svg/audio-x-generic.svg
>+share/cantata/icons/cantata/svg/cantata.svg
>+share/cantata/icons/cantata/svg/dynamic-playlist.svg
>+%%TAGLIB%%share/cantata/icons/cantata/svg/drive-removable-media-usb-pendrive.svg
>+share/cantata/icons/cantata/svg/folder-downloads.svg
>+share/cantata/icons/cantata/svg/folder-temp.svg
>+share/cantata/icons/cantata/svg/fork.svg
>+share/cantata/icons/cantata/svg/information.svg
>+share/cantata/icons/cantata/svg/inode-directory.svg
>+%%TAGLIB%%share/cantata/icons/cantata/svg/multimedia-player.svg
>+share/cantata/icons/cantata/svg/network-server-database.svg
>+share/cantata/icons/cantata/svg/playlist.svg
>+share/cantata/icons/cantata/svg/preferences-desktop-keyboard.svg
>+share/cantata/icons/cantata/svg/preferences-other.svg
>+share/cantata/icons/cantata/svg/speaker.svg
>+share/cantata/icons/cantata/svg64/dialog-error.svg
>+share/cantata/icons/cantata/svg64/dialog-information.svg
>+share/cantata/icons/cantata/svg64/dialog-question.svg
>+share/cantata/icons/cantata/svg64/dialog-warning.svg
> share/cantata/mpd/mpd.conf.template
> share/cantata/scripts/cantata-dynamic
> share/cantata/scripts/cantata-remote
>@@ -24,20 +47,14 @@
> share/cantata/themes/mint-x.css
> share/cantata/themes/radiance-dt.css
> share/cantata/themes/radiance.css
>-share/cantata/translations/cantata_cs.qm
>-share/cantata/translations/cantata_de.qm
>-share/cantata/translations/cantata_en_GB.qm
>-share/cantata/translations/cantata_es.qm
>-share/cantata/translations/cantata_fr.qm
>-share/cantata/translations/cantata_hu.qm
>-share/cantata/translations/cantata_ko.qm
>-share/cantata/translations/cantata_pl.qm
>-share/cantata/translations/cantata_ru.qm
>-share/cantata/translations/cantata_zh_CN.qm
>-share/icons/hicolor/16x16/apps/cantata.png
>-share/icons/hicolor/22x22/apps/cantata.png
>-share/icons/hicolor/24x24/apps/cantata.png
>-share/icons/hicolor/32x32/apps/cantata.png
>-share/icons/hicolor/48x48/apps/cantata.png
>-share/icons/hicolor/64x64/apps/cantata.png
>+%%NLS%%share/cantata/translations/cantata_cs.qm
>+%%NLS%%share/cantata/translations/cantata_de.qm
>+%%NLS%%share/cantata/translations/cantata_en_GB.qm
>+%%NLS%%share/cantata/translations/cantata_es.qm
>+%%NLS%%share/cantata/translations/cantata_fr.qm
>+%%NLS%%share/cantata/translations/cantata_hu.qm
>+%%NLS%%share/cantata/translations/cantata_ko.qm
>+%%NLS%%share/cantata/translations/cantata_pl.qm
>+%%NLS%%share/cantata/translations/cantata_ru.qm
>+%%NLS%%share/cantata/translations/cantata_zh_CN.qm
> share/icons/hicolor/scalable/apps/cantata.svg

Actions: View | Diff

Attachments on bug 209095: 169754 | 169755 | 169756