Sandro Jäckel
d05ff6e0f4
qt514.qtwebkit: Fix patch applying
2020-12-29 19:41:51 +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
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
Milan Pässler
aa81ee843b
qt5.qtwebengine: remove patch upstreamed in 5.12.2
2020-12-12 19:29:31 +01:00
Frederik Rietdijk
a717b55392
Merge staging-next into staging
2020-12-11 13:24:41 +01:00
Dmitry Kalinkin
b583611cec
qt515: fix on darwin after bump to 5.15.2
2020-12-11 04:31:24 +01:00
Andreas Rammhold
0263f626a0
qt-5: 5.15.0 -> 5.15.2
...
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
2020-12-11 04:31:24 +01:00
Doron Behar
983465f13a
qt515.qtwebkit: unbreak 🎉
...
A copy of #96309 essentially - fix the build of it with bison-3.7.
2020-11-21 10:54:43 +02:00
Dmitry Kalinkin
0c74da1342
qt5{14,15}.qtbase: fix on darwin
2020-11-17 10:04:09 -05:00
Frederik Rietdijk
986c2d36da
Merge master into staging-next
2020-11-16 09:01:53 +01:00
Andrew Childs
16075a712c
qt515.qtbase: patch framework detection to support tbd frameworks
2020-11-12 16:57:19 +09:00
Andrew Childs
1f52024720
qt514.qtbase: patch framework detection to support tbd frameworks
2020-11-12 16:57:19 +09: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
2020-11-09 21:11:59 -05:00
Dmitry Kalinkin
aa08b8eb73
qt5.qtwebengine: remove dead conditions for pre 5.12 support
...
This doesn't change the derivation.
2020-11-09 15:36:08 -05:00
Frederik Rietdijk
37d29394ec
Merge staging-next into staging
2020-09-12 10:00:45 +02:00
Thomas Tuegel
b3d72930d8
qtbase: Preserve configuration options on Qt < 5.15
2020-09-07 08:05:38 -05:00
Thomas Tuegel
017e498d02
Revert "qt514: remove"
...
This reverts commit bec5405fc5449f5eb9103249bf2c5dfed9fdcce9.
Qt 5.14 is still supported upstream, so we will not remove it yet.
2020-09-07 08:05:27 -05:00
Thomas Tuegel
01bcfd3579
qtwebkit: mark broken with Qt 5.15
2020-09-07 08:05:24 -05:00
Timothy DeHerrera
2a5f800520
qt514: remove
2020-09-07 08:05:11 -05:00
Timothy DeHerrera
eb919fa712
qt5: 5.14.2 -> 5.15.0
2020-09-07 08:05:06 -05:00
Graham Bennett
8e4e38cdcd
octave: Fix libtool framework link failure on Darwin
...
This fix moves linker flags of the form `-framework foo` from dependency_libs to
inherited_linker_flags, since libtool doesn't understand them. See #96977 for
details.
Fixes #96977
2020-09-06 20:24:14 +01:00
John Ericson
1965a241fc
Merge pull request #61019 from volth/gcc.arch-amd
...
platform.gcc.arch: support for AMD CPUs
2020-09-01 22:31:16 -04:00
Frederik Rietdijk
efb45f7638
Merge master into staging-next
2020-08-28 09:54:31 +02:00
Fabian Möller
f82565f87d
qt5.qtwebkit: fix build with bison-3.7
2020-08-27 11:42:53 +02:00
Chuck
4bac8a7a00
qtbase: Move libtiff dependency from qtbase to qtimageformats
2020-08-27 08:47:47 +02:00
Frederik Rietdijk
081bd762e5
Merge staging-next into staging
2020-08-26 08:43:29 +02:00
Fabian Möller
90db9641cb
qt5.qtwebengine: fix build with bison-3.7 ( #96295 )
2020-08-25 20:13:45 +02:00
Peter Simons
7b527223fd
qtdeclarative: revert "Patch for scrollbar regression"
...
This reverts commit 5530043208https://github.com/NixOS/nixpkgs/issues/96159 .
2020-08-25 12:02:15 +02:00
Florian Klink
40d2968ebf
Merge pull request #94354 from flokli/systemd-246
...
systemd: 245.6 -> 246
2020-08-24 12:42:24 +02:00
Jan Tojnar
91104b5417
Merge branch 'master' into staging-next
2020-08-23 02:00:50 +02:00
Ruben Maher
68bf9101d7
qtwebengine: fix build for darwin
2020-08-19 21:57:45 +09:00
Jamie
4cb5383141
qt: bring back QML import patch in 5.14 ( #95772 )
...
This was missed in the 5.12 -> 5.14 update process.
Resolves #95636
2020-08-19 02:56:19 +02:00
Thomas Tuegel
5530043208
qtdeclarative: Patch for scrollbar regression
2020-08-15 08:36:15 +02:00
Florian Klink
77a9788b08
qt5.qtwebengine: use lib.getLib systemd instead of systemd.lib
...
This will pick the `lib` output if it exists, otherwise default to `out`.
2020-08-13 20:51:40 +02:00
Frederik Rietdijk
f707715136
Merge master into staging-next
2020-08-11 10:26:35 +02:00
Pascal Bach
2cfff96eff
qtwebkit: 5.212-alpha-01-26-2018 -> 5.212.0-alpha4
2020-08-07 09:31:52 +02:00
volth
cf7b63df5b
gcc.arch: refactor, move tables under lib/
2020-08-05 11:18:26 +00:00
volth
463db72e63
platform.gcc.arch: support for AMD CPUs
2020-08-05 02:32:48 +00:00
Milan Pässler
d4c607aa71
qt5: 5.12.7 -> 5.14.2
...
This includes contributions by @ttuegel and @DizFer. Thanks!
2020-07-31 18:50:58 +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
Doron Behar
01d4e2fe33
treewide: use ffmpeg_3 explicitly if not wanted otherwise
...
After making `ffmpeg` point to the latest `ffmpeg_4`, all packages that
used `ffmpeg` without requiring a specific version now use ffmpeg_3
explicitly so they shouldn't change.
2020-06-12 11:55:31 -07: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
Michael Reilly
84cf00f980
treewide: Per RFC45, remove all unquoted URLs
2020-04-10 17:54:53 +01: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
Tom Hall
704b49db97
qttools: Add qtdeclarative to buildInputs
...
qtdeclarative is an optional dependency for some parts of qttools:
without it, the lupdate binary is not able to process qml files for
translatable strings.
2020-02-10 15:27:41 -06: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
Frederik Rietdijk
dce0ca29d9
Merge master into staging-next
2020-01-28 10:46:13 +01:00
Thomas Tuegel
740c780c1d
qt5: remove last vestiges of Qt 5.11
...
A file was left-over after removing Qt 5.11 at its end-of-life.
2020-01-26 16:06:58 -06:00
Anders Kaseorg
3cd8ce3bce
treewide: Fix unsafe concatenation of $LD_LIBRARY_PATH
...
Naive concatenation of $LD_LIBRARY_PATH can result in an empty
colon-delimited segment; this tells glibc to load libraries from the
current directory, which is definitely wrong, and may be a security
vulnerability if the current directory is untrusted. (See #67234 , for
example.) Fix this throughout the tree.
Signed-off-by: Anders Kaseorg <andersk@mit.edu>
2020-01-15 09:47:03 +01:00
Luka Blaskovic
81d778466c
qtwebkit: build with bison3
2020-01-13 21:35:19 +00:00
Frederik Rietdijk
8fff915659
Merge pull request #76488 from jtojnar/more-python-cleanups
...
Another batch of Python 2 clean-ups
2020-01-06 12:00:36 +01:00
Robin Gloster
e9c27ed5f9
treewide: configureFlags is a flat list
2019-12-31 01:34:39 +01:00
Robin Gloster
ab0cfd9e03
treewide: NIX_*_COMPILE -> string
2019-12-31 00:10:18 +01:00
Frederik Rietdijk
6d059becd3
Merge gcc-9 into staging ( #68029 )
2019-12-30 16:38:38 +01:00
Jan Tojnar
7e8293edcb
qt5.qtdeclarative: switch to python 3
2019-12-29 11:21:09 +01:00
Franz Pletz
77b6c3cd06
Merge remote-tracking branch 'origin/master' into gcc-9
2019-12-26 14:17:36 +01:00
Graham Christensen
ef96a4ad78
qt5.qtbase: python2 -> python3
...
The only python reference in qtbase's dev output is a python script
which imports print from __future__ (mkspecs/features/uikit/devices.py).
It's not clear whether it depends on python or it just provides a python
script. But I believe it's still good to have in buildInputs so it has
a proper shebang.
Co-authored-by: worldofpeace <worldofpeace@protonmail.ch>
2019-12-18 21:47:05 -05:00
Bjørn Forsman
9e144d5527
wrap-qt-apps-hook.sh: wrap binaries in ./sbin/
...
wrap-qt-apps-hook.sh runs before move-sbin.sh, so programs in ./sbin are
currently not wrapped. Fix it.
2019-12-08 20:44:29 +01: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
5f8b0d7d99
Merge staging-next into staging
2019-11-19 14:53:29 +01:00
adisbladis
ab3f50a1c0
qt511: Remove package sets
...
Nothing depends on Qt 5.11 any more
2019-11-18 20:10:44 +00:00
adisbladis
f70c47a901
qt59: Remove package sets
...
Nothing depends on Qt 5.9 any more
2019-11-18 20:10:43 +00:00
John Ericson
ef43c5f5d9
wrap-qt-apps-hook: qtWrapperArgs may be undefined
2019-11-17 15:48:39 -05: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
John Ericson
784c3dc0f9
qt5 qmake setup hook: qmakeFlags may be undefined
2019-11-08 13:28:59 -05:00
Franz Pletz
1b6e97e82b
qt511.qtbase: fix build with gcc9
2019-11-05 00:49:42 +01:00
Milan Pässler
00ac18cdea
qtwebengine: add patch for CVE-2019-13720
2019-11-04 22:50:00 +01:00
John Ericson
9b274e2962
qtbase-setup-hook: postPhases may be undefined
...
My earlier sed missed this because it already had `{..}`.
2019-11-02 19:23:44 -04:00
John Ericson
b7f4bda282
treewide: *Phase(s)? variables are optional
...
If these aren't defined, the stdenv defaults are used in the `*Phase`
case, or no extra phases are done, in the `*Phases` case.
2019-11-01 14:44:44 -04:00
John Ericson
2811b032d6
treewide: Make still dont* Variables are optional in most cases
...
Go beyond the obvious setup hooks now, with a bit of sed, with a skipped case:
- cc-wrapper's `dontlink`, because it already is handled.
Also, in nix files escaping was manually added.
EMP
2019-11-01 14:44:44 -04:00
John Ericson
1290e532ea
treewide: Make more dont* variables OK to be undefined in setup hooks
2019-11-01 14:44:44 -04:00
Frederik Rietdijk
12441bdf9f
Merge staging-next into staging
2019-10-16 11:17:12 +02:00
Will Dietz
10f8c46e8e
Merge pull request #70689 from dtzWill/update/qt5-5.12.5
...
qt5: 5.12.4 -> 5.12.5
2019-10-14 18:54:12 -05:00
Vladimír Čunát
26ec15c267
qt511.qmake: fix after 756b46a4
...
5.11 was forgotten by accident, apparently.
This fixes build of qt511.qtsvg, for example (and many reverse deps).
2019-10-13 13:28:45 +02:00
Jan Tojnar
e2e3861d6b
Merge branch 'staging-next' into staging
2019-10-12 00:51:55 +02:00
Jan Tojnar
6c8aed6391
Merge branch 'master' into staging-next
2019-10-12 00:50:21 +02: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
Dima
3bfe0872b9
qt5.{qtwebengine, qtwebkit}: fix -Wno-class-memaccess warning for clang
...
With a previous fix for log size issues due to GCC 8
a gcc specific `-W` flag was added that clang does
not know, so it spams the logs.
2019-10-07 04:12:26 +02:00
adisbladis
5ade6ec79e
qt5.qtbase: Build all QPA backends by default
2019-10-07 01:19:34 +01: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
Vladimír Čunát
6c567ed797
Merge branch 'staging-next' into staging
2019-09-22 10:06:45 +02:00
Vladimír Čunát
22a216849b
Re-Revert "Merge branch 'staging-next'"
...
This reverts commit f8a8fc6c7c
2019-09-22 09:38:09 +02:00
