Attachment #154229 for bug #197510




# $FreeBSD$

PORTNAME=	tomahawk
PORTVERSION=	0.8.2
PORTREVISION=	4
CATEGORIES=	audio

MAINTAINER=	arved@FreeBSD.org


LICENSE=	GPLv3

BUILD_DEPENDS=	google-sparsehash>=2.0.2:${PORTSDIR}/devel/google-sparsehash \
		websocketpp>=0.4.0:${PORTSDIR}/devel/websocketpp
RUN_DEPENS=	phonon-vlc>=0.6.1:${PORTSDIR}/multimedia/phonon-vlc
LIB_DEPENDS=	libattica.so:${PORTSDIR}/x11-toolkits/attica \
		liblucene++.so:${PORTSDIR}/textproc/luceneplusplus \
		libboost_thread.so:${PORTSDIR}/devel/boost-libs \
		libechonest.so:${PORTSDIR}/audio/libechonest \
		libgnutls.so:${PORTSDIR}/security/gnutls \
		libjreen.so:${PORTSDIR}/net-im/libjreen \
		liblastfm.so:${PORTSDIR}/audio/liblastfm \
		libqca.so:${PORTSDIR}/devel/qca \
		libqjson.so:${PORTSDIR}/devel/qjson \
		libqtkeychain.so:${PORTSDIR}/security/qtkeychain \
		libquazip.so:${PORTSDIR}/archivers/quazip \
		libtag.so:${PORTSDIR}/audio/taglib

CMAKE_ARGS=	-DBUILD_RELEASE="ON"
CXXFLAGS+=	-Wno-cast-align -I${LOCALBASE}/include
CXXFLAGS+=	-Wno-cast-align

GH_ACCOUNT=	tomahawk-player
GH_COMMIT=	78eb0c0
GH_PROJECT=	${PORTNAME}
GH_COMMIT=	7a869ef

TELEPATHY_LIB_DEPENDS=	libtelepathy-qt4.so:${PORTSDIR}/net-im/telepathy-qt4
TELEPATHY_DESC=	Configure Telepathy Settings
TELEPATHY_USE_KDE4=	kdelibs automoc4

INSTALLS_ICONS=	yes

OPTIONS_DEFAULT=
OPTIONS_DEFINE=	TELEPATHY
OPTIONS_RADIO=	 PHONON
OPTIONS_RADIO_PHONON=	GSTREAMER VLC XINE
OPTIONS_SUB=	yes
QTWEETLIB_DESC=	Enable Twitter SIP plugin
VLC_DESC=	Multimedia support for VLC

PLIST_SUB+=	DESKTOPDIR=${DESKTOPDIR:S,^${PREFIX}/,,} \
		PORTVERSION=${PORTVERSION}

USES=		cmake desktop-file-utils pkgconfig
USE_GITHUB=	yes
USE_LDCONFIG=	yes

USE_QT4=	dbus designer gui linguist_build moc_build \
		network phonon qmake_build qtestlib rcc_build \
		sql-sqlite2 svg uic_build xml

.include <bsd.port.options.mk>

.if ${PORT_OPTIONS:MQTWEETLIB}
LIB_DEPENDS+=	libQTweetLib.so:${PORTSDIR}/net/qtweetlib
.else
CMAKE_ARGS+=	-DWITH_QTweetLib:BOOL="OFF"
.endif

.if ${PORT_OPTIONS:MGSTREAMER}
RUN_DEPENDS+=	phonon-gstreamer>=4.6.3:${PORTSDIR}/multimedia/phonon-gstreamer
.endif

.if ${PORT_OPTIONS:MVLC}
RUN_DEPENDS+=	phonon-vlc>=0.6.1:${PORTSDIR}/multimedia/phonon-vlc
.endif

.if ${PORT_OPTIONS:MXINE}
RUN_DEPENDS+=	phonon-xine>=4.4.4_5:${PORTSDIR}/multimedia/phonon-xine
.endif

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (tomahawk-0.7.0.tar.gz) = 2871c6fcdc88e0392051e62697c25494571b2a62b709782590f3d539723669a6	1	SHA256 (tomahawk-0.8.2.tar.gz) = e9dd9e1b69918af152cbb0ee5c1d7bddc05116d038abdeb79f97b678fe57bfea
2	SIZE (tomahawk-0.7.0.tar.gz) = 6520138	2	SIZE (tomahawk-0.8.2.tar.gz) = 9588294




--- ./CMakeModules/FindCLucene.cmake.orig	2013-04-29 23:22:22.000000000 +0200
+++ ./CMakeModules/FindCLucene.cmake	2013-04-29 23:23:02.000000000 +0200
@@ -85,14 +85,14 @@
 SET(CLUCENE_GOOD_VERSION TRUE)
 
 FIND_PATH(CLUCENE_LIBRARY_DIR
-	NAMES CLuceneConfig.cmake/CLuceneConfig.cmake CLucene/CLuceneConfig.cmake
-       	PATHS ${TRIAL_LIBRARY_PATHS} ${TRIAL_INCLUDE_PATHS} NO_DEFAULT_PATH)
+	NAMES CLuceneConfig.cmake CLucene/CLuceneConfig.cmake
+       	PATHS ${TRIAL_LIBRARY_PATHS} ${TRIAL_INCLUDE_PATHS} ${CLUCENE_CONFIG_PATH} NO_DEFAULT_PATH)
 IF (CLUCENE_LIBRARY_DIR)
   MESSAGE(STATUS "Found CLucene library dir: ${CLUCENE_LIBRARY_DIR}")
   # include CLuceneConfig/CLuceneConfig.cmake
-  IF(EXISTS ${CLUCENE_LIBRARY_DIR}/CLuceneConfig.cmake/CLuceneConfig.cmake)
-        INCLUDE(${CLUCENE_LIBRARY_DIR}/CLuceneConfig.cmake/CLuceneConfig.cmake)
-  ENDIF(EXISTS ${CLUCENE_LIBRARY_DIR}/CLuceneConfig.cmake/CLuceneConfig.cmake)
+  IF(EXISTS ${CLUCENE_LIBRARY_DIR}/CLuceneConfig.cmake)
+        INCLUDE(${CLUCENE_LIBRARY_DIR}/CLuceneConfig.cmake)
+  ENDIF(EXISTS ${CLUCENE_LIBRARY_DIR}/CLuceneConfig.cmake)
   # include CLucene/CLuceneConfig.cmake
   IF(EXISTS ${CLUCENE_LIBRARY_DIR}/CLucene/CLuceneConfig.cmake)
         INCLUDE(${CLUCENE_LIBRARY_DIR}/CLucene/CLuceneConfig.cmake)

Lines 1-7 Link Here

