Commit Graph

61 Commits

Author SHA1 Message Date
Bastian Köcher 96a0d6a810
qtwebkit: Fix build with icu 68 2021-02-28 13:35:55 +01:00
github-actions[bot] 104c56e909
Merge staging-next into staging 2021-02-01 00:47:02 +00:00
Thomas Tuegel f3f4cbfc07
Merge pull request #108687 from B4dM4n/qt512-update
qt512: 5.12.9 -> 5.12.10
2021-01-31 14:16:17 -06:00
github-actions[bot] 1b5da764a7
Merge staging-next into staging 2021-01-27 12:24:09 +00:00
Ben Siraphob 3bbad8b041 treewide: remove inherited stdenv.lib 2021-01-27 12:44:43 +07:00
Thomas Tuegel 7744998f04
qtbase: Set cmakeFlags and NIX_CFLAGS_COMPILE in setupHook 2021-01-25 15:56:05 -06:00
Thomas Tuegel b80ce0aeca
qmake: Select debug or release build
The qmake hook sets its own `CONFIG+=debug` or `CONFIG+=release` depending on
how `qtbase` was built. We no longer rely on using the custom deriver for this
feature.
2021-01-24 09:51:34 -06:00
Ben Siraphob 2f78ee7e81 pkgs/development: stdenv.lib -> lib 2021-01-24 00:16:29 +07:00
Fabian Möller 0392271676
qt512: 5.12.9 -> 5.12.10 2021-01-07 14:05:56 +01:00
Thomas Tuegel 9c04596480 qtlocation: backport upstream patch for recent GCC 2021-01-03 10:00:18 +01:00
Thomas Tuegel a61f20e418
qt512: fix build on darwin 2021-01-01 05:32:19 -06:00
Doron Behar 6d13b4c5ec qt5: Update comment regarding updating srcs.nix 2020-12-28 19:52:06 +02:00
Doron Behar d342045066 qt512: 5.12.7 -> 5.12.9 2020-12-23 19:06:06 +02:00
Frederik Rietdijk 986c2d36da Merge master into staging-next 2020-11-16 09:01:53 +01:00
Andrew Childs f6c54e8f08 qt512.qtbase: patch framework detection to support tbd frameworks 2020-11-12 16:57:19 +09:00
Dmitry Kalinkin ee2501f124
qt5.qtwebengine: don't override `patches` in qtModule
This fixes darwin build.

Fixes: 90db9641 ('qt5.qtwebengine: fix build with bison-3.7')
2020-11-09 21:11:59 -05:00
Fabian Möller f82565f87d
qt5.qtwebkit: fix build with bison-3.7 2020-08-27 11:42:53 +02:00
Ruben Maher 68bf9101d7
qtwebengine: fix build for darwin 2020-08-19 21:57:45 +09:00
Pascal Bach 2cfff96eff qtwebkit: 5.212-alpha-01-26-2018 -> 5.212.0-alpha4 2020-08-07 09:31:52 +02:00
Thomas Tuegel 9cfca08777
Merge pull request #89846 from lelongg/qtserialbus
qt5.qtserialbus: init at 5.12
2020-07-19 14:46:02 -05:00
Gérald Lelong be7a8df1fa qt5.qtserialbus: init at 5.12 2020-06-08 23:25:04 +02:00
Thomas Tuegel 99d2567515
Merge pull request #86317 from xbreak/qt5-pkg-config
qt5: Add missing include path to pkg-config files
2020-05-28 05:46:52 -05:00
Henk Kalkwater 5ecd99b2bd qt5.qtgamepad: init at 5.12.7 2020-05-14 21:56:30 -07:00
xbreak ee5975319b
qt5: Add missing include path to pkg-config files
This is achieved by patching qtbase `qmake/generators/makefile.cpp` to
unconditionally add the missing `-I${includedir}`. The include path is
otherwise conditioned on whether it is already available or not. Since there is
no unified set of system include paths in nix this cause problems as reported
in #52457.
2020-05-12 06:25:28 +00:00
Frederik Rietdijk 92124ed660 Merge master into staging-next 2020-04-03 21:54:40 +02:00
Aleksey Uimanov a01e8b740e qxmledit: init at 0.9.15 2020-03-22 20:01:49 +05:00
volth 4b6bbc1b4e qt512: pick upstream patch for QTBUG-78937 2020-03-12 11:30:08 +01:00
Martin Milata 80650ae4f0 qt5.qtbase: backport cmake macro fix
Backport fix of QT5_MAKE_OUTPUT_FILE CMake macro which causes FreeCAD
build failure when building with qt-5.12.7.

