Attachment 162979 Details for Bug 204440 – audio_qjackctl.diff

[patch] audio_qjackctl.diff

audio_qjackctl.diff (text/plain), 3.38 KB, created by tkato432 on 2015-11-10 18:31:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2015-11-10 18:31:35 UTC

Size: 3.38 KB

patch

obsolete

>diff -urN /usr/ports/audio/qjackctl/Makefile audio/qjackctl/Makefile
>--- /usr/ports/audio/qjackctl/Makefile	2015-10-10 09:11:54.649809000 +0900
>+++ audio/qjackctl/Makefile	2015-11-11 00:00:00.000000000 +0900
>@@ -2,7 +2,7 @@
> # $FreeBSD: head/audio/qjackctl/Makefile 398962 2015-10-09 21:44:27Z marino $
> 
> PORTNAME=	qjackctl
>-PORTVERSION=	0.4.0
>+PORTVERSION=	0.4.1
> CATEGORIES=	audio
> MASTER_SITES=	SF
> 
>@@ -18,10 +18,9 @@
> GNU_CONFIGURE=	yes
> CONFIGURE_ENV=	ac_cv_path_ac_moc=${MOC} \
> 		ac_cv_path_ac_uic=${UIC} \
>-		ac_cv_path_ac_qmake=${QMAKE} \
> 		ac_cv_path_ac_lupdate=${LUPDATE} \
>-		ac_cv_path_ac_lrelease=${LRELEASE}
>-INSTALLS_ICONS=	yes
>+		ac_cv_path_ac_lrelease=${LRELEASE} \
>+		ac_cv_qmake=${QMAKE}
> MAKE_JOBS_UNSAFE=yes
> 
> OPTIONS_DEFINE=		ALSA PORTAUDIO
>@@ -37,7 +36,7 @@
> 			qt4=linguisttools_build \
> 			qt4=moc_build,qmake_build,rcc_build,uic_build
> QT4_CONFIGURE_ENABLE=	qt4
>-QT5_USE=		qt5=core,dbus,gui,widgets,xml \
>+QT5_USE=		qt5=core,dbus,gui,widgets,x11extras,xml \
> 			qt5=buildtools_build,linguisttools_build,qmake_build
> QT5_CXXFLAGS=		-fPIC
> QT5_CONFIGURE_ENABLE=	qt5
>diff -urN /usr/ports/audio/qjackctl/distinfo audio/qjackctl/distinfo
>--- /usr/ports/audio/qjackctl/distinfo	2015-10-10 09:11:54.650839000 +0900
>+++ audio/qjackctl/distinfo	2015-11-11 00:00:00.000000000 +0900
>@@ -1,2 +1,2 @@
>-SHA256 (qjackctl-0.4.0.tar.gz) = 5b651cc5bd85986bcb36b32943e091c931ba229d58732c1724a200e03762485a
>-SIZE (qjackctl-0.4.0.tar.gz) = 500534
>+SHA256 (qjackctl-0.4.1.tar.gz) = 98024e1ea9f55ac16c290feda051d6494b2261e83f6a918f0fa583b509e2bfd1
>+SIZE (qjackctl-0.4.1.tar.gz) = 824293
>diff -urN /usr/ports/audio/qjackctl/files/patch-src__qjackctl.cpp audio/qjackctl/files/patch-src__qjackctl.cpp
>--- /usr/ports/audio/qjackctl/files/patch-src__qjackctl.cpp	1970-01-01 09:00:00.000000000 +0900
>+++ audio/qjackctl/files/patch-src__qjackctl.cpp	2015-11-11 00:00:00.000000000 +0900
>@@ -0,0 +1,22 @@
>+--- src/qjackctl.cpp.orig	2015-10-28 15:24:52 UTC
>++++ src/qjackctl.cpp
>+@@ -30,6 +30,10 @@
>+ 
>+ #include <QSessionManager>
>+ 
>++#ifdef HAVE_UNISTD_H
>++#include <unistd.h>
>++#endif
>++
>+ #if QT_VERSION < 0x040500
>+ namespace Qt {
>+ const WindowFlags WindowCloseButtonHint = WindowFlags(0x08000000);
>+@@ -216,7 +220,7 @@ public:
>+ 			sUnique += sServerName;
>+ 		}
>+ 		char szHostName[255];
>+-		if (::gethostname(szHostName, sizeof(szHostName)) == 0) {
>++		if (gethostname(szHostName, sizeof(szHostName)) == 0) {
>+ 			sUnique += '@';
>+ 			sUnique += szHostName;
>+ 		}
>diff -urN /usr/ports/audio/qjackctl/files/patch-src__qjackctlInterfaceComboBox.cpp audio/qjackctl/files/patch-src__qjackctlInterfaceComboBox.cpp
>--- /usr/ports/audio/qjackctl/files/patch-src__qjackctlInterfaceComboBox.cpp	1970-01-01 09:00:00.000000000 +0900
>+++ audio/qjackctl/files/patch-src__qjackctlInterfaceComboBox.cpp	2015-11-11 00:00:00.000000000 +0900
>@@ -0,0 +1,19 @@
>+--- src/qjackctlInterfaceComboBox.cpp.orig	2015-10-28 15:24:52 UTC
>++++ src/qjackctlInterfaceComboBox.cpp
>+@@ -191,9 +191,16 @@ private:
>+ 
>+ 			// Fill HostApi info...
>+ 			const PaHostApiIndex iNumHostApi = Pa_GetHostApiCount();
>++#ifdef __clang__
>++			QString *hostNames = new QString[iNumHostApi];
>++#else
>+ 			QString hostNames[iNumHostApi];
>++#endif
>+ 			for (PaHostApiIndex i = 0; i < iNumHostApi; ++i)
>+ 				hostNames[i] = QString(Pa_GetHostApiInfo(i)->name);
>++#ifdef __clang__
>++			delete [] hostNames;
>++#endif
>+ 
>+ 			// Fill device info...
>+ 			const PaDeviceIndex iNumDevice = Pa_GetDeviceCount();

Actions: View | Diff

Attachments on bug 204440: 162979