diff options
author | Tobias C. Berner <tcberner@FreeBSD.org> | 2020-04-13 12:35:58 +0000 |
---|---|---|
committer | Tobias C. Berner <tcberner@FreeBSD.org> | 2020-04-13 12:35:58 +0000 |
commit | a25eafc3bce88330229459fa94b75b13e47bb6be (patch) | |
tree | 254f2fdb3d4b84249949fca27e32456dc331e5fb /www/qt5-webengine/files/patch-configure.pri | |
parent | devel/cmake: update to 3.17.1 (diff) |
Update Qt5 to 5.14.2
Very big thanks go again to kai@ who provided the www/qt5-webengine upgrade (to 5.14.0).
Notably, video capture support was re-enabled.
Announcement:
https://www.qt.io/blog/qt-5.14-has-released
PR: 244964
Exp-run by: antoine
Notes
Notes:
svn path=/head/; revision=531601
Diffstat (limited to 'www/qt5-webengine/files/patch-configure.pri')
-rw-r--r-- | www/qt5-webengine/files/patch-configure.pri | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/www/qt5-webengine/files/patch-configure.pri b/www/qt5-webengine/files/patch-configure.pri new file mode 100644 index 000000000000..8d0718d1389e --- /dev/null +++ b/www/qt5-webengine/files/patch-configure.pri @@ -0,0 +1,30 @@ +--- configure.pri.orig 2019-12-03 07:18:02 UTC ++++ configure.pri +@@ -114,7 +114,7 @@ defineTest(qtwebengine_platformError) { + defineTest(qtConfTest_detectPlatform) { + QT_FOR_CONFIG += gui-private + +- !linux:!win32:!macos { ++ !linux:!win32:!macos:!unix: { + qtwebengine_platformError("Unknown platform. Qt WebEngine only supports Linux, Windows, and macOS.") + } else { + linux:qtwebengine_isLinuxPlatformSupported() { +@@ -126,6 +126,9 @@ defineTest(qtConfTest_detectPlatform) { + macos:qtwebengine_isMacOsPlatformSupported() { + $${1}.platform = "macos" + } ++ unix:qtwebengine_isLinuxPlatformSupported() { ++ $${1}.platform = "linux" ++ } + } + + !isEmpty(platformError) { +@@ -163,7 +166,7 @@ defineTest(qtConfTest_detectNinja) { + !isEmpty(ninja) { + qtLog("Found ninja from path: $$ninja") + qtRunLoggedCommand("$$ninja --version", version)|return(false) +- contains(version, "1.[7-9].*"): return(true) ++ contains(version, "1\.([7-9]|1[0-9])\..*"): return(true) + qtLog("Ninja version too old") + } + qtLog("Building own ninja") |