Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 10 Oct 2023 10:12:21 GMT
From:      Ganael LAPLANCHE <martymac@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 44f73262b2e3 - main - comms/gqrx: Update to 2.17.2
Message-ID:  <202310101012.39AACL83071163@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by martymac:

URL: https://cgit.FreeBSD.org/ports/commit/?id=44f73262b2e349e9ed454d349a9ddc1c54fa3afb

commit 44f73262b2e349e9ed454d349a9ddc1c54fa3afb
Author:     Ganael LAPLANCHE <martymac@FreeBSD.org>
AuthorDate: 2023-10-10 10:08:14 +0000
Commit:     Ganael LAPLANCHE <martymac@FreeBSD.org>
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)
- 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202310101012.39AACL83071163>