Skip to content

Commit

Permalink
qt-5: 5.15.0 -> 5.15.2
Browse files Browse the repository at this point in the history
This is a maintenance release of the Qt 5.15 release series. It focuses on
bug and security fixes. The feature that made me update this package was
the broken u2f support in QtWebEngine when used together with
Qutebrowser. It previously (on older Qt versions) used to work but
stopped working with the switch to 5.15.

As the changelog is rather extensive the reader is advised to inspect
[0] to checkout the changes to each of the components of their
interest.

This also fixes a security issue with QtWebEngine based browsers that
could be crashed by visiting a website that invokes certain WebRTC
features [1].

[0] https://wiki.qt.io/Qt_5.15.2_Change_Files
[1] https://bugreports.qt.io/browse/QTBUG-86752
  • Loading branch information
andir authored and Milan committed Dec 11, 2020
1 parent 0d0d05f commit 0263f62
Show file tree
Hide file tree
Showing 3 changed files with 170 additions and 180 deletions.
12 changes: 1 addition & 11 deletions pkgs/development/libraries/qt-5/5.15/default.nix
Expand Up @@ -77,17 +77,7 @@ let
qtdeclarative = [ ./qtdeclarative.patch ];
qtscript = [ ./qtscript.patch ];
qtserialport = [ ./qtserialport.patch ];
qtwebengine = [
# Fix build with bison-3.7: https://code.qt.io/cgit/qt/qtwebengine-chromium.git/commit/?id=1a53f599
(fetchpatch {
name = "qtwebengine-bison-3.7-build.patch";
url = "https://code.qt.io/cgit/qt/qtwebengine-chromium.git/patch/?id=1a53f599";
sha256 = "1nqpyn5fq37q7i9nasag6i14lnz0d7sld5ikqhlm8qwq9d7gbmjy";
stripLen = 1;
extraPrefix = "src/3rdparty/";
})
]
++ optional stdenv.isDarwin ./qtwebengine-darwin-no-platform-check.patch;
qtwebengine = optional stdenv.isDarwin ./qtwebengine-darwin-no-platform-check.patch;
qtwebkit = [ ./qtwebkit.patch ]
++ optionals stdenv.isDarwin [
./qtwebkit-darwin-no-readline.patch
Expand Down
2 changes: 1 addition & 1 deletion pkgs/development/libraries/qt-5/5.15/fetch.sh
@@ -1 +1 @@
WGET_ARGS=( http://download.qt.io/official_releases/qt/5.15/5.15.0/submodules/ )
WGET_ARGS=( http://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/ )

0 comments on commit 0263f62

Please sign in to comment.