From nobody Tue Oct 10 10:12:21 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S4Wsx5THrz4wWj6; Tue, 10 Oct 2023 10:12:21 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S4Wsx4wlRz3Sw5; Tue, 10 Oct 2023 10:12:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696932741; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zbBsj/1NPqdfAhkZszZZVDLk4NkWxBme1u07cZLske8=; b=HJP7hl9BMqr6H5xEHPOXBworiqNAonK0cxzYOl4xa2BXVnHiV0IYtryKPNvTOTKvSPocrp VUYjbjcoboq94vKtN+ajMUh17M1mA0wb3sfeGC3/35itAH/ABhGikU+aIlSLBJEM2ofVWs BLr1n5cRwAgpSVKLGlGw2gyIANIkiP7y9v01/QxxhJO94EmAhPk3SoskfIfcBeBlkz2uhr BMHC+WlVXngx//UYDceIigo0PpZ71R2jgbyvT9KhdUX/TE9iqyGQ40BOCk5iXBS/0fEEAh +knfoFajrtYXaZHo3bYlgfep3nhXkDkMxmOs7lUEjQYpMTOarjgIttoon5iNRg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696932741; a=rsa-sha256; cv=none; b=tLANd+/2zKk+QTnu4291HQNFmUN39X6+OE/WuWFFAWDYHgQCuj0n4hDsqrNtZ9VoOOznzo xIGOVMivwtow73HK3thZVf2qAN5Tb0eyM48rW1V/nlDXd7TsxvXS64WJAeN+gLx3BKpB3k lOynNOZNZVpemicdHN8BmZOqgH2zzLv0IcaiTxG7PdgVWJZudvZvqu96u80FQfcW4YlWPK ZIxM/I5CsFRz9vzsu2TN2KRFv5/aDdnDwVLtIfAVRPWtEx7fUL16o+cMc7fzaqU9CQx9HQ T1+V+1WEPcUaTUS0KvDabo691AoLoj/+FOtMYt6qv8Mnf4WAkM8E1FuYi6iLIw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696932741; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zbBsj/1NPqdfAhkZszZZVDLk4NkWxBme1u07cZLske8=; b=kk14mDDWpF3iHloAozcPNxb398VhwXzUlSgp2blKP9eft1ig4Kah5qrSKaAuLsI5NDoiKB 0iFhNafKafEhEb5kkK5L1DyT7Y/UmIG5siTv09g+fOu7SE4JEFN5QUkAQyz1dJ/5ICEbnb arwoAEQKu9GT08rc8S6myRHsGlpOBuJP8NccUxJkdW4nFxZ0Ed3ed0lhUoOqfrEHuDTeYf 6yjC7Ad012aMfcLwDacSmGaIwaESscBOypl6pnOGGmKNgJbYEwJyuXrq21fssQqTZT3Qlg BpIIcmfHXbKRQdU9sxNqb3ixwnTOr0Gunbpj73qdcPH9dMcdKhMQlMO9xKBupA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S4Wsx41gfzb0f; Tue, 10 Oct 2023 10:12:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39AACLUd071166; Tue, 10 Oct 2023 10:12:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39AACL83071163; Tue, 10 Oct 2023 10:12:21 GMT (envelope-from git) Date: Tue, 10 Oct 2023 10:12:21 GMT Message-Id: <202310101012.39AACL83071163@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Ganael LAPLANCHE Subject: git: 44f73262b2e3 - main - comms/gqrx: Update to 2.17.2 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: martymac X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 44f73262b2e349e9ed454d349a9ddc1c54fa3afb Auto-Submitted: auto-generated The branch main has been updated by martymac: URL: https://cgit.FreeBSD.org/ports/commit/?id=44f73262b2e349e9ed454d349a9ddc1c54fa3afb commit 44f73262b2e349e9ed454d349a9ddc1c54fa3afb Author: Ganael LAPLANCHE AuthorDate: 2023-10-10 10:08:14 +0000 Commit: Ganael LAPLANCHE CommitDate: 2023-10-10 10:08:14 +0000 comms/gqrx: Update to 2.17.2 and switch to using Qt6, Gqrx being now stable with it --- comms/gqrx/Makefile | 12 ++++++++---- comms/gqrx/distinfo | 6 +++--- comms/gqrx/files/patch-CMakeLists.txt | 13 ------------- 3 files changed, 11 insertions(+), 20 deletions(-) diff --git a/comms/gqrx/Makefile b/comms/gqrx/Makefile index 2472674ef247..bb9f5e3c03fb 100644 --- a/comms/gqrx/Makefile +++ b/comms/gqrx/Makefile @@ -1,7 +1,6 @@ PORTNAME= gqrx -PORTVERSION= 2.16 +PORTVERSION= 2.17.2 DISTVERSIONPREFIX= v -PORTREVISION= 4 PORTEPOCH= 1 CATEGORIES= comms hamradio @@ -32,17 +31,22 @@ LIB_DEPENDS= libgnuradio-runtime.so:comms/gnuradio \ libjack.so:audio/jack \ libportaudio.so:audio/portaudio -USES= cmake compiler:c++11-lang gl pkgconfig qt:5 +USES= cmake compiler:c++11-lang gl pkgconfig qt:6 USE_GITHUB= yes GH_ACCOUNT= gqrx-sdr USE_GL= gl -USE_QT= core gui network svg widgets +USE_QT= base svg # XXX Use Portaudio as Gqrx is invariably linked to it # (auto-detected and used through Gnuradio CMake files) CMAKE_ARGS+= -DLINUX_AUDIO_BACKEND:STRING="Portaudio" +# XXX Work around Gnuradio 3.8 headers (gnuradio/rpcserver_aggregator.h) still +# using std::unary_function (removed with C++17). This breaks when building +# on FreeBSD 14: error: no template named 'unary_function' in namespace 'std' +CXXFLAGS+= -D_LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION + PLIST_FILES= bin/gqrx \ share/applications/dk.gqrx.gqrx.desktop \ man/man1/gqrx.1.gz diff --git a/comms/gqrx/distinfo b/comms/gqrx/distinfo index 252fd8ad2d35..fb41a187f334 100644 --- a/comms/gqrx/distinfo +++ b/comms/gqrx/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1682972773 -SHA256 (gqrx-sdr-gqrx-v2.16_GH0.tar.gz) = eab65f490da22c3f276366f418af37803bd0d51d8d31b1ce7fdd4cac47932456 -SIZE (gqrx-sdr-gqrx-v2.16_GH0.tar.gz) = 3608271 +TIMESTAMP = 1696914008 +SHA256 (gqrx-sdr-gqrx-v2.17.2_GH0.tar.gz) = 8d5f70390d3935278527cc7aa6344d6ec0201bce156851c610e88acd6102c356 +SIZE (gqrx-sdr-gqrx-v2.17.2_GH0.tar.gz) = 3620793 diff --git a/comms/gqrx/files/patch-CMakeLists.txt b/comms/gqrx/files/patch-CMakeLists.txt deleted file mode 100644 index d57ee9ab2b45..000000000000 --- a/comms/gqrx/files/patch-CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ ---- CMakeLists.txt.orig 2023-04-28 17:35:04 UTC -+++ CMakeLists.txt -@@ -121,10 +121,7 @@ else() - endif() - - # 3rd Party Dependency Stuff --find_package(Qt6 QUIET COMPONENTS Core Network Widgets Svg SvgWidgets) --if(NOT Qt6_FOUND) - find_package(Qt5 REQUIRED COMPONENTS Core Network Widgets Svg) --endif() - include(FindPkgConfig) - find_package(Gnuradio-osmosdr REQUIRED) -