Date: Tue, 15 May 2018 15:10:29 +0000 (UTC) From: Raphael Kubo da Costa <rakuco@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r470023 - head/sysutils/tarsnap-gui/files Message-ID: <201805151510.w4FFATk6011899@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <gperciva@tarsnap.com> +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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201805151510.w4FFATk6011899>