update clementine patch against current git (841982ceec9d30a7ab7324979a0fd5c9c36fd121)

diff --git a/QtSingleApplication.spec b/QtSingleApplication.spec
index c657d79da17c6bde445c7f36bf06b670f34d3814..68e99041068587556c6c35226ae92adddde18726 100644 (file)
--- a/QtSingleApplication.spec
+++ b/QtSingleApplication.spec
@@ -55,7 +55,7 @@ applications that use QtSingleApplication.
 %setup -qc
 %patch0 -p0
 %patch1 -p0
-%patch2 -p4
+%patch2 -p1
 
 # We already disabled bundling this extrenal library.
 # But just to make sure:

diff --git a/clementine.patch b/clementine.patch
index 237b1103bddff51489c11633c4cb56cbe3522005..1201b54e536e03938e8b5ff213b5193b65aae8f0 100644 (file)
--- a/clementine.patch
+++ b/clementine.patch
@@ -5,41 +5,16 @@ https://github.com/clementine-player/Clementine/issues/291#issuecomment-29984507
 qtsingleapplication: "Open With" on the file browser, and passing filenames as arguments in the command line
 Controlling playback with the commandline as well (--pause, --play, etc.)
 
-diff -ur /home/david/qtsingleapplication-2.6_1-opensource/src/qtlocalpeer.cpp qtsingleapplication/qtlocalpeer.cpp
---- /home/david/qtsingleapplication-2.6_1-opensource/src/qtlocalpeer.cpp       2009-12-16 10:43:33.000000000 +0000
-+++ qtsingleapplication/qtlocalpeer.cpp        2010-07-10 16:26:50.000000000 +0100
-@@ -48,6 +48,7 @@
+--- QtSingleApplication-2.6.1/src/qtlocalpeer.cpp~     2015-02-23 00:06:20.000000000 +0200
++++ QtSingleApplication-2.6.1/src/qtlocalpeer.cpp      2015-02-23 00:08:51.179884397 +0200
+@@ -42,6 +42,7 @@
  #include "qtlocalpeer.h"
- #include <QtCore/QCoreApplication>
- #include <QtCore/QTime>
+ #include <QCoreApplication>
+ #include <QTime>
 +#include <QtDebug>
  
  #if defined(Q_OS_WIN)
- #include <QtCore/QLibrary>
-@@ -59,14 +60,12 @@
- #include <time.h>
- #endif
- 
--namespace QtLP_Private {
- #include "qtlockedfile.cpp"
- #if defined(Q_OS_WIN)
- #include "qtlockedfile_win.cpp"
- #else
- #include "qtlockedfile_unix.cpp"
- #endif
--}
- 
- const char* QtLocalPeer::ack = "ack";
- 
-@@ -118,7 +117,7 @@
-     if (lockFile.isLocked())
-         return false;
- 
--    if (!lockFile.lock(QtLP_Private::QtLockedFile::WriteLock, false))
-+    if (!lockFile.lock(QtLockedFile::WriteLock, false))
-         return true;
- 
-     bool res = server->listen(socketName);
+ #include <QLibrary>
 @@ -138,6 +137,11 @@
  
  bool QtLocalPeer::sendMessage(const QString &message, int timeout)
@@ -63,32 +38,22 @@ diff -ur /home/david/qtsingleapplication-2.6_1-opensource/src/qtlocalpeer.cpp qt
      bool res = socket.waitForBytesWritten(timeout);
      res &= socket.waitForReadyRead(timeout);   // wait for ack
      res &= (socket.read(qstrlen(ack)) == ack);
-@@ -195,9 +198,9 @@
+@@ -189,10 +190,10 @@
          delete socket;
          return;
      }
 -    QString message(QString::fromUtf8(uMsg));
      socket->write(ack, qstrlen(ack));
      socket->waitForBytesWritten(1000);
+     socket->waitForDisconnected(1000); // make sure client reads ack
      delete socket;
 -    emit messageReceived(message); //### (might take a long time to return)
 +    emit messageReceived(uMsg); //### (might take a long time to return)
 +    emit messageReceived(QString::fromUtf8(uMsg));
  }
