Attachment #162979 for bug #204440

View | Details | Raw Unified | Return to bug 204440
Collapse All | Expand All




# $FreeBSD: head/audio/qjackctl/Makefile 398962 2015-10-09 21:44:27Z marino $

PORTNAME=	qjackctl
PORTVERSION=	0.4.1
CATEGORIES=	audio
MASTER_SITES=	SF


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} \
		ac_cv_qmake=${QMAKE}
MAKE_JOBS_UNSAFE=yes

OPTIONS_DEFINE=		ALSA PORTAUDIO

			qt4=linguisttools_build \
			qt4=moc_build,qmake_build,rcc_build,uic_build
QT4_CONFIGURE_ENABLE=	qt4
QT5_USE=		qt5=core,dbus,gui,widgets,x11extras,xml \
			qt5=buildtools_build,linguisttools_build,qmake_build
QT5_CXXFLAGS=		-fPIC
QT5_CONFIGURE_ENABLE=	qt5

Lines 1-2 Link Here

(-)audio/qjackctl/distinfo (-2 / +2 lines)
1	SHA256 (qjackctl-0.4.0.tar.gz) = 5b651cc5bd85986bcb36b32943e091c931ba229d58732c1724a200e03762485a	1	SHA256 (qjackctl-0.4.1.tar.gz) = 98024e1ea9f55ac16c290feda051d6494b2261e83f6a918f0fa583b509e2bfd1
2	SIZE (qjackctl-0.4.0.tar.gz) = 500534	2	SIZE (qjackctl-0.4.1.tar.gz) = 824293




--- 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;
 		}




--- 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();

Return to bug 204440

Lines 2-8 Link Here

(-)audio/qjackctl/Makefile (-5 / +4 lines)
2	# $FreeBSD: head/audio/qjackctl/Makefile 398962 2015-10-09 21:44:27Z marino $	2	# $FreeBSD: head/audio/qjackctl/Makefile 398962 2015-10-09 21:44:27Z marino $
3		3
4	PORTNAME= qjackctl	4	PORTNAME= qjackctl
5	PORTVERSION= 0.4.0	5	PORTVERSION= 0.4.1
6	CATEGORIES= audio	6	CATEGORIES= audio
7	MASTER_SITES= SF	7	MASTER_SITES= SF
8		8
Lines 18-27 Link Here
18	GNU_CONFIGURE= yes	18	GNU_CONFIGURE= yes
19	CONFIGURE_ENV= ac_cv_path_ac_moc=${MOC} \	19	CONFIGURE_ENV= ac_cv_path_ac_moc=${MOC} \
20	ac_cv_path_ac_uic=${UIC} \	20	ac_cv_path_ac_uic=${UIC} \
21	ac_cv_path_ac_qmake=${QMAKE} \
22	ac_cv_path_ac_lupdate=${LUPDATE} \	21	ac_cv_path_ac_lupdate=${LUPDATE} \
23	ac_cv_path_ac_lrelease=${LRELEASE}	22	ac_cv_path_ac_lrelease=${LRELEASE} \
24	INSTALLS_ICONS= yes	23	ac_cv_qmake=${QMAKE}
25	MAKE_JOBS_UNSAFE=yes	24	MAKE_JOBS_UNSAFE=yes
26		25
27	OPTIONS_DEFINE= ALSA PORTAUDIO	26	OPTIONS_DEFINE= ALSA PORTAUDIO
Lines 37-43 Link Here
37	qt4=linguisttools_build \	36	qt4=linguisttools_build \
38	qt4=moc_build,qmake_build,rcc_build,uic_build	37	qt4=moc_build,qmake_build,rcc_build,uic_build
39	QT4_CONFIGURE_ENABLE= qt4	38	QT4_CONFIGURE_ENABLE= qt4
40	QT5_USE= qt5=core,dbus,gui,widgets,xml \	39	QT5_USE= qt5=core,dbus,gui,widgets,x11extras,xml \
41	qt5=buildtools_build,linguisttools_build,qmake_build	40	qt5=buildtools_build,linguisttools_build,qmake_build
42	QT5_CXXFLAGS= -fPIC	41	QT5_CXXFLAGS= -fPIC
43	QT5_CONFIGURE_ENABLE= qt5	42	QT5_CONFIGURE_ENABLE= qt5

Line 0 Link Here

(-)audio/qjackctl/files/patch-src__qjackctl.cpp (+22 lines)
	1	--- src/qjackctl.cpp.orig 2015-10-28 15:24:52 UTC
	2	+++ src/qjackctl.cpp
	3	@@ -30,6 +30,10 @@
	4
	5	#include <QSessionManager>
	6
	7	+#ifdef HAVE_UNISTD_H
	8	+#include <unistd.h>
	9	+#endif
	10	+
	11	#if QT_VERSION < 0x040500
	12	namespace Qt {
	13	const WindowFlags WindowCloseButtonHint = WindowFlags(0x08000000);
	14	@@ -216,7 +220,7 @@ public:
	15	sUnique += sServerName;
	16	}
	17	char szHostName[255];
	18	- if (::gethostname(szHostName, sizeof(szHostName)) == 0) {
	19	+ if (gethostname(szHostName, sizeof(szHostName)) == 0) {
	20	sUnique += '@';
	21	sUnique += szHostName;
	22	}

Line 0 Link Here

(-)audio/qjackctl/files/patch-src__qjackctlInterfaceComboBox.cpp (+19 lines)
	1	--- src/qjackctlInterfaceComboBox.cpp.orig 2015-10-28 15:24:52 UTC
	2	+++ src/qjackctlInterfaceComboBox.cpp
	3	@@ -191,9 +191,16 @@ private:
	4
	5	// Fill HostApi info...
	6	const PaHostApiIndex iNumHostApi = Pa_GetHostApiCount();
	7	+#ifdef __clang__
	8	+ QString *hostNames = new QString[iNumHostApi];
	9	+#else
	10	QString hostNames[iNumHostApi];
	11	+#endif
	12	for (PaHostApiIndex i = 0; i < iNumHostApi; ++i)
	13	hostNames[i] = QString(Pa_GetHostApiInfo(i)->name);
	14	+#ifdef __clang__
	15	+ delete [] hostNames;
	16	+#endif
	17
	18	// Fill device info...
	19	const PaDeviceIndex iNumDevice = Pa_GetDeviceCount();