Please provide information about your system and the version of Clementine used.
Operating System: f38 x86_64
Clementine version: git master
Expected behaviour / actual behaviour
Result: using #7294 and the system qtsingleapplication, clementine runs fine. So, we can definitely use the qtsingleapplication-2.6 that fedora ships; all I tried, I couldn't launch a second instance, even trying to get a race condition very hard. So, it seems that things work.
Minimizing maintenance overhead, we shouldn't be bundling our own version of qtsingleapplication unless we really need to. It seems that any available qtsingleapplication 2.6 will work. It's sadly not clear whether in the process of updating the bundled qtsingleapplication to Qt5, it was considered to unbundle it; would make a lot of sense that the patches were no longer needed, seeing that e995685 removed the whole library's source code, and replaced it with something that seems, aside from a compiler option, identical to upstream.
Here's the relevant diffs:
--- 3rdparty/qtsingleapplication/qtsingleapplication.h 2023-09-12 12:50:57.674697110 +0200
+++ /usr/include/qt5/QtSolutions/qtsingleapplication.h 2023-01-20 01:00:00.000000000 +0100
@@ -1,12 +1,11 @@
/****************************************************************************
**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
**
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of a Qt Solutions component.
+** This file is part of the Qt Solutions component.
**
+** $QT_BEGIN_LICENSE:BSD$
** You may use this file under the terms of the BSD license as follows:
**
** "Redistribution and use in source and binary forms, with or without
@@ -18,10 +17,10 @@
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
-** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-** the names of its contributors may be used to endorse or promote
-** products derived from this software without specific prior written
-** permission.
+** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
+** of its contributors may be used to endorse or promote products derived
+** from this software without specific prior written permission.
+**
**
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -35,6 +34,8 @@
** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
**
+** $QT_END_LICENSE$
+**
****************************************************************************/
#ifndef QTSINGLEAPPLICATION_H
@@ -44,7 +45,7 @@
class QtLocalPeer;
-#if defined(Q_OS_WIN) || defined(Q_OS_WIN32)
+#if defined(Q_OS_WIN)
# if !defined(QT_QTSINGLEAPPLICATION_EXPORT) && !defined(QT_QTSINGLEAPPLICATION_IMPORT)
# define QT_QTSINGLEAPPLICATION_EXPORT
# elif defined(QT_QTSINGLEAPPLICATION_IMPORT)
@@ -67,8 +68,17 @@
public:
QtSingleApplication(int &argc, char **argv, bool GUIenabled = true);
QtSingleApplication(const QString &id, int &argc, char **argv);
+#if QT_VERSION < 0x050000
+ QtSingleApplication(int &argc, char **argv, Type type);
+# if defined(Q_WS_X11)
+ QtSingleApplication(Display* dpy, Qt::HANDLE visual = 0, Qt::HANDLE colormap = 0);
+ QtSingleApplication(Display *dpy, int &argc, char **argv, Qt::HANDLE visual = 0, Qt::HANDLE cmap= 0);
+ QtSingleApplication(Display* dpy, const QString &appId, int argc, char **argv, Qt::HANDLE visual = 0, Qt::HANDLE colormap = 0);
+# endif // Q_WS_X11
+#endif // QT_VERSION < 0x050000
bool isRunning();
+ void setAppId(const QString &id);
QString id() const;
void setActivationWindow(QWidget* aw, bool activateOnMessage = true);
@@ -78,6 +88,8 @@
void initialize(bool dummy = true)
{ isRunning(); Q_UNUSED(dummy) }
+ void removeLockFile();
+
public Q_SLOTS:
bool sendMessage(const QString &message, int timeout = 5000);
void activateWindow();
and
--- 3rdparty/qtsingleapplication/qtsinglecoreapplication.h 2023-09-12 12:50:57.674697110 +0200
+++ /usr/include/qt5/QtSolutions/qtsinglecoreapplication.h 2015-06-29 15:40:53.000000000 +0200
@@ -1,12 +1,11 @@
/****************************************************************************
**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
**
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of a Qt Solutions component.
+** This file is part of the Qt Solutions component.
**
+** $QT_BEGIN_LICENSE:BSD$
** You may use this file under the terms of the BSD license as follows:
**
** "Redistribution and use in source and binary forms, with or without
@@ -18,10 +17,10 @@
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
-** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-** the names of its contributors may be used to endorse or promote
-** products derived from this software without specific prior written
-** permission.
+** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
+** of its contributors may be used to endorse or promote products derived
+** from this software without specific prior written permission.
+**
**
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -35,6 +34,8 @@
** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
**
+** $QT_END_LICENSE$
+**
****************************************************************************/
#ifndef QTSINGLECOREAPPLICATION_H
Before posting
Please follow the steps below and check the boxes with [x] once you did the step.
System information
Please provide information about your system and the version of Clementine used.
Expected behaviour / actual behaviour
Result: using #7294 and the system qtsingleapplication, clementine runs fine. So, we can definitely use the qtsingleapplication-2.6 that fedora ships; all I tried, I couldn't launch a second instance, even trying to get a race condition very hard. So, it seems that things work.
Minimizing maintenance overhead, we shouldn't be bundling our own version of qtsingleapplication unless we really need to. It seems that any available qtsingleapplication 2.6 will work. It's sadly not clear whether in the process of updating the bundled qtsingleapplication to Qt5, it was considered to unbundle it; would make a lot of sense that the patches were no longer needed, seeing that e995685 removed the whole library's source code, and replaced it with something that seems, aside from a compiler option, identical to upstream.
Here's the relevant diffs:
and