75 Commits

Author SHA1 Message Date
Baptist BENOIST
7d72b9b74e Remove bbenoist from maintainers
Sorry guys but I did not used Nix since months and cannot spend time
maintaining my previous work...
2017-03-23 03:03:04 +01:00
Orivej Desh
583e862d11
qtbase-* nitpick: fix list nesting
Generalized from #24036, and leaving the authorship there.
2017-03-19 11:03:51 +01:00
Thomas Tuegel
e24261ed16
qtbase: fix sed syntax in .pc file fixup 2017-03-11 16:25:48 -06:00
Bjørn Forsman
f5d460a7a0
qt5.qtbase: fix host_bins= path in pkg-config file
So that pkg-config can be used to find 'moc' etc. (Currently it points
to a non-existing path.)

Fixes #22945 ('Linux kbuild incompatible with "nix-shell -p qt5.full"').
2017-03-04 15:08:47 -06:00
Graham Christensen
a927abbee0 qt55.qtbase: fix patch sha with fetchpatch instead of fetchurl 2017-01-19 22:56:08 +01:00
Thomas Tuegel
851b5944bb
qt5: factor out common setup hook for qtbase 2016-12-03 09:51:31 -06:00
Alexander V. Nikolaev
f0974e1e58 qt5: more reproducible builds
Avoid mktemp -d in sources, where pathnames can affect result.
2016-12-02 14:31:36 +02:00
Frederik Rietdijk
8fcccec543 qt55: use python2 2016-10-18 23:16:10 +02:00
Thomas Tuegel
fc23f64d34
qt5.qtbase: ruby is no longer a dependency 2016-10-04 21:49:33 -05:00
Kirill Boltaev
bccd75094f treewide: explicitly specify gtk and related package versions 2016-09-12 18:26:06 +03:00
Tuomas Tynkkynen
a17216af4c treewide: Shuffle outputs
Make either 'bin' or 'out' the first output.
2016-08-29 14:49:51 +03:00
Moritz Ulrich
17f9b21c09 Revert "qt5: use absolute paths to plugins in CMake"
This reverts commit 7a9e04943dc82294037ec03e6eadf23d2933f821.

The commit in question breaks the patches to qtbase, causing the build to fail. An issue to track this feature will follow.
2016-08-28 12:29:20 +02:00
Thomas Tuegel
7a9e04943d
qt5: use absolute paths to plugins in CMake
CMake needs absolute paths to plugin shared objects in case one package
provides a plugin for a different package.
2016-08-27 12:24:54 -05:00
Thomas Tuegel
dedc6716e4 qt5: build without -reduce-relocations
Fixes #17862.
2016-08-20 17:36:32 -05:00
Thomas Tuegel
add332c424 qt55: fix CMake module paths 2016-07-28 18:26:54 -05:00
Thomas Tuegel
343415e02e qt55.qtbase: fix setup hook and QMake hook 2016-07-16 15:02:19 -05:00
Thomas Tuegel
766ea7c4ca qt55.qtbase: update setup hook 2016-07-16 10:14:45 -05:00
Tobias Geerinckx-Rice
6669fac77e
qt55.qtbase: remove unused dlopen-gtkstyle.patch 2016-06-23 12:13:24 +02:00
Nikolay Amiantov
693b49166a qt5: remove gtkStyle option
It's no more needed now that we split QGtkStyle plugin
into separate output.
2016-06-03 19:14:52 +03:00
Thomas Tuegel
3f6a2b9441 qt55.qtbase: build QGtkStyle by default 2016-04-30 12:20:09 -05:00
Thomas Tuegel
008b3d5d84 qt55.qtbase: move moveToOutput hooks 2016-04-30 12:20:09 -05:00
Thomas Tuegel
97d9368471 qmakeHook: move libtool archives and qmake project files to $dev/lib 2016-04-30 12:20:09 -05:00
Thomas Tuegel
9ea3e371df qt5: handle dev output even without qmake 2016-04-21 04:57:01 -05:00
Nikolay Amiantov
b857459bdb qt5.qmakeHook: init, move from qtbase's setup hook 2016-04-20 18:55:37 +03:00
Thomas Tuegel
84a83feb4d qt55.qtbase: do not link $out/lib into $dev/ 2016-04-20 10:01:06 -05:00
Thomas Tuegel
8727485e08 qt55.qtbase: canonicalize paths in addToSearchPathOnce 2016-04-20 10:01:06 -05:00
Thomas Tuegel
51fe07711f qt55.qtbase: disable plugin path debugging 2016-04-20 10:01:06 -05:00
Thomas Tuegel
e6c91d586c qt55.qtbase: debug NIX_PROFILES paths 2016-04-20 10:01:06 -05:00
Vladimír Čunát
d1df28f8e5 Merge 'staging' into closure-size
This is mainly to get the update of bootstrap tools.
Otherwise there were mysterious segfaults:
https://github.com/NixOS/nixpkgs/pull/7701#issuecomment-203389817
2016-04-07 14:40:51 +02:00
Thomas Tuegel
7f336a4513 qtbase: unset QT_PLUGIN_PATH after loading 2016-03-31 14:36:30 -05:00
Nikolay Amiantov
f752424924 qt55.qtbase: use more system libraries 2016-03-31 15:53:06 +03:00
Thomas Tuegel
aa2e03e6ff qt55.qtbase: upstream patch for backing store issue
The included patch from upstream fixes the issue described here:
https://bugreports.qt.io/browse/QTBUG-48321
The backing store of certain widgets was being improperly invalidated,
leading to display bugs in, e.g. VLC.

