From daf3034d990599a11a55ce5b111ccc01440ed908 Mon Sep 17 00:00:00 2001 From: Dominik Schmidt Date: Wed, 9 Dec 2015 00:15:22 +0100 Subject: [PATCH 01/13] Only look for and link against libvlc, not libvlccore --- CMakeModules/FindLIBVLC.cmake | 9 +-------- src/libtomahawk/CMakeLists.txt | 1 - 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/CMakeModules/FindLIBVLC.cmake b/CMakeModules/FindLIBVLC.cmake index b4f23396e..97ff666f6 100644 --- a/CMakeModules/FindLIBVLC.cmake +++ b/CMakeModules/FindLIBVLC.cmake @@ -14,11 +14,6 @@ find_library(LIBVLC_LIBRARY NAMES vlc libvlc ${PC_LIBVLC_LIBRARY_DIRS} ) -find_library(LIBVLCCORE_LIBRARY NAMES vlccore libvlccore - HINTS - ${PC_LIBVLC_LIBDIR} - ${PC_LIBVLC_LIBRARY_DIRS} -) set(LIBVLC_VERSION ${PC_LIBVLC_VERSION}) @@ -32,8 +27,6 @@ int main(int argc, char *argv[]) { HAVE_VLC_ALBUMARTIST) find_package_handle_standard_args(LibVLC - REQUIRED_VARS LIBVLC_LIBRARY LIBVLCCORE_LIBRARY LIBVLC_INCLUDE_DIR + REQUIRED_VARS LIBVLC_LIBRARY LIBVLC_INCLUDE_DIR VERSION_VAR LIBVLC_VERSION ) - - diff --git a/src/libtomahawk/CMakeLists.txt b/src/libtomahawk/CMakeLists.txt index 5da56cce6..ee687c2b2 100644 --- a/src/libtomahawk/CMakeLists.txt +++ b/src/libtomahawk/CMakeLists.txt @@ -524,7 +524,6 @@ ENDIF( UNIX AND NOT APPLE ) TARGET_LINK_LIBRARIES( ${TOMAHAWK_LIBRARY} LINK_PRIVATE ${LIBVLC_LIBRARY} - ${LIBVLCCORE_LIBRARY} # Thirdparty shipped with tomahawk ${LIBPORTFWD_LIBRARIES} From 99fe5c8e8e572d7df6a188b99e371ba90f2053b6 Mon Sep 17 00:00:00 2001 From: Dominik Schmidt Date: Wed, 9 Dec 2015 00:15:48 +0100 Subject: [PATCH 02/13] Look for keg-only libvlc --- CMakeModules/FindLIBVLC.cmake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CMakeModules/FindLIBVLC.cmake b/CMakeModules/FindLIBVLC.cmake index 97ff666f6..db797ada6 100644 --- a/CMakeModules/FindLIBVLC.cmake +++ b/CMakeModules/FindLIBVLC.cmake @@ -6,12 +6,14 @@ find_path(LIBVLC_INCLUDE_DIR vlc/vlc.h HINTS ${PC_LIBVLC_INCLUDEDIR} ${PC_LIBVLC_INCLUDE_DIRS} + /usr/local/opt/vlc/include ) find_library(LIBVLC_LIBRARY NAMES vlc libvlc HINTS ${PC_LIBVLC_LIBDIR} ${PC_LIBVLC_LIBRARY_DIRS} + /usr/local/opt/vlc/lib ) From 86f08b307e6f9bbb28bff5faaa2c2040cb546a5a Mon Sep 17 00:00:00 2001 From: Dominik Schmidt Date: Wed, 9 Dec 2015 00:21:10 +0100 Subject: [PATCH 03/13] Fix typo --- src/tomahawk/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tomahawk/CMakeLists.txt b/src/tomahawk/CMakeLists.txt index 92a7afac5..d328be9cd 100644 --- a/src/tomahawk/CMakeLists.txt +++ b/src/tomahawk/CMakeLists.txt @@ -1,4 +1,4 @@ -set(TOMAHAWK_APPLICATION_TARGET "tomahahawk-bin") +set(TOMAHAWK_APPLICATION_TARGET "tomahawk-bin") include( ECMAddAppIcon ) From 4d351168da7ec788d6012e9812407f122d3c42db Mon Sep 17 00:00:00 2001 From: Dominik Schmidt Date: Wed, 9 Dec 2015 00:49:55 +0100 Subject: [PATCH 04/13] Don't compile 64x64 icon into OSX iconset --- src/tomahawk/CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/tomahawk/CMakeLists.txt b/src/tomahawk/CMakeLists.txt index d328be9cd..e18c798ec 100644 --- a/src/tomahawk/CMakeLists.txt +++ b/src/tomahawk/CMakeLists.txt @@ -146,6 +146,10 @@ IF( BUILD_GUI ) ENDIF() file( GLOB_RECURSE TOMAHAWK_ICONS "${CMAKE_SOURCE_DIR}/data/icons/*-tomahawk-icon.png" ) +if(APPLE) + list(REMOVE_ITEM TOMAHAWK_ICONS "${CMAKE_SOURCE_DIR}/data/icons/64x64-tomahawk-icon.png") +endif() + ecm_add_app_icon( tomahawkSources ICONS ${TOMAHAWK_ICONS} ) From 45c96e7367c1c8dcd60cf3964d3a75d0f57a9e32 Mon Sep 17 00:00:00 2001 From: Dominik Schmidt Date: Wed, 9 Dec 2015 12:24:18 +0100 Subject: [PATCH 05/13] Update VLC plugin paths --- admin/mac/macdeploy.py | 264 ++++++++++++++++++++--------------------- 1 file changed, 132 insertions(+), 132 deletions(-) diff --git a/admin/mac/macdeploy.py b/admin/mac/macdeploy.py index 45575b783..da55e755d 100755 --- a/admin/mac/macdeploy.py +++ b/admin/mac/macdeploy.py @@ -27,161 +27,161 @@ FRAMEWORK_SEARCH_PATH=[ os.path.join(os.environ['HOME'], 'Library/Frameworks') ] -LIBRARY_SEARCH_PATH=['/usr/local/lib', '/usr/local/Cellar/gettext/0.19.2/lib', '.'] +LIBRARY_SEARCH_PATH=['/usr/local/lib', '/usr/local/opt/vlc/lib', '/usr/local/Cellar/gettext/0.19.2/lib', '.'] VLC_PLUGINS=[ - 'access/libattachment_plugin.dylib', - #'access/libaccess_avio_plugin.dylib', - #'access/libaccess_fake_plugin.dylib', - 'access/libftp_plugin.dylib', - 'access/libhttp_plugin.dylib', - 'access/libimem_plugin.dylib', - #'access/libaccess_mmap_plugin.dylib', - 'access/libaccess_mms_plugin.dylib', - 'access/libaccess_realrtsp_plugin.dylib', - 'access/libtcp_plugin.dylib', - 'access/libudp_plugin.dylib', - 'access/libcdda_plugin.dylib', - 'access/libfilesystem_plugin.dylib', - 'access/libqtcapture_plugin.dylib', - 'access/librtp_plugin.dylib', - 'access/libzip_plugin.dylib', - 'access_output/libaccess_output_dummy_plugin.dylib', - 'access_output/libaccess_output_file_plugin.dylib', - 'access_output/libaccess_output_http_plugin.dylib', - 'access_output/libaccess_output_shout_plugin.dylib', - 'access_output/libaccess_output_udp_plugin.dylib', - 'audio_filter/liba52tofloat32_plugin.dylib', - 'audio_filter/liba52tospdif_plugin.dylib', - 'audio_filter/libaudio_format_plugin.dylib', - 'audio_filter/libaudiobargraph_a_plugin.dylib', - 'audio_filter/libchorus_flanger_plugin.dylib', + 'libattachment_plugin.dylib', + #'libaccess_avio_plugin.dylib', + #'libaccess_fake_plugin.dylib', + 'libftp_plugin.dylib', + 'libhttp_plugin.dylib', + 'libimem_plugin.dylib', + #'libaccess_mmap_plugin.dylib', + 'libaccess_mms_plugin.dylib', + 'libaccess_realrtsp_plugin.dylib', + 'libtcp_plugin.dylib', + 'libudp_plugin.dylib', + 'libcdda_plugin.dylib', + 'libfilesystem_plugin.dylib', + 'libqtcapture_plugin.dylib', + 'librtp_plugin.dylib', + 'libzip_plugin.dylib', + 'libaccess_output_dummy_plugin.dylib', + 'libaccess_output_file_plugin.dylib', + 'libaccess_output_http_plugin.dylib', + 'libaccess_output_shout_plugin.dylib', + 'libaccess_output_udp_plugin.dylib', + 'liba52tofloat32_plugin.dylib', + 'liba52tospdif_plugin.dylib', + 'libaudio_format_plugin.dylib', + 'libaudiobargraph_a_plugin.dylib', + 'libchorus_flanger_plugin.dylib', #'libconverter_fixed_plugin.dylib', - 'audio_filter/libdolby_surround_decoder_plugin.dylib', - 'audio_filter/libdtstofloat32_plugin.dylib', - 'audio_filter/libdtstospdif_plugin.dylib', - 'audio_filter/libequalizer_plugin.dylib', - 'audio_filter/libheadphone_channel_mixer_plugin.dylib', - 'audio_filter/libmono_plugin.dylib', - 'audio_filter/libmpgatofixed32_plugin.dylib', - 'audio_filter/libnormvol_plugin.dylib', - 'audio_filter/libparam_eq_plugin.dylib', - 'audio_filter/libscaletempo_plugin.dylib', - 'audio_filter/libsimple_channel_mixer_plugin.dylib', - 'audio_filter/libspatializer_plugin.dylib', - 'audio_filter/libtrivial_channel_mixer_plugin.dylib', - 'audio_filter/libugly_resampler_plugin.dylib', - 'audio_mixer/libfloat_mixer_plugin.dylib', + 'libdolby_surround_decoder_plugin.dylib', + 'libdtstofloat32_plugin.dylib', + 'libdtstospdif_plugin.dylib', + 'libequalizer_plugin.dylib', + 'libheadphone_channel_mixer_plugin.dylib', + 'libmono_plugin.dylib', + 'libmpgatofixed32_plugin.dylib', + 'libnormvol_plugin.dylib', + 'libparam_eq_plugin.dylib', + 'libscaletempo_plugin.dylib', + 'libsimple_channel_mixer_plugin.dylib', + 'libspatializer_plugin.dylib', + 'libtrivial_channel_mixer_plugin.dylib', + 'libugly_resampler_plugin.dylib', + 'libfloat_mixer_plugin.dylib', #'libspdif_mixer_plugin.dylib', #'libtrivial_mixer_plugin.dylib', #'libaout_file_plugin.dylib', - 'audio_output/libauhal_plugin.dylib', - 'codec/liba52_plugin.dylib', - 'codec/libadpcm_plugin.dylib', - 'codec/libaes3_plugin.dylib', - 'codec/libaraw_plugin.dylib', - 'codec/libavcodec_plugin.dylib', - 'codec/libcc_plugin.dylib', - 'codec/libcdg_plugin.dylib', - 'codec/libdts_plugin.dylib', - 'codec/libfaad_plugin.dylib', + 'libauhal_plugin.dylib', + 'liba52_plugin.dylib', + 'libadpcm_plugin.dylib', + 'libaes3_plugin.dylib', + 'libaraw_plugin.dylib', + 'libavcodec_plugin.dylib', + 'libcc_plugin.dylib', + 'libcdg_plugin.dylib', + 'libdts_plugin.dylib', + 'libfaad_plugin.dylib', #'libfake_plugin.dylib', - 'codec/libflac_plugin.dylib', + 'libflac_plugin.dylib', #'libfluidsynth_plugin.dylib', #'libinvmem_plugin.dylib', - 'codec/liblpcm_plugin.dylib', - 'codec/libmpeg_audio_plugin.dylib', - 'codec/libpng_plugin.dylib', - 'codec/librawvideo_plugin.dylib', - 'codec/libspeex_plugin.dylib', - 'codec/libspudec_plugin.dylib', - 'codec/libtheora_plugin.dylib', - 'codec/libtwolame_plugin.dylib', - 'codec/libvorbis_plugin.dylib', - #'control/libgestures_plugin.dylib', + 'liblpcm_plugin.dylib', + 'libmpeg_audio_plugin.dylib', + 'libpng_plugin.dylib', + 'librawvideo_plugin.dylib', + 'libspeex_plugin.dylib', + 'libspudec_plugin.dylib', + 'libtheora_plugin.dylib', + 'libtwolame_plugin.dylib', + 'libvorbis_plugin.dylib', + #'libgestures_plugin.dylib', #'libhotkeys_plugin.dylib', #'libmotion_plugin.dylib', #'libnetsync_plugin.dylib', #'libsignals_plugin.dylib', - 'demux/libaiff_plugin.dylib', - 'demux/libasf_plugin.dylib', - 'demux/libau_plugin.dylib', + 'libaiff_plugin.dylib', + 'libasf_plugin.dylib', + 'libau_plugin.dylib', #'libavformat_plugin.dylib', - 'demux/libavi_plugin.dylib', - 'demux/libdemux_cdg_plugin.dylib', - 'demux/libdemuxdump_plugin.dylib', - 'demux/libdiracsys_plugin.dylib', - 'demux/libes_plugin.dylib', - 'demux/libflacsys_plugin.dylib', - 'access/liblive555_plugin.dylib', - 'demux/libmkv_plugin.dylib', - 'demux/libmod_plugin.dylib', - 'demux/libmp4_plugin.dylib', - 'demux/libmpc_plugin.dylib', - 'demux/libmpgv_plugin.dylib', - 'demux/libnsc_plugin.dylib', - 'demux/libnsv_plugin.dylib', - 'demux/libnuv_plugin.dylib', - 'demux/libogg_plugin.dylib', - 'demux/libplaylist_plugin.dylib', - 'demux/libps_plugin.dylib', - 'demux/libpva_plugin.dylib', - 'demux/librawaud_plugin.dylib', - 'demux/librawdv_plugin.dylib', - 'demux/librawvid_plugin.dylib', - 'demux/libreal_plugin.dylib', - 'demux/libsmf_plugin.dylib', - 'demux/libts_plugin.dylib', - 'demux/libtta_plugin.dylib', - 'demux/libty_plugin.dylib', - 'demux/libvc1_plugin.dylib', - 'demux/libvoc_plugin.dylib', - 'demux/libwav_plugin.dylib', - 'demux/libxa_plugin.dylib', - 'meta_engine/libfolder_plugin.dylib', - 'meta_engine/libtaglib_plugin.dylib', + 'libavi_plugin.dylib', + 'libdemux_cdg_plugin.dylib', + 'libdemuxdump_plugin.dylib', + 'libdiracsys_plugin.dylib', + 'libes_plugin.dylib', + 'libflacsys_plugin.dylib', + 'liblive555_plugin.dylib', + 'libmkv_plugin.dylib', + 'libmod_plugin.dylib', + 'libmp4_plugin.dylib', + 'libmpc_plugin.dylib', + 'libmpgv_plugin.dylib', + 'libnsc_plugin.dylib', + 'libnsv_plugin.dylib', + 'libnuv_plugin.dylib', + 'libogg_plugin.dylib', + 'libplaylist_plugin.dylib', + 'libps_plugin.dylib', + 'libpva_plugin.dylib', + 'librawaud_plugin.dylib', + 'librawdv_plugin.dylib', + 'librawvid_plugin.dylib', + 'libreal_plugin.dylib', + 'libsmf_plugin.dylib', + 'libts_plugin.dylib', + 'libtta_plugin.dylib', + 'libty_plugin.dylib', + 'libvc1_plugin.dylib', + 'libvoc_plugin.dylib', + 'libwav_plugin.dylib', + 'libxa_plugin.dylib', + 'libfolder_plugin.dylib', + 'libtaglib_plugin.dylib', #'libaudioscrobbler_plugin.dylib', - 'control/libdummy_plugin.dylib', - 'misc/libexport_plugin.dylib', + 'libdummy_plugin.dylib', + 'libexport_plugin.dylib', #'libfreetype_plugin.dylib', #'libgnutls_plugin.dylib', - 'misc/liblogger_plugin.dylib', - 'lua/liblua_plugin.dylib', + 'liblogger_plugin.dylib', + 'liblua_plugin.dylib', #'libosd_parser_plugin.dylib', #'libquartztext_plugin.dylib', #'libstats_plugin.dylib', - 'misc/libvod_rtsp_plugin.dylib', - 'misc/libxml_plugin.dylib', + 'libvod_rtsp_plugin.dylib', + 'libxml_plugin.dylib', #'libxtag_plugin.dylib', - 'video_chroma/libi420_rgb_mmx_plugin.dylib', - 'video_chroma/libi420_yuy2_mmx_plugin.dylib', - 'video_chroma/libi422_yuy2_mmx_plugin.dylib', + 'libi420_rgb_mmx_plugin.dylib', + 'libi420_yuy2_mmx_plugin.dylib', + 'libi422_yuy2_mmx_plugin.dylib', #'libmemcpymmx_plugin.dylib', #'libmemcpymmxext_plugin.dylib', - 'mux/libmux_asf_plugin.dylib', - 'mux/libmux_avi_plugin.dylib', - 'mux/libmux_dummy_plugin.dylib', - 'mux/libmux_mp4_plugin.dylib', - 'mux/libmux_mpjpeg_plugin.dylib', - 'mux/libmux_ogg_plugin.dylib', - 'mux/libmux_ps_plugin.dylib', - 'mux/libmux_ts_plugin.dylib', - 'mux/libmux_wav_plugin.dylib', - 'packetizer/libpacketizer_copy_plugin.dylib', - 'packetizer/libpacketizer_dirac_plugin.dylib', - 'packetizer/libpacketizer_flac_plugin.dylib', - 'packetizer/libpacketizer_h264_plugin.dylib', - 'packetizer/libpacketizer_mlp_plugin.dylib', - 'packetizer/libpacketizer_mpeg4audio_plugin.dylib', - 'packetizer/libpacketizer_mpeg4video_plugin.dylib', - 'packetizer/libpacketizer_mpegvideo_plugin.dylib', - 'packetizer/libpacketizer_vc1_plugin.dylib', - 'video_chroma/libi420_rgb_sse2_plugin.dylib', - 'video_chroma/libi420_yuy2_sse2_plugin.dylib', - 'video_chroma/libi422_yuy2_sse2_plugin.dylib', - 'stream_filter/libdecomp_plugin.dylib', - #'access/libstream_filter_rar_plugin.dylib', - 'stream_filter/librecord_plugin.dylib', + 'libmux_asf_plugin.dylib', + 'libmux_avi_plugin.dylib', + 'libmux_dummy_plugin.dylib', + 'libmux_mp4_plugin.dylib', + 'libmux_mpjpeg_plugin.dylib', + 'libmux_ogg_plugin.dylib', + 'libmux_ps_plugin.dylib', + 'libmux_ts_plugin.dylib', + 'libmux_wav_plugin.dylib', + 'libpacketizer_copy_plugin.dylib', + 'libpacketizer_dirac_plugin.dylib', + 'libpacketizer_flac_plugin.dylib', + 'libpacketizer_h264_plugin.dylib', + 'libpacketizer_mlp_plugin.dylib', + 'libpacketizer_mpeg4audio_plugin.dylib', + 'libpacketizer_mpeg4video_plugin.dylib', + 'libpacketizer_mpegvideo_plugin.dylib', + 'libpacketizer_vc1_plugin.dylib', + 'libi420_rgb_sse2_plugin.dylib', + 'libi420_yuy2_sse2_plugin.dylib', + 'libi422_yuy2_sse2_plugin.dylib', + 'libdecomp_plugin.dylib', + #'libstream_filter_rar_plugin.dylib', + 'librecord_plugin.dylib', #'libvisual_plugin.dylib', ] From 07919370321815813765e619975937ca48d2e2de Mon Sep 17 00:00:00 2001 From: Dominik Schmidt Date: Wed, 9 Dec 2015 12:31:35 +0100 Subject: [PATCH 06/13] Fixup last commit --- admin/mac/macdeploy.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/mac/macdeploy.py b/admin/mac/macdeploy.py index da55e755d..51aa892f2 100755 --- a/admin/mac/macdeploy.py +++ b/admin/mac/macdeploy.py @@ -186,7 +186,7 @@ VLC_PLUGINS=[ ] VLC_SEARCH_PATH=[ - '/usr/local/lib/vlc/plugins/', + '/usr/local/opt/vlc/lib/vlc/plugins/', ] QT_PLUGINS = [ From 2afc578d7ae8b5dfc8ab89428573d507a02c616c Mon Sep 17 00:00:00 2001 From: Dominik Schmidt Date: Thu, 10 Dec 2015 02:45:36 +0100 Subject: [PATCH 07/13] Fix qt5 plugin lookup path --- admin/mac/macdeploy.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/mac/macdeploy.py b/admin/mac/macdeploy.py index 51aa892f2..fe33c6df5 100755 --- a/admin/mac/macdeploy.py +++ b/admin/mac/macdeploy.py @@ -229,7 +229,7 @@ TOMAHAWK_PLUGINS = [ ] QT_PLUGINS_SEARCH_PATH=[ - '/usr/local/Cellar/qt5/5.4.0/plugins', + '/usr/local/opt/qt5/plugins', ] SNORE_PLUGINS_SEARCH_PATH=[ From 92c66d725211d8f5cee8941d5d783f33557a4cdd Mon Sep 17 00:00:00 2001 From: Dominik Schmidt Date: Thu, 10 Dec 2015 02:45:47 +0100 Subject: [PATCH 08/13] Fix snorenotify plugin lookup path --- admin/mac/macdeploy.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/mac/macdeploy.py b/admin/mac/macdeploy.py index fe33c6df5..7f884b9a4 100755 --- a/admin/mac/macdeploy.py +++ b/admin/mac/macdeploy.py @@ -233,7 +233,7 @@ QT_PLUGINS_SEARCH_PATH=[ ] SNORE_PLUGINS_SEARCH_PATH=[ - '/usr/local/Cellar/snorenotify/HEAD/lib/libsnore', + '/usr/local/opt/snorenotify/lib/libsnore', ] class Error(Exception): From 75427a7af22839e673096bd8d539a5d00fed02fd Mon Sep 17 00:00:00 2001 From: Dominik Schmidt Date: Thu, 10 Dec 2015 02:46:20 +0100 Subject: [PATCH 09/13] Fixup libs that were fixed up but aren't correct anymore (because they reference ../lib while we use ../Frameworks/ --- admin/mac/macdeploy.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/mac/macdeploy.py b/admin/mac/macdeploy.py index 7f884b9a4..257a8d963 100755 --- a/admin/mac/macdeploy.py +++ b/admin/mac/macdeploy.py @@ -308,7 +308,7 @@ def GetBrokenLibraries(binary): continue # unix style system library elif re.match(r'Breakpad', line): continue # Manually added by cmake. - elif re.match(r'^\s*@executable_path', line) or re.match(r'^\s*@loader_path', line): + elif re.match(r'^\s*@executable_path', line) or re.match(r'^\s*@loader_path', line) and not re.match(r'^\s*@loader_path/../lib', line): # Potentially already fixed library if '.framework' in line: relative_path = os.path.join(*line.split('/')[3:]) From 66a2d3cb88deab64d17d4cd41634696a70c04023 Mon Sep 17 00:00:00 2001 From: Dominik Schmidt Date: Thu, 10 Dec 2015 22:50:57 +0100 Subject: [PATCH 10/13] Fix snorenotify paths --- admin/mac/macdeploy.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/admin/mac/macdeploy.py b/admin/mac/macdeploy.py index 257a8d963..550aecf39 100755 --- a/admin/mac/macdeploy.py +++ b/admin/mac/macdeploy.py @@ -201,8 +201,8 @@ QT_PLUGINS = [ ] SNORE_PLUGINS = [ -# 'libsnore_backend_growl.so', -# 'libsnore_backend_osxnotificationcenter.so', + 'libsnore_backend_growl.so', + 'libsnore_backend_osxnotificationcenter.so', ] TOMAHAWK_PLUGINS = [ @@ -219,7 +219,7 @@ TOMAHAWK_PLUGINS = [ 'libtomahawk_infoplugin_musixmatch.so', 'libtomahawk_infoplugin_newreleases.so', 'libtomahawk_infoplugin_rovi.so', -# 'libtomahawk_infoplugin_snorenotify.so', + 'libtomahawk_infoplugin_snorenotify.so', 'libtomahawk_infoplugin_spotify.so', 'libtomahawk_viewpage_dashboard.so', # 'libtomahawk_viewpage_networkactivity.so', @@ -233,7 +233,7 @@ QT_PLUGINS_SEARCH_PATH=[ ] SNORE_PLUGINS_SEARCH_PATH=[ - '/usr/local/opt/snorenotify/lib/libsnore', + '/usr/local/opt/snorenotify/lib/plugins/libsnore-qt5', ] class Error(Exception): @@ -576,7 +576,7 @@ for plugin in TOMAHAWK_PLUGINS: FixPlugin(plugin, '../MacOS') for plugin in SNORE_PLUGINS: - FixPlugin(FindSnorePlugin(plugin), '../MacOS/libsnore') + FixPlugin(FindSnorePlugin(plugin), '../lib/plugins/libsnore-qt5') try: FixPlugin('tomahawk_crash_reporter', '../MacOS') From 0223fd59925f0c95d232e53529c230f52e91d515 Mon Sep 17 00:00:00 2001 From: Dominik Schmidt Date: Thu, 10 Dec 2015 22:51:19 +0100 Subject: [PATCH 11/13] Ship hatchet account again. why was this disabled?! --- admin/mac/macdeploy.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/mac/macdeploy.py b/admin/mac/macdeploy.py index 550aecf39..38eea3351 100755 --- a/admin/mac/macdeploy.py +++ b/admin/mac/macdeploy.py @@ -209,7 +209,7 @@ TOMAHAWK_PLUGINS = [ 'libtomahawk_account_xmpp.dylib', 'libtomahawk_account_google.so', 'libtomahawk_account_zeroconf.so', -# 'libtomahawk_account_hatchet.so', + 'libtomahawk_account_hatchet.so', 'libtomahawk_infoplugin_adium.so', 'libtomahawk_infoplugin_charts.so', 'libtomahawk_infoplugin_discogs.so', From a36287c2ed359914cbc8d334a71f0662389b9efa Mon Sep 17 00:00:00 2001 From: Dominik Schmidt Date: Thu, 10 Dec 2015 22:56:49 +0100 Subject: [PATCH 12/13] Fix OSX bundle icon --- src/tomahawk/CMakeLists.txt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/tomahawk/CMakeLists.txt b/src/tomahawk/CMakeLists.txt index e18c798ec..9f32414f7 100644 --- a/src/tomahawk/CMakeLists.txt +++ b/src/tomahawk/CMakeLists.txt @@ -151,7 +151,14 @@ if(APPLE) endif() -ecm_add_app_icon( tomahawkSources ICONS ${TOMAHAWK_ICONS} ) +if(APPLE) + # OUTFILE is currently only supported in my branch, see https://git.reviewboard.kde.org/r/126303/ + # once merged (and released), we can remove this conditional usage + ecm_add_app_icon(tomahawkSources ICONS ${TOMAHAWK_ICONS} OUTFILE "${TOMAHAWK_APPLICATION_NAME}") +else() + ecm_add_app_icon(tomahawkSources ICONS ${TOMAHAWK_ICONS}) +endif() + qt_add_resources( RC_SRCS "../../resources.qrc" ) From c4197374ca31f030383341f242b6a392a6bff72f Mon Sep 17 00:00:00 2001 From: Dominik Schmidt Date: Tue, 22 Dec 2015 04:43:06 +0100 Subject: [PATCH 13/13] Fixed extracmakemodules instead of remove item hack --- src/tomahawk/CMakeLists.txt | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/tomahawk/CMakeLists.txt b/src/tomahawk/CMakeLists.txt index 9f32414f7..897d6a46a 100644 --- a/src/tomahawk/CMakeLists.txt +++ b/src/tomahawk/CMakeLists.txt @@ -146,11 +146,6 @@ IF( BUILD_GUI ) ENDIF() file( GLOB_RECURSE TOMAHAWK_ICONS "${CMAKE_SOURCE_DIR}/data/icons/*-tomahawk-icon.png" ) -if(APPLE) - list(REMOVE_ITEM TOMAHAWK_ICONS "${CMAKE_SOURCE_DIR}/data/icons/64x64-tomahawk-icon.png") -endif() - - if(APPLE) # OUTFILE is currently only supported in my branch, see https://git.reviewboard.kde.org/r/126303/ # once merged (and released), we can remove this conditional usage