- Add patches missing in the previous commit

PR:		209981
Submitted by:	cmangin@arobas.net

3 files changed, 36 insertions, 25 deletions

diff --git a/audio/quimup/files/patch-src__qm-config.cpp b/audio/quimup/files/patch-src__qm-config.cpp
new file mode 100644
index 000000000000..50f931ce50d3
--- /dev/null
+++ b/audio/quimup/files/patch-src__qm-config.cpp
@@ -0,0 +1,14 @@
+--- src/qm_config.cpp.orig	2016-02-28 04:52:29.000000000 -0500
++++ src/qm_config.cpp	2016-06-02 13:28:13.722103000 -0400
+@@ -168,9 +168,9 @@
+     version       	    = sts.value("version",			    "0.0" ).toString();  
+     // server related values
+     quitMPD_onquit    	= sts.value("quitMPD_onquit",		false ).toBool();
+-    onquit_mpd_command  = sts.value("onquit_mpd_command",	"mpd --kill").toString();
++    onquit_mpd_command  = sts.value("onquit_mpd_command",	"musicpd --kill").toString();
+     startMPD_onstart    = sts.value("startMPD_onstart",		false  ).toBool();
+-    onstart_mpd_command = sts.value("onstart_mpd_command",	"mpd"  ).toString();
++    onstart_mpd_command = sts.value("onstart_mpd_command",	"musicpd"  ).toString();
+     auto_connect     	= sts.value("auto_connect",			true   ).toBool();
+     
+     profile    			= sts.value("profile",				0   ).toInt();
diff --git a/audio/quimup/files/patch-src__qm-mpdcom.cpp b/audio/quimup/files/patch-src__qm-mpdcom.cpp
new file mode 100644
index 000000000000..0e1f4945d99e
--- /dev/null
+++ b/audio/quimup/files/patch-src__qm-mpdcom.cpp
@@ -0,0 +1,22 @@
+--- src/qm_mpdcom.cpp.orig	2016-02-28 04:52:46.000000000 -0500
++++ src/qm_mpdcom.cpp	2016-06-02 13:24:56.493027000 -0400
+@@ -2500,17 +2500,10 @@
+     struct stat sts;
+     bool b_isrunning = false;
+ 
+-    // try pidof
+-    if (stat("/bin/pidof", &sts) == 0)
+-    {
+-        if( system("pidof mpd > /dev/null") == 0)
+-        b_isrunning = true;
+-    }
+-    else
+     // try pgrep
+-    if (stat("/usr/bin/pgrep", &sts) == 0)
++    if (stat("/bin/pgrep", &sts) == 0)
+     {
+-        if( system("pgrep mpd > /dev/null") == 0)
++        if( system("pgrep musicpd > /dev/null") == 0)
+             b_isrunning = true;
+     }
+ 
diff --git a/audio/quimup/files/patch-src_qtlocalpeer.cpp b/audio/quimup/files/patch-src_qtlocalpeer.cpp
deleted file mode 100644
index 36a55b818e89..000000000000
--- a/audio/quimup/files/patch-src_qtlocalpeer.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-Fix the build with Qt >= 5.5:
-
-src/qtlocalpeer.cpp:157:17: error: variable has incomplete type 'QDataStream'
-    QDataStream ds(&socket);
-                ^
-/usr/local/include/qt5/QtCore/qglobal.h:570:7: note: forward declaration of 'QDataStream'
-class QDataStream;
-      ^
-src/qtlocalpeer.cpp:177:17: error: variable has incomplete type 'QDataStream'
-    QDataStream ds(socket);
-                ^
-/usr/local/include/qt5/QtCore/qglobal.h:570:7: note: forward declaration of 'QDataStream'
-class QDataStream;
-      ^
-2 errors generated.
---- src/qtlocalpeer.cpp.orig	2016-01-21 08:48:24 UTC
-+++ src/qtlocalpeer.cpp
-@@ -40,6 +40,7 @@
- 
- #include "qtlocalpeer.h"
- #include <QCoreApplication>
-+#include <QDataStream>
- #include <QTime>
- 
- #if defined(Q_OS_WIN)