audio/quimup: update to 1.4.4

PR:		236437
Submitted by:	Chris <cmangin@arobas.net> (maintainer)

5 files changed, 49 insertions, 16 deletions

diff --git a/audio/quimup/Makefile b/audio/quimup/Makefile
index 448c45d0325e..8d89b3b7c877 100644
--- a/audio/quimup/Makefile
+++ b/audio/quimup/Makefile
@@ -2,11 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	quimup
-PORTVERSION=	1.4.3
-PORTREVISION=	3
+PORTVERSION=	1.4.4
 CATEGORIES=	audio
 MASTER_SITES=	SF/${PORTNAME}
-DISTNAME=	${PORTNAME}_${PORTVERSION}_source
+DISTNAME=	Quimup_${PORTVERSION}_source
 
 MAINTAINER=	cmangin@arobas.net
 COMMENT=	Qt5 client for MPD (the Music Player Daemon)
@@ -17,12 +16,12 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 LIB_DEPENDS=	libmpdclient.so:audio/libmpdclient \
 		libtag.so:audio/taglib
 
-WRKSRC=		${WRKDIR}/Quimup_${PORTVERSION}
-
-USES=		pkgconfig qmake compiler:c++11-lang qt:5
+USES=		compiler:c++11-lang gl pkgconfig qmake qt:5
 USE_QT=		core gui network widgets buildtools_build
 USE_GL=		gl
 
+WRKSRC=		${WRKDIR}/Quimup_${PORTVERSION}_source
+
 CXXFLAGS+=	-std=c++11
 
 PLIST_FILES=	bin/quimup \
@@ -34,6 +33,7 @@ DESKTOP_ENTRIES="Quimup" "MPD client" "quimup" "quimup" \
 post-patch:
 	@${REINPLACE_CMD} -e \
 		'/^#define get_time/d' ${WRKSRC}/src/qm_playlistview.h
+	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/src/qm_mpdcom.cpp
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/quimup ${STAGEDIR}${PREFIX}/bin
diff --git a/audio/quimup/distinfo b/audio/quimup/distinfo
index 95b865e819ed..eda1e4dbd2e3 100644
--- a/audio/quimup/distinfo
+++ b/audio/quimup/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1517267675
-SHA256 (quimup_1.4.3_source.tar.gz) = dac47b4c0f458e1a020f2c70d4291ad6bcf85041e6a26f1d011d6542aa3fdc33
-SIZE (quimup_1.4.3_source.tar.gz) = 587260
+TIMESTAMP = 1552177932
+SHA256 (Quimup_1.4.4_source.tar.gz) = d87ec8c57a78587bfc4d6230d55f713f7fb5bc2e642676b94dbd31e157dc83fc
+SIZE (Quimup_1.4.4_source.tar.gz) = 240902
diff --git a/audio/quimup/files/patch-src_qm__config.cpp b/audio/quimup/files/patch-src_qm__config.cpp
index e862e10a3a7d..c6ac51d40dc8 100644
--- a/audio/quimup/files/patch-src_qm__config.cpp
+++ b/audio/quimup/files/patch-src_qm__config.cpp
@@ -1,6 +1,6 @@
---- src/qm_config.cpp.orig	2016-02-28 09:52:29 UTC
+--- src/qm_config.cpp.orig	2018-11-28 18:19:33 UTC
 +++ src/qm_config.cpp
-@@ -168,9 +168,9 @@ void qm_config::load_config()
+@@ -172,9 +172,9 @@ void qm_config::load_config()
      version       	    = sts.value("version",			    "0.0" ).toString();  
      // server related values
      quitMPD_onquit    	= sts.value("quitMPD_onquit",		false ).toBool();
@@ -10,5 +10,5 @@
 -    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();
+     start_minimized     = sts.value("start_minimized",		false   ).toBool();
      
-     profile    			= sts.value("profile",				0   ).toInt();
diff --git a/audio/quimup/files/patch-src_qm__itemlist.h b/audio/quimup/files/patch-src_qm__itemlist.h
index 2121f33f37f3..dd286324fdf1 100644
--- a/audio/quimup/files/patch-src_qm__itemlist.h
+++ b/audio/quimup/files/patch-src_qm__itemlist.h
@@ -1,6 +1,6 @@
---- src/qm_itemlist.h.orig	2016-02-28 09:52:29 UTC
+--- src/qm_itemlist.h.orig	2018-12-09 18:43:06 UTC
 +++ src/qm_itemlist.h
-@@ -63,7 +63,7 @@ public:
+@@ -63,7 +63,7 @@ class qm_listitemInfo (public)
      QString sorter;
  
      // Override the < operator for alist.sort();
diff --git a/audio/quimup/files/patch-src_qm__mpdcom.cpp b/audio/quimup/files/patch-src_qm__mpdcom.cpp
index d2630be2ebd3..c3cf55809370 100644
--- a/audio/quimup/files/patch-src_qm__mpdcom.cpp
+++ b/audio/quimup/files/patch-src_qm__mpdcom.cpp
@@ -1,6 +1,39 @@
---- src/qm_mpdcom.cpp.orig	2016-02-28 09:52:46 UTC
+--- src/qm_mpdcom.cpp.orig	2018-12-11 21:49:38 UTC
 +++ src/qm_mpdcom.cpp
-@@ -2500,17 +2500,10 @@ bool qm_mpdCom::is_mpd_running()
+@@ -367,16 +367,16 @@ QString qm_mpdCom::get_from_etcdefaultmpd()
+     QFile file;
+     QString line = "";
+ 
+-    file.setFileName("/etc/default/mpd");
++    file.setFileName("%%PREFIX%%/etc/musicpd.conf");
+     if ( !file.exists() )
+     {
+-        printf ("MPD's config : Tried /etc/default/mpd but it does not exist\n");
++        printf ("MPD's config : Tried %%PREFIX%%/etc/musicpd.conf but it does not exist\n");
+         return line;
+     }
+ 
+     if (!file.open(QIODevice::ReadOnly | QIODevice::Text))
+     {
+-        printf ("MPD's config : Tried /etc/default/mpd but it is not readable\n");
++        printf ("MPD's config : Tried %%PREFIX%%/etc/musicpd.conf but it is not readable\n");
+         return line;
+     }
+ 
+@@ -393,10 +393,10 @@ QString qm_mpdCom::get_from_etcdefaultmpd()
+     file.close();
+ 
+     if (line.isEmpty())
+-        printf ("MPD's config : Tried /etc/default/mpd but MPDCONF is not set\n");
++        printf ("MPD's config : Tried %%PREFIX%%/etc/musicpd.conf but MPDCONF is not set\n");
+     else
+     {
+-        QString msg  = "MPD's config found in /etc/default/mpd : " + line + "\n";
++        QString msg  = "MPD's config found in %%PREFIX%%/etc/musicpd.conf : " + line + "\n";
+         printf ("%s", msg.toUtf8().constData());
+     }
+ 
+@@ -2710,17 +2710,10 @@ bool qm_mpdCom::is_mpd_running()
      struct stat sts;
      bool b_isrunning = false;