(-)files/patch-src__libtomahawk__sip__PeerInfo.cpp (-4 / +4 lines)
1	--- ./src/libtomahawk/sip/PeerInfo.cpp.orig 2013-06-28 17:01:55.000000000 +0200	1	--- src/libtomahawk/sip/PeerInfo.cpp.orig 2014-11-20 00:17:56 UTC
2	+++ ./src/libtomahawk/sip/PeerInfo.cpp 2013-06-28 17:02:45.000000000 +0200	2	+++ src/libtomahawk/sip/PeerInfo.cpp
3	@@ -312,7 +312,7 @@	3	@@ -333,7 +333,7 @@ PeerInfo::setAvatar( const QPixmap& avat
4	m_fancyAvatar = 0;	4	d->fancyAvatar.reset();
5		5
6	Q_ASSERT( !contactId().isEmpty() );	6	Q_ASSERT( !contactId().isEmpty() );
7	- TomahawkUtils::Cache::instance()->putData( "Sources", 7776000000 /* 90 days */, contactId(), ba );	7	- TomahawkUtils::Cache::instance()->putData( "Sources", 7776000000 /* 90 days */, contactId(), ba );

Lines 1-6 Link Here

(-)files/patch-src__libtomahawk__utils__Closure.h (-3 / +3 lines)
1	--- src/libtomahawk/utils/Closure.h.orig 2014-08-15 16:48:25.000000000 +0200	1	--- src/libtomahawk/utils/Closure.h.orig 2014-11-20 00:17:56 UTC
2	+++ src/libtomahawk/utils/Closure.h 2014-08-15 16:49:47.000000000 +0200	2	+++ src/libtomahawk/utils/Closure.h
3	@@ -30,6 +30,10 @@	3	@@ -40,6 +40,10 @@ using std::tr1::function;
4	#include <boost/noncopyable.hpp>	4	#include <boost/noncopyable.hpp>
5	#include <boost/scoped_ptr.hpp>	5	#include <boost/scoped_ptr.hpp>
6		6




--- ./src/main.cpp.orig	2013-06-28 17:15:02.000000000 +0200
+++ ./src/main.cpp	2013-06-28 17:15:16.000000000 +0200
@@ -34,8 +34,10 @@
 
 #ifndef ENABLE_HEADLESS
     #include "TomahawkSettingsGui.h"
+#ifdef WITH_BREAKPAD
     #include "breakpad/BreakPad.h"
 #endif
+#endif
 
 
 #ifdef Q_OS_WIN




--- src/libtomahawk/utils/TomahawkUtils.cpp.orig	2014-11-20 00:17:56 UTC
+++ src/libtomahawk/utils/TomahawkUtils.cpp
@@ -19,6 +19,8 @@
  *   along with Tomahawk. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <unistd.h>
+
 #include "utils/TomahawkUtils.h"
 
 #include "config.h"
@@ -183,7 +185,7 @@ appDataDir()
         }
     #elif defined(Q_OS_MAC)
         path = appSupportFolderPath();
-    #elif defined(Q_OS_LINUX)
+    #elif defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
         path = QDir::home().filePath( ".local/share" );
     #else
         path = QCoreApplication::applicationDirPath();

Line 0 Link Here

(-)pkg-message (+2 lines)
	1	ATTENTION!
	2	Tomahawk currently does not work if multimedia/phonon-gstreamer is installed.

Lines 1-8 Link Here

(-)pkg-plist (-52 / +127 lines)
1	bin/tomahawk	1	%%QT_BINDIR%%/tomahawk
2	include/libtomahawk/AclRegistry.h
3	include/libtomahawk/ActionCollection.h	2	include/libtomahawk/ActionCollection.h
4	include/libtomahawk/Album.h	3	include/libtomahawk/Album.h
5	include/libtomahawk/AlbumPlaylistInterface.h	4	include/libtomahawk/AlbumPlaylistInterface.h
		5	include/libtomahawk/Album_p.h
6	include/libtomahawk/Artist.h	6	include/libtomahawk/Artist.h
7	include/libtomahawk/ArtistPlaylistInterface.h	7	include/libtomahawk/ArtistPlaylistInterface.h
8	include/libtomahawk/AtticaManager.h	8	include/libtomahawk/AtticaManager.h
Lines 17-37 Link Here
17	include/libtomahawk/LatchManager.h	17	include/libtomahawk/LatchManager.h
18	include/libtomahawk/MetaPlaylistInterface.h	18	include/libtomahawk/MetaPlaylistInterface.h
19	include/libtomahawk/Pipeline.h	19	include/libtomahawk/Pipeline.h
		20	include/libtomahawk/Pipeline_p.h
		21	include/libtomahawk/PlaybackLog.h
20	include/libtomahawk/Playlist.h	22	include/libtomahawk/Playlist.h
		23	include/libtomahawk/PlaylistEntry.h
		24	include/libtomahawk/PlaylistEntry_p.h
21	include/libtomahawk/PlaylistInterface.h	25	include/libtomahawk/PlaylistInterface.h
22	include/libtomahawk/PlaylistPlaylistInterface.h	26	include/libtomahawk/PlaylistPlaylistInterface.h
		27	include/libtomahawk/Playlist_p.h
23	include/libtomahawk/Query.h	28	include/libtomahawk/Query.h
		29	include/libtomahawk/Query_p.h
24	include/libtomahawk/Result.h	30	include/libtomahawk/Result.h
		31	include/libtomahawk/SocialAction.h
25	include/libtomahawk/Source.h	32	include/libtomahawk/Source.h
26	include/libtomahawk/SourceList.h	33	include/libtomahawk/SourceList.h
27	include/libtomahawk/SourcePlaylistInterface.h	34	include/libtomahawk/SourcePlaylistInterface.h
		35	include/libtomahawk/Source_p.h
28	include/libtomahawk/TomahawkPlugin.h	36	include/libtomahawk/TomahawkPlugin.h
29	include/libtomahawk/TomahawkSettings.h	37	include/libtomahawk/TomahawkSettings.h
30	include/libtomahawk/TomahawkSettingsGui.h
31	include/libtomahawk/TomahawkVersion.h	38	include/libtomahawk/TomahawkVersion.h
		39	include/libtomahawk/Track.h
		40	include/libtomahawk/TrackData.h
		41	include/libtomahawk/Track_p.h
32	include/libtomahawk/Typedefs.h	42	include/libtomahawk/Typedefs.h
		43	include/libtomahawk/UrlHandler.h
		44	include/libtomahawk/UrlHandler_p.h
33	include/libtomahawk/ViewManager.h	45	include/libtomahawk/ViewManager.h
34	include/libtomahawk/ViewPage.h	46	include/libtomahawk/ViewPage.h
		47	include/libtomahawk/ViewPageLazyLoader.h
		48	include/libtomahawk/ViewPagePlugin.h
35	include/libtomahawk/accounts/Account.h	49	include/libtomahawk/accounts/Account.h
36	include/libtomahawk/accounts/AccountConfigWidget.h	50	include/libtomahawk/accounts/AccountConfigWidget.h
37	include/libtomahawk/accounts/AccountDelegate.h	51	include/libtomahawk/accounts/AccountDelegate.h
Lines 42-48 Link Here
42	include/libtomahawk/accounts/AccountModel.h	56	include/libtomahawk/accounts/AccountModel.h
43	include/libtomahawk/accounts/AccountModelFilterProxy.h	57	include/libtomahawk/accounts/AccountModelFilterProxy.h
44	include/libtomahawk/accounts/AccountModelNode.h	58	include/libtomahawk/accounts/AccountModelNode.h
		59	include/libtomahawk/accounts/ConfigStorage.h
		60	include/libtomahawk/accounts/ConfigStorageDllMacro.h
		61	include/libtomahawk/accounts/CredentialsManager.h
45	include/libtomahawk/accounts/DelegateConfigWrapper.h	62	include/libtomahawk/accounts/DelegateConfigWrapper.h
		63	include/libtomahawk/accounts/LocalConfigStorage.h
46	include/libtomahawk/accounts/ResolverAccount.h	64	include/libtomahawk/accounts/ResolverAccount.h
47	include/libtomahawk/accounts/lastfm/LastFmAccount.h	65	include/libtomahawk/accounts/lastfm/LastFmAccount.h
48	include/libtomahawk/accounts/lastfm/LastFmConfig.h	66	include/libtomahawk/accounts/lastfm/LastFmConfig.h
Lines 52-64 Link Here
52	include/libtomahawk/accounts/spotify/SpotifyInfoPlugin.h	70	include/libtomahawk/accounts/spotify/SpotifyInfoPlugin.h
53	include/libtomahawk/accounts/spotify/SpotifyPlaylistUpdater.h	71	include/libtomahawk/accounts/spotify/SpotifyPlaylistUpdater.h
54	include/libtomahawk/audio/AudioEngine.h	72	include/libtomahawk/audio/AudioEngine.h
		73	include/libtomahawk/audio/AudioEngine_p.h
		74	include/libtomahawk/collection/AlbumsRequest.h
		75	include/libtomahawk/collection/ArtistsRequest.h
		76	include/libtomahawk/collection/Collection.h
		77	include/libtomahawk/collection/TracksRequest.h
