swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-10-20 20:53:19 +02:00
Code Issues Packages Projects Releases Wiki Activity
233337 commits 5 branches 0 tags 31 GiB
Commit graph

59 commits

Author SHA1 Message Date
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
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
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
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 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
Milan Pässler 00ac18cdea qtwebengine: add patch for CVE-2019-13720 2019-11-04 22:50:00 +01: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
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
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 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
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
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