Date: Thu, 19 Nov 2015 13:37:41 +0000 (UTC) From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r401948 - in head/audio/qjackctl: . files Message-ID: <201511191337.tAJDbfrT056454@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danfe Date: Thu Nov 19 13:37:41 2015 New Revision: 401948 URL: https://svnweb.freebsd.org/changeset/ports/401948 Log: - Update to version 0.4.1 - Remove INSTALLS_ICONS knob (not to be used for Qt-based programs) - Rephrase COMMENT and TOOLKIT_DESC - Fix a few whitespace issues PR: 204440 Added: head/audio/qjackctl/files/patch-src_qjackctl.cpp (contents, props changed) head/audio/qjackctl/files/patch-src_qjackctlInterfaceComboBox.cpp (contents, props changed) Modified: head/audio/qjackctl/Makefile head/audio/qjackctl/distinfo Modified: head/audio/qjackctl/Makefile ============================================================================== --- head/audio/qjackctl/Makefile Thu Nov 19 13:19:54 2015 (r401947) +++ head/audio/qjackctl/Makefile Thu Nov 19 13:37:41 2015 (r401948) @@ -2,12 +2,12 @@ # $FreeBSD$ PORTNAME= qjackctl -PORTVERSION= 0.4.0 +PORTVERSION= 0.4.1 CATEGORIES= audio MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org -COMMENT= Qt Interface for the JACK Audio Connection Kit +COMMENT= Qt interface for JACK Audio Connection Kit LICENSE= GPLv2 @@ -16,12 +16,12 @@ LIB_DEPENDS= libjack.so:${PORTSDIR}/audi USES= gmake QT_NONSTANDARD= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= ac_cv_path_ac_moc=${MOC} \ +CONFIGURE_ENV= ac_cv_qmake=${QMAKE} \ + 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_path_ac_lupdate=${LUPDATE} + MAKE_JOBS_UNSAFE=yes OPTIONS_DEFINE= ALSA PORTAUDIO @@ -29,19 +29,22 @@ OPTIONS_SINGLE= TOOLKIT OPTIONS_SINGLE_TOOLKIT= QT4 QT5 OPTIONS_DEFAULT= QT4 -ALSA_LIB_DEPENDS= libasound.so:${PORTSDIR}/audio/alsa-lib +TOOLKIT_DESC= Preferred Qt toolkit + +ALSA_LIB_DEPENDS= libasound.so:${PORTSDIR}/audio/alsa-lib ALSA_CONFIGURE_ENABLE= alsa_seq + PORTAUDIO_LIB_DEPENDS= libportaudio.so:${PORTSDIR}/audio/portaudio PORTAUDIO_CONFIGURE_ENABLE= portaudio + QT4_USE= qt4=corelib,dbus,gui,xml \ 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 -TOOLKIT_DESC= Qt toolkit post-configure: @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${QMAKE} -o ${PORTNAME}.mak \ Modified: head/audio/qjackctl/distinfo ============================================================================== --- head/audio/qjackctl/distinfo Thu Nov 19 13:19:54 2015 (r401947) +++ head/audio/qjackctl/distinfo Thu Nov 19 13:37:41 2015 (r401948) @@ -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 Added: head/audio/qjackctl/files/patch-src_qjackctl.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/qjackctl/files/patch-src_qjackctl.cpp Thu Nov 19 13:37:41 2015 (r401948) @@ -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; + } Added: head/audio/qjackctl/files/patch-src_qjackctlInterfaceComboBox.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/qjackctl/files/patch-src_qjackctlInterfaceComboBox.cpp Thu Nov 19 13:37:41 2015 (r401948) @@ -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();
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201511191337.tAJDbfrT056454>