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
f43eb5ece0
qt54.qttools: move runtime executables to $out
2016-01-31 21:15:03 -06:00
Thomas Tuegel
588c8499f7
qt55: don't set output flags by default
2016-01-31 21:15:03 -06:00
Thomas Tuegel
2efbf665a3
qt55.qttools: move runtime executables to $out
2016-01-31 21:15:03 -06:00
Thomas Tuegel
0c79c7c3b2
qt54.qtconnectivity: fix Qt module CMake config files
2016-01-31 21:15:03 -06:00
Thomas Tuegel
6e623f8784
qt54.qtenginio: fix Qt module CMake config files
2016-01-31 21:15:03 -06:00
Thomas Tuegel
b3c8878a65
qt54.qtlocation: fix Qt module CMake config files
2016-01-31 21:15:03 -06:00
Thomas Tuegel
a7cce8b329
qt54.qtmultimedia: fix Qt module CMake config files
2016-01-31 21:15:03 -06:00
Thomas Tuegel
d769d6c3bd
qt54.qtquick1: fix Qt module CMake config files
2016-01-31 21:15:03 -06:00
Thomas Tuegel
2f0ec07921
qt54.qtsensors: fix Qt module CMake config files
2016-01-31 21:15:03 -06:00
Thomas Tuegel
3bb5501a88
qt54.qtserialport: fix Qt module CMake config files
2016-01-31 21:15:03 -06:00
Thomas Tuegel
ece0396b55
qt54.qtsvg: fix Qt module CMake config files
2016-01-31 21:15:03 -06:00
Thomas Tuegel
35f33b438c
qt54.qttools: fix Qt module CMake config files
2016-01-31 21:15:03 -06:00
Thomas Tuegel
1a481e58ec
qt54.qtwebkit: fix Qt module CMake config files
2016-01-31 21:15:03 -06:00
Thomas Tuegel
4d25e97193
qt54.qtwebsockets: fix Qt module CMake config files
2016-01-31 21:15:03 -06:00
Thomas Tuegel
669dcb3485
qt54.qtx11extras: fix Qt module CMake config files
2016-01-31 21:15:03 -06:00
Thomas Tuegel
a67c2ded6b
qt54.qtxmlpatterns: fix Qt module CMake config files
2016-01-31 21:15:03 -06:00
Thomas Tuegel
b7db2185a0
qt54.qtdeclarative: fix Qt module CMake config files
2016-01-31 21:15:03 -06:00
Thomas Tuegel
fbcdf3ee62
qt54.qtscript: fix Qt module CMake config files
2016-01-31 21:15:03 -06:00
Thomas Tuegel
65ef8578c2
qt54.qtbase: fix Qt module CMake config files
2016-01-31 21:15:03 -06:00
Thomas Tuegel
f4e6b173bb
qt54: add fixQtModuleCMakeConfig setup hook
2016-01-31 21:15:03 -06:00
Thomas Tuegel
d282d0bfe7
qt54.qtbase: set licenses correctly
2016-01-31 21:15:03 -06:00
Thomas Tuegel
150238dc99
qt54: updated homepage
2016-01-31 21:15:03 -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
7fae06718e
qt55.makeQtWrapper: don't set XDG_DATA_DIRS
2016-01-31 21:15:03 -06:00
Thomas Tuegel
776de6d955
qt55.qtconnectivity: fix Qt module CMake config files
2016-01-31 21:15:03 -06:00
Thomas Tuegel
aea5ee64db
qt55.qtenginio: fix Qt module CMake config files
2016-01-31 21:15:03 -06:00
Thomas Tuegel
35c7cdac5f
qt55.qtlocation: fix Qt module CMake config files
2016-01-31 21:15:03 -06:00
Thomas Tuegel
ea0794696f
qt55.qtmultimedia: fix Qt module CMake config files
2016-01-31 21:15:03 -06:00
Thomas Tuegel
89dc8118b4
qt55.qtquick1: fix Qt module CMake config files
2016-01-31 21:15:03 -06:00
Thomas Tuegel
abcb26c2bb
qt55.qtsensors: fix Qt module CMake config files
2016-01-31 21:15:03 -06:00
Thomas Tuegel
50de9a3f09
qt55.qtserialport: fix Qt module CMake config files
2016-01-31 21:15:03 -06:00
Thomas Tuegel
02f2761233
qt55.qtsvg: fix Qt module CMake config files
2016-01-31 21:15:03 -06:00
Thomas Tuegel
ed20a6a97c
qt55.qttools: fix Qt module CMake config files
2016-01-31 21:15:03 -06:00
Thomas Tuegel
db7cabe098
qt55.qtwebkit: fix Qt module CMake config files
2016-01-31 21:15:03 -06:00
Thomas Tuegel
da454bc547
qt55.qtwebsockets: fix Qt module CMake config files
2016-01-31 21:15:03 -06:00
Thomas Tuegel
055b1b86c5
qt55.qtx11extras: fix Qt module CMake config files
2016-01-31 21:15:03 -06:00
Thomas Tuegel
27824e3332
qt55.qtxmlpatterns: fix Qt module CMake config files
2016-01-31 21:15:03 -06:00
Thomas Tuegel
6c37bebabd
qt55.qtdeclarative: fix Qt module CMake config files
2016-01-31 21:15:03 -06:00
Thomas Tuegel
6dfabcb47b
qt55.qtscript: fix Qt module CMake config files
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
ac5a585ed8
qt55: add fixQtModuleCMakeConfig setup hook
2016-01-31 21:15:03 -06:00
Thomas Tuegel
4465f438de
qt55: improve update documentation
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
0055c6aa94
qt54: use multiple outputs
2016-01-31 21:14:24 -06:00
Thomas Tuegel
d8a08fff90
qt54: 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:14:24 -06:00
Thomas Tuegel
67d5a026ca
qt54.qtbase: don't propagate makeWrapper dependency
...
I have no idea how it even got here; it's certainly not necessary!
2016-01-31 21:14:24 -06:00
Thomas Tuegel
4ed8d5d125
qt54.qtbase: don't propagate extra Mesa dependency
...
The note accompanying this dependency says "it's small and doesn't
remain a runtime-dep if not used," but *neither* of those statements is
true.
2016-01-31 21:14:24 -06:00
Thomas Tuegel
a6fd9e9be6
qt54.qtbase: don't propagate gtk dependencies
...
It is not necessary to propagate the GTK dependencies if Qt is
configured with the GTK Style enabled.
2016-01-31 21:14:24 -06:00
Thomas Tuegel
b0753cec2a
qt54.qtbase: don't propagate postgresql dependency
...
It is not necessary to propagate the postgresql buildInput if Qt is
configured with PostgreSQL enabled.
2016-01-31 21:14:24 -06:00
Thomas Tuegel
5fb4e3b338
qt54.qtbase: don't propagate mysql dependency
...
It is not necessary to propagate the mysql buildInput if Qt is configure
with MySQL enabled.
2016-01-31 21:14:24 -06:00
Thomas Tuegel
c1f0f62a9c
qt54.qtbase: don't propagate cups dependency
...
It is not necessary to propagate the cups buildInput if Qt is configured
with cups enabled.
2016-01-31 21:14:24 -06:00
Thomas Tuegel
66d76f8b5b
qt54.qtbase: don't rever to .dev outputs at runtime
2016-01-31 21:14:24 -06:00
Thomas Tuegel
9e743fd151
qt54.qtbase: fix path typo in resolv patch
2016-01-28 11:15:58 -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
Thomas Tuegel
2b76df28b0
qt54.qtbase: fix evaluation error
2016-01-23 07:03:11 -06:00
Vladimír Čunát
f9f6f41bff
Merge branch 'master' into closure-size
...
TODO: there was more significant refactoring of qtbase and plasma 5.5
on master, and I'm deferring pointing to correct outputs to later.
2015-12-31 09:53:02 +01:00
Robin Gloster
99b1b464b4
qt55.qtbase: add patch to build with libressl 2.3
2015-12-23 22:10:01 +00:00
Thomas Tuegel
f250a6e64e
qt5: build env and full per version
2015-12-20 07:56:38 -06:00
Thomas Tuegel
1402c20bfd
qt54: backport Qt infrastructure changes from Qt 5.5
2015-12-19 16:20:27 -06:00
Thomas Tuegel
36dda92317
qt55.qtbase: don't interpolate needlessly
2015-12-19 12:26:54 -06:00
Thomas Tuegel
09e9e3e359
fixup! qt55.qtbase: don't include optional dependencies unconditionally
2015-12-19 12:26:45 -06:00
Thomas Tuegel
98e2fbe630
qt55.qtbase: remove non-existent paths from LD_LIBRARY_PATH
2015-12-19 12:18:48 -06:00
Thomas Tuegel
0a54898a20
qt55.qtbase: don't include optional dependencies unconditionally
2015-12-19 12:18:06 -06:00
Thomas Tuegel
9f62af0885
qt55.qtbase: fallback libGL path
...
If libGL is not found on the system library path, fall back to the
default Mesa driver.
2015-12-19 12:15:33 -06:00
Thomas Tuegel
081b1f1707
qt55.qtbase: set compose search path
...
This was previously set using substituteInPlace, but this leads to
duplicate search paths.
2015-12-19 12:02:57 -06:00
Thomas Tuegel
14f27e5eb7
qt55.qtbase: move sed scripts to postPatch
2015-12-19 11:59:05 -06:00
Thomas Tuegel
8b890cac07
qt55.qtbase: manage patches with quilt
2015-12-19 11:56:50 -06:00
Luca Bruno
a412927924
Merge remote-tracking branch 'origin/master' into closure-size
2015-11-25 21:37:30 +01:00
Thomas Tuegel
4cb7779a5a
qt55: 5.5.0 -> 5.5.1
2015-11-23 12:58:39 -06:00
Vladimír Čunát
333d69a5f0
Merge staging into closure-size
...
The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.
2015-11-20 14:32:58 +01:00
Bjørn Forsman
2cec70ce6c
qt55: fix qtmultimedia gstreamer support
...
Without this, configure will say:
Checking for openal... no
/tmp/nix-build-qtmultimedia-5.5.0.drv-0/qtmultimedia-opensource-src-5.5.0/qtmultimedia.pro:28:
Variable GST_VERSION is not defined.
Checking for resourcepolicy... no
And there may be application runtime errors like
defaultServiceProvider::requestService(): no service found for - "org.qt-project.qt.camera"
After this fix, configure will say:
Checking for openal... no
Checking for gstreamer... yes
Checking for gstreamer_photography... no
Checking for gstreamer_encodingprofiles... yes
Checking for gstreamer_appsrc... yes
Checking for linux_v4l... yes
Checking for resourcepolicy... no
And the above runtime error will not appear.
This fix is similar to 449b6028
("qt5.multimedia: fix gstreamer
support."), except with Qt 5.5 we also need to set GST_VERSION.
2015-11-09 10:55:04 +01:00
Thomas Tuegel
24babaad9a
makeQtWrapper: wrap XDG directories
2015-10-31 08:48:53 -05:00
Thomas Tuegel
dcd70c54aa
qtbase: copy qmake to temp dir
...
Fixes #10273 .
2015-10-31 08:48:45 -05:00
Thomas Tuegel
361b1165ef
qtbase: propagate runtime dependencies
...
This is done so that makeQtWrapper works correctly.
2015-10-30 16:10:37 -05:00
Thomas Tuegel
9fa17aa293
kdoctools: set XDG_DATA_DIRS in setupHook
2015-10-30 16:10:37 -05:00
Thomas Tuegel
5a2c45427b
makeQtWrapper: always wrap impurely
2015-10-30 16:10:37 -05:00
Thomas Tuegel
fb375f1a2e
qt55: set QML import paths from NIX_PROFILES
2015-10-30 16:10:37 -05:00
Thomas Tuegel
b1f904f69a
qt55: set Qt Quick import paths from NIX_PROFILES
2015-10-30 16:10:37 -05:00
Thomas Tuegel
a3855ef9ae
qt55: set library paths from NIX_PROFILES
2015-10-30 16:10:37 -05:00
Thomas Tuegel
d57e50d840
separate makeQtWrapper from qtbase setup-hook
2015-10-30 16:10:37 -05:00
Thomas Tuegel
89d31daa8f
qtmultimedia: build with gstreamer-1.0
...
Fixes #10289 .
2015-10-30 16:10:37 -05:00
Thomas Tuegel
a122ca8ba3
qt55.qtbase: add makeQtWrapper
2015-10-30 16:10:37 -05:00
Thomas Tuegel
ebb9c07168
qtbase: remove redundant directory checks
...
addToSearchPath already checks if the directory exists before adding it
to the path; it's not necessary to check it again.
2015-10-30 16:10:37 -05:00