This patch is included in Qt 5.6, so we should remove it when we
upgrade.
2016-02-18 06:09:20 -06:00
Thomas Tuegel
9065ab0c8a kde5.extra-cmake-modules: rewrite setupHook
The rewrite achieves three goals. First, all the installation paths are
set correctly for multiple outputs. Second, the correct search paths are
set for all types of shared data. Third, packages are installed through
propagatedUserEnvPkgs as required.
2016-01-31 21:15:03 -06:00
Thomas Tuegel
ae75c88808 qt55.qtbase: upstream patch for backing store issue
The included patch from upstream fixes the issue described here:
https://bugreports.qt.io/browse/QTBUG-48321
The backing store of certain widgets was being improperly invalidated,
leading to display bugs in, e.g. VLC.

This patch is included in Qt 5.6, so we should remove it when we
upgrade.
2016-01-31 21:15:03 -06:00
Thomas Tuegel
8bfae5c46d qt55.qtbase: fix Qt module CMake config files 2016-01-31 21:15:03 -06:00
Thomas Tuegel
a6c9a6f5bf qt55.qtbase: set licenses correctly 2016-01-31 21:15:03 -06:00
Thomas Tuegel
9adcd6f78c qt55: update homepage 2016-01-31 21:15:03 -06:00
Thomas Tuegel
6dda0824ba qt55.qtbase: use -system-harfbuzz 2016-01-31 21:15:03 -06:00
Thomas Tuegel
74121e07a7 qt55: use multiple outputs 2016-01-31 21:15:03 -06:00
Thomas Tuegel
db69888a02 qt55.qtbase: disable documentation
The documentation cannot be built as part of the split-module build
anyway. After all the modules are built, we could build the
documentation as a separate package.
2016-01-31 21:15:03 -06:00
Thomas Tuegel
3cfb552bbc qt55.qtbase: don't depend on makeWrapper 2016-01-31 21:15:03 -06:00
Thomas Tuegel
302450dbfe qt55.qtbase: don't propagate extra Mesa dependency 2016-01-31 21:15:03 -06:00
Thomas Tuegel
e64822b87d qt55.qtbase: don't propagate gtk dependencies 2016-01-31 21:15:03 -06:00
Thomas Tuegel
4b844747a2 qt55.qtbase: don't propagate postgresql dependency 2016-01-31 21:15:03 -06:00
Thomas Tuegel
d5d7554639 qt55.qtbase: don't propagate mysql dependency 2016-01-31 21:15:03 -06:00
Thomas Tuegel
5337a2a4b3 qt55.qtbase: don't propagate cups dependency 2016-01-31 21:15:03 -06:00
Thomas Tuegel
fcf290cd1d qt55.qtbase: don't refer to .dev outputs at runtime 2016-01-31 21:15:03 -06:00
Thomas Tuegel
9695e139ec qt55.qtbase: fix path typo in resolv patch 2016-01-28 11:15:14 -06:00
Vladimír Čunát
363f667e8b qt5*.qtbase: fixup output references
Hopefully I haven't missed any references in qt5*.
2016-01-28 13:31:17 +01:00
Thomas Tuegel
21bebe1592 qt55.qtbase: fix syntax error 2016-01-23 07:52:29 -06:00