Attachment 171041 Details for Bug 209981 – Updated patch

[patch] Updated patch

quimup2.patch (text/plain), 4.83 KB, created by Chris Mangin on 2016-06-05 12:07:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Mangin

Created: 2016-06-05 12:07:31 UTC

Size: 4.83 KB

patch

obsolete

>diff -ruN quimup.orig/Makefile quimup/Makefile
>--- quimup.orig/Makefile	2016-04-01 09:29:15.000000000 -0400
>+++ quimup/Makefile	2016-06-05 08:02:11.626758000 -0400
>@@ -2,13 +2,13 @@
> # $FreeBSD: head/audio/quimup/Makefile 412344 2016-04-01 13:29:15Z mat $
> 
> PORTNAME=	quimup
>-PORTVERSION=	1.4.0
>+PORTVERSION=	1.4.1
> CATEGORIES=	audio
>-MASTER_SITES=	SF/musicpd/Quimup/${PORTVERSION}
>-DISTNAME=	${PORTNAME}_${PORTVERSION}_src
>+MASTER_SITES=	SF/${PORTNAME}
>+DISTNAME=	${PORTNAME}_${PORTVERSION}_source
> 
>-MAINTAINER=	ports@FreeBSD.org
>-COMMENT=	Qt4 client for MPD (the Music Player Daemon)
>+MAINTAINER=	cmangin@arobas.net
>+COMMENT=	Qt5 client for MPD (the Music Player Daemon)
> 
> LICENSE=	GPLv2+
> 
>@@ -19,11 +19,12 @@
> 
> 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" "quiump" "quiump" \
>+DESKTOP_ENTRIES="Quimup" "MPD client" "quimup" "quimup" \
> 		"Audio;AudioVideo;Qt;" true
> 
> post-patch:
>diff -ruN quimup.orig/distinfo quimup/distinfo
>--- quimup.orig/distinfo	2015-10-10 08:15:58.000000000 -0400
>+++ quimup/distinfo	2016-06-02 14:52:35.362888000 -0400
>@@ -1,2 +1,3 @@
>-SHA256 (quimup_1.4.0_src.tar.gz) = b46f8ff651b9154a43cf90b005c160cbbddcc2fb8c6b17dfdee9b6c4a2e131ea
>-SIZE (quimup_1.4.0_src.tar.gz) = 225621
>+SHA256 (quimup_1.4.1_source.tar.gz) =  dca98b80ce9583937a7f9d1c2ae8c619eecbeea704f30d1111c80312dec3347d
>+SIZE (quimup_1.4.1_source.tar.gz) = 233112
>+
>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-02 14:19:42.131074000 -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-02 14:19:42.131224000 -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)
>diff -ruN quimup.orig/pkg-descr quimup/pkg-descr
>--- quimup.orig/pkg-descr	2013-03-02 10:00:14.000000000 -0500
>+++ quimup/pkg-descr	2016-06-02 12:22:05.303762000 -0400
>@@ -1,5 +1,5 @@
> QUIMUP is a 'graphical' client for the music player daemon (MPD)
>-written in C++ and Qt4.
>+written in C++ and Qt5.
> 
> Features include:
>

Actions: View | Diff

Attachments on bug 209981: 170959 | 170960 | 171041 | 171210