Commit graph

30 commits

Author SHA1 Message Date
Matthew Bauer 70c1c856d4 qtbase: remove sdk.mk check for macOS 2019-08-26 00:19:48 -04: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
Samuel Dionne-Riel 6cb99e79ed qt512: Enforce strict compatible version paths 2019-07-30 20:33:22 -04:00
Frederik Rietdijk bf39fc17d4 Revert "qt 5.12.0 -> 5.12.3"
Segmentation faults. See https://github.com/NixOS/nixpkgs/issues/65448

This reverts commit 552803f6f5.
2019-07-28 12:16:29 +02:00
Frederik Rietdijk c220e00d7a Revert "qt512: Update qtbase.patch"
Segmentation faults. See https://github.com/NixOS/nixpkgs/issues/65448

This reverts commit 02afb228e2.
2019-07-28 12:16:29 +02:00
Frederik Rietdijk 4aee94629d Merge staging-next into staging 2019-07-13 09:46:03 +02:00
Frederik Rietdijk 54065ae20d Merge master into staging-next 2019-07-13 09:45:40 +02:00
Thomas Tuegel 02afb228e2 qt512: Update qtbase.patch 2019-07-12 14:12:52 +02:00
Jos van den Oever 552803f6f5 qt 5.12.0 -> 5.12.3 2019-07-12 14:12:52 +02:00
arcnmx eda2dbaab2 qt512.qtwebengine: darwin patch
This patch is currently applied to 5.11, allowing it to begin building;
both packages fail to compile regardless, but it's an improvement.
2019-07-11 10:23:30 -07:00
Thomas Tuegel 56d5963382
Merge pull request #54525 from ttuegel/feature/qt-5/wrap-qt-apps
Wrap Qt applications
2019-07-05 14:38:10 -05:00
Thomas Tuegel f79fd2e826
wrapQtAppsHook: wrap Qt applications for runtime dependencies 2019-07-05 10:41:41 -05:00
Daiderd Jordan cbfbe9ca1e
qt: remove cf-private 2019-07-03 22:20:16 +02:00
Matthew Bauer 4c3e09b022 qt5.12: patch to work on x86_64-darwin
unfortunately, some private headers making the logging hard to handle.
Specifically, os/activity.h that is included does not match what Qt5
is expected. This removes the activity logging (while keeping the
other logging methods) on macOS.

Fixes #63528
2019-06-23 18:29:04 -04:00
Matthew Bauer 79c0e740a7 qttools: patch qmlimportscanner for darwin builds
This needs to be the full path for qtmacdeploy to work. We add
${qt5.qttools.dev}/bin/qmlimportscanner as the default.

Fixes #63093
2019-06-22 22:21:38 -04:00
nyanloutre 895e78c9bc qt5.qtnetworkauth: init 2019-05-20 20:17:59 -04:00
Matthew Bauer c1f1a0ea15 qt5: use llvm5 for all modules
This avoids some issues encountered with qt5 not working libcxx 7. We
can remove this at some point when qt5 has addressed all of their issues.
2019-04-26 21:55:12 -04:00
Matthew Bauer 0fe315c9b6 treewide: remove old patches for macOS
These shouldn’t be needed now that we are on macOS 10.12.
2019-04-26 21:54:32 -04:00
nyanloutre 4b7d9dc868 fetch-kde-qt.sh: get hashes from metadata 2019-03-27 22:16:18 -04:00
Dmitry Kalinkin 1809832958
qt5.qtwebengine: disable platform check using patches
The previous code using substituteInPlace was broken for both 5.9 and
5.11 (latter was broken after a minor release bump). Using patches
should make things fail loudly and prevent modules/qtwebengine.nix from
being littered with version checks.

The patch for 5.12 is only tested to apply.
2019-03-26 16:30:50 -04:00
Anton Kindestam b22d92fb6d qt512: patch qtwebengine against CVE-2019-5786 2019-03-13 22:27:01 +01:00
Dmitry Kalinkin 4a62576c12
Merge pull request #55983 from veprbl/pr/qt5_qtwebkit_darwin_fix
qt511.qtwebkit: fix on darwin
2019-03-03 11:01:47 -05:00
Pedro Pombeiro 080612a870
qt5.full: add qtwebview module to 5.11 and 5.12 packages 2019-03-02 09:50:08 +01:00
Dmitry Kalinkin 4bbd00e934
qt511.qtwebkit: fix on darwin
readline is used on macOS and iOS for some javascript console (JSC). It
seems to be easier to disable it than to fix it.
2019-02-19 23:52:06 -05:00
Matthew Bauer 8724819d94
Merge pull request #55910 from veprbl/pr/qt5_qtconnectivity_darwin_fix
qt5.qtconnectivity: fix darwin build
2019-02-19 22:37:15 -05:00
Dmitry Kalinkin 3e3e3918f2 qt5.qtwebengine: fail properly
QtWebEngine's build system is setup to perform certain platform checks
(see mkspecs/features/platform.prf). But a failed check will not cause
configuration phase to fail, but instead it configures no build targets.
So in such case the build will successfully perform build and install
phases. An empty output directories will are produced and the build
succeeds.

This patches qtwebengine qmake files to properly fail during
configuration phase.

This doesn't touch qt56 as it doesn't have this mechanism.
2019-02-19 12:28:15 -05:00
Dmitry Kalinkin 4bf4484515
qt5.qtconnectivity: fix darwin build 2019-02-16 18:13:58 -05:00
Bastian Köcher 8e811ec295 qt5: 5.11 -> 5.12 2018-12-19 09:15:14 +01:00