55	include/libtomahawk/config.h	78	include/libtomahawk/config.h
56	include/libtomahawk/context/ContextPage.h
57	include/libtomahawk/context/ContextWidget.h
58	include/libtomahawk/context/pages/RelatedArtistsContext.h
59	include/libtomahawk/context/pages/TopTracksContext.h
60	include/libtomahawk/context/pages/WebContext.h
61	include/libtomahawk/context/pages/WikipediaContext.h
62	include/libtomahawk/database/Database.h	79	include/libtomahawk/database/Database.h
63	include/libtomahawk/database/DatabaseCollection.h	80	include/libtomahawk/database/DatabaseCollection.h
64	include/libtomahawk/database/DatabaseCommand.h	81	include/libtomahawk/database/DatabaseCommand.h
Lines 69-74 Link Here
69	include/libtomahawk/database/DatabaseCommand_AllAlbums.h	86	include/libtomahawk/database/DatabaseCommand_AllAlbums.h
70	include/libtomahawk/database/DatabaseCommand_AllArtists.h	87	include/libtomahawk/database/DatabaseCommand_AllArtists.h
71	include/libtomahawk/database/DatabaseCommand_AllTracks.h	88	include/libtomahawk/database/DatabaseCommand_AllTracks.h
		89	include/libtomahawk/database/DatabaseCommand_ArtistStats.h
		90	include/libtomahawk/database/DatabaseCommand_CalculatePlaytime.h
		91	include/libtomahawk/database/DatabaseCommand_CalculatePlaytime_p.h
72	include/libtomahawk/database/DatabaseCommand_ClientAuthValid.h	92	include/libtomahawk/database/DatabaseCommand_ClientAuthValid.h
73	include/libtomahawk/database/DatabaseCommand_CollectionAttributes.h	93	include/libtomahawk/database/DatabaseCommand_CollectionAttributes.h
74	include/libtomahawk/database/DatabaseCommand_CollectionStats.h	94	include/libtomahawk/database/DatabaseCommand_CollectionStats.h
Lines 76-88 Link Here
76	include/libtomahawk/database/DatabaseCommand_CreatePlaylist.h	96	include/libtomahawk/database/DatabaseCommand_CreatePlaylist.h
77	include/libtomahawk/database/DatabaseCommand_DeleteDynamicPlaylist.h	97	include/libtomahawk/database/DatabaseCommand_DeleteDynamicPlaylist.h
78	include/libtomahawk/database/DatabaseCommand_DeleteFiles.h	98	include/libtomahawk/database/DatabaseCommand_DeleteFiles.h
		99	include/libtomahawk/database/DatabaseCommand_DeleteInboxEntry.h
79	include/libtomahawk/database/DatabaseCommand_DeletePlaylist.h	100	include/libtomahawk/database/DatabaseCommand_DeletePlaylist.h
80	include/libtomahawk/database/DatabaseCommand_DirMtimes.h	101	include/libtomahawk/database/DatabaseCommand_DirMtimes.h
81	include/libtomahawk/database/DatabaseCommand_FileMTimes.h	102	include/libtomahawk/database/DatabaseCommand_FileMTimes.h
		103	include/libtomahawk/database/DatabaseCommand_ForceResync.h
82	include/libtomahawk/database/DatabaseCommand_GenericSelect.h	104	include/libtomahawk/database/DatabaseCommand_GenericSelect.h
83	include/libtomahawk/database/DatabaseCommand_ImportPlaylist.h	105	include/libtomahawk/database/DatabaseCommand_ImportPlaylist.h
84	include/libtomahawk/database/DatabaseCommand_LoadAllAutoPlaylists.h	106	include/libtomahawk/database/DatabaseCommand_LoadAllAutoPlaylists.h
85	include/libtomahawk/database/DatabaseCommand_LoadAllPlaylists.h	107	include/libtomahawk/database/DatabaseCommand_LoadAllPlaylists.h
		108	include/libtomahawk/database/DatabaseCommand_LoadAllPlaylists_p.h
86	include/libtomahawk/database/DatabaseCommand_LoadAllSortedPlaylists.h	109	include/libtomahawk/database/DatabaseCommand_LoadAllSortedPlaylists.h
87	include/libtomahawk/database/DatabaseCommand_LoadAllSources.h	110	include/libtomahawk/database/DatabaseCommand_LoadAllSources.h
88	include/libtomahawk/database/DatabaseCommand_LoadAllStations.h	111	include/libtomahawk/database/DatabaseCommand_LoadAllStations.h
Lines 89-99 Link Here
89	include/libtomahawk/database/DatabaseCommand_LoadDynamicPlaylist.h	112	include/libtomahawk/database/DatabaseCommand_LoadDynamicPlaylist.h
90	include/libtomahawk/database/DatabaseCommand_LoadDynamicPlaylistEntries.h	113	include/libtomahawk/database/DatabaseCommand_LoadDynamicPlaylistEntries.h
91	include/libtomahawk/database/DatabaseCommand_LoadFiles.h	114	include/libtomahawk/database/DatabaseCommand_LoadFiles.h
		115	include/libtomahawk/database/DatabaseCommand_LoadInboxEntries.h
92	include/libtomahawk/database/DatabaseCommand_LoadOps.h	116	include/libtomahawk/database/DatabaseCommand_LoadOps.h
93	include/libtomahawk/database/DatabaseCommand_LoadPlaylistEntries.h	117	include/libtomahawk/database/DatabaseCommand_LoadPlaylistEntries.h
94	include/libtomahawk/database/DatabaseCommand_LoadSocialActions.h	118	include/libtomahawk/database/DatabaseCommand_LoadSocialActions.h
		119	include/libtomahawk/database/DatabaseCommand_LoadTrackAttributes.h
95	include/libtomahawk/database/DatabaseCommand_LogPlayback.h	120	include/libtomahawk/database/DatabaseCommand_LogPlayback.h
		121	include/libtomahawk/database/DatabaseCommand_ModifyInboxEntry.h
96	include/libtomahawk/database/DatabaseCommand_ModifyPlaylist.h	122	include/libtomahawk/database/DatabaseCommand_ModifyPlaylist.h
		123	include/libtomahawk/database/DatabaseCommand_NetworkCharts.h
97	include/libtomahawk/database/DatabaseCommand_PlaybackCharts.h	124	include/libtomahawk/database/DatabaseCommand_PlaybackCharts.h
98	include/libtomahawk/database/DatabaseCommand_PlaybackHistory.h	125	include/libtomahawk/database/DatabaseCommand_PlaybackHistory.h
99	include/libtomahawk/database/DatabaseCommand_RenamePlaylist.h	126	include/libtomahawk/database/DatabaseCommand_RenamePlaylist.h
Lines 102-116 Link Here
102	include/libtomahawk/database/DatabaseCommand_SetDynamicPlaylistRevision.h	129	include/libtomahawk/database/DatabaseCommand_SetDynamicPlaylistRevision.h
103	include/libtomahawk/database/DatabaseCommand_SetPlaylistRevision.h	130	include/libtomahawk/database/DatabaseCommand_SetPlaylistRevision.h
104	include/libtomahawk/database/DatabaseCommand_SetTrackAttributes.h	131	include/libtomahawk/database/DatabaseCommand_SetTrackAttributes.h
		132	include/libtomahawk/database/DatabaseCommand_ShareTrack.h
105	include/libtomahawk/database/DatabaseCommand_SocialAction.h	133	include/libtomahawk/database/DatabaseCommand_SocialAction.h
106	include/libtomahawk/database/DatabaseCommand_SourceOffline.h	134	include/libtomahawk/database/DatabaseCommand_SourceOffline.h
107	include/libtomahawk/database/DatabaseCommand_TrackAttributes.h	135	include/libtomahawk/database/DatabaseCommand_TrackAttributes.h
108	include/libtomahawk/database/DatabaseCommand_TrackStats.h	136	include/libtomahawk/database/DatabaseCommand_TrackStats.h
		137	include/libtomahawk/database/DatabaseCommand_TrendingArtists.h
		138	include/libtomahawk/database/DatabaseCommand_TrendingArtists_p.h
		139	include/libtomahawk/database/DatabaseCommand_TrendingTracks.h
		140	include/libtomahawk/database/DatabaseCommand_TrendingTracks_p.h
