From owner-svn-ports-all@freebsd.org Sat Apr 4 17:27:57 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id F0D6027B044; Sat, 4 Apr 2020 17:27:56 +0000 (UTC) (envelope-from tcberner@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48vkK71Dbrz4dG5; Sat, 4 Apr 2020 17:27:55 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 30CF624E2A; Sat, 4 Apr 2020 17:27:46 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 034HRj84019781; Sat, 4 Apr 2020 17:27:45 GMT (envelope-from tcberner@FreeBSD.org) Received: (from tcberner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 034HRjOJ019780; Sat, 4 Apr 2020 17:27:45 GMT (envelope-from tcberner@FreeBSD.org) Message-Id: <202004041727.034HRjOJ019780@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tcberner set sender to tcberner@FreeBSD.org using -f From: "Tobias C. Berner" Date: Sat, 4 Apr 2020 17:27:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r530694 - head/comms/wsjtx/files X-SVN-Group: ports-head X-SVN-Commit-Author: tcberner X-SVN-Commit-Paths: head/comms/wsjtx/files X-SVN-Commit-Revision: 530694 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Apr 2020 17:27:57 -0000 Author: tcberner Date: Sat Apr 4 17:27:45 2020 New Revision: 530694 URL: https://svnweb.freebsd.org/changeset/ports/530694 Log: comms/wsjtx: Prepare for Qt5-5.14 PR: 244964 Modified: head/comms/wsjtx/files/wsjtx.patch Modified: head/comms/wsjtx/files/wsjtx.patch ============================================================================== --- head/comms/wsjtx/files/wsjtx.patch Sat Apr 4 17:26:35 2020 (r530693) +++ head/comms/wsjtx/files/wsjtx.patch Sat Apr 4 17:27:45 2020 (r530694) @@ -56,3 +56,21 @@ # build the main application add_executable (wsjtx MACOSX_BUNDLE +--- wsjtx/qt_helpers.hpp.orig 2020-04-04 19:19:54.667679000 +0200 ++++ wsjtx/qt_helpers.hpp 2020-04-04 19:20:37.899375000 +0200 +@@ -78,6 +78,7 @@ + } + }; + ++#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0)) + namespace std + { + // std::hash<> specialization for QString based on the dbj2 +@@ -97,6 +98,7 @@ + } + }; + } ++#endif + + // Register some useful Qt types with QMetaType + Q_DECLARE_METATYPE (QHostAddress);