https://bugreports.qt.io/browse/QTBUG-81715
2020-02-20 00:55:57 +01:00
Milan Pässler 2a2d3de78c qt5: remove patch merged in 5.12.6
Patch for CVE-2019-13720 is included since QT 5.12.6, so it is unnecessary now.
2019-11-24 11:54:39 +01:00
Frederik Rietdijk 73b88e17dd Merge staging-next into staging 2019-11-11 12:09:26 +01:00
adisbladis c9774cb6e5
qt512.qtbase: Fix darwin build 2019-11-10 12:47:59 +00:00
Milan Pässler 00ac18cdea qtwebengine: add patch for CVE-2019-13720 2019-11-04 22:50:00 +01:00
Will Dietz d78a084846
qt5.qtbase: fix filename 2019-10-07 19:24:59 -05:00
Will Dietz f43e0983c0
qt512.qtbase: fix new path used in header modules 2019-10-07 19:24:52 -05:00
Thomas Tuegel a2e3bef2e5
Merge pull request #69086 from ttuegel/qt-5.12.4
Qt 5.12.4
2019-09-26 05:24:08 -05:00
worldofpeace dcdee6db60 qtwebengine: fix build with pulseaudio 13.0 2019-09-24 22:32:30 -04:00
Thomas Tuegel 756b46a449
fix-qmake-libtool.sh 2019-09-19 07:39:11 -05:00
Thomas Tuegel 7962f8c78b
qt512.qtbase: Replace libdir unconditionally 2019-09-19 07:39:10 -05:00
Thomas Tuegel ec9e7e4a0c
qt512.qtbase: Refresh patches 2019-09-19 07:39:10 -05:00
Milan Pässler 94af997d40 qt5.12: Add patches for QTBUG-73459 and QTBUG-69077
QT 5.12 introduced a regression, where a QT program wouldn't show its
tray icon, if there was no tray bar during program startup. (QTBUG-73459)

QT 5.12 introduced a regression, where qtwebengine applications would
freeze in some wayland compositors if a surface from the instance was not
visible (for example having a qutebrowser window on another workspace in
sway would freeze all qutebrowser windows).

Both got fixed already in Qt 5.12.4, but according to #57042 and its
sibling issues/PRs it doesn't seem to get fixed in near future for
nixpkgs.
2019-09-15 17:45:58 +02:00
Thomas Tuegel 469d17a3f0
Revert "Revert "qt 5.12.0 -> 5.12.3""
This reverts commit bf39fc17d4.
2019-08-06 14:42:51 -05:00
Thomas Tuegel 421782edb1
Merge pull request #65526 from samueldr/feature/qt-strict-compatible-versions
qt5*: Enforce strict compatible version paths
2019-08-02 15:04:04 -05:00
Samuel Dionne-Riel 6cb99e79ed qt512: Enforce strict compatible version paths 2019-07-30 20:33:22 -04:00
Frederik Rietdijk bf39fc17d4 Revert "qt 5.12.0 -> 5.12.3"
Segmentation faults. See https://github.com/NixOS/nixpkgs/issues/65448

This reverts commit 552803f6f5.
2019-07-28 12:16:29 +02:00
Jos van den Oever 552803f6f5 qt 5.12.0 -> 5.12.3 2019-07-12 14:12:52 +02:00
Thomas Tuegel 56d5963382
Merge pull request #54525 from ttuegel/feature/qt-5/wrap-qt-apps
Wrap Qt applications
2019-07-05 14:38:10 -05:00
Thomas Tuegel f79fd2e826
wrapQtAppsHook: wrap Qt applications for runtime dependencies 2019-07-05 10:41:41 -05:00
Daiderd Jordan cbfbe9ca1e
qt: remove cf-private 2019-07-03 22:20:16 +02:00
Matthew Bauer 79c0e740a7 qttools: patch qmlimportscanner for darwin builds
This needs to be the full path for qtmacdeploy to work. We add
${qt5.qttools.dev}/bin/qmlimportscanner as the default.

Fixes #63093
2019-06-22 22:21:38 -04:00
nyanloutre 895e78c9bc qt5.qtnetworkauth: init 2019-05-20 20:17:59 -04:00