FreeBSD Bugzilla – Attachment 171210 Details for
Bug 209981
audio/quimup: Update to 1.4.1, take MAINTAINER'ship
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Missed parts of patch
quimup_files.patch (text/plain), 3.04 KB, created by
Chris Mangin
on 2016-06-08 18:04:03 UTC
(
hide
)
Description:
Missed parts of patch
Filename:
MIME Type:
Creator:
Chris Mangin
Created:
2016-06-08 18:04:03 UTC
Size:
3.04 KB
patch
obsolete
>diff -ruN quimup.orig/files/patch-src__qm-config.cpp quimup/files/patch-src__qm-config.cpp >--- quimup.orig/files/patch-src__qm-config.cpp 1969-12-31 19:00:00.000000000 -0500 >+++ quimup/files/patch-src__qm-config.cpp 2016-06-08 13:47:40.862863000 -0400 >@@ -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 -ruN quimup.orig/files/patch-src__qm-mpdcom.cpp quimup/files/patch-src__qm-mpdcom.cpp >--- quimup.orig/files/patch-src__qm-mpdcom.cpp 1969-12-31 19:00:00.000000000 -0500 >+++ quimup/files/patch-src__qm-mpdcom.cpp 2016-06-08 13:47:40.864104000 -0400 >@@ -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 -ruN quimup.orig/files/patch-src_qtlocalpeer.cpp quimup/files/patch-src_qtlocalpeer.cpp >--- quimup.orig/files/patch-src_qtlocalpeer.cpp 2016-01-21 05:09:41.000000000 -0500 >+++ quimup/files/patch-src_qtlocalpeer.cpp 1969-12-31 19:00:00.000000000 -0500 >@@ -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)
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 209981
:
170959
|
170960
|
171041
| 171210