Commit Graph

18 Commits

Author SHA1 Message Date
Vladimír Čunát ff101946a8
Merge branch 'master' into staging-next
Hydra nixpkgs: ?compare=1503899
2019-02-06 14:24:46 +01:00
Matthew Bauer 81531046e8 qt511: add patch for macOS sdk
Unfortunately we don’t have access to NSWindowStyleMask. These patches
should go away once we switch to a newer SDK.
2019-02-05 20:50:52 -05:00
Vladimír Čunát 5effa4e0f9
Merge branch 'master' into staging-next
Comments on conflicts:
- llvm: d6f401e1 vs. 469ecc70 - docs for 6 and 7 say the default is
  to build all targets, so we should be fine
- some pypi hashes: they were equivalent, just base16 vs. base32
2019-02-01 09:22:29 +01:00
Andreas Rammhold 2f5d37b77b
qt511: 5.11.1 -> 5.11.3
This fixes

 * CVE-2018-15518, Qt Base: “double free or corruption” in QXmlStreamReader
 * CVE-2018-19873, Qt Base: QBmpHandler segfault on malformed BMP file
 * CVE-2018-19870, Qt Base: Check for QImage allocation failure in qgifhandler
 * CVE-2018-19871, Qt Imageformats: QImage: QTgaFile CPU exhaustion
 * CVE-2018-19865, Qt Virtual Keyboard: Qt Virtual Keyboard logs all key presses
 * CVE-2018-19869, Qt Svg: Fix crash when parsing malformed url reference

More details can be obtained from the Qt annoucement [1].

[1] https://blog.qt.io/blog/2018/12/04/qt-5-11-3-released-important-security-updates/
2019-01-31 11:00:27 +01:00
Trolli Schmittlauch 4b76c4605e qt511.qtdeclarative: fix CMake `qmlcachegen` path
This package contains several CMake files used for setting up its
provided tools for use in other projects build with CMake.
While packaging *ktouch* I found out that the ${_qt5Core_install_prefix}
variable doesn't expand at all, rendering the path to the `qmlcachegen`
binary useless. As a fix, the command itself is used instead of the path
to the binary.
2019-01-13 00:09:38 +01:00
Dmitry Kalinkin 45ab55e6e2
qt511.qtwebengine: fix build on darwin
Co-Authored-By: Josef Kemetmüller <josef.kemetmueller@gmail.com>
2019-01-12 16:40:06 -05:00
Jörg Thalheim 1b146a8c6f
treewide: remove paxutils from stdenv
More then one year ago we removed grsecurity kernels from nixpkgs:
https://github.com/NixOS/nixpkgs/pull/25277

This removes now also paxutils from stdenv.
2018-12-22 12:55:05 +01:00
Lluís Batlle i Rossell 54377280f0 Fix qtbase cmake for gui plugins
It should fix "Broken cmake file with Qt5.10 full" #40706.

I leave to @ttuegel rearranging the patches.
2018-11-18 19:29:43 +01:00
Daiderd Jordan 942d90b282
qt5.qtmacextras: include cf-private on darwin
Undefined symbols for architecture x86_64:
      "_OBJC_CLASS_$_NSData", referenced from:
          objc-class-ref in qmacfunctions.o
      "_OBJC_CLASS_$_NSMutableArray", referenced from:
          objc-class-ref in qmactoolbar.o
          objc-class-ref in qmactoolbardelegate.o
    ld: symbol(s) not found for architecture x86_64
2018-11-17 21:02:22 +01:00
Tom Hall 230f71477b qtwebglplugin: init at 5.11
Note: As with all Qt plugins, must set QT_QPA_PLATFORM_PLUGIN_PATH=~/.nix-profile/lib/qt-5.11/plugins for it to be found.
2018-11-10 19:56:11 +00:00
Jan Malakhovski c0a4e46714 qt5: use https, tiny cleanup 2018-11-08 05:20:19 +00:00
Samuel Dionne-Riel cb380983ed qt5.qtwebkit: Fixes modules src being subtly broken.
b785d4813e introduced breakage in Qt
modules for 5.6 and 5.9, especially visible is Qt Webkit.

This was manifested by having a non-sensical build log where it is using
the top-level `src` attribute as source instead of Qt Webkit's own
source.

Were it not for the `src` top-level attribute (which is a legit
package), the error would have been made obvious by passing `null` to
`src`.

This partily reverts newly introduced way `src` can be passed to a
qtModule, instead relying on extending the `srcs` attrset.

For ZHF #45960
2018-09-08 14:20:23 -04:00
volth 52f53c69ce pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
Orivej Desh bbca5042ac qt511.qtbase: fix darwin build
Qt 5.11.1 replaced one occurrence of NSMouseMoved with NSEventTypeMouseMoved:
da32360ffc.

It is not available in AppKit from macOS 10.10, therefore this change restores
NSMouseMoved: https://developer.apple.com/documentation/appkit/nsmousemoved

Closes #43258
2018-07-10 15:27:17 +00:00
averelld 1999d279ec qt5: 5.11.0 -> 5.11.1 (#42351)
This may be needed to unbreak a couple of builds such as nextcloud clients or rstudio: codereview.qt-project.org/#/c/232367
2018-07-05 02:37:48 +00:00
Daiderd Jordan 738df73f2a qt5: update darwin patch for 5.11 2018-06-12 14:27:11 +02:00
Daiderd Jordan 4ed62d6b88 qt5: revert qtbase commit that removes macOS 10.10 code paths
We use MACOSX_DEPLOYMENT_TARGET=10.10 in nixpkgs and some darwin
packages like CoreFoundation are based on the 10.10 sources from
opensource.apple.com.
2018-06-12 14:27:11 +02:00
Bastian Köcher b785d4813e qt5: 5.10 -> 5.11
This is the first time since 5.9 that we also update `qtwebkit`.
`qtwebkit` is not maintained by Qt anymore and thus, we switch to the
community port as for example arch has done. To prevent pulling in
single patches, we just stick to the latest git version.
2018-06-12 14:27:11 +02:00