From owner-svn-ports-all@freebsd.org Tue May 15 15:10:30 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 01084EE0543; Tue, 15 May 2018 15:10:30 +0000 (UTC) (envelope-from rakuco@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A624182B4D; Tue, 15 May 2018 15:10:29 +0000 (UTC) (envelope-from rakuco@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 87EA1502F; Tue, 15 May 2018 15:10:29 +0000 (UTC) (envelope-from rakuco@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4FFATUJ011900; Tue, 15 May 2018 15:10:29 GMT (envelope-from rakuco@FreeBSD.org) Received: (from rakuco@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4FFATk6011899; Tue, 15 May 2018 15:10:29 GMT (envelope-from rakuco@FreeBSD.org) Message-Id: <201805151510.w4FFATk6011899@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rakuco set sender to rakuco@FreeBSD.org using -f From: Raphael Kubo da Costa Date: Tue, 15 May 2018 15:10:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r470023 - head/sysutils/tarsnap-gui/files X-SVN-Group: ports-head X-SVN-Commit-Author: rakuco X-SVN-Commit-Paths: head/sysutils/tarsnap-gui/files X-SVN-Commit-Revision: 470023 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.26 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: Tue, 15 May 2018 15:10:30 -0000 Author: rakuco Date: Tue May 15 15:10:29 2018 New Revision: 470023 URL: https://svnweb.freebsd.org/changeset/ports/470023 Log: Add upstream patch to fix `make configure' with Qt 5.10. Without this commit, configuring with Qt 5.10 fails with Project ERROR: Tarsnap-gui requires Qt 5.2 or higher. PR: 228213 Added: head/sysutils/tarsnap-gui/files/ head/sysutils/tarsnap-gui/files/patch-git_f1824def12 (contents, props changed) Added: head/sysutils/tarsnap-gui/files/patch-git_f1824def12 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/tarsnap-gui/files/patch-git_f1824def12 Tue May 15 15:10:29 2018 (r470023) @@ -0,0 +1,32 @@ +From f1824def1277daedcd38df199fc4039be3c1c76c Mon Sep 17 00:00:00 2001 +From: Graham Percival +Date: Tue, 12 Dec 2017 14:07:28 -0800 +Subject: [PATCH] build: require Qt 5.2 without (5.10 < 5.2) bug + +qmake's lessThan() sorts "5.10" as less than "5.2". The newly-added +versionLessThan() would also fix this, but that seems to be only 5.10 or later. +--- + Tarsnap.pro | 14 +++++++++++++- + 1 file changed, 13 insertions(+), 1 deletion(-) + +--- Tarsnap.pro ++++ Tarsnap.pro +@@ -1,5 +1,17 @@ + # Check for at least Qt 5.2 +-lessThan(QT_VERSION, 5.2): error("Tarsnap-gui requires Qt 5.2 or higher.") ++NOTSUPPORTED=0 ++lessThan(QT_MAJOR_VERSION, 6) { ++ lessThan(QT_MAJOR_VERSION, 5) { ++ # Qt 4 or below ++ NOTSUPPORTED=1 ++ } else { ++ lessThan(QT_MINOR_VERSION, 2) { ++ # Qt 5.0 or 5.1 ++ NOTSUPPORTED=1 ++ } ++ } ++} ++greaterThan(NOTSUPPORTED, 0): error("Tarsnap-gui requires Qt 5.2 or higher.") + + QT += core gui network sql widgets + CONFIG += c++11