Attachment 154229 Details for Bug 197510 – Current state of patch as of 2015-03-11

[patch] Current state of patch as of 2015-03-11

patch-2015-03-11 (text/plain), 28.18 KB, created by Tilman Keskinoz on 2015-03-11 22:47:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tilman Keskinoz

Created: 2015-03-11 22:47:23 UTC

Size: 28.18 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 378829)
>+++ Makefile	(working copy)
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	tomahawk
>-PORTVERSION=	0.7.0
>-PORTREVISION=	4
>+PORTVERSION=	0.8.2
> CATEGORIES=	audio
> 
> MAINTAINER=	arved@FreeBSD.org
>@@ -11,64 +10,47 @@
> 
> 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 \
>-		libclucene-core.so:${PORTSDIR}/textproc/clucene \
>+		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+=	-DWITH_BREAKPAD:BOOL="OFF" \
>-		-DCLUCENE_CONFIG_PATH:PATH="${LOCALBASE}/share/clucene"
>-CXXFLAGS+=	-Wno-cast-align
>+CMAKE_ARGS=	-DBUILD_RELEASE="ON"
>+CXXFLAGS+=	-Wno-cast-align -I${LOCALBASE}/include
> 
> 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_DEFINE=	QTWEETLIB
>-OPTIONS_DEFAULT=	GSTREAMER QTWEETLIB
>-OPTIONS_RADIO=	 PHONON
>-OPTIONS_RADIO_PHONON=	GSTREAMER VLC XINE
>+OPTIONS_DEFAULT=
>+OPTIONS_DEFINE=	TELEPATHY
> 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 pkgconfig desktop-file-utils
>+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>
>Index: distinfo
>===================================================================
>--- distinfo	(revision 378829)
>+++ distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (tomahawk-0.7.0.tar.gz) = 2871c6fcdc88e0392051e62697c25494571b2a62b709782590f3d539723669a6
>-SIZE (tomahawk-0.7.0.tar.gz) = 6520138
>+SHA256 (tomahawk-0.8.2.tar.gz) = e9dd9e1b69918af152cbb0ee5c1d7bddc05116d038abdeb79f97b678fe57bfea
>+SIZE (tomahawk-0.8.2.tar.gz) = 9588294
>Index: files/patch-CMakeModules__FindCLucene.cmake
>===================================================================
>--- files/patch-CMakeModules__FindCLucene.cmake	(revision 378829)
>+++ files/patch-CMakeModules__FindCLucene.cmake	(working copy)
>@@ -1,22 +0,0 @@
>---- ./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)
>Index: files/patch-src__libtomahawk__sip__PeerInfo.cpp
>===================================================================
>--- files/patch-src__libtomahawk__sip__PeerInfo.cpp	(revision 378829)
>+++ files/patch-src__libtomahawk__sip__PeerInfo.cpp	(working copy)
>@@ -1,7 +1,7 @@
>---- ./src/libtomahawk/sip/PeerInfo.cpp.orig	2013-06-28 17:01:55.000000000 +0200
>-+++ ./src/libtomahawk/sip/PeerInfo.cpp	2013-06-28 17:02:45.000000000 +0200
>-@@ -312,7 +312,7 @@
>-     m_fancyAvatar = 0;
>+--- src/libtomahawk/sip/PeerInfo.cpp.orig	2014-11-20 00:17:56 UTC
>++++ src/libtomahawk/sip/PeerInfo.cpp
>+@@ -333,7 +333,7 @@ PeerInfo::setAvatar( const QPixmap& avat
>+     d->fancyAvatar.reset();
>  
>      Q_ASSERT( !contactId().isEmpty() );
> -    TomahawkUtils::Cache::instance()->putData( "Sources", 7776000000 /* 90 days */, contactId(), ba );
>Index: files/patch-src__libtomahawk__utils__Closure.h
>===================================================================
>--- files/patch-src__libtomahawk__utils__Closure.h	(revision 378829)
>+++ files/patch-src__libtomahawk__utils__Closure.h	(working copy)
>@@ -1,6 +1,6 @@
>---- src/libtomahawk/utils/Closure.h.orig	2014-08-15 16:48:25.000000000 +0200
>-+++ src/libtomahawk/utils/Closure.h	2014-08-15 16:49:47.000000000 +0200
>-@@ -30,6 +30,10 @@
>+--- src/libtomahawk/utils/Closure.h.orig	2014-11-20 00:17:56 UTC
>++++ src/libtomahawk/utils/Closure.h
>+@@ -40,6 +40,10 @@ using std::tr1::function;
>  #include <boost/noncopyable.hpp>
>  #include <boost/scoped_ptr.hpp>
>  
>Index: files/patch-src__main.cpp
>===================================================================
>--- files/patch-src__main.cpp	(revision 378829)
>+++ files/patch-src__main.cpp	(working copy)
>@@ -1,13 +0,0 @@
>---- ./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
>Index: files/patch-src_libtomahawk_utils_TomahawkUtils.cpp
>===================================================================
>--- files/patch-src_libtomahawk_utils_TomahawkUtils.cpp	(revision 0)
>+++ files/patch-src_libtomahawk_utils_TomahawkUtils.cpp	(working copy)
>@@ -0,0 +1,20 @@
>+--- 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();
>
>Property changes on: files/patch-src_libtomahawk_utils_TomahawkUtils.cpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: pkg-message
>===================================================================
>--- pkg-message	(revision 0)
>+++ pkg-message	(working copy)
>@@ -0,0 +1,2 @@
>+ATTENTION!
>+Tomahawk currently does not work if multimedia/phonon-gstreamer is installed.
>
>Property changes on: pkg-message
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 378829)
>+++ pkg-plist	(working copy)
>@@ -1,8 +1,8 @@
>-bin/tomahawk
>-include/libtomahawk/AclRegistry.h
>+%%QT_BINDIR%%/tomahawk
> include/libtomahawk/ActionCollection.h
> include/libtomahawk/Album.h
> include/libtomahawk/AlbumPlaylistInterface.h
>+include/libtomahawk/Album_p.h
> include/libtomahawk/Artist.h
> include/libtomahawk/ArtistPlaylistInterface.h
> include/libtomahawk/AtticaManager.h
>@@ -17,21 +17,35 @@
> include/libtomahawk/LatchManager.h
> include/libtomahawk/MetaPlaylistInterface.h
> include/libtomahawk/Pipeline.h
>+include/libtomahawk/Pipeline_p.h
>+include/libtomahawk/PlaybackLog.h
> include/libtomahawk/Playlist.h
>+include/libtomahawk/PlaylistEntry.h
>+include/libtomahawk/PlaylistEntry_p.h
> include/libtomahawk/PlaylistInterface.h
> include/libtomahawk/PlaylistPlaylistInterface.h
>+include/libtomahawk/Playlist_p.h
> include/libtomahawk/Query.h
>+include/libtomahawk/Query_p.h
> include/libtomahawk/Result.h
>+include/libtomahawk/SocialAction.h
> include/libtomahawk/Source.h
> include/libtomahawk/SourceList.h
> include/libtomahawk/SourcePlaylistInterface.h
>+include/libtomahawk/Source_p.h
> include/libtomahawk/TomahawkPlugin.h
> include/libtomahawk/TomahawkSettings.h
>-include/libtomahawk/TomahawkSettingsGui.h
> include/libtomahawk/TomahawkVersion.h
>+include/libtomahawk/Track.h
>+include/libtomahawk/TrackData.h
>+include/libtomahawk/Track_p.h
> include/libtomahawk/Typedefs.h
>+include/libtomahawk/UrlHandler.h
>+include/libtomahawk/UrlHandler_p.h
> include/libtomahawk/ViewManager.h
> include/libtomahawk/ViewPage.h
>+include/libtomahawk/ViewPageLazyLoader.h
>+include/libtomahawk/ViewPagePlugin.h
> include/libtomahawk/accounts/Account.h
> include/libtomahawk/accounts/AccountConfigWidget.h
> include/libtomahawk/accounts/AccountDelegate.h
>@@ -42,7 +56,11 @@
> include/libtomahawk/accounts/AccountModel.h
> include/libtomahawk/accounts/AccountModelFilterProxy.h
> include/libtomahawk/accounts/AccountModelNode.h
>+include/libtomahawk/accounts/ConfigStorage.h
>+include/libtomahawk/accounts/ConfigStorageDllMacro.h
>+include/libtomahawk/accounts/CredentialsManager.h
> include/libtomahawk/accounts/DelegateConfigWrapper.h
>+include/libtomahawk/accounts/LocalConfigStorage.h
> include/libtomahawk/accounts/ResolverAccount.h
> include/libtomahawk/accounts/lastfm/LastFmAccount.h
> include/libtomahawk/accounts/lastfm/LastFmConfig.h
>@@ -52,13 +70,12 @@
> include/libtomahawk/accounts/spotify/SpotifyInfoPlugin.h
> include/libtomahawk/accounts/spotify/SpotifyPlaylistUpdater.h
> include/libtomahawk/audio/AudioEngine.h
>+include/libtomahawk/audio/AudioEngine_p.h
>+include/libtomahawk/collection/AlbumsRequest.h
>+include/libtomahawk/collection/ArtistsRequest.h
>+include/libtomahawk/collection/Collection.h
>+include/libtomahawk/collection/TracksRequest.h
> include/libtomahawk/config.h
>-include/libtomahawk/context/ContextPage.h
>-include/libtomahawk/context/ContextWidget.h
>-include/libtomahawk/context/pages/RelatedArtistsContext.h
>-include/libtomahawk/context/pages/TopTracksContext.h
>-include/libtomahawk/context/pages/WebContext.h
>-include/libtomahawk/context/pages/WikipediaContext.h
> include/libtomahawk/database/Database.h
> include/libtomahawk/database/DatabaseCollection.h
> include/libtomahawk/database/DatabaseCommand.h
>@@ -69,6 +86,9 @@
> include/libtomahawk/database/DatabaseCommand_AllAlbums.h
> include/libtomahawk/database/DatabaseCommand_AllArtists.h
> include/libtomahawk/database/DatabaseCommand_AllTracks.h
>+include/libtomahawk/database/DatabaseCommand_ArtistStats.h
>+include/libtomahawk/database/DatabaseCommand_CalculatePlaytime.h
>+include/libtomahawk/database/DatabaseCommand_CalculatePlaytime_p.h
> include/libtomahawk/database/DatabaseCommand_ClientAuthValid.h
> include/libtomahawk/database/DatabaseCommand_CollectionAttributes.h
> include/libtomahawk/database/DatabaseCommand_CollectionStats.h
>@@ -76,13 +96,16 @@
> include/libtomahawk/database/DatabaseCommand_CreatePlaylist.h
> include/libtomahawk/database/DatabaseCommand_DeleteDynamicPlaylist.h
> include/libtomahawk/database/DatabaseCommand_DeleteFiles.h
>+include/libtomahawk/database/DatabaseCommand_DeleteInboxEntry.h
> include/libtomahawk/database/DatabaseCommand_DeletePlaylist.h
> include/libtomahawk/database/DatabaseCommand_DirMtimes.h
> include/libtomahawk/database/DatabaseCommand_FileMTimes.h
>+include/libtomahawk/database/DatabaseCommand_ForceResync.h
> include/libtomahawk/database/DatabaseCommand_GenericSelect.h
> include/libtomahawk/database/DatabaseCommand_ImportPlaylist.h
> include/libtomahawk/database/DatabaseCommand_LoadAllAutoPlaylists.h
> include/libtomahawk/database/DatabaseCommand_LoadAllPlaylists.h
>+include/libtomahawk/database/DatabaseCommand_LoadAllPlaylists_p.h
> include/libtomahawk/database/DatabaseCommand_LoadAllSortedPlaylists.h
> include/libtomahawk/database/DatabaseCommand_LoadAllSources.h
> include/libtomahawk/database/DatabaseCommand_LoadAllStations.h
>@@ -89,11 +112,15 @@
> include/libtomahawk/database/DatabaseCommand_LoadDynamicPlaylist.h
> include/libtomahawk/database/DatabaseCommand_LoadDynamicPlaylistEntries.h
> include/libtomahawk/database/DatabaseCommand_LoadFiles.h
>+include/libtomahawk/database/DatabaseCommand_LoadInboxEntries.h
> include/libtomahawk/database/DatabaseCommand_LoadOps.h
> include/libtomahawk/database/DatabaseCommand_LoadPlaylistEntries.h
> include/libtomahawk/database/DatabaseCommand_LoadSocialActions.h
>+include/libtomahawk/database/DatabaseCommand_LoadTrackAttributes.h
> include/libtomahawk/database/DatabaseCommand_LogPlayback.h
>+include/libtomahawk/database/DatabaseCommand_ModifyInboxEntry.h
> include/libtomahawk/database/DatabaseCommand_ModifyPlaylist.h
>+include/libtomahawk/database/DatabaseCommand_NetworkCharts.h
> include/libtomahawk/database/DatabaseCommand_PlaybackCharts.h
> include/libtomahawk/database/DatabaseCommand_PlaybackHistory.h
> include/libtomahawk/database/DatabaseCommand_RenamePlaylist.h
>@@ -102,15 +129,20 @@
> include/libtomahawk/database/DatabaseCommand_SetDynamicPlaylistRevision.h
> include/libtomahawk/database/DatabaseCommand_SetPlaylistRevision.h
> include/libtomahawk/database/DatabaseCommand_SetTrackAttributes.h
>+include/libtomahawk/database/DatabaseCommand_ShareTrack.h
> include/libtomahawk/database/DatabaseCommand_SocialAction.h
> include/libtomahawk/database/DatabaseCommand_SourceOffline.h
> include/libtomahawk/database/DatabaseCommand_TrackAttributes.h
> include/libtomahawk/database/DatabaseCommand_TrackStats.h
>+include/libtomahawk/database/DatabaseCommand_TrendingArtists.h
>+include/libtomahawk/database/DatabaseCommand_TrendingArtists_p.h
>+include/libtomahawk/database/DatabaseCommand_TrendingTracks.h
>+include/libtomahawk/database/DatabaseCommand_TrendingTracks_p.h
> include/libtomahawk/database/DatabaseCommand_UpdateSearchIndex.h
>+include/libtomahawk/database/DatabaseCommand_p.h
> include/libtomahawk/database/DatabaseImpl.h
> include/libtomahawk/database/DatabaseResolver.h
> include/libtomahawk/database/DatabaseWorker.h
>-include/libtomahawk/database/FuzzyIndex.h
> include/libtomahawk/database/IdThreadWorker.h
> include/libtomahawk/database/LocalCollection.h
> include/libtomahawk/database/Op.h
>@@ -126,12 +158,12 @@
> include/libtomahawk/filemetadata/taghandlers/mp4tag.h
> include/libtomahawk/filemetadata/taghandlers/oggtag.h
> include/libtomahawk/filemetadata/taghandlers/tag.h
>-include/libtomahawk/infobar/InfoBar.h
> include/libtomahawk/infosystem/InfoSystem.h
> include/libtomahawk/infosystem/InfoSystemCache.h
> include/libtomahawk/infosystem/InfoSystemWorker.h
> include/libtomahawk/jobview/AclJobItem.h
> include/libtomahawk/jobview/ErrorStatusMessage.h
>+include/libtomahawk/jobview/InboxJobItem.h
> include/libtomahawk/jobview/IndexingJobItem.h
> include/libtomahawk/jobview/JobStatusDelegate.h
> include/libtomahawk/jobview/JobStatusItem.h
>@@ -139,52 +171,75 @@
> include/libtomahawk/jobview/JobStatusView.h
> include/libtomahawk/jobview/LatchedStatusItem.h
> include/libtomahawk/jobview/PipelineStatusItem.h
>+include/libtomahawk/jobview/ScannerStatusItem.h
> include/libtomahawk/jobview/TransferStatusItem.h
> include/libtomahawk/network/BufferIoDevice.h
>+include/libtomahawk/network/BufferIoDevice_p.h
> include/libtomahawk/network/Connection.h
>+include/libtomahawk/network/ConnectionManager.h
>+include/libtomahawk/network/ConnectionManager_p.h
>+include/libtomahawk/network/Connection_p.h
> include/libtomahawk/network/ControlConnection.h
>+include/libtomahawk/network/ControlConnection_p.h
>+include/libtomahawk/network/DBSyncConnectionState.h
> include/libtomahawk/network/DbSyncConnection.h
>+include/libtomahawk/network/Enums.h
> include/libtomahawk/network/Msg.h
> include/libtomahawk/network/MsgProcessor.h
>+include/libtomahawk/network/Msg_p.h
> include/libtomahawk/network/PortFwdThread.h
>+include/libtomahawk/network/QTcpSocketExtra.h
> include/libtomahawk/network/RemoteCollection.h
> include/libtomahawk/network/Servent.h
>+include/libtomahawk/network/Servent_p.h
> include/libtomahawk/network/StreamConnection.h
>-include/libtomahawk/playlist/AlbumItemDelegate.h
> include/libtomahawk/playlist/AlbumModel.h
>-include/libtomahawk/playlist/FlexibleHeader.h
>-include/libtomahawk/playlist/FlexibleView.h
>+include/libtomahawk/playlist/ColumnItemDelegate.h
>+include/libtomahawk/playlist/ColumnView.h
>+include/libtomahawk/playlist/ColumnViewPreviewWidget.h
>+include/libtomahawk/playlist/ContextView.h
> include/libtomahawk/playlist/GridItemDelegate.h
> include/libtomahawk/playlist/GridView.h
>+include/libtomahawk/playlist/InboxModel.h
>+include/libtomahawk/playlist/InboxView.h
> include/libtomahawk/playlist/LovedTracksModel.h
>+include/libtomahawk/playlist/LovedTracksModel_p.h
> include/libtomahawk/playlist/PlayableItem.h
> include/libtomahawk/playlist/PlayableModel.h
>+include/libtomahawk/playlist/PlayableModel_p.h
> include/libtomahawk/playlist/PlayableProxyModel.h
> include/libtomahawk/playlist/PlayableProxyModelPlaylistInterface.h
>-include/libtomahawk/playlist/PlaylistChartItemDelegate.h
> include/libtomahawk/playlist/PlaylistItemDelegate.h
>-include/libtomahawk/playlist/PlaylistLargeItemDelegate.h
> include/libtomahawk/playlist/PlaylistModel.h
>+include/libtomahawk/playlist/PlaylistModel_p.h
>+include/libtomahawk/playlist/PlaylistTemplate.h
>+include/libtomahawk/playlist/PlaylistTemplate_p.h
> include/libtomahawk/playlist/PlaylistUpdaterInterface.h
>-include/libtomahawk/playlist/PlaylistView.h
> include/libtomahawk/playlist/QueueProxyModel.h
> include/libtomahawk/playlist/QueueView.h
> include/libtomahawk/playlist/RecentlyAddedModel.h
>+include/libtomahawk/playlist/RecentlyLovedTracksModel.h
>+include/libtomahawk/playlist/RecentlyLovedTracksModel_p.h
> include/libtomahawk/playlist/RecentlyPlayedModel.h
>+include/libtomahawk/playlist/RevisionQueueItem.h
> include/libtomahawk/playlist/SingleTrackPlaylistInterface.h
>+include/libtomahawk/playlist/TopLovedTracksModel.h
>+include/libtomahawk/playlist/TopLovedTracksModel_p.h
>+include/libtomahawk/playlist/TrackDetailView.h
>+include/libtomahawk/playlist/TrackItemDelegate.h
> include/libtomahawk/playlist/TrackView.h
>-include/libtomahawk/playlist/TreeItemDelegate.h
> include/libtomahawk/playlist/TreeModel.h
> include/libtomahawk/playlist/TreeProxyModel.h
> include/libtomahawk/playlist/TreeProxyModelPlaylistInterface.h
>-include/libtomahawk/playlist/TreeView.h
>-include/libtomahawk/playlist/TreeWidget.h
> include/libtomahawk/playlist/ViewHeader.h
>+include/libtomahawk/playlist/XspfPlaylistTemplate.h
>+include/libtomahawk/playlist/XspfPlaylistTemplate_p.h
> include/libtomahawk/playlist/XspfUpdater.h
> include/libtomahawk/playlist/dynamic/DynamicControl.h
> include/libtomahawk/playlist/dynamic/DynamicModel.h
> include/libtomahawk/playlist/dynamic/DynamicPlaylist.h
> include/libtomahawk/playlist/dynamic/DynamicPlaylistRevision.h
>+include/libtomahawk/playlist/dynamic/DynamicPlaylist_p.h
> include/libtomahawk/playlist/dynamic/DynamicView.h
> include/libtomahawk/playlist/dynamic/GeneratorFactory.h
> include/libtomahawk/playlist/dynamic/GeneratorInterface.h
>@@ -202,7 +257,9 @@
> include/libtomahawk/playlist/dynamic/widgets/ReadOrWriteWidget.h
> include/libtomahawk/resolvers/ExternalResolver.h
> include/libtomahawk/resolvers/ExternalResolverGui.h
>-include/libtomahawk/resolvers/QtScriptResolver.h
>+include/libtomahawk/resolvers/JSResolver.h
>+include/libtomahawk/resolvers/JSResolverHelper.h
>+include/libtomahawk/resolvers/JSResolver_p.h
> include/libtomahawk/resolvers/Resolver.h
> include/libtomahawk/resolvers/ScriptCollection.h
> include/libtomahawk/resolvers/ScriptCommand.h
>@@ -210,93 +267,103 @@
> include/libtomahawk/resolvers/ScriptCommand_AllAlbums.h
> include/libtomahawk/resolvers/ScriptCommand_AllArtists.h
> include/libtomahawk/resolvers/ScriptCommand_AllTracks.h
>+include/libtomahawk/resolvers/ScriptCommand_LookupUrl.h
>+include/libtomahawk/resolvers/ScriptCommand_LookupUrl_p.h
>+include/libtomahawk/resolvers/ScriptEngine.h
> include/libtomahawk/resolvers/ScriptResolver.h
> include/libtomahawk/sip/PeerInfo.h
>+include/libtomahawk/sip/PeerInfo_p.h
> include/libtomahawk/sip/SipInfo.h
> include/libtomahawk/sip/SipPlugin.h
> include/libtomahawk/sip/SipStatusMessage.h
>+include/libtomahawk/sip/SipStatusMessage_p.h
> include/libtomahawk/thirdparty/Qocoa/qbutton.h
> include/libtomahawk/thirdparty/Qocoa/qocoa_mac.h
> include/libtomahawk/thirdparty/Qocoa/qsearchfield.h
> include/libtomahawk/thirdparty/Qocoa/qtoolbartabdialog.h
>-include/libtomahawk/thirdparty/kdsingleapplicationguard/kdlockedsharedmemorypointer.h
>-include/libtomahawk/thirdparty/kdsingleapplicationguard/kdsharedmemorylocker.h
>-include/libtomahawk/thirdparty/kdsingleapplicationguard/kdsingleapplicationguard.h
>-include/libtomahawk/thirdparty/kdsingleapplicationguard/kdtoolsglobal.h
>-include/libtomahawk/thirdparty/kdsingleapplicationguard/pimpl_ptr.h
> include/libtomahawk/utils/AnimatedSpinner.h
> include/libtomahawk/utils/BinaryExtractWorker.h
> include/libtomahawk/utils/BinaryInstallerHelper.h
> include/libtomahawk/utils/Closure.h
>+include/libtomahawk/utils/Cloudstream.h
>+include/libtomahawk/utils/DpiScaler.h
> include/libtomahawk/utils/DropJobNotifier.h
>-include/libtomahawk/utils/ExfmParser.h
> include/libtomahawk/utils/GroovesharkParser.h
> include/libtomahawk/utils/GuiHelpers.h
> include/libtomahawk/utils/ImageRegistry.h
>+include/libtomahawk/utils/ItunesLoader.h
> include/libtomahawk/utils/ItunesParser.h
>+include/libtomahawk/utils/Json.h
> include/libtomahawk/utils/JspfLoader.h
> include/libtomahawk/utils/Logger.h
> include/libtomahawk/utils/M3uLoader.h
>+include/libtomahawk/utils/NetworkAccessManager.h
>+include/libtomahawk/utils/NetworkProxyFactory.h
> include/libtomahawk/utils/NetworkReply.h
> include/libtomahawk/utils/PixmapDelegateFader.h
>+include/libtomahawk/utils/PluginLoader.h
>+include/libtomahawk/utils/PluginLoader_p.h
> include/libtomahawk/utils/ProxyStyle.h
> include/libtomahawk/utils/Qnr_IoDeviceStream.h
>-include/libtomahawk/utils/RdioParser.h
>+include/libtomahawk/utils/ResultUrlChecker.h
> include/libtomahawk/utils/SharedTimeLine.h
>+include/libtomahawk/utils/ShortLinkHelper.h
>+include/libtomahawk/utils/ShortLinkHelper_p.h
> include/libtomahawk/utils/ShortenedLinkParser.h
> include/libtomahawk/utils/SmartPointerList.h
>-include/libtomahawk/utils/SoundcloudParser.h
> include/libtomahawk/utils/SpotifyParser.h
>-include/libtomahawk/utils/StyleHelper.h
> include/libtomahawk/utils/TomahawkCache.h
>+include/libtomahawk/utils/TomahawkStyle.h
> include/libtomahawk/utils/TomahawkUtils.h
> include/libtomahawk/utils/TomahawkUtilsGui.h
> include/libtomahawk/utils/TomahawkUtils_Mac.h
>-include/libtomahawk/utils/WebResultHintChecker.h
>+include/libtomahawk/utils/WeakObjectHash.h
>+include/libtomahawk/utils/WeakObjectList.h
> include/libtomahawk/utils/WidgetDragFilter.h
> include/libtomahawk/utils/XspfGenerator.h
> include/libtomahawk/utils/XspfLoader.h
>-include/libtomahawk/widgets/AnimatedCounterLabel.h
>+include/libtomahawk/viewpages/AlbumViewPage.h
>+include/libtomahawk/viewpages/ArtistViewPage.h
>+include/libtomahawk/viewpages/CollectionViewPage.h
>+include/libtomahawk/viewpages/PlaylistViewPage.h
>+include/libtomahawk/viewpages/SearchViewPage.h
>+include/libtomahawk/viewpages/SourceViewPage.h
>+include/libtomahawk/viewpages/TrackViewPage.h
> include/libtomahawk/widgets/AnimatedSplitter.h
>+include/libtomahawk/widgets/BackgroundWidget.h
> include/libtomahawk/widgets/BasicHeader.h
> include/libtomahawk/widgets/Breadcrumb.h
> include/libtomahawk/widgets/BreadcrumbButton.h
>+include/libtomahawk/widgets/CaptionLabel.h
> include/libtomahawk/widgets/ChartDataLoader.h
>-include/libtomahawk/widgets/CheckDirTree.h
>+include/libtomahawk/widgets/ClickableLabel.h
> include/libtomahawk/widgets/ComboBox.h
> include/libtomahawk/widgets/ElidedLabel.h
>-include/libtomahawk/widgets/FadingPixmap.h
> include/libtomahawk/widgets/FilterHeader.h
> include/libtomahawk/widgets/HeaderLabel.h
>-include/libtomahawk/widgets/HeaderWidget.h
>+include/libtomahawk/widgets/HistoryWidget.h
>+include/libtomahawk/widgets/HoverControls.h
> include/libtomahawk/widgets/ImageButton.h
>-include/libtomahawk/widgets/NewPlaylistWidget.h
>-include/libtomahawk/widgets/NewReleasesWidget.h
> include/libtomahawk/widgets/OverlayButton.h
> include/libtomahawk/widgets/OverlayWidget.h
> include/libtomahawk/widgets/PlayableCover.h
>-include/libtomahawk/widgets/PlaylistTypeSelectorDialog.h
>+include/libtomahawk/widgets/PlaylistsModel.h
>+include/libtomahawk/widgets/PlaylistsModel_p.h
> include/libtomahawk/widgets/QueryLabel.h
> include/libtomahawk/widgets/RecentPlaylistsModel.h
> include/libtomahawk/widgets/RecentlyPlayedPlaylistsModel.h
> include/libtomahawk/widgets/ScriptCollectionHeader.h
>-include/libtomahawk/widgets/SearchWidget.h
>+include/libtomahawk/widgets/ScrollingLabel.h
> include/libtomahawk/widgets/SeekSlider.h
>-include/libtomahawk/widgets/SocialPlaylistWidget.h
> include/libtomahawk/widgets/SourceTreePopupDialog.h
> include/libtomahawk/widgets/SourceTreePopupDialog_mac.h
> include/libtomahawk/widgets/ToggleButton.h
>-include/libtomahawk/widgets/WelcomeWidget.h
>-include/libtomahawk/widgets/WhatsHotWidget.h
>-include/libtomahawk/widgets/infowidgets/AlbumInfoWidget.h
>-include/libtomahawk/widgets/infowidgets/ArtistInfoWidget.h
>-include/libtomahawk/widgets/infowidgets/SourceInfoWidget.h
>-include/libtomahawk/widgets/infowidgets/TrackInfoWidget.h
> include/libtomahawk/widgets/searchlineedit/ClearButton.h
> include/libtomahawk/widgets/searchlineedit/LineEdit.h
> include/libtomahawk/widgets/searchlineedit/LineEdit_p.h
> include/libtomahawk/widgets/searchlineedit/SearchButton.h
> include/libtomahawk/widgets/searchlineedit/SearchLineEdit.h
>+lib/cmake/Tomahawk/TomahawkAddLibrary.cmake
> lib/cmake/Tomahawk/TomahawkAddPlugin.cmake
> lib/cmake/Tomahawk/TomahawkConfig.cmake
> lib/cmake/Tomahawk/TomahawkConfigVersion.cmake
>@@ -303,10 +370,18 @@
> lib/cmake/Tomahawk/TomahawkLibraryDepends-%%CMAKE_BUILD_TYPE%%.cmake
> lib/cmake/Tomahawk/TomahawkLibraryDepends.cmake
> lib/cmake/Tomahawk/TomahawkUse.cmake
>+lib/libtomahawk-playdarapi.so
>+lib/libtomahawk-playdarapi.so.%%PORTVERSION%%
>+lib/libtomahawk-widgets.so
>+lib/libtomahawk-widgets.so.%%PORTVERSION%%
>+lib/libtomahawk.so
>+lib/libtomahawk.so.%%PORTVERSION%%
> lib/libtomahawk_account_google.so
>-%%QTWEETLIB%%lib/libtomahawk_account_twitter.so
>+lib/libtomahawk_account_hatchet.so
> lib/libtomahawk_account_xmpp.so
> lib/libtomahawk_account_zeroconf.so
>+%%TELEPATHY%%lib/libtomahawk_configstorage_telepathy.so
>+%%TELEPATHY%%lib/libtomahawk_configstorage_telepathy_kde.so
> lib/libtomahawk_infoplugin_charts.so
> lib/libtomahawk_infoplugin_discogs.so
> lib/libtomahawk_infoplugin_echonest.so
>@@ -318,12 +393,12 @@
> lib/libtomahawk_infoplugin_newreleases.so
> lib/libtomahawk_infoplugin_rovi.so
> lib/libtomahawk_infoplugin_spotify.so
>-lib/libtomahawk_portfwd.so
>-lib/libtomahawklib.so
>-lib/libtomahawklib.so.%%PORTVERSION%%
>-libexec/tomahawk_crash_reporter
>+lib/libtomahawk_viewpage_charts.so
>+lib/libtomahawk_viewpage_dashboard.so
>+lib/libtomahawk_viewpage_newreleases.so
>+lib/libtomahawk_viewpage_whatsnew_0_8.so
> %%DESKTOPDIR%%/tomahawk.desktop
>-share/icons/hicolor/128x128-grayscale/apps/tomahawk.png
>+share/icons/hicolor/1024x1024/apps/tomahawk.png
> share/icons/hicolor/128x128/apps/tomahawk.png
> share/icons/hicolor/16x16/apps/tomahawk.png
> share/icons/hicolor/256x256/apps/tomahawk.png

Actions: View | Diff

Attachments on bug 197510: 152835 | 154229 | 158872