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
Frederik Rietdijk
e48db707e4
Merge master into staging-next
2021-01-02 08:49:09 +01:00
Thomas Tuegel
54fff8407b
qt512.qtwebengine: update darwin patches
2021-01-01 07:58:34 -06:00
Thomas Tuegel
a61f20e418
qt512: fix build on darwin
2021-01-01 05:32:19 -06:00
Frederik Rietdijk
e823016e66
Merge master into staging-next
2020-12-31 13:29:32 +01:00
Doron Behar
6d13b4c5ec
qt5: Update comment regarding updating srcs.nix
2020-12-28 19:52:06 +02:00
Thomas Tuegel
3db04334e3
Revert "fetch-kde-qt.sh: get hashes from metadata"
...
This reverts commit 4b7d9dc868
.
The KDE project has changed their source index pages so that the links to
package metadata files are generated by JavaScript after the page loads. As a
result, wget is no longer able to recursively fetch the package metadata
automatically.
2020-12-26 05:24:25 -06: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
Will Dietz
77a6a364b8
qt-5: 5.12.6 -> 5.12.7
...
https://www.qt.io/blog/qt-5.12.7-released
2020-02-02 11:04:43 -06:00
Sébastien Lavoie
f27b686ed6
qt5.qtbase: fix darwin patches for 5.12.6 ( #74911 )
...
qtbase was updated to 5.12.6 in https://github.com/NixOS/nixpkgs/pull/73562 ,
but the patch for macOS wasn't updated, causing the build to fail.
2019-12-03 16:53:31 -05: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
Will Dietz
cc4ff0904f
qt5: 5.12.5 -> 5.12.6
...
https://www.qt.io/blog/qt-5.12.6-released
2019-11-24 09:56:30 +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
792d6a91ab
qt5: fix header_module variable typo
2019-10-07 19:25:11 -05: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
Will Dietz
f6e8dd8bad
qt5: revert mac qtbase patch to include recent change
2019-10-07 19:24:07 -05:00
Will Dietz
35b13614b5
qt5: regen patches for 5.12.5 (conflicts/attention needed: mkspecs-mac, replace-libdir)
2019-10-07 19:22:52 -05:00
Will Dietz
b3594de31f
qt5: 5.12.4 -> 5.12.5
2019-10-07 19:21:47 -05:00
Thomas Tuegel
6f66afe069
qtbase: Disable QAppleTestLogger on Darwin
2019-10-01 05:33:06 -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
333ef0d821
qtbase-mac.patch: Re-enable QAppleTestLogger
2019-09-19 10:46:07 -05: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