Funkwhale/strawberry-audio-player-windows-mac-linux
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Require KDSingleApplication 1.1.0

Browse Source
This commit is contained in:
Jonas Kvinge 2023-12-26 20:47:11 +01:00
parent 22169bda0d
commit a35fa5b158
5 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.github/workflows/build.yml vendored
View File

@ -101,6 +101,12 @@ jobs:
- name: Install tagparser - name: Install tagparser
if: matrix.opensuse_version == 'tumbleweed' if: matrix.opensuse_version == 'tumbleweed'
run: zypper -n --gpg-auto-import-keys in tagparser-devel run: zypper -n --gpg-auto-import-keys in tagparser-devel
- name: Install kdsingleapplication-devel
if: matrix.opensuse_version == 'tumbleweed' && matrix.qt_version == '5'
run: zypper -n --gpg-auto-import-keys in kdsingleapplication-devel
- name: Install kdsingleapplication-qt6-devel
if: matrix.opensuse_version == 'tumbleweed' && matrix.qt_version == '6'
run: zypper -n --gpg-auto-import-keys in kdsingleapplication-qt6-devel
- name: Checkout - name: Checkout
uses: actions/checkout@v4 uses: actions/checkout@v4
with: with:
@ -217,6 +223,7 @@ jobs:
desktop-file-utils desktop-file-utils
libappstream-glib libappstream-glib
hicolor-icon-theme hicolor-icon-theme
kdsingleapplication-qt6-devel
- name: Checkout - name: Checkout
uses: actions/checkout@v4 uses: actions/checkout@v4
with: with:

2
3rdparty/kdsingleapplication/KDSingleApplication vendored

@ -1 +1 @@
Subproject commit ffce501f4533bb8c19e9a89d712077acecd9c78d Subproject commit cb0c664b40d3b31bad30aa3521eff603162ed0bd

7
CMakeLists.txt
View File

@ -305,18 +305,13 @@ if(QT_VERSION_MAJOR EQUAL 5)
else() else()
set(KDSINGLEAPPLICATION_NAME "KDSingleApplication-qt${QT_VERSION_MAJOR}") set(KDSINGLEAPPLICATION_NAME "KDSingleApplication-qt${QT_VERSION_MAJOR}")
endif() endif()
find_package(${KDSINGLEAPPLICATION_NAME}) find_package(${KDSINGLEAPPLICATION_NAME} 1.1.0)
if(TARGET KDAB::kdsingleapplication) if(TARGET KDAB::kdsingleapplication)
if(QT_VERSION_MAJOR EQUAL 5) if(QT_VERSION_MAJOR EQUAL 5)
set(KDSINGLEAPPLICATION_VERSION "${KDSingleApplication_VERSION}") set(KDSINGLEAPPLICATION_VERSION "${KDSingleApplication_VERSION}")
elseif(QT_VERSION_MAJOR EQUAL 6) elseif(QT_VERSION_MAJOR EQUAL 6)
set(KDSINGLEAPPLICATION_VERSION "${KDSingleApplication-qt6_VERSION}") set(KDSINGLEAPPLICATION_VERSION "${KDSingleApplication-qt6_VERSION}")
endif() endif()
if(KDSINGLEAPPLICATION_VERSION VERSION_GREATER_EQUAL 1.0.95)
set(HAVE_KDSINGLEAPPLICATION_OPTIONS ON)
else()
set(HAVE_KDSINGLEAPPLICATION_OPTIONS OFF)
endif()
message(STATUS "Using system KDSingleApplication (Version ${KDSINGLEAPPLICATION_VERSION})") message(STATUS "Using system KDSingleApplication (Version ${KDSINGLEAPPLICATION_VERSION})")
set(SINGLEAPPLICATION_LIBRARIES KDAB::kdsingleapplication) set(SINGLEAPPLICATION_LIBRARIES KDAB::kdsingleapplication)
else() else()

2
src/config.h.in
View File

@ -58,6 +58,4 @@
#cmakedefine HAVE_EBUR128 #cmakedefine HAVE_EBUR128
#cmakedefine HAVE_KDSINGLEAPPLICATION_OPTIONS
#endif // CONFIG_H_IN #endif // CONFIG_H_IN

8
src/main.cpp
View File

@ -156,11 +156,7 @@ int main(int argc, char *argv[]) {
// Only start a core application now, so we can check if there's another instance without requiring an X server. // Only start a core application now, so we can check if there's another instance without requiring an X server.
// This MUST be done before parsing the commandline options so QTextCodec gets the right system locale for filenames. // This MUST be done before parsing the commandline options so QTextCodec gets the right system locale for filenames.
QCoreApplication core_app(argc, argv); QCoreApplication core_app(argc, argv);
#ifdef HAVE_KDSINGLEAPPLICATION_OPTIONS
KDSingleApplication single_app(QCoreApplication::applicationName(), KDSingleApplication::Option::IncludeUsernameInSocketName); KDSingleApplication single_app(QCoreApplication::applicationName(), KDSingleApplication::Option::IncludeUsernameInSocketName);
#else
KDSingleApplication single_app(QCoreApplication::applicationName());
#endif
// Parse commandline options - need to do this before starting the full QApplication, so it works without an X server // Parse commandline options - need to do this before starting the full QApplication, so it works without an X server
if (!options.Parse()) return 1; if (!options.Parse()) return 1;
logging::SetLevels(options.log_levels()); logging::SetLevels(options.log_levels());
@ -197,11 +193,7 @@ int main(int argc, char *argv[]) {
QGuiApplication::setQuitOnLastWindowClosed(false); QGuiApplication::setQuitOnLastWindowClosed(false);
QApplication a(argc, argv); QApplication a(argc, argv);
#ifdef HAVE_KDSINGLEAPPLICATION_OPTIONS
KDSingleApplication single_app(QCoreApplication::applicationName(), KDSingleApplication::Option::IncludeUsernameInSocketName); KDSingleApplication single_app(QCoreApplication::applicationName(), KDSingleApplication::Option::IncludeUsernameInSocketName);
#else
KDSingleApplication single_app(QCoreApplication::applicationName());
#endif
if (!single_app.isPrimaryInstance()) { if (!single_app.isPrimaryInstance()) {
if (options.is_empty()) { if (options.is_empty()) {
qLog(Info) << "Strawberry is already running - activating existing window (2)"; qLog(Info) << "Strawberry is already running - activating existing window (2)";