From 74498c3ac923d042c4ffe9d97974f112e99e813f Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Fri, 28 Jan 2022 20:24:13 +0100 Subject: [PATCH] Remove remaining sparkle integration --- .github/workflows/ccpp.yml | 22 ---------------------- CMakeLists.txt | 8 +------- src/CMakeLists.txt | 4 ---- src/config.h.in | 1 - 4 files changed, 1 insertion(+), 34 deletions(-) diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index a5d98ab8c..67be7c439 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -1396,12 +1396,6 @@ jobs: taglib libplist gdk-pixbuf - sparkle - - - name: Link Sparkle - shell: bash - run: | - sudo ln -s /usr/local/Caskroom/sparkle/$(ls /usr/local/Caskroom/sparkle | head -n1) /usr/local/opt/sparkle - name: Build libgpod shell: bash @@ -1446,11 +1440,6 @@ jobs: cp -v /usr/local/opt/icu4c/lib/libicudata.69.dylib strawberry.app/Contents/Frameworks/ cp -v /usr/local/lib/libgpod.dylib strawberry.app/Contents/Frameworks/ install_name_tool -change "@rpath/libgpod.dylib" "@loader_path/../Frameworks/libgpod.dylib" strawberry.app/Contents/MacOS/strawberry - # Sparkle - mkdir -p strawberry.app/Contents/Frameworks/Sparkle.framework/Versions/B - cp -v /usr/local/opt/sparkle/Sparkle.framework/Sparkle strawberry.app/Contents/Frameworks/Sparkle.framework/ - cp -v /usr/local/opt/sparkle/Sparkle.framework/Versions/B/Sparkle strawberry.app/Contents/Frameworks/Sparkle.framework/Versions/B/ - cp -v -R /usr/local/opt/sparkle/Sparkle.framework/Versions/Current strawberry.app/Contents/Frameworks/Sparkle.framework/Versions/ - name: Deploy working-directory: build shell: bash @@ -1497,12 +1486,6 @@ jobs: taglib libplist gdk-pixbuf - sparkle - - - name: Link Sparkle - shell: bash - run: | - sudo ln -s /usr/local/Caskroom/sparkle/$(ls /usr/local/Caskroom/sparkle | head -n1) /usr/local/opt/sparkle - name: Build libgpod shell: bash @@ -1548,11 +1531,6 @@ jobs: run: | mkdir -p strawberry.app/Contents/Frameworks/ cp -v /usr/local/lib/libbrotlicommon.1.dylib strawberry.app/Contents/Frameworks/ - # Sparkle - mkdir -p strawberry.app/Contents/Frameworks/Sparkle.framework/Versions/B - cp -v /usr/local/opt/sparkle/Sparkle.framework/Sparkle strawberry.app/Contents/Frameworks/Sparkle.framework/ - cp -v /usr/local/opt/sparkle/Sparkle.framework/Versions/B/Sparkle strawberry.app/Contents/Frameworks/Sparkle.framework/Versions/B/ - cp -v -R /usr/local/opt/sparkle/Sparkle.framework/Versions/Current strawberry.app/Contents/Frameworks/Sparkle.framework/Versions/ - name: Deploy working-directory: build shell: bash diff --git a/CMakeLists.txt b/CMakeLists.txt index 9d6bebd82..6cace39d0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -295,7 +295,6 @@ set(SINGLEAPPLICATION_LIBRARIES singleapplication) set(SINGLECOREAPPLICATION_LIBRARIES singlecoreapplication) if(APPLE) - find_library(SPARKLE Sparkle PATHS "/usr/local/opt/sparkle") add_subdirectory(3rdparty/SPMediaKeyTap) set(SPMEDIAKEYTAP_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/SPMediaKeyTap) set(SPMEDIAKEYTAP_LIBRARIES SPMediaKeyTap) @@ -303,7 +302,7 @@ if(APPLE) add_subdirectory(ext/macdeploycheck) endif() -if(NOT SPARKLE AND (APPLE OR WIN32)) +if(WIN32) if(BUILD_WITH_QT6) pkg_check_modules(QTSPARKLE qtsparkle-qt6) else() @@ -408,11 +407,6 @@ optional_component(LIBMTP ON "Devices: MTP support" DEPENDS "libmtp" LIBMTP_FOUND ) -optional_component(SPARKLE ON "Sparkle integration" - DEPENDS "macOS" APPLE - DEPENDS "Sparkle" SPARKLE -) - if(BUILD_WITH_QT6) optional_component(TRANSLATIONS ON "Translations" DEPENDS "gettext" GETTEXT_FOUND diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index d1a85043c..c33093cdd 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1152,10 +1152,6 @@ if(APPLE) "-framework ScriptingBridge" ) target_link_libraries(strawberry_lib PRIVATE ${SPMEDIAKEYTAP_LIBRARIES}) - if(HAVE_SPARKLE) - target_include_directories(strawberry_lib SYSTEM PRIVATE ${SPARKLE}/Headers) - target_link_libraries(strawberry_lib PRIVATE ${SPARKLE}) - endif() endif() if(WIN32) diff --git a/src/config.h.in b/src/config.h.in index 08f8a277b..0629fe394 100644 --- a/src/config.h.in +++ b/src/config.h.in @@ -16,7 +16,6 @@ #cmakedefine HAVE_LIBGPOD #cmakedefine HAVE_LIBMTP #cmakedefine HAVE_LIBPULSE -#cmakedefine HAVE_SPARKLE #cmakedefine HAVE_QTSPARKLE #cmakedefine HAVE_SONGFINGERPRINTING #cmakedefine HAVE_MUSICBRAINZ