View | Details | Raw Unified | Return to bug 209981 | Differences between
and this patch

Collapse All | Expand All

(-)quimup/files/patch-src__qm-config.cpp (+14 lines)
Line 0 Link Here
1
--- src/qm_config.cpp.orig	2016-02-28 04:52:29.000000000 -0500
2
+++ src/qm_config.cpp	2016-06-02 13:28:13.722103000 -0400
3
@@ -168,9 +168,9 @@
4
     version       	    = sts.value("version",			    "0.0" ).toString();  
5
     // server related values
6
     quitMPD_onquit    	= sts.value("quitMPD_onquit",		false ).toBool();
7
-    onquit_mpd_command  = sts.value("onquit_mpd_command",	"mpd --kill").toString();
8
+    onquit_mpd_command  = sts.value("onquit_mpd_command",	"musicpd --kill").toString();
9
     startMPD_onstart    = sts.value("startMPD_onstart",		false  ).toBool();
10
-    onstart_mpd_command = sts.value("onstart_mpd_command",	"mpd"  ).toString();
11
+    onstart_mpd_command = sts.value("onstart_mpd_command",	"musicpd"  ).toString();
12
     auto_connect     	= sts.value("auto_connect",			true   ).toBool();
13
     
14
     profile    			= sts.value("profile",				0   ).toInt();
(-)quimup/files/patch-src__qm-mpdcom.cpp (+22 lines)
Line 0 Link Here
1
--- src/qm_mpdcom.cpp.orig	2016-02-28 04:52:46.000000000 -0500
2
+++ src/qm_mpdcom.cpp	2016-06-02 13:24:56.493027000 -0400
3
@@ -2500,17 +2500,10 @@
4
     struct stat sts;
5
     bool b_isrunning = false;
6
 
7
-    // try pidof
8
-    if (stat("/bin/pidof", &sts) == 0)
9
-    {
10
-        if( system("pidof mpd > /dev/null") == 0)
11
-        b_isrunning = true;
12
-    }
13
-    else
14
     // try pgrep
15
-    if (stat("/usr/bin/pgrep", &sts) == 0)
16
+    if (stat("/bin/pgrep", &sts) == 0)
17
     {
18
-        if( system("pgrep mpd > /dev/null") == 0)
19
+        if( system("pgrep musicpd > /dev/null") == 0)
20
             b_isrunning = true;
21
     }
22
 
(-)quimup/files/patch-src_qtlocalpeer.cpp (-25 lines)
Lines 1-25 Link Here
1
Fix the build with Qt >= 5.5:
2
3
src/qtlocalpeer.cpp:157:17: error: variable has incomplete type 'QDataStream'
4
    QDataStream ds(&socket);
5
                ^
6
/usr/local/include/qt5/QtCore/qglobal.h:570:7: note: forward declaration of 'QDataStream'
7
class QDataStream;
8
      ^
9
src/qtlocalpeer.cpp:177:17: error: variable has incomplete type 'QDataStream'
10
    QDataStream ds(socket);
11
                ^
12
/usr/local/include/qt5/QtCore/qglobal.h:570:7: note: forward declaration of 'QDataStream'
13
class QDataStream;
14
      ^
15
2 errors generated.
16
--- src/qtlocalpeer.cpp.orig	2016-01-21 08:48:24 UTC
17
+++ src/qtlocalpeer.cpp
18
@@ -40,6 +40,7 @@
19
 
20
 #include "qtlocalpeer.h"
21
 #include <QCoreApplication>
22
+#include <QDataStream>
23
 #include <QTime>
24
 
25
 #if defined(Q_OS_WIN)

Return to bug 209981