-diff -ur /home/david/qtsingleapplication-2.6_1-opensource/src/qtlocalpeer.h qtsingleapplication/qtlocalpeer.h
---- /home/david/qtsingleapplication-2.6_1-opensource/src/qtlocalpeer.h 2009-12-16 10:43:33.000000000 +0000
-+++ qtsingleapplication/qtlocalpeer.h  2010-07-10 16:26:16.000000000 +0100
-@@ -49,9 +49,7 @@
- #include <QtNetwork/QLocalSocket>
- #include <QtCore/QDir>
- 
--namespace QtLP_Private {
- #include "qtlockedfile.h"
--}
- 
- class QtLocalPeer : public QObject
- {
-@@ -61,11 +59,13 @@
+--- QtSingleApplication-2.6.1/src/qtlocalpeer.h~       2015-02-23 00:12:20.000000000 +0200
++++ QtSingleApplication-2.6.1/src/qtlocalpeer.h        2015-02-23 00:19:44.407242485 +0200
+@@ -55,11 +55,13 @@
      QtLocalPeer(QObject *parent = 0, const QString &appId = QString());
      bool isClient();
      bool sendMessage(const QString &message, int timeout);
@@ -102,17 +67,7 @@ diff -ur /home/david/qtsingleapplication-2.6_1-opensource/src/qtlocalpeer.h qtsi
  
  protected Q_SLOTS:
      void receiveConnection();
-@@ -74,7 +74,7 @@
-     QString id;
-     QString socketName;
-     QLocalServer* server;
--    QtLP_Private::QtLockedFile lockFile;
-+    QtLockedFile lockFile;
- 
- private:
-     static const char* ack;
-diff -ur /home/david/qtsingleapplication-2.6_1-opensource/src/qtlockedfile_win.cpp qtsingleapplication/qtlockedfile_win.cpp
---- /home/david/qtsingleapplication-2.6_1-opensource/src/qtlockedfile_win.cpp  2009-12-16 10:43:33.000000000 +0000
+--- qtsingleapplication-2.6_1-opensource/src/qtlockedfile_win.cpp      2009-12-16 10:43:33.000000000 +0000
 +++ qtsingleapplication/qtlockedfile_win.cpp   2010-07-10 16:26:33.000000000 +0100
 @@ -65,7 +65,7 @@
  
@@ -132,8 +87,7 @@ diff -ur /home/david/qtsingleapplication-2.6_1-opensource/src/qtlockedfile_win.c
                 { mutex = OpenMutexA(SYNCHRONIZE | MUTEX_MODIFY_STATE, FALSE, mname.toLocal8Bit().constData()); } );
          if (!mutex) {
              if (GetLastError() != ERROR_FILE_NOT_FOUND)
-diff -ur /home/david/qtsingleapplication-2.6_1-opensource/src/qtsingleapplication.cpp qtsingleapplication/qtsingleapplication.cpp
---- /home/david/qtsingleapplication-2.6_1-opensource/src/qtsingleapplication.cpp       2009-12-16 10:43:33.000000000 +0000
+--- qtsingleapplication-2.6_1-opensource/src/qtsingleapplication.cpp   2009-12-16 10:43:33.000000000 +0000
 +++ qtsingleapplication/qtsingleapplication.cpp        2010-07-10 16:23:53.000000000 +0100
 @@ -144,6 +144,7 @@
      actWin = 0;
@@ -172,8 +126,7 @@ diff -ur /home/david/qtsingleapplication-2.6_1-opensource/src/qtsingleapplicatio
  }
  
  
-diff -ur /home/david/qtsingleapplication-2.6_1-opensource/src/qtsingleapplication.h qtsingleapplication/qtsingleapplication.h
---- /home/david/qtsingleapplication-2.6_1-opensource/src/qtsingleapplication.h 2009-12-16 10:43:33.000000000 +0000
+--- qtsingleapplication-2.6_1-opensource/src/qtsingleapplication.h     2009-12-16 10:43:33.000000000 +0000
 +++ qtsingleapplication/qtsingleapplication.h  2010-07-10 16:23:53.000000000 +0100
 @@ -91,11 +91,13 @@
  
@@ -189,8 +142,7 @@ diff -ur /home/david/qtsingleapplication-2.6_1-opensource/src/qtsingleapplicatio
  
  
  private:
-diff -ur /home/david/qtsingleapplication-2.6_1-opensource/src/qtsinglecoreapplication.cpp qtsingleapplication/qtsinglecoreapplication.cpp
---- /home/david/qtsingleapplication-2.6_1-opensource/src/qtsinglecoreapplication.cpp   2009-12-16 10:43:33.000000000 +0000
+--- qtsingleapplication-2.6_1-opensource/src/qtsinglecoreapplication.cpp       2009-12-16 10:43:33.000000000 +0000
 +++ qtsingleapplication/qtsinglecoreapplication.cpp    2010-07-10 16:32:33.000000000 +0100
 @@ -81,6 +81,7 @@
  {
@@ -220,8 +172,7 @@ diff -ur /home/david/qtsingleapplication-2.6_1-opensource/src/qtsinglecoreapplic
  
  /*!
      Returns the application identifier. Two processes with the same
-diff -ur /home/david/qtsingleapplication-2.6_1-opensource/src/qtsinglecoreapplication.h qtsingleapplication/qtsinglecoreapplication.h
---- /home/david/qtsingleapplication-2.6_1-opensource/src/qtsinglecoreapplication.h     2009-12-16 10:43:33.000000000 +0000
+--- qtsingleapplication-2.6_1-opensource/src/qtsinglecoreapplication.h 2009-12-16 10:43:33.000000000 +0000
 +++ qtsingleapplication/qtsinglecoreapplication.h      2010-07-10 16:32:33.000000000 +0100
 @@ -62,10 +62,12 @@