diff options
| author | TomZ <tomz@freedommail.ch> | 2020-04-23 00:21:31 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2020-05-26 22:32:56 +0200 |
| commit | 8d1ab36a56b4fda3f89c81816cb25729ba95176d (patch) | |
| tree | 6f79d30d005eb1973c6bf1f1fda6ba43e6adbd82 /gnu/packages/patches/qtbase-use-TZDIR.patch | |
| parent | 9d3965edca29f80667374da45214cc6f22a85be4 (diff) | |
| download | guix-8d1ab36a56b4fda3f89c81816cb25729ba95176d.tar.gz | |
gnu: Qt: Update to 5.14.2.
* gnu/packages/qt.scm (qtsvg, qtimageformats, qtx11extras, qtxmlpatterns, qtconnectivity, qtwebsockets, qtsensors, qtmultimedia, qtserialport, qtserialbus, qtwebchannel, qtwebview, qtlocation, qttools, qtscript, qtquickcontrols, qtquickcontrols2, qtgraphicaleffects, qtgamepad, qtscxml, qtpurchasing, qtcharts, qtdatavis3d, qtnetworkauth, qtspeech, qtwebengine): Update to 5.14.2. (qtcanvas3d): Remove variable. Upstream deprecated it. (qtbase)[source](patches): Remove qtbase-QTBUG-81715.patch. [arguments]: Drop X11lib substitution: patched dir no longer exists. (qtwayland)[arguments]: Disable two tests, and add phase to prevent fatal DBus warnings. (qtwebglplugin)[inputs]: Add ZLIB. (qtremoteobjects): Disable some tests that fail due to missing network. (qtdeclarative)[native-inputs]: Add VULKAN-HEADERS. (qtwebengine)[source](snippet): Adjust list of preserved files. [inputs]: Add VULKAN-HEADERS. * gnu/packages/patches/qtbase-QTBUG-81715.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. Co-authored-by: Marius Bakke <mbakke@fastmail.com>
Diffstat (limited to 'gnu/packages/patches/qtbase-use-TZDIR.patch')
| -rw-r--r-- | gnu/packages/patches/qtbase-use-TZDIR.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gnu/packages/patches/qtbase-use-TZDIR.patch b/gnu/packages/patches/qtbase-use-TZDIR.patch index 11c737d844..b6c377b133 100644 --- a/gnu/packages/patches/qtbase-use-TZDIR.patch +++ b/gnu/packages/patches/qtbase-use-TZDIR.patch @@ -4,8 +4,8 @@ important to be able to update it fast. Based on a patch fron NixOS. =================================================================== ---- qtbase-opensource-src-5.9.4.orig/src/corelib/tools/qtimezoneprivate_tz.cpp -+++ qtbase-opensource-src-5.9.4/src/corelib/tools/qtimezoneprivate_tz.cpp +--- qtbase-opensource-src-5.14.2.orig/src/corelib/time/qtimezoneprivate_tz.cpp ++++ qtbase-opensource-src-5.15.2/src/corelib/time/qtimezoneprivate_tz.cpp @@ -70,7 +70,11 @@ // Parse zone.tab table, assume lists all installed zones, if not will need to read directories static QTzTimeZoneHash loadTzTimeZones() |