109	include/libtomahawk/database/DatabaseCommand_UpdateSearchIndex.h	141	include/libtomahawk/database/DatabaseCommand_UpdateSearchIndex.h
		142	include/libtomahawk/database/DatabaseCommand_p.h
110	include/libtomahawk/database/DatabaseImpl.h	143	include/libtomahawk/database/DatabaseImpl.h
111	include/libtomahawk/database/DatabaseResolver.h	144	include/libtomahawk/database/DatabaseResolver.h
112	include/libtomahawk/database/DatabaseWorker.h	145	include/libtomahawk/database/DatabaseWorker.h
113	include/libtomahawk/database/FuzzyIndex.h
114	include/libtomahawk/database/IdThreadWorker.h	146	include/libtomahawk/database/IdThreadWorker.h
115	include/libtomahawk/database/LocalCollection.h	147	include/libtomahawk/database/LocalCollection.h
116	include/libtomahawk/database/Op.h	148	include/libtomahawk/database/Op.h
Lines 126-137 Link Here
126	include/libtomahawk/filemetadata/taghandlers/mp4tag.h	158	include/libtomahawk/filemetadata/taghandlers/mp4tag.h
127	include/libtomahawk/filemetadata/taghandlers/oggtag.h	159	include/libtomahawk/filemetadata/taghandlers/oggtag.h
128	include/libtomahawk/filemetadata/taghandlers/tag.h	160	include/libtomahawk/filemetadata/taghandlers/tag.h
129	include/libtomahawk/infobar/InfoBar.h
130	include/libtomahawk/infosystem/InfoSystem.h	161	include/libtomahawk/infosystem/InfoSystem.h
131	include/libtomahawk/infosystem/InfoSystemCache.h	162	include/libtomahawk/infosystem/InfoSystemCache.h
132	include/libtomahawk/infosystem/InfoSystemWorker.h	163	include/libtomahawk/infosystem/InfoSystemWorker.h
133	include/libtomahawk/jobview/AclJobItem.h	164	include/libtomahawk/jobview/AclJobItem.h
134	include/libtomahawk/jobview/ErrorStatusMessage.h	165	include/libtomahawk/jobview/ErrorStatusMessage.h
		166	include/libtomahawk/jobview/InboxJobItem.h
135	include/libtomahawk/jobview/IndexingJobItem.h	167	include/libtomahawk/jobview/IndexingJobItem.h
136	include/libtomahawk/jobview/JobStatusDelegate.h	168	include/libtomahawk/jobview/JobStatusDelegate.h
137	include/libtomahawk/jobview/JobStatusItem.h	169	include/libtomahawk/jobview/JobStatusItem.h
Lines 139-190 Link Here
139	include/libtomahawk/jobview/JobStatusView.h	171	include/libtomahawk/jobview/JobStatusView.h
140	include/libtomahawk/jobview/LatchedStatusItem.h	172	include/libtomahawk/jobview/LatchedStatusItem.h
141	include/libtomahawk/jobview/PipelineStatusItem.h	173	include/libtomahawk/jobview/PipelineStatusItem.h
		174	include/libtomahawk/jobview/ScannerStatusItem.h
142	include/libtomahawk/jobview/TransferStatusItem.h	175	include/libtomahawk/jobview/TransferStatusItem.h
143	include/libtomahawk/network/BufferIoDevice.h	176	include/libtomahawk/network/BufferIoDevice.h
		177	include/libtomahawk/network/BufferIoDevice_p.h
144	include/libtomahawk/network/Connection.h	178	include/libtomahawk/network/Connection.h
		179	include/libtomahawk/network/ConnectionManager.h
		180	include/libtomahawk/network/ConnectionManager_p.h
		181	include/libtomahawk/network/Connection_p.h
145	include/libtomahawk/network/ControlConnection.h	182	include/libtomahawk/network/ControlConnection.h
		183	include/libtomahawk/network/ControlConnection_p.h
		184	include/libtomahawk/network/DBSyncConnectionState.h
146	include/libtomahawk/network/DbSyncConnection.h	185	include/libtomahawk/network/DbSyncConnection.h
		186	include/libtomahawk/network/Enums.h
147	include/libtomahawk/network/Msg.h	187	include/libtomahawk/network/Msg.h
148	include/libtomahawk/network/MsgProcessor.h	188	include/libtomahawk/network/MsgProcessor.h
		189	include/libtomahawk/network/Msg_p.h
149	include/libtomahawk/network/PortFwdThread.h	190	include/libtomahawk/network/PortFwdThread.h
		191	include/libtomahawk/network/QTcpSocketExtra.h
150	include/libtomahawk/network/RemoteCollection.h	192	include/libtomahawk/network/RemoteCollection.h
151	include/libtomahawk/network/Servent.h	193	include/libtomahawk/network/Servent.h
		194	include/libtomahawk/network/Servent_p.h
152	include/libtomahawk/network/StreamConnection.h	195	include/libtomahawk/network/StreamConnection.h
153	include/libtomahawk/playlist/AlbumItemDelegate.h
154	include/libtomahawk/playlist/AlbumModel.h	196	include/libtomahawk/playlist/AlbumModel.h
155	include/libtomahawk/playlist/FlexibleHeader.h	197	include/libtomahawk/playlist/ColumnItemDelegate.h
156	include/libtomahawk/playlist/FlexibleView.h	198	include/libtomahawk/playlist/ColumnView.h
		199	include/libtomahawk/playlist/ColumnViewPreviewWidget.h
		200	include/libtomahawk/playlist/ContextView.h
157	include/libtomahawk/playlist/GridItemDelegate.h	201	include/libtomahawk/playlist/GridItemDelegate.h
158	include/libtomahawk/playlist/GridView.h	202	include/libtomahawk/playlist/GridView.h
		203	include/libtomahawk/playlist/InboxModel.h
		204	include/libtomahawk/playlist/InboxView.h
159	include/libtomahawk/playlist/LovedTracksModel.h	205	include/libtomahawk/playlist/LovedTracksModel.h
		206	include/libtomahawk/playlist/LovedTracksModel_p.h
160	include/libtomahawk/playlist/PlayableItem.h	207	include/libtomahawk/playlist/PlayableItem.h
161	include/libtomahawk/playlist/PlayableModel.h	208	include/libtomahawk/playlist/PlayableModel.h
		209	include/libtomahawk/playlist/PlayableModel_p.h
162	include/libtomahawk/playlist/PlayableProxyModel.h	210	include/libtomahawk/playlist/PlayableProxyModel.h
163	include/libtomahawk/playlist/PlayableProxyModelPlaylistInterface.h	211	include/libtomahawk/playlist/PlayableProxyModelPlaylistInterface.h
164	include/libtomahawk/playlist/PlaylistChartItemDelegate.h
165	include/libtomahawk/playlist/PlaylistItemDelegate.h	212	include/libtomahawk/playlist/PlaylistItemDelegate.h
166	include/libtomahawk/playlist/PlaylistLargeItemDelegate.h
167	include/libtomahawk/playlist/PlaylistModel.h	213	include/libtomahawk/playlist/PlaylistModel.h
		214	include/libtomahawk/playlist/PlaylistModel_p.h
		215	include/libtomahawk/playlist/PlaylistTemplate.h
		216	include/libtomahawk/playlist/PlaylistTemplate_p.h
