3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

26 commits

Author SHA1 Message Date
Thomas Tuegel db215a62b7
qtwebengine: fix build failure due to -Wformat-security
ninja builds some components with -Wno-format, which is not compatible with the
default hardening setting of -Wformat-security in Nixpkgs.
2018-05-25 20:14:05 -05:00
Will Dietz 39696b6d56 qt-5.10: don't use features that require new-ish kernels, stay compat
Before this change:
$ readelf --notes /nix/store/zf5yja02g8n8dzgs25pqfd8w3myfzgzc-qtbase-5.10.1/lib/libQt5Core.so

Displaying notes found at file offset 0x004a7778 with length 0x00000020:
  Owner                 Data size       Description
  GNU                  0x00000010       NT_GNU_ABI_TAG (ABI version tag)
    OS: Linux, ABI: 3.17.0

After:
$ readelf --notes /nix/store/sg1s9hdw0b7p6h0dwg09g4lxy1acq7y6-qtbase-5.10.1/lib/libQt5Core.so

Displaying notes found at file offset 0x004a7dcc with length 0x00000020:
  Owner                 Data size       Description
  GNU                  0x00000010       NT_GNU_ABI_TAG (ABI version tag)
    OS: Linux, ABI: 2.6.28

-----------

The above paths were before rebasing the commit onto staging,
and it'd probably be good to have someone confirm the same happens
when built on a hydra builder or other non-dtzWill machine :).

[dezgeg: added comments]
2018-05-18 03:51:20 +03:00
Josef Kemetmüller 472f21951a qt5.qtwebkit: Reduce log size to fix hydra build
This should fix the darwin build of qtwebkit.
2018-05-06 18:44:31 +02:00
Matthew Bauer ec632b745f qtwebengine: rewrite
Fixes #39334
and Fixes #36729

Also, Fixes #36932 (hopefully it's still building)

(This might be able to be able to be cherry-picked to 18.03 but be
careful - chromium is extremely touchy. Probably best to wait for it
to be built successfully on Hydra a few times.)
2018-04-24 23:57:46 -05:00
Shea Levy 05e375d710
Merge remote-tracking branch 'origin/master' into staging 2018-03-28 09:36:47 -04:00
Corey O'Connor 807a308623 qtwebengine: correct how NIX_BUILD_CORES is propagated to the gn driven ninja. 2018-03-26 12:32:46 -07:00
Nikolay Amiantov a5b2e0277a qt5.qtwebengine: fix build 2018-03-26 14:01:49 +03:00
Robin Gloster 8a244db9f3
libsForQt5.qtspeech: enable 2018-03-24 12:07:52 +01:00
Daiderd Jordan ecbb9027ea
Merge pull request #36847 from badi/qtlocation
qtlocation: fix darwin build
2018-03-14 00:14:53 +01:00
volth 7ec0471242 treewide: s/xlibs/xorg/g (#36889) 2018-03-13 10:16:03 +00:00
John Ericson dde80d705e qtbase: Fix x86_64-conditional logic
Now works with cross and old and new meta checks alike.
2018-03-12 18:55:41 -04:00
Badi Abdul-Wahid 833851cd6e
qtlocation: fix darwin build
A dependency (boost) makes use of `std::auto_ptr`, which is no longer
supported in C++17 in Clang. This change re-enables `std::auto_ptr`
capabilities.
2018-03-12 02:04:28 -04:00
Alexander V. Nikolaev e94cd63bf5 treewide: transition libGL/libGLU for qt
Also rename mesaSupported to libGLSupported
2018-02-24 17:06:49 +02:00
Vladimír Čunát d4f1587da5
qt5*.qtwebkit: disable a warning to fit log on Hydra
Before > 64 MiB, now ~25 MiB.
2018-02-17 09:45:38 +01:00
Thomas Tuegel 5783980fc6
qtbase: fix evaluation error
`git rebase` strikes again!
2018-01-15 19:12:01 -06:00
Thomas Tuegel 04239641b5
Merge branch 'bugfix/qt-5/closure-size-static-libs' into merge/qt-5.10.0 2018-01-15 18:49:27 -06:00
Thomas Tuegel 75d2a7dc4d
qt5: reduce closure size
First, closure size is reduced by including the static libraries in $out instead
of trying to move them to $dev. The Qt build system cannot handle libraries
being split between different prefixes. Previously, the static libraries were
moved into $dev and the shared libraries were symlinked from $out to $dev to
fool the build system. However, this causes $dev to be retained at
runtime. Instead, we now keep the static libraries in $out. Fortunately, the
static libraries are not very large anyway.

Second, we build with QT_NO_DEBUG defined unless debugging is enabled. This
causes some assertions to be removed; when assertions are included, they pull
paths from $dev into the runtime closure by using the __FILE__ macro. We also
now patch qtbase to remove even more assertions when QT_NO_DEBUG is defined.
2018-01-15 18:48:37 -06:00
Vladimír Čunát f29000b002
Merge branch 'master' into staging
Hydra: ?compare=1421760
2017-12-29 10:13:33 +01:00
Robin Gloster 9359050ae2 mariadb: more lib -> connector-c 2017-12-29 02:18:35 +01:00
adisbladis 907face464
qt5: Add qtvirtualkeyboard submodule 2017-12-28 21:13:45 +08:00
Orivej Desh fb349c84e2 qt5.qttools: install macdeployqt on darwin 2017-12-20 08:56:54 +00:00
Thomas Tuegel 145e0f9940
Revert "Revert "qt5: 5.9.1 -> 5.9.3""
This reverts commit a1b77bfe5f.

KDE Frameworks are updated to version 5.41.0 which is compatible with Qt 5.9.3.
2017-12-11 11:32:16 -06:00
Orivej Desh a1b77bfe5f Revert "qt5: 5.9.1 -> 5.9.3"
KDE frameworks 5.40 are not compatible with Qt 5.9.3: #32253

This reverts commit bd71d3aef7 (#32100).
2017-12-02 17:22:17 +00:00
Bastian Köcher bd71d3aef7 qt5: 5.9.2 -> 5.9.3 2017-12-01 18:34:54 +01:00
Thomas Tuegel d3efa486e5
qt59.qtbase: carefully avoid applying Linux flags to Darwin build 2017-11-12 09:51:48 -06:00
Thomas Tuegel fe0ab944db
qt5: factor out common definitions and remove symlink farm
The module definitions are factored out and shared between qt56 and qt59. The
symlink farm which was created during builds is no longer needed.
2017-11-07 07:18:46 -06:00