From owner-svn-ports-all@freebsd.org Mon Mar 18 23:21:29 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 760DD155082D; Mon, 18 Mar 2019 23:21:29 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 1708083731; Mon, 18 Mar 2019 23:21:29 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E68A24BE; Mon, 18 Mar 2019 23:21:28 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x2INLSuv079924; Mon, 18 Mar 2019 23:21:28 GMT (envelope-from swills@FreeBSD.org) Received: (from swills@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x2INLSH5079920; Mon, 18 Mar 2019 23:21:28 GMT (envelope-from swills@FreeBSD.org) Message-Id: <201903182321.x2INLSH5079920@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: swills set sender to swills@FreeBSD.org using -f From: Steve Wills Date: Mon, 18 Mar 2019 23:21:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r496221 - in head/audio/quimup: . files X-SVN-Group: ports-head X-SVN-Commit-Author: swills X-SVN-Commit-Paths: in head/audio/quimup: . files X-SVN-Commit-Revision: 496221 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 1708083731 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_SHORT(-0.98)[-0.977,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Mar 2019 23:21:29 -0000 Author: swills Date: Mon Mar 18 23:21:27 2019 New Revision: 496221 URL: https://svnweb.freebsd.org/changeset/ports/496221 Log: audio/quimup: update to 1.4.4 PR: 236437 Submitted by: Chris (maintainer) Modified: head/audio/quimup/Makefile (contents, props changed) head/audio/quimup/distinfo (contents, props changed) head/audio/quimup/files/patch-src_qm__config.cpp (contents, props changed) head/audio/quimup/files/patch-src_qm__itemlist.h (contents, props changed) head/audio/quimup/files/patch-src_qm__mpdcom.cpp (contents, props changed) Modified: head/audio/quimup/Makefile ============================================================================== --- head/audio/quimup/Makefile Mon Mar 18 22:47:55 2019 (r496220) +++ head/audio/quimup/Makefile Mon Mar 18 23:21:27 2019 (r496221) @@ -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 Modified: head/audio/quimup/distinfo ============================================================================== --- head/audio/quimup/distinfo Mon Mar 18 22:47:55 2019 (r496220) +++ head/audio/quimup/distinfo Mon Mar 18 23:21:27 2019 (r496221) @@ -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 Modified: head/audio/quimup/files/patch-src_qm__config.cpp ============================================================================== --- head/audio/quimup/files/patch-src_qm__config.cpp Mon Mar 18 22:47:55 2019 (r496220) +++ head/audio/quimup/files/patch-src_qm__config.cpp Mon Mar 18 23:21:27 2019 (r496221) @@ -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(); Modified: head/audio/quimup/files/patch-src_qm__itemlist.h ============================================================================== --- head/audio/quimup/files/patch-src_qm__itemlist.h Mon Mar 18 22:47:55 2019 (r496220) +++ head/audio/quimup/files/patch-src_qm__itemlist.h Mon Mar 18 23:21:27 2019 (r496221) @@ -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(); Modified: head/audio/quimup/files/patch-src_qm__mpdcom.cpp ============================================================================== --- head/audio/quimup/files/patch-src_qm__mpdcom.cpp Mon Mar 18 22:47:55 2019 (r496220) +++ head/audio/quimup/files/patch-src_qm__mpdcom.cpp Mon Mar 18 23:21:27 2019 (r496221) @@ -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;