Commit graph

613 commits

Author SHA1 Message Date
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
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
worldofpeace 15e99a06a8 wrapQtAppsHook: correct skip directories heuristic 2019-09-20 19:10:02 -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 dd599e20cf
qtbase: Fix formatting 2019-09-19 07:39:11 -05:00
Thomas Tuegel bddca5a91a
qmake-hook.sh: qmakeFlags is an array 2019-09-19 07:39:11 -05:00
Thomas Tuegel e4e3419096
qtbase: Create .qmake.stash if missing 2019-09-19 07:39:10 -05:00
Thomas Tuegel 36a8cfc874
qtbase: Update qmake cache name for Qt >= 5.12.4 2019-09-19 07:39:10 -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
Thomas Tuegel 7aab7ed9ef
qt512: 5.12.3 -> 5.12.4 2019-09-19 07:36:51 -05:00
Thomas Tuegel 5b14ea3b05
Merge pull request #68351 from petabyteboy/feature/qt-patches-staging
qt512: Add patches for QTBUG-73459 and QTBUG-69077
2019-09-18 05:44:58 -05:00
Vladimír Čunát fa4a3af5a7
Merge branch 'master' into staging-next 2019-09-16 19:24:52 +02:00
worldofpeace f21f980ab8 qt5.qtwebengine: reduce log output
Identical fix as 6f1ad0676f.
2019-09-15 19:20:45 -04: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
Vladimír Čunát b6c6e1f9e8
Merge branch 'master' into staging-next 2019-09-15 13:18:54 +02:00
Bjørn Forsman d6e65ec4a0 wrapQtAppsHook: skip directories
Prevents messages like this in the build log:

  grep: <PATH>/bin: Is a directory
2019-09-13 16:53:11 +02:00
Bjørn Forsman c6d516dfc4 wrapQtAppsHook: use patchelf --print-interpreter instead of isELFExec
Some executables are built as PIEs (e.g. keepassxc) and are technically
isELFDyn, not isELFExec. Without this change those executables will not
be wrapped.
2019-09-13 16:53:11 +02:00
Jan Tojnar a441eaa7b1
Merge branch 'staging-next' into staging 2019-09-12 22:49:43 +02:00
Nathan van Doorn 4535178a37 qt59.qtscript: fix error due to gcc8.3 2019-09-11 13:33:38 +01:00
Nathan van Doorn a4ace375d2 qt511.qtscript: fix error due to gcc8.3 2019-09-11 13:32:53 +01:00
Dima 6f1ad0676f qtwebkit: fixing build / reducing build log size
GCC 8 introduced a new type of warning `-Wclass-memaccess` which
is included in `-Wall`. This warnings spits out *a million* of warnings
like the following:

```
[...]
/build/source/Source/WTF/wtf/Vector.h:128:15: warning: 'void* memcpy(void*, const void*, size_t)' writing to an object of type 'class WTF::RefPtr<WebCore::TransformOperation>' with no trivial copy-assignment; use copy-assignment or copy-initialization instead [-Wclass-memaccess]
         memcpy(dst, src, reinterpret_cast<const char*>(srcEnd) - reinterpret_cast<const char*>(src));
[...]
``

Logs demonstrating the issue:
https://hydra.nixos.org/build/100205478/nixlog/1

While I don't think disabling warnings is the best way to deal with this,
there is alrady precedent for this package and I don't feel confident enough
to either patch or bump this package.

Please view this as a low-friction sub-optimal suggestion in case nobody else
has a better fix.
2019-09-10 18:42:30 +02:00
Izorkin 329a88efa7 treewide: replace mysql.connector-c to libmysqlclient 2019-09-09 15:55:34 +03:00
Frederik Rietdijk 5061fe0c2c Merge staging-next into staging 2019-08-28 08:26:42 +02:00
volth 35d68ef143 treewide: remove redundant quotes 2019-08-26 21:40:19 +00:00
Matthew Bauer 70c1c856d4 qtbase: remove sdk.mk check for macOS 2019-08-26 00:19:48 -04:00
Vladimír Čunát 2e6bf42a22
Merge branch 'master' into staging-next
There ver very many conflicts, basically all due to
name -> pname+version.  Fortunately, almost everything was auto-resolved
by kdiff3, and for now I just fixed up a couple evaluation problems,
as verified by the tarball job.  There might be some fallback to these
conflicts, but I believe it should be minimal.

Hydra nixpkgs: ?compare=1538299
2019-08-24 08:55:37 +02:00
Robin Gloster 3dede565c7
qt56: remove; unused, broken with openssl 1.1 2019-08-22 14:50:28 +02:00
Robin Gloster f4fc845e5b
Merge remote-tracking branch 'upstream/master' into openssl-1.1 2019-08-21 14:25:13 +02:00
Florian Klink 88146a095f wrapQtAppsHook: use isELFExec
This ensures we only wrap executables, not shared libraries
2019-08-17 16:45:57 +02:00
Frederik Rietdijk cff9e6429a Merge staging-next into staging 2019-08-14 13:46:33 +02:00
Frederik Rietdijk 8d56f2472e Merge master into staging-next 2019-08-14 13:45:54 +02:00
Averell Dalton 658ffb06d6 pkgsi686Linux.qt5.qtbase: fix build 2019-08-08 20:14:55 +02:00
Thomas Tuegel 3a2a980787
Revert "Revert "qt512: Update qtbase.patch""
This reverts commit c220e00d7a.
2019-08-06 14:43:04 -05: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
Robin Gloster 30969073f0
Merge remote-tracking branch 'upstream/master' into openssl-1.1 2019-08-02 03:01:30 +02:00
Frederik Rietdijk 55e4555b77 Merge master into staging-next 2019-08-01 09:42:54 +02:00
Samuel Dionne-Riel 6cb99e79ed qt512: Enforce strict compatible version paths 2019-07-30 20:33:22 -04:00
Samuel Dionne-Riel 4d0bff9f31 qt511: Enforce strict compatible version paths 2019-07-30 20:33:22 -04:00
Samuel Dionne-Riel fb96e450b4 qt59: Enforce strict compatible version paths 2019-07-30 20:33:22 -04:00
Samuel Dionne-Riel ed50ec8129 qt56: Enforce strict compatible version paths 2019-07-30 20:33:21 -04:00