Remove remaining sparkle integration
This commit is contained in:
22
.github/workflows/ccpp.yml
vendored
22
.github/workflows/ccpp.yml
vendored
@@ -1396,12 +1396,6 @@ jobs:
|
|||||||
taglib
|
taglib
|
||||||
libplist
|
libplist
|
||||||
gdk-pixbuf
|
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
|
- name: Build libgpod
|
||||||
shell: bash
|
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/opt/icu4c/lib/libicudata.69.dylib strawberry.app/Contents/Frameworks/
|
||||||
cp -v /usr/local/lib/libgpod.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
|
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
|
- name: Deploy
|
||||||
working-directory: build
|
working-directory: build
|
||||||
shell: bash
|
shell: bash
|
||||||
@@ -1497,12 +1486,6 @@ jobs:
|
|||||||
taglib
|
taglib
|
||||||
libplist
|
libplist
|
||||||
gdk-pixbuf
|
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
|
- name: Build libgpod
|
||||||
shell: bash
|
shell: bash
|
||||||
@@ -1548,11 +1531,6 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
mkdir -p strawberry.app/Contents/Frameworks/
|
mkdir -p strawberry.app/Contents/Frameworks/
|
||||||
cp -v /usr/local/lib/libbrotlicommon.1.dylib 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
|
- name: Deploy
|
||||||
working-directory: build
|
working-directory: build
|
||||||
shell: bash
|
shell: bash
|
||||||
|
|||||||
@@ -295,7 +295,6 @@ set(SINGLEAPPLICATION_LIBRARIES singleapplication)
|
|||||||
set(SINGLECOREAPPLICATION_LIBRARIES singlecoreapplication)
|
set(SINGLECOREAPPLICATION_LIBRARIES singlecoreapplication)
|
||||||
|
|
||||||
if(APPLE)
|
if(APPLE)
|
||||||
find_library(SPARKLE Sparkle PATHS "/usr/local/opt/sparkle")
|
|
||||||
add_subdirectory(3rdparty/SPMediaKeyTap)
|
add_subdirectory(3rdparty/SPMediaKeyTap)
|
||||||
set(SPMEDIAKEYTAP_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/SPMediaKeyTap)
|
set(SPMEDIAKEYTAP_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/SPMediaKeyTap)
|
||||||
set(SPMEDIAKEYTAP_LIBRARIES SPMediaKeyTap)
|
set(SPMEDIAKEYTAP_LIBRARIES SPMediaKeyTap)
|
||||||
@@ -303,7 +302,7 @@ if(APPLE)
|
|||||||
add_subdirectory(ext/macdeploycheck)
|
add_subdirectory(ext/macdeploycheck)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(NOT SPARKLE AND (APPLE OR WIN32))
|
if(WIN32)
|
||||||
if(BUILD_WITH_QT6)
|
if(BUILD_WITH_QT6)
|
||||||
pkg_check_modules(QTSPARKLE qtsparkle-qt6)
|
pkg_check_modules(QTSPARKLE qtsparkle-qt6)
|
||||||
else()
|
else()
|
||||||
@@ -408,11 +407,6 @@ optional_component(LIBMTP ON "Devices: MTP support"
|
|||||||
DEPENDS "libmtp" LIBMTP_FOUND
|
DEPENDS "libmtp" LIBMTP_FOUND
|
||||||
)
|
)
|
||||||
|
|
||||||
optional_component(SPARKLE ON "Sparkle integration"
|
|
||||||
DEPENDS "macOS" APPLE
|
|
||||||
DEPENDS "Sparkle" SPARKLE
|
|
||||||
)
|
|
||||||
|
|
||||||
if(BUILD_WITH_QT6)
|
if(BUILD_WITH_QT6)
|
||||||
optional_component(TRANSLATIONS ON "Translations"
|
optional_component(TRANSLATIONS ON "Translations"
|
||||||
DEPENDS "gettext" GETTEXT_FOUND
|
DEPENDS "gettext" GETTEXT_FOUND
|
||||||
|
|||||||
@@ -1152,10 +1152,6 @@ if(APPLE)
|
|||||||
"-framework ScriptingBridge"
|
"-framework ScriptingBridge"
|
||||||
)
|
)
|
||||||
target_link_libraries(strawberry_lib PRIVATE ${SPMEDIAKEYTAP_LIBRARIES})
|
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()
|
endif()
|
||||||
|
|
||||||
if(WIN32)
|
if(WIN32)
|
||||||
|
|||||||
@@ -16,7 +16,6 @@
|
|||||||
#cmakedefine HAVE_LIBGPOD
|
#cmakedefine HAVE_LIBGPOD
|
||||||
#cmakedefine HAVE_LIBMTP
|
#cmakedefine HAVE_LIBMTP
|
||||||
#cmakedefine HAVE_LIBPULSE
|
#cmakedefine HAVE_LIBPULSE
|
||||||
#cmakedefine HAVE_SPARKLE
|
|
||||||
#cmakedefine HAVE_QTSPARKLE
|
#cmakedefine HAVE_QTSPARKLE
|
||||||
#cmakedefine HAVE_SONGFINGERPRINTING
|
#cmakedefine HAVE_SONGFINGERPRINTING
|
||||||
#cmakedefine HAVE_MUSICBRAINZ
|
#cmakedefine HAVE_MUSICBRAINZ
|
||||||
|
|||||||
Reference in New Issue
Block a user