From owner-svn-ports-all@freebsd.org Sat Apr 4 13:35: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 A26BA2ACE48; Sat, 4 Apr 2020 13:35:57 +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 48vd9R2JzPz47rL; Sat, 4 Apr 2020 13:35:54 +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 BF15221BDD; Sat, 4 Apr 2020 13:28:03 +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 034DS3Vj071463; Sat, 4 Apr 2020 13:28:03 GMT (envelope-from tcberner@FreeBSD.org) Received: (from tcberner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 034DS3TV071462; Sat, 4 Apr 2020 13:28:03 GMT (envelope-from tcberner@FreeBSD.org) Message-Id: <202004041328.034DS3TV071462@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 13:28:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r530659 - head/deskutils/syncthingtray/files X-SVN-Group: ports-head X-SVN-Commit-Author: tcberner X-SVN-Commit-Paths: head/deskutils/syncthingtray/files X-SVN-Commit-Revision: 530659 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 13:35:57 -0000 Author: tcberner Date: Sat Apr 4 13:28:03 2020 New Revision: 530659 URL: https://svnweb.freebsd.org/changeset/ports/530659 Log: deskutils/syncthingtray: Prepare for Qt5-5.14 PR: 244964 Added: head/deskutils/syncthingtray/files/patch-qt5-5.14 (contents, props changed) Added: head/deskutils/syncthingtray/files/patch-qt5-5.14 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/deskutils/syncthingtray/files/patch-qt5-5.14 Sat Apr 4 13:28:03 2020 (r530659) @@ -0,0 +1,25 @@ +Fix build with Qt5-5.14 + +Obtained from: + https://github.com/Martchus/syncthingtray/commit/37893f77cbb95b19cd3644dcdea891fed2cdf408 + +--- ../syncthingtray/widgets/settings/settings.cpp.orig 2020-04-04 15:18:02.892012000 +0200 ++++ ../syncthingtray/widgets/settings/settings.cpp 2020-04-04 15:18:31.344229000 +0200 +@@ -33,8 +33,8 @@ + using namespace Data; + using namespace QtUtilities; + ++#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0)) + namespace std { +- + template <> struct hash { + std::size_t operator()(const QString &str) const + { +@@ -42,6 +42,7 @@ + } + }; + } // namespace std ++#endif + + namespace Settings { +