Transfer the applicable NixOS patches for qtserialport as of 2018-01-19:
- src/serialport/qtudev_p.h: Transferred: Use hard-coded path to libudev.
* gnu/packages/qt.scm(qtserialport)[#:phases]<patch-dlopen-paths>:
New phase.
Transfer the applicable NixOS patches as of 2018-01-19:
- Not adopted: We don't change the .cmake.in and .prf, but use config
mechanisms provided by th Qt build system.
- src/corelib/tools/qtimezoneprivate_tz.cpp: Adopted patch: Use $TZDIR to
search for time-zone data. Thus avoid depending on package "tzdata", which
often introduces changes with near-immediate effects, so it's important to
be able to update it fast.
- src/corelib/kernel/qcoreapplication.cpp: Not adopted: NixOS adds plugin
paths derived from PATH. We do not need this, since we already have
native-search-path QT_PLUGIN_PATH.
- src/network/kernel/qdnslookup_unix.cpp,
src/network/kernel/qhostinfo_unix.cpp: Transferred: Use hard-coded path to
libresolv.
- src/network/ssl/qsslcontext_openssl.cpp: Not adopted: NixOS changes a
conditional compilation for Qt 5.9 (but leaves it unchanged for Qt 5.10) to
fix compilation with libressl. But Qt does not support libressl anway, see
config.tests/openssl/openssl.cpp in qtbase 5.9.4.
- src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp:
Transferred: Use hard-coded path to libx11.
- src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp:
Transferred: Use hard-coded path to mess's libGL, no need for a fall-back.
- src/plugins/platforms/xcb/qxcbcursor.cpp: Transferred: Use hard-coded path
to Xcursor.
- src/plugins/platformthemes/gtk3/main.cpp: Not adopted: NixOS changes
$XDG_DATA_DIRS and $GIO_EXTRA_MODULES in the code. We already have a
search-path-specification for this.
- src/testlib/qtestassert.h: Decided not to adopt this for guix.
* gnu/packages/patches/qtbase-use-TZDIR.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/qt.scm (qtbase): Add comment. [source]: Use new patch.
[arguments]<#:phases>'patch-paths': New phase.
* gnu/packages/qt.scm (python-qscintilla)[arguments]: In the 'configure'
phase, remove result code plumbing that is no longer needed, since 'invoke'
never returns #false.
Fixes a regression introduced in 8075b62378.
This allows 'linguist.pro' of 'qttools' to find 'ConfigVersion.cmake.in',
which is needed for 'Qt5LinguistToolsConfigVersion.cmake'.
Reported by Thomas Danckaert <post@thomasdanckaert.be>.
* gnu/packages/qt.scm (qtsvg)[arguments]: Set 'EffectiveSourcePaths' in
the 'configure-qmake' phase.
After the qtbase installation directories have been changed,
the relative RPATH in the libs no longer matched the sructure.
* gnu/packages/qt.scm(qtwebkit)[arguments]: New phase
fix-qmlwebkit-plugins-rpath.
* gnu/packages/qt.scm (qwt)[arguments]<#:phases>: Modify 'qwtconfig.pri' to
use a directory layout that matching qtbase. Modify 'doc/doc.pro' to remove
the misplaced installation of man pages. Rename phase 'install-documentation'
to 'install-man-pages'.
Before this, the paths in pkg-config (.pc) and libtool (.la) files of
submodules are all pointing to qtbase.
* gnu/packages/qt.scm (qtbase)[native-inputs]: Move 'which' to
'propagated-inputs'.
[arguments]: Rename 'patch-qt_config.prf' phase to 'patch-mkspecs' and
patch more qmake spec files there.
(qtsvg)[arguments]: Add 'configure-qmake' phase.
* gnu/packages/qt.scm (qtmultimedia)[inputs]: Add gstreamer and
gst-plugins-base.
[arguments]: Replace configure phase to pass extra arguments to qmake.
* gnu/packages/qt.scm (qtbase)[arguments]: Change the configure flags to
not use the precompiled headers. Enable x86_64 special hardware
instructions which have runtime detection.
* gnu/packages/patches/qtscript-disable-tests.patch: New file.
* gnu/packages/qt.scm (qtscript)[source]: Use it.
* gnu/local.am (dist_patch_DATA): Register it.
* gnu/packages/qt.scm (qtsvg)[arguments]: Set QT_BUILD_PARTS in the
custom 'configure phase to include tests. Add custom 'set-display
phase to enable offscreen tests.
(qtx11extras, qtxmlpatterns, qtdeclarative, qtwebsockets, qtlocation,
qttools, qtquickcontrols, qtquickcontrols2, qtgraphicaleffects,
qtcharts, qtdatavis3d)[arguments]: Disable tests.
(qtmultimedia)[source]: Edit snippet to not build 'spectrum' example.
[arguments]: Disable tests.
(qtscxml)[source]: Edit snippet to not build 'scion' test.
(qtcanvas3d)[arguments]: Don't build the test suite, don't run the tests.
Marius Bakke