Merge branch 'core-updates'

gnu: qt: Add patch for i686 build problem.

See <https://bugreports.qt.io/browse/QTBUG-45205>.

* gnu/packages/patches/qt5-conflicting-typedefs.patch: New file.
* gnu-system.am (dist_patch_DATA): Add it.
* gnu/packages/qt.scm (qt): Add the patch.

Merge branch 'core-updates'

gnu: qt-4: Add "doc" output; use more standard directory names.

* gnu/packages/qt.scm (qt-4)[outputs]: New field.
  (qt-4)[arguments]: Pass '-docdir', '-demosdir', and '-examplesdir'.

gnu: qt-4: Do not set $LDFLAGS since that triggerred a build failure.

Fixes the build failure at <http://hydra.gnu.org/build/379884/log/raw>:

  g++ -licui18n -Wl,-O1 [...] -o ../../../../bin/assistant [...]
  ld: warning: libQtCLucene.so.4, needed by /tmp/nix-build-qt-4.8.6.drv-0/qt-everywhere-opensource-src-4.8.6/lib/libQtHelp.so, not found (try using -rpath or -rpath-link)
  /tmp/nix-build-qt-4.8.6.drv-0/qt-everywhere-opensource-src-4.8.6/lib/libQtHelp.so: undefined reference to `QCLucenePhraseQuery::getTerms() const'
  [...]

* gnu/packages/patches/qt4-ldflags.patch: New file.
* gnu-system.am (dist_patch_DATA): Add it.
* gnu/packages/qt.scm (qt-4)[source]: Use it.
  [arguments]: Remove 'setenv' call in 'configure' phase.

gnu: qt-5: Allow the use of DT_RUNPATH for libQt5WebEngineCore.so.

* gnu/packages/patches/qt5-runpath.patch: New file.
* gnu-system.am (dist_patch_DATA): Add it.
* gnu/packages/qt.scm (qt)[source]: Use it.

Merge branch 'master' into core-updates

gnu: qt: Update to 5.4.1.

* gnu/packages/qt.scm (qt): Update to 5.4.1.

gnu: Move 'which' to (gnu packages base).

* gnu/packages/which.scm: Remove.
* gnu-system.am (GNU_SYSTEM_MODULES): Remove it.
* gnu/packages/base.scm (which): New variable.
* gnu/packages/aspell.scm, gnu/packages/audio.scm,
  gnu/packages/autogen.scm, gnu/packages/cdrom.scm,
  gnu/packages/compression.scm, gnu/packages/datamash.scm,
  gnu/packages/games.scm, gnu/packages/glib.scm,
  gnu/packages/gnu-pw-mgr.scm, gnu/packages/gnutls.scm,
  gnu/packages/gps.scm, gnu/packages/guile.scm,
  gnu/packages/java.scm, gnu/packages/libevent.scm,
  gnu/packages/linux.scm, gnu/packages/lisp.scm,
  gnu/packages/node.scm, gnu/packages/ntp.scm,
  gnu/packages/orpheus.scm, gnu/packages/pciutils.scm,
  gnu/packages/python.scm, gnu/packages/qt.scm,
  gnu/packages/rsync.scm, gnu/packages/sawfish.scm,
  gnu/packages/scheme.scm, gnu/packages/ssh.scm,
  gnu/packages/statistics.scm, gnu/packages/texlive.scm,
  gnu/packages/wdiff.scm: Adjust accordingly.

Merge branch 'master' into core-updates

gnu: Add PyQt for Qt-4.

* gnu/packages/qt.scm (python-pyqt-4, python2-pyqt-4): New variables.

gnu: Add python-pyqt.

* gnu/packages/qt.scm (python-pyqt, python2-pyqt): New variables.
* gnu/packages/patches/pyqt-configure.patch: New file.
* gnu-system.am (dist_patch_DATA): Register patch.

gnu: Add python-sip.

* gnu/packages/qt.scm (python.sip, python2-sip): New variables.

Merge branch 'master' into core-updates

gnu: qt: Add more inputs.

* gnu/packages/qt.scm (qt): Add expat, pciutils, libxcomposite, libxcursor,
  libxfixes, libxinerama, libxml2, libxrandr, libxslt, libxtst, mtdev, nss,
  pcre, sqlite, eudev to 'inputs'.
  Add bison, flex, gperf, ninja, python-2, ruby, which to 'native-inputs'.

gnu: qt: Update to 5.4.0.

* gnu/packages/qt.scm (qt): Update to 5.4.0.
  [origin]: Add snippet.

Merge branch 'master' into 'core-updates'.

gnu: libxkbcommon: Add inputs libx11 and xkeyboard-config and use
  corresponding configure flags.

* gnu/packages/qt.scm (libxkbcommon): Add inputs libx11 and xkeyboard-config.
    Use configure flags to set XKB config root and X11 locale root
    directories.

gnu: qt: Add input ruby.

* gnu/packages/qt.scm (qt): Add input ruby.

gnu: libxkbcommon: Update to 0.5.0.

* gnu/packages/qt.scm (libxkbcommon): Update to 0.5.0.
    Add input libxcb and native input pkg-config.