168	include/libtomahawk/playlist/PlaylistUpdaterInterface.h	217	include/libtomahawk/playlist/PlaylistUpdaterInterface.h
169	include/libtomahawk/playlist/PlaylistView.h
170	include/libtomahawk/playlist/QueueProxyModel.h	218	include/libtomahawk/playlist/QueueProxyModel.h
171	include/libtomahawk/playlist/QueueView.h	219	include/libtomahawk/playlist/QueueView.h
172	include/libtomahawk/playlist/RecentlyAddedModel.h	220	include/libtomahawk/playlist/RecentlyAddedModel.h
		221	include/libtomahawk/playlist/RecentlyLovedTracksModel.h
		222	include/libtomahawk/playlist/RecentlyLovedTracksModel_p.h
173	include/libtomahawk/playlist/RecentlyPlayedModel.h	223	include/libtomahawk/playlist/RecentlyPlayedModel.h
		224	include/libtomahawk/playlist/RevisionQueueItem.h
174	include/libtomahawk/playlist/SingleTrackPlaylistInterface.h	225	include/libtomahawk/playlist/SingleTrackPlaylistInterface.h
		226	include/libtomahawk/playlist/TopLovedTracksModel.h
		227	include/libtomahawk/playlist/TopLovedTracksModel_p.h
		228	include/libtomahawk/playlist/TrackDetailView.h
		229	include/libtomahawk/playlist/TrackItemDelegate.h
175	include/libtomahawk/playlist/TrackView.h	230	include/libtomahawk/playlist/TrackView.h
176	include/libtomahawk/playlist/TreeItemDelegate.h
177	include/libtomahawk/playlist/TreeModel.h	231	include/libtomahawk/playlist/TreeModel.h
178	include/libtomahawk/playlist/TreeProxyModel.h	232	include/libtomahawk/playlist/TreeProxyModel.h
179	include/libtomahawk/playlist/TreeProxyModelPlaylistInterface.h	233	include/libtomahawk/playlist/TreeProxyModelPlaylistInterface.h
180	include/libtomahawk/playlist/TreeView.h
181	include/libtomahawk/playlist/TreeWidget.h
182	include/libtomahawk/playlist/ViewHeader.h	234	include/libtomahawk/playlist/ViewHeader.h
		235	include/libtomahawk/playlist/XspfPlaylistTemplate.h
		236	include/libtomahawk/playlist/XspfPlaylistTemplate_p.h
183	include/libtomahawk/playlist/XspfUpdater.h	237	include/libtomahawk/playlist/XspfUpdater.h
184	include/libtomahawk/playlist/dynamic/DynamicControl.h	238	include/libtomahawk/playlist/dynamic/DynamicControl.h
185	include/libtomahawk/playlist/dynamic/DynamicModel.h	239	include/libtomahawk/playlist/dynamic/DynamicModel.h
186	include/libtomahawk/playlist/dynamic/DynamicPlaylist.h	240	include/libtomahawk/playlist/dynamic/DynamicPlaylist.h
187	include/libtomahawk/playlist/dynamic/DynamicPlaylistRevision.h	241	include/libtomahawk/playlist/dynamic/DynamicPlaylistRevision.h
		242	include/libtomahawk/playlist/dynamic/DynamicPlaylist_p.h
188	include/libtomahawk/playlist/dynamic/DynamicView.h	243	include/libtomahawk/playlist/dynamic/DynamicView.h
189	include/libtomahawk/playlist/dynamic/GeneratorFactory.h	244	include/libtomahawk/playlist/dynamic/GeneratorFactory.h
190	include/libtomahawk/playlist/dynamic/GeneratorInterface.h	245	include/libtomahawk/playlist/dynamic/GeneratorInterface.h
Lines 202-208 Link Here
202	include/libtomahawk/playlist/dynamic/widgets/ReadOrWriteWidget.h	257	include/libtomahawk/playlist/dynamic/widgets/ReadOrWriteWidget.h
203	include/libtomahawk/resolvers/ExternalResolver.h	258	include/libtomahawk/resolvers/ExternalResolver.h
204	include/libtomahawk/resolvers/ExternalResolverGui.h	259	include/libtomahawk/resolvers/ExternalResolverGui.h
205	include/libtomahawk/resolvers/QtScriptResolver.h	260	include/libtomahawk/resolvers/JSResolver.h
		261	include/libtomahawk/resolvers/JSResolverHelper.h
		262	include/libtomahawk/resolvers/JSResolver_p.h
206	include/libtomahawk/resolvers/Resolver.h	263	include/libtomahawk/resolvers/Resolver.h
207	include/libtomahawk/resolvers/ScriptCollection.h	264	include/libtomahawk/resolvers/ScriptCollection.h
208	include/libtomahawk/resolvers/ScriptCommand.h	265	include/libtomahawk/resolvers/ScriptCommand.h
Lines 210-302 Link Here
210	include/libtomahawk/resolvers/ScriptCommand_AllAlbums.h	267	include/libtomahawk/resolvers/ScriptCommand_AllAlbums.h
211	include/libtomahawk/resolvers/ScriptCommand_AllArtists.h	268	include/libtomahawk/resolvers/ScriptCommand_AllArtists.h
212	include/libtomahawk/resolvers/ScriptCommand_AllTracks.h	269	include/libtomahawk/resolvers/ScriptCommand_AllTracks.h
		270	include/libtomahawk/resolvers/ScriptCommand_LookupUrl.h
		271	include/libtomahawk/resolvers/ScriptCommand_LookupUrl_p.h
		272	include/libtomahawk/resolvers/ScriptEngine.h
213	include/libtomahawk/resolvers/ScriptResolver.h	273	include/libtomahawk/resolvers/ScriptResolver.h
214	include/libtomahawk/sip/PeerInfo.h	274	include/libtomahawk/sip/PeerInfo.h
		275	include/libtomahawk/sip/PeerInfo_p.h
215	include/libtomahawk/sip/SipInfo.h	276	include/libtomahawk/sip/SipInfo.h
216	include/libtomahawk/sip/SipPlugin.h	277	include/libtomahawk/sip/SipPlugin.h
217	include/libtomahawk/sip/SipStatusMessage.h	278	include/libtomahawk/sip/SipStatusMessage.h
		279	include/libtomahawk/sip/SipStatusMessage_p.h
218	include/libtomahawk/thirdparty/Qocoa/qbutton.h	280	include/libtomahawk/thirdparty/Qocoa/qbutton.h
219	include/libtomahawk/thirdparty/Qocoa/qocoa_mac.h	281	include/libtomahawk/thirdparty/Qocoa/qocoa_mac.h
220	include/libtomahawk/thirdparty/Qocoa/qsearchfield.h	282	include/libtomahawk/thirdparty/Qocoa/qsearchfield.h
221	include/libtomahawk/thirdparty/Qocoa/qtoolbartabdialog.h	283	include/libtomahawk/thirdparty/Qocoa/qtoolbartabdialog.h
222	include/libtomahawk/thirdparty/kdsingleapplicationguard/kdlockedsharedmemorypointer.h
223	include/libtomahawk/thirdparty/kdsingleapplicationguard/kdsharedmemorylocker.h
224	include/libtomahawk/thirdparty/kdsingleapplicationguard/kdsingleapplicationguard.h
225	include/libtomahawk/thirdparty/kdsingleapplicationguard/kdtoolsglobal.h
226	include/libtomahawk/thirdparty/kdsingleapplicationguard/pimpl_ptr.h
227	include/libtomahawk/utils/AnimatedSpinner.h	284	include/libtomahawk/utils/AnimatedSpinner.h
228	include/libtomahawk/utils/BinaryExtractWorker.h	285	include/libtomahawk/utils/BinaryExtractWorker.h
229	include/libtomahawk/utils/BinaryInstallerHelper.h	286	include/libtomahawk/utils/BinaryInstallerHelper.h
230	include/libtomahawk/utils/Closure.h	287	include/libtomahawk/utils/Closure.h
		288	include/libtomahawk/utils/Cloudstream.h
		289	include/libtomahawk/utils/DpiScaler.h
