From nobody Mon Jul 24 14:58:57 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 4R8jwd4lHSz4p9nK; Mon, 24 Jul 2023 14:58:57 +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 4R8jwd4D2Vz3DyZ; Mon, 24 Jul 2023 14:58:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690210737; 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=VQKFppySxY9y1emvqz2W1CN8NVr9MdCGWs9EQf7s8ok=; b=pvuURI3enR+haf7yfcz++2iyIqJp5OGfZ18eNPSqYuPy37HZINqL+d4h8DwcUFm0xFW2F5 LuEQji8JeeeSvh4gNL/IIeOZKT61rSsSgPuk0WwfrMFryRe8O3MxFAh0hiyKUXMRTAbr/K 5bmKhwlikNd0ODY65FzsyotisNz+9sAhbf/wzvBNGqDc5YqzGTqPMXmhYZRXsrRJpnq0pt iPLBvgJfDrpp6pHHiTg4zz9niB5Tz68sVDtIqVaC1w9RUvwsNyEx5SJmCxmgEUfm7pUl6M 6oIKQcvoDKPLbCpIooJj21HPKZZPVok/YgYZxFnFT7X/44t+nuvt1l/iDwxgYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690210737; 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=VQKFppySxY9y1emvqz2W1CN8NVr9MdCGWs9EQf7s8ok=; b=Wd0OvDlpWfGXew60AeDFZ+D3NW2stJUYRNXkBt+sr32u+J9v+6Lt5cOHJUcPQVtV9KW7eY VuwxGV5HrDLF47hg4Dl66Khc771O/bhOiYPKscKXV2WUIupiME+4nCh2Fp3myp4JPbuY7q iMhbBF54LgZoPHrtj1+Sw0TBApWVt0FiTAe0TV4YU45LcEVQ0c3PdlTlKEOgiAGGKChkuV Juyh99TEmvVvO/um9c3weGSRJnaOLEfAAMlJxKxn5Xg9+A9msF51dCd/NVx1JdmLOnALlF sTseSpaIJTjnVCVAbWtUKVPOwg9BySoDNbyd2+vx7cx98AbeTGj8T2C3pC5Vnw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690210737; a=rsa-sha256; cv=none; b=Cdnp2jVolqfw8qr8fC3o86E0O5adzYrxYIeao+/lV4q5yMlBnxjxFsOKkj+azx9wBaAdc/ +MXufNPhIVTTbsrjTIOq3ZLd7n64e5/JpnHKn4OOBzilF0fSLkpbFxIEXpFybK1bXO/itJ JMuu/M9YnBK8AKWmFzRxD/p1DTd7UxjgWAad6ubg/wVK5aex4UN/HzGediGlq8rN/mQfu0 6Pia/HZOjK6fRcxDAQMSrq+wIwEaG/xXr1Z1hoJhWDVIJovdQZdrHlr28H6e4qTeyxyMUA Q/V0aZ/rPHPtsHmVqk8tqtng5xmJPmZb3f3S90o+Ikj3M4+E0y9Y1QmEp5colQ== 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 4R8jwd3CC2zMgD; Mon, 24 Jul 2023 14:58:57 +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 36OEwvoG097036; Mon, 24 Jul 2023 14:58:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36OEwvat097035; Mon, 24 Jul 2023 14:58:57 GMT (envelope-from git) Date: Mon, 24 Jul 2023 14:58:57 GMT Message-Id: <202307241458.36OEwvat097035@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: ef05a498904a - main - comms/gqrx: Always build with Qt5 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: ef05a498904a506f6cbdfe33613e7ae7b1acc909 Auto-Submitted: auto-generated The branch main has been updated by martymac: URL: https://cgit.FreeBSD.org/ports/commit/?id=ef05a498904a506f6cbdfe33613e7ae7b1acc909 commit ef05a498904a506f6cbdfe33613e7ae7b1acc909 Author: Ganael LAPLANCHE AuthorDate: 2023-07-24 14:52:39 +0000 Commit: Ganael LAPLANCHE 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, 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) () from /usr/local/lib/qt6/libQt6Core.so.6 23 0x0000000801cdd407 in QEventLoop::exec(QFlags) () 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) +