Attachment 202762 Details for Bug 236437 – Patch to update to 1.4.4 (corrected)

[patch] Patch to update to 1.4.4 (corrected)

quimup.patch (text/plain), 3.35 KB, created by Chris Mangin on 2019-03-10 02:00:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Mangin

Created: 2019-03-10 02:00:20 UTC

Size: 3.35 KB

patch

obsolete

>diff -ruN quimup.orig/Makefile quimup/Makefile
>--- quimup.orig/Makefile	2019-03-09 20:57:49.628076000 -0500
>+++ quimup/Makefile	2019-03-09 20:36:24.129542000 -0500
>@@ -1,12 +1,11 @@
> # Created by: Cezary Morga <cm@therek.net>
>-# $FreeBSD$
>+# $FreeBSD: head/audio/quimup/Makefile 490472 2019-01-16 11:13:44Z tijl $
> 
> 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,9 +16,9 @@
> LIB_DEPENDS=	libmpdclient.so:audio/libmpdclient \
> 		libtag.so:audio/taglib
> 
>-WRKSRC=		${WRKDIR}/Quimup_${PORTVERSION}
>+WRKSRC=		${WRKDIR}/Quimup_${PORTVERSION}_source
> 
>-USES=		pkgconfig qmake compiler:c++11-lang qt:5
>+USES=		gl pkgconfig qmake compiler:c++11-lang qt:5
> USE_QT=		core gui network widgets buildtools_build
> USE_GL=		gl
> 
>diff -ruN quimup.orig/distinfo quimup/distinfo
>--- quimup.orig/distinfo	2018-02-02 23:29:04.000000000 -0500
>+++ quimup/distinfo	2019-03-09 19:32:12.199137000 -0500
>@@ -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
>Binary files quimup.orig/files/.patch-src_qm__mpdcom.cpp.swp and quimup/files/.patch-src_qm__mpdcom.cpp.swp differ
>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	2016-07-26 12:51:15.000000000 -0400
>+++ quimup/files/patch-src_qm__mpdcom.cpp	2019-03-09 20:16:17.734839000 -0500
>@@ -1,6 +1,39 @@
>---- src/qm_mpdcom.cpp.orig	2016-02-28 09:52:46 UTC
>-+++ src/qm_mpdcom.cpp
>-@@ -2500,17 +2500,10 @@ bool qm_mpdCom::is_mpd_running()
>+--- src/qm_mpdcom.cpp.orig	2018-12-11 16:49:38.000000000 -0500
>++++ src/qm_mpdcom.cpp	2019-03-09 20:14:42.938535000 -0500
>+@@ -367,16 +367,16 @@
>+     QFile file;
>+     QString line = "";
>+ 
>+-    file.setFileName("/etc/default/mpd");
>++    file.setFileName("/usr/local/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 /usr/local/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 /usr/local/etc/musicpd.conf but it is not readable\n");
>+         return line;
>+     }
>+ 
>+@@ -393,10 +393,10 @@
>+     file.close();
>+ 
>+     if (line.isEmpty())
>+-        printf ("MPD's config : Tried /etc/default/mpd but MPDCONF is not set\n");
>++        printf ("MPD's config : Tried /usr/local/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 /usr/local/etc/musicpd.conf : " + line + "\n";
>+         printf ("%s", msg.toUtf8().constData());
>+     }
>+ 
>+@@ -2710,17 +2710,10 @@
>      struct stat sts;
>      bool b_isrunning = false;
>

Flags:

cmangin: maintainer-approval+

Actions: View | Diff

Attachments on bug 236437: 202760 | 202761 | 202762 | 202763