231	include/libtomahawk/utils/DropJobNotifier.h	290	include/libtomahawk/utils/DropJobNotifier.h
232	include/libtomahawk/utils/ExfmParser.h
233	include/libtomahawk/utils/GroovesharkParser.h	291	include/libtomahawk/utils/GroovesharkParser.h
234	include/libtomahawk/utils/GuiHelpers.h	292	include/libtomahawk/utils/GuiHelpers.h
235	include/libtomahawk/utils/ImageRegistry.h	293	include/libtomahawk/utils/ImageRegistry.h
		294	include/libtomahawk/utils/ItunesLoader.h
236	include/libtomahawk/utils/ItunesParser.h	295	include/libtomahawk/utils/ItunesParser.h
		296	include/libtomahawk/utils/Json.h
237	include/libtomahawk/utils/JspfLoader.h	297	include/libtomahawk/utils/JspfLoader.h
238	include/libtomahawk/utils/Logger.h	298	include/libtomahawk/utils/Logger.h
239	include/libtomahawk/utils/M3uLoader.h	299	include/libtomahawk/utils/M3uLoader.h
		300	include/libtomahawk/utils/NetworkAccessManager.h
		301	include/libtomahawk/utils/NetworkProxyFactory.h
240	include/libtomahawk/utils/NetworkReply.h	302	include/libtomahawk/utils/NetworkReply.h
241	include/libtomahawk/utils/PixmapDelegateFader.h	303	include/libtomahawk/utils/PixmapDelegateFader.h
		304	include/libtomahawk/utils/PluginLoader.h
		305	include/libtomahawk/utils/PluginLoader_p.h
242	include/libtomahawk/utils/ProxyStyle.h	306	include/libtomahawk/utils/ProxyStyle.h
243	include/libtomahawk/utils/Qnr_IoDeviceStream.h	307	include/libtomahawk/utils/Qnr_IoDeviceStream.h
244	include/libtomahawk/utils/RdioParser.h	308	include/libtomahawk/utils/ResultUrlChecker.h
245	include/libtomahawk/utils/SharedTimeLine.h	309	include/libtomahawk/utils/SharedTimeLine.h
		310	include/libtomahawk/utils/ShortLinkHelper.h
		311	include/libtomahawk/utils/ShortLinkHelper_p.h
246	include/libtomahawk/utils/ShortenedLinkParser.h	312	include/libtomahawk/utils/ShortenedLinkParser.h
247	include/libtomahawk/utils/SmartPointerList.h	313	include/libtomahawk/utils/SmartPointerList.h
248	include/libtomahawk/utils/SoundcloudParser.h
249	include/libtomahawk/utils/SpotifyParser.h	314	include/libtomahawk/utils/SpotifyParser.h
250	include/libtomahawk/utils/StyleHelper.h
251	include/libtomahawk/utils/TomahawkCache.h	315	include/libtomahawk/utils/TomahawkCache.h
		316	include/libtomahawk/utils/TomahawkStyle.h
252	include/libtomahawk/utils/TomahawkUtils.h	317	include/libtomahawk/utils/TomahawkUtils.h
253	include/libtomahawk/utils/TomahawkUtilsGui.h	318	include/libtomahawk/utils/TomahawkUtilsGui.h
254	include/libtomahawk/utils/TomahawkUtils_Mac.h	319	include/libtomahawk/utils/TomahawkUtils_Mac.h
255	include/libtomahawk/utils/WebResultHintChecker.h	320	include/libtomahawk/utils/WeakObjectHash.h
		321	include/libtomahawk/utils/WeakObjectList.h
256	include/libtomahawk/utils/WidgetDragFilter.h	322	include/libtomahawk/utils/WidgetDragFilter.h
257	include/libtomahawk/utils/XspfGenerator.h	323	include/libtomahawk/utils/XspfGenerator.h
258	include/libtomahawk/utils/XspfLoader.h	324	include/libtomahawk/utils/XspfLoader.h
259	include/libtomahawk/widgets/AnimatedCounterLabel.h	325	include/libtomahawk/viewpages/AlbumViewPage.h
		326	include/libtomahawk/viewpages/ArtistViewPage.h
		327	include/libtomahawk/viewpages/CollectionViewPage.h
		328	include/libtomahawk/viewpages/PlaylistViewPage.h
		329	include/libtomahawk/viewpages/SearchViewPage.h
		330	include/libtomahawk/viewpages/SourceViewPage.h
		331	include/libtomahawk/viewpages/TrackViewPage.h
260	include/libtomahawk/widgets/AnimatedSplitter.h	332	include/libtomahawk/widgets/AnimatedSplitter.h
		333	include/libtomahawk/widgets/BackgroundWidget.h
261	include/libtomahawk/widgets/BasicHeader.h	334	include/libtomahawk/widgets/BasicHeader.h
262	include/libtomahawk/widgets/Breadcrumb.h	335	include/libtomahawk/widgets/Breadcrumb.h
263	include/libtomahawk/widgets/BreadcrumbButton.h	336	include/libtomahawk/widgets/BreadcrumbButton.h
		337	include/libtomahawk/widgets/CaptionLabel.h
264	include/libtomahawk/widgets/ChartDataLoader.h	338	include/libtomahawk/widgets/ChartDataLoader.h
265	include/libtomahawk/widgets/CheckDirTree.h	339	include/libtomahawk/widgets/ClickableLabel.h
266	include/libtomahawk/widgets/ComboBox.h	340	include/libtomahawk/widgets/ComboBox.h
267	include/libtomahawk/widgets/ElidedLabel.h	341	include/libtomahawk/widgets/ElidedLabel.h
268	include/libtomahawk/widgets/FadingPixmap.h
269	include/libtomahawk/widgets/FilterHeader.h	342	include/libtomahawk/widgets/FilterHeader.h
270	include/libtomahawk/widgets/HeaderLabel.h	343	include/libtomahawk/widgets/HeaderLabel.h
271	include/libtomahawk/widgets/HeaderWidget.h	344	include/libtomahawk/widgets/HistoryWidget.h
		345	include/libtomahawk/widgets/HoverControls.h
272	include/libtomahawk/widgets/ImageButton.h	346	include/libtomahawk/widgets/ImageButton.h
273	include/libtomahawk/widgets/NewPlaylistWidget.h
274	include/libtomahawk/widgets/NewReleasesWidget.h
275	include/libtomahawk/widgets/OverlayButton.h	347	include/libtomahawk/widgets/OverlayButton.h
276	include/libtomahawk/widgets/OverlayWidget.h	348	include/libtomahawk/widgets/OverlayWidget.h
277	include/libtomahawk/widgets/PlayableCover.h	349	include/libtomahawk/widgets/PlayableCover.h
278	include/libtomahawk/widgets/PlaylistTypeSelectorDialog.h	350	include/libtomahawk/widgets/PlaylistsModel.h
		351	include/libtomahawk/widgets/PlaylistsModel_p.h
