git: ef05a498904a - main - comms/gqrx: Always build with Qt5

The branch main has been updated by martymac:

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

commit ef05a498904a506f6cbdfe33613e7ae7b1acc909
Author:     Ganael LAPLANCHE <martymac@FreeBSD.org>
AuthorDate: 2023-07-24 14:52:39 +0000
Commit:     Ganael LAPLANCHE <martymac@FreeBSD.org>
CommitDate: 2023-07-24 14:58:43 +0000

    comms/gqrx: Always build with Qt5
    
    Gqrx crashes when built with Qt6, e.g. when selecting demodulator:
    
      0  memcpy () at /usr/src/lib/libc/amd64/string/memmove.S:306
      1  0x000000080140edd9 in ?? () from /usr/local/lib/qt6/libQt6Gui.so.6
      2  0x0000000801416193 in QRasterPaintEngine::drawImage(QPointF const&, QImage const&) () from /usr/local/lib/qt6/libQt6Gui.so.6
      3  0x00000000003569ba in ?? ()
      4  0x0000000800b3c555 in QWidget::event(QEvent*) () from /usr/local/lib/qt6/libQt6Widgets.so.6
      5  0x0000000800bcf37b in QFrame::event(QEvent*) () from /usr/local/lib/qt6/libQt6Widgets.so.6
      6  0x0000000800ae943a in QApplicationPrivate::notify_helper(QObject*, QEvent*) () from /usr/local/lib/qt6/libQt6Widgets.so.6
      7  0x0000000800aea526 in QApplication::notify(QObject*, QEvent*) () from /usr/local/lib/qt6/libQt6Widgets.so.6
      8  0x0000000801cd3d43 in QCoreApplication::notifyInternal2(QObject*, QEvent*) () from /usr/local/lib/qt6/libQt6Core.so.6
      9  0x0000000800b2d681 in QWidgetPrivate::drawWidget(QPaintDevice*, QRegion const&, QPoint const&, QFlags<QWidgetPrivate::DrawWidgetFlag>, QPainter*, QWidgetRepaintManager*) () from /usr/local/lib/qt6/libQt6Widgets.so.6
      10 0x0000000800b4d3ae in QWidgetRepaintManager::paintAndFlush() () from /usr/local/lib/qt6/libQt6Widgets.so.6
      11 0x0000000800b4d820 in QWidgetRepaintManager::sync() () from /usr/local/lib/qt6/libQt6Widgets.so.6
      12 0x0000000800b3c784 in QWidget::event(QEvent*) () from /usr/local/lib/qt6/libQt6Widgets.so.6
      13 0x0000000800c76a69 in QMainWindow::event(QEvent*) () from /usr/local/lib/qt6/libQt6Widgets.so.6
      14 0x0000000800ae943a in QApplicationPrivate::notify_helper(QObject*, QEvent*) () from /usr/local/lib/qt6/libQt6Widgets.so.6
      15 0x0000000800aea526 in QApplication::notify(QObject*, QEvent*) () from /usr/local/lib/qt6/libQt6Widgets.so.6
      16 0x0000000801cd3d43 in QCoreApplication::notifyInternal2(QObject*, QEvent*) () from /usr/local/lib/qt6/libQt6Core.so.6
      17 0x0000000801cd4e16 in QCoreApplicationPrivate::sendPostedEvents(QObject*, int, QThreadData*) () from /usr/local/lib/qt6/libQt6Core.so.6
      18 0x0000000801f47578 in ?? () from /usr/local/lib/qt6/libQt6Core.so.6
      19 0x00000008034a7034 in g_main_context_dispatch () from /usr/local/lib/libglib-2.0.so.0
      20 0x00000008034a7373 in ?? () from /usr/local/lib/libglib-2.0.so.0
      21 0x00000008034a7418 in g_main_context_iteration () from /usr/local/lib/libglib-2.0.so.0
      22 0x0000000801f46f89 in QEventDispatcherGlib::processEvents(QFlags<QEventLoop::ProcessEventsFlag>) () from /usr/local/lib/qt6/libQt6Core.so.6
      23 0x0000000801cdd407 in QEventLoop::exec(QFlags<QEventLoop::ProcessEventsFlag>) () from /usr/local/lib/qt6/libQt6Core.so.6
      24 0x0000000801cd4491 in QCoreApplication::exec() () from /usr/local/lib/qt6/libQt6Core.so.6
    
    This patch avoids Qt6 detection. We will switch to Qt6 later, following
    comms/gnuradio dependency (that still depends on Qt5).
    
    PR:     272543
    Reported by:    trasz
---
 comms/gqrx/Makefile                   |  2 +-
 comms/gqrx/files/patch-CMakeLists.txt | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/comms/gqrx/Makefile b/comms/gqrx/Makefile
index 2974b7542287..4368cf73a328 100644
--- a/comms/gqrx/Makefile
+++ b/comms/gqrx/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	gqrx
 PORTVERSION=	2.16
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	comms hamradio
 
diff --git a/comms/gqrx/files/patch-CMakeLists.txt b/comms/gqrx/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..d57ee9ab2b45
--- /dev/null
+++ b/comms/gqrx/files/patch-CMakeLists.txt
@@ -0,0 +1,13 @@
+--- 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)
+