Attachment #170959 for bug #209981




# $FreeBSD: head/audio/quimup/Makefile 412344 2016-04-01 13:29:15Z mat $

PORTNAME=	quimup
PORTVERSION=	1.4.1
CATEGORIES=	audio
MASTER_SITES=	SF/${PORTNAME}
DISTNAME=	${PORTNAME}_${PORTVERSION}_source

MAINTAINER=	ports@FreeBSD.org
COMMENT=	Qt5 client for MPD (the Music Player Daemon)

LICENSE=	GPLv2+



USES=		pkgconfig qmake
USE_QT5=	core gui network widgets buildtools_build
USE_GL=		gl

PLIST_FILES=	bin/quimup \
		share/pixmaps/quimup.png

DESKTOP_ENTRIES="Quimup" "MPD client" "quimup" "quimup" \
		"Audio;AudioVideo;Qt;" true

post-patch:

Lines 1-2 Link Here

(-)quimup/distinfo (-2 / +3 lines)
1	SHA256 (quimup_1.4.0_src.tar.gz) = b46f8ff651b9154a43cf90b005c160cbbddcc2fb8c6b17dfdee9b6c4a2e131ea	1	SHA256 (quimup_1.4.1_source.tar.gz) = dca98b80ce9583937a7f9d1c2ae8c619eecbeea704f30d1111c80312dec3347d
2	SIZE (quimup_1.4.0_src.tar.gz) = 225621	2	SIZE (quimup_1.4.1_source.tar.gz) = 233112
		3




--- 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();




--- 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;
     }
 




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)

Lines 1-5 Link Here

(-)quimup/pkg-descr (-1 / +1 lines)
1	QUIMUP is a 'graphical' client for the music player daemon (MPD)	1	QUIMUP is a 'graphical' client for the music player daemon (MPD)
2	written in C++ and Qt4.	2	written in C++ and Qt5.
3		3
4	Features include:	4	Features include:
5		5

Return to bug 209981

Lines 2-14 Link Here

(-)quimup/Makefile (-5 / +6 lines)
2	# $FreeBSD: head/audio/quimup/Makefile 412344 2016-04-01 13:29:15Z mat $	2	# $FreeBSD: head/audio/quimup/Makefile 412344 2016-04-01 13:29:15Z mat $
3		3
4	PORTNAME= quimup	4	PORTNAME= quimup
5	PORTVERSION= 1.4.0	5	PORTVERSION= 1.4.1
6	CATEGORIES= audio	6	CATEGORIES= audio
7	MASTER_SITES= SF/musicpd/Quimup/${PORTVERSION}	7	MASTER_SITES= SF/${PORTNAME}
8	DISTNAME= ${PORTNAME}_${PORTVERSION}_src	8	DISTNAME= ${PORTNAME}_${PORTVERSION}_source
9		9
10	MAINTAINER= ports@FreeBSD.org	10	MAINTAINER= ports@FreeBSD.org
11	COMMENT= Qt4 client for MPD (the Music Player Daemon)	11	COMMENT= Qt5 client for MPD (the Music Player Daemon)
12		12
13	LICENSE= GPLv2+	13	LICENSE= GPLv2+
14		14
Lines 19-29 Link Here
19		19
20	USES= pkgconfig qmake	20	USES= pkgconfig qmake
21	USE_QT5= core gui network widgets buildtools_build	21	USE_QT5= core gui network widgets buildtools_build
		22	USE_GL= gl
22		23
23	PLIST_FILES= bin/quimup \	24	PLIST_FILES= bin/quimup \
24	share/pixmaps/quimup.png	25	share/pixmaps/quimup.png
25		26
26	DESKTOP_ENTRIES="Quimup" "MPD client" "quiump" "quiump" \	27	DESKTOP_ENTRIES="Quimup" "MPD client" "quimup" "quimup" \
27	"Audio;AudioVideo;Qt;" true	28	"Audio;AudioVideo;Qt;" true
28		29
29	post-patch:	30	post-patch:

Line 0 Link Here

(-)quimup/files/patch-src__qm-config.cpp (+14 lines)
	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();

Line 0 Link Here

(-)quimup/files/patch-src__qm-mpdcom.cpp (+22 lines)
	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

Lines 1-25 Link Here

(-)quimup/files/patch-src_qtlocalpeer.cpp (-25 lines)
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)