279	include/libtomahawk/widgets/QueryLabel.h	352	include/libtomahawk/widgets/QueryLabel.h
280	include/libtomahawk/widgets/RecentPlaylistsModel.h	353	include/libtomahawk/widgets/RecentPlaylistsModel.h
281	include/libtomahawk/widgets/RecentlyPlayedPlaylistsModel.h	354	include/libtomahawk/widgets/RecentlyPlayedPlaylistsModel.h
282	include/libtomahawk/widgets/ScriptCollectionHeader.h	355	include/libtomahawk/widgets/ScriptCollectionHeader.h
283	include/libtomahawk/widgets/SearchWidget.h	356	include/libtomahawk/widgets/ScrollingLabel.h
284	include/libtomahawk/widgets/SeekSlider.h	357	include/libtomahawk/widgets/SeekSlider.h
285	include/libtomahawk/widgets/SocialPlaylistWidget.h
286	include/libtomahawk/widgets/SourceTreePopupDialog.h	358	include/libtomahawk/widgets/SourceTreePopupDialog.h
287	include/libtomahawk/widgets/SourceTreePopupDialog_mac.h	359	include/libtomahawk/widgets/SourceTreePopupDialog_mac.h
288	include/libtomahawk/widgets/ToggleButton.h	360	include/libtomahawk/widgets/ToggleButton.h
289	include/libtomahawk/widgets/WelcomeWidget.h
290	include/libtomahawk/widgets/WhatsHotWidget.h
291	include/libtomahawk/widgets/infowidgets/AlbumInfoWidget.h
292	include/libtomahawk/widgets/infowidgets/ArtistInfoWidget.h
293	include/libtomahawk/widgets/infowidgets/SourceInfoWidget.h
294	include/libtomahawk/widgets/infowidgets/TrackInfoWidget.h
295	include/libtomahawk/widgets/searchlineedit/ClearButton.h	361	include/libtomahawk/widgets/searchlineedit/ClearButton.h
296	include/libtomahawk/widgets/searchlineedit/LineEdit.h	362	include/libtomahawk/widgets/searchlineedit/LineEdit.h
297	include/libtomahawk/widgets/searchlineedit/LineEdit_p.h	363	include/libtomahawk/widgets/searchlineedit/LineEdit_p.h
298	include/libtomahawk/widgets/searchlineedit/SearchButton.h	364	include/libtomahawk/widgets/searchlineedit/SearchButton.h
299	include/libtomahawk/widgets/searchlineedit/SearchLineEdit.h	365	include/libtomahawk/widgets/searchlineedit/SearchLineEdit.h
		366	lib/cmake/Tomahawk/TomahawkAddLibrary.cmake
300	lib/cmake/Tomahawk/TomahawkAddPlugin.cmake	367	lib/cmake/Tomahawk/TomahawkAddPlugin.cmake
301	lib/cmake/Tomahawk/TomahawkConfig.cmake	368	lib/cmake/Tomahawk/TomahawkConfig.cmake
302	lib/cmake/Tomahawk/TomahawkConfigVersion.cmake	369	lib/cmake/Tomahawk/TomahawkConfigVersion.cmake
Lines 303-312 Link Here
303	lib/cmake/Tomahawk/TomahawkLibraryDepends-%%CMAKE_BUILD_TYPE%%.cmake	370	lib/cmake/Tomahawk/TomahawkLibraryDepends-%%CMAKE_BUILD_TYPE%%.cmake
304	lib/cmake/Tomahawk/TomahawkLibraryDepends.cmake	371	lib/cmake/Tomahawk/TomahawkLibraryDepends.cmake
305	lib/cmake/Tomahawk/TomahawkUse.cmake	372	lib/cmake/Tomahawk/TomahawkUse.cmake
		373	lib/libtomahawk-playdarapi.so
		374	lib/libtomahawk-playdarapi.so.%%PORTVERSION%%
		375	lib/libtomahawk-widgets.so
		376	lib/libtomahawk-widgets.so.%%PORTVERSION%%
		377	lib/libtomahawk.so
		378	lib/libtomahawk.so.%%PORTVERSION%%
306	lib/libtomahawk_account_google.so	379	lib/libtomahawk_account_google.so
307	%%QTWEETLIB%%lib/libtomahawk_account_twitter.so	380	lib/libtomahawk_account_hatchet.so
308	lib/libtomahawk_account_xmpp.so	381	lib/libtomahawk_account_xmpp.so
309	lib/libtomahawk_account_zeroconf.so	382	lib/libtomahawk_account_zeroconf.so
		383	%%TELEPATHY%%lib/libtomahawk_configstorage_telepathy.so
		384	%%TELEPATHY%%lib/libtomahawk_configstorage_telepathy_kde.so
310	lib/libtomahawk_infoplugin_charts.so	385	lib/libtomahawk_infoplugin_charts.so
311	lib/libtomahawk_infoplugin_discogs.so	386	lib/libtomahawk_infoplugin_discogs.so
312	lib/libtomahawk_infoplugin_echonest.so	387	lib/libtomahawk_infoplugin_echonest.so
Lines 318-329 Link Here
318	lib/libtomahawk_infoplugin_newreleases.so	393	lib/libtomahawk_infoplugin_newreleases.so
319	lib/libtomahawk_infoplugin_rovi.so	394	lib/libtomahawk_infoplugin_rovi.so
320	lib/libtomahawk_infoplugin_spotify.so	395	lib/libtomahawk_infoplugin_spotify.so
321	lib/libtomahawk_portfwd.so	396	lib/libtomahawk_viewpage_charts.so
322	lib/libtomahawklib.so	397	lib/libtomahawk_viewpage_dashboard.so
323	lib/libtomahawklib.so.%%PORTVERSION%%	398	lib/libtomahawk_viewpage_newreleases.so
324	libexec/tomahawk_crash_reporter	399	lib/libtomahawk_viewpage_whatsnew_0_8.so
325	%%DESKTOPDIR%%/tomahawk.desktop	400	%%DESKTOPDIR%%/tomahawk.desktop
326	share/icons/hicolor/128x128-grayscale/apps/tomahawk.png	401	share/icons/hicolor/1024x1024/apps/tomahawk.png
327	share/icons/hicolor/128x128/apps/tomahawk.png	402	share/icons/hicolor/128x128/apps/tomahawk.png
328	share/icons/hicolor/16x16/apps/tomahawk.png	403	share/icons/hicolor/16x16/apps/tomahawk.png
329	share/icons/hicolor/256x256/apps/tomahawk.png	404	share/icons/hicolor/256x256/apps/tomahawk.png

Return to bug 197510

Lines 2-9 Link Here

(-)Makefile (-35 / +17 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= tomahawk	4	PORTNAME= tomahawk
5	PORTVERSION= 0.7.0	5	PORTVERSION= 0.8.2
6	PORTREVISION= 4
7	CATEGORIES= audio	6	CATEGORIES= audio
8		7
9	MAINTAINER= arved@FreeBSD.org	8	MAINTAINER= arved@FreeBSD.org
Lines 11-74 Link Here
11		10
12	LICENSE= GPLv3	11	LICENSE= GPLv3
13		12
		13	BUILD_DEPENDS= google-sparsehash>=2.0.2:${PORTSDIR}/devel/google-sparsehash \
		14	websocketpp>=0.4.0:${PORTSDIR}/devel/websocketpp
		15	RUN_DEPENS= phonon-vlc>=0.6.1:${PORTSDIR}/multimedia/phonon-vlc
14	LIB_DEPENDS= libattica.so:${PORTSDIR}/x11-toolkits/attica \	16	LIB_DEPENDS= libattica.so:${PORTSDIR}/x11-toolkits/attica \
15	libclucene-core.so:${PORTSDIR}/textproc/clucene \	17	liblucene++.so:${PORTSDIR}/textproc/luceneplusplus \
16	libboost_thread.so:${PORTSDIR}/devel/boost-libs \	18	libboost_thread.so:${PORTSDIR}/devel/boost-libs \
17	libechonest.so:${PORTSDIR}/audio/libechonest \	19	libechonest.so:${PORTSDIR}/audio/libechonest \
		20	libgnutls.so:${PORTSDIR}/security/gnutls \
18	libjreen.so:${PORTSDIR}/net-im/libjreen \	21	libjreen.so:${PORTSDIR}/net-im/libjreen \
19	liblastfm.so:${PORTSDIR}/audio/liblastfm \	22	liblastfm.so:${PORTSDIR}/audio/liblastfm \
20	libqca.so:${PORTSDIR}/devel/qca \	23	libqca.so:${PORTSDIR}/devel/qca \
21	libqjson.so:${PORTSDIR}/devel/qjson \	24	libqjson.so:${PORTSDIR}/devel/qjson \
		25	libqtkeychain.so:${PORTSDIR}/security/qtkeychain \
22	libquazip.so:${PORTSDIR}/archivers/quazip \	26	libquazip.so:${PORTSDIR}/archivers/quazip \
23	libtag.so:${PORTSDIR}/audio/taglib	27	libtag.so:${PORTSDIR}/audio/taglib
24		28
25	CMAKE_ARGS+= -DWITH_BREAKPAD:BOOL="OFF" \	29	CMAKE_ARGS= -DBUILD_RELEASE="ON"
26	-DCLUCENE_CONFIG_PATH:PATH="${LOCALBASE}/share/clucene"	30	CXXFLAGS+= -Wno-cast-align -I${LOCALBASE}/include
27	CXXFLAGS+= -Wno-cast-align
28		31
29	GH_ACCOUNT= tomahawk-player	32	GH_ACCOUNT= tomahawk-player
		33	GH_COMMIT= 78eb0c0
30	GH_PROJECT= ${PORTNAME}	34	GH_PROJECT= ${PORTNAME}
31	GH_COMMIT= 7a869ef
32		35
		36	TELEPATHY_LIB_DEPENDS= libtelepathy-qt4.so:${PORTSDIR}/net-im/telepathy-qt4
		37	TELEPATHY_DESC= Configure Telepathy Settings
		38	TELEPATHY_USE_KDE4= kdelibs automoc4
		39
33	INSTALLS_ICONS= yes	40	INSTALLS_ICONS= yes
34		41
35	OPTIONS_DEFINE= QTWEETLIB	42	OPTIONS_DEFAULT=
36	OPTIONS_DEFAULT= GSTREAMER QTWEETLIB	43	OPTIONS_DEFINE= TELEPATHY
37	OPTIONS_RADIO= PHONON
38	OPTIONS_RADIO_PHONON= GSTREAMER VLC XINE
39	OPTIONS_SUB= yes	44	OPTIONS_SUB= yes
40	QTWEETLIB_DESC= Enable Twitter SIP plugin
41	VLC_DESC= Multimedia support for VLC
42		45
43	PLIST_SUB+= DESKTOPDIR=${DESKTOPDIR:S,^${PREFIX}/,,} \	46	PLIST_SUB+= DESKTOPDIR=${DESKTOPDIR:S,^${PREFIX}/,,} \
44	PORTVERSION=${PORTVERSION}	47	PORTVERSION=${PORTVERSION}
45		48
46	USES= cmake pkgconfig desktop-file-utils	49	USES= cmake desktop-file-utils pkgconfig
47	USE_GITHUB= yes	50	USE_GITHUB= yes
48	USE_LDCONFIG= yes	51	USE_LDCONFIG= yes
49
50	USE_QT4= dbus designer gui linguist_build moc_build \	52	USE_QT4= dbus designer gui linguist_build moc_build \
51	network phonon qmake_build qtestlib rcc_build \	53	network phonon qmake_build qtestlib rcc_build \
52	sql-sqlite2 svg uic_build xml	54	sql-sqlite2 svg uic_build xml
53		55
54	.include <bsd.port.options.mk>
55
56	.if ${PORT_OPTIONS:MQTWEETLIB}
57	LIB_DEPENDS+= libQTweetLib.so:${PORTSDIR}/net/qtweetlib
58	.else
59	CMAKE_ARGS+= -DWITH_QTweetLib:BOOL="OFF"
60	.endif
61
62	.if ${PORT_OPTIONS:MGSTREAMER}
63	RUN_DEPENDS+= phonon-gstreamer>=4.6.3:${PORTSDIR}/multimedia/phonon-gstreamer
64	.endif
65
66	.if ${PORT_OPTIONS:MVLC}
67	RUN_DEPENDS+= phonon-vlc>=0.6.1:${PORTSDIR}/multimedia/phonon-vlc
68	.endif
69
70	.if ${PORT_OPTIONS:MXINE}
71	RUN_DEPENDS+= phonon-xine>=4.4.4_5:${PORTSDIR}/multimedia/phonon-xine
72	.endif
73
74	.include <bsd.port.mk>	56	.include <bsd.port.mk>

Lines 1-22 Link Here

(-)files/patch-CMakeModules__FindCLucene.cmake (-22 lines)
1	--- ./CMakeModules/FindCLucene.cmake.orig 2013-04-29 23:22:22.000000000 +0200
2	+++ ./CMakeModules/FindCLucene.cmake 2013-04-29 23:23:02.000000000 +0200
3	@@ -85,14 +85,14 @@
4	SET(CLUCENE_GOOD_VERSION TRUE)
5
6	FIND_PATH(CLUCENE_LIBRARY_DIR
7	- NAMES CLuceneConfig.cmake/CLuceneConfig.cmake CLucene/CLuceneConfig.cmake
8	- PATHS ${TRIAL_LIBRARY_PATHS} ${TRIAL_INCLUDE_PATHS} NO_DEFAULT_PATH)
9	+ NAMES CLuceneConfig.cmake CLucene/CLuceneConfig.cmake
10	+ PATHS ${TRIAL_LIBRARY_PATHS} ${TRIAL_INCLUDE_PATHS} ${CLUCENE_CONFIG_PATH} NO_DEFAULT_PATH)
11	IF (CLUCENE_LIBRARY_DIR)
12	MESSAGE(STATUS "Found CLucene library dir: ${CLUCENE_LIBRARY_DIR}")
13	# include CLuceneConfig/CLuceneConfig.cmake
14	- IF(EXISTS ${CLUCENE_LIBRARY_DIR}/CLuceneConfig.cmake/CLuceneConfig.cmake)
15	- INCLUDE(${CLUCENE_LIBRARY_DIR}/CLuceneConfig.cmake/CLuceneConfig.cmake)
16	- ENDIF(EXISTS ${CLUCENE_LIBRARY_DIR}/CLuceneConfig.cmake/CLuceneConfig.cmake)
17	+ IF(EXISTS ${CLUCENE_LIBRARY_DIR}/CLuceneConfig.cmake)
18	+ INCLUDE(${CLUCENE_LIBRARY_DIR}/CLuceneConfig.cmake)
19	+ ENDIF(EXISTS ${CLUCENE_LIBRARY_DIR}/CLuceneConfig.cmake)
20	# include CLucene/CLuceneConfig.cmake
21	IF(EXISTS ${CLUCENE_LIBRARY_DIR}/CLucene/CLuceneConfig.cmake)
22	INCLUDE(${CLUCENE_LIBRARY_DIR}/CLucene/CLuceneConfig.cmake)

Lines 1-13 Link Here

(-)files/patch-src__main.cpp (-13 lines)
1	--- ./src/main.cpp.orig 2013-06-28 17:15:02.000000000 +0200
2	+++ ./src/main.cpp 2013-06-28 17:15:16.000000000 +0200
3	@@ -34,8 +34,10 @@
4
5	#ifndef ENABLE_HEADLESS
6	#include "TomahawkSettingsGui.h"
7	+#ifdef WITH_BREAKPAD
8	#include "breakpad/BreakPad.h"
9	#endif
10	+#endif
11
12
13	#ifdef Q_OS_WIN

Line 0 Link Here

(-)files/patch-src_libtomahawk_utils_TomahawkUtils.cpp (+20 lines)
	1	--- src/libtomahawk/utils/TomahawkUtils.cpp.orig 2014-11-20 00:17:56 UTC
	2	+++ src/libtomahawk/utils/TomahawkUtils.cpp
	3	@@ -19,6 +19,8 @@
	4	* along with Tomahawk. If not, see <http://www.gnu.org/licenses/>.
	5	*/
	6
	7	+#include <unistd.h>
	8	+
	9	#include "utils/TomahawkUtils.h"
	10
	11	#include "config.h"
	12	@@ -183,7 +185,7 @@ appDataDir()
	13	}
	14	#elif defined(Q_OS_MAC)
	15	path = appSupportFolderPath();
	16	- #elif defined(Q_OS_LINUX)
	17	+ #elif defined(Q_OS_LINUX) \|\| defined(Q_OS_FREEBSD)
	18	path = QDir::home().filePath( ".local/share" );
	19	#else
	20	path = QCoreApplication::applicationDirPath();