Commit Graph

238 Commits

Author SHA1 Message Date
Efraim Flashner 852a5692bb
gnu: qt@4: Use invoke.
* gnu/packages/qt.scm (qt@4)[arguments]: Use invoke.
2018-10-28 09:52:46 +02:00
Efraim Flashner 1f71daf499
gnu: qt@4: Update build config.
* gnu/packages/qt.scm (qt@4)[arguments]: Substitute hardcoded '/bin/ls'
invocation. Add configure-flags to not build the examples or demos.
Don't use the precompiled headers.
2018-10-28 09:52:38 +02:00
Efraim Flashner 3ea61f9642
gnu: qt: Use invoke.
* gnu/packages/qt.scm (qt)[arguments]: Use invoke.
2018-10-28 09:52:16 +02:00
Efraim Flashner 124351efad
gnu: qt: Add vulkan support.
* gnu/packages/qt.scm (qt, qtbase)[native-inputs]: Add vulkan-headers.
(qt@4)[native-inputs]: Don't add vulkan-headers.
(qttools)[native-inputs]: Add vulkan-headers.
2018-10-28 09:51:56 +02:00
Efraim Flashner d28af1991a
gnu: qt: Use system sqlite.
* gnu/packages/databases.scm (sqlite-with-column-metadata): New
variable.
* gnu/packages/qt.scm (qt, qtbase)[source]: Remove bundled sqlite.
[inputs]: Add sqlite-with-column-metadata.
[arguments]: Add configure-flag to use system sqlite.
2018-10-28 09:51:25 +02:00
Efraim Flashner 7930cfc989
gnu: qt: Update to 5.11.2.
* gnu/packages/qt.scm (qt, qtbase, qtsvg, qtimageformats, qtx11extras,
qtxmlpatterns, qtdeclarative, qtconnectivity, qtwebsockets, qtsensors,
qtmultimedia, qtwayland, qtserialport, qtserialbus, qtwebchannel,
qtwebglplugin, qtwebview, qtlocation, qttools, qtscript,
qtquickcontrols, qtquickcontrols2, qtgraphicaleffects, qtgamepad,
qtscxml, qtpurchasing, qtcanvas3d, qtcharts, qtdatavis3d, qtnetworkauth,
qtremoteobjects, qtspeech): Update to 5.11.2.
2018-10-28 09:51:05 +02:00
Efraim Flashner 96bdf904ac
gnu: dotherside: Update home-page.
* gnu/packages/qt.scm (dotherside)[home-page]: Fix project's home-page.
2018-10-24 14:17:53 +03:00
Ricardo Wurmus 0e2d6d2698
gnu: Add python-pyqt-without-qtwebkit.
* gnu/packages/qt.scm (python-pyqt-without-qtwebkit): New variable.
2018-08-31 16:37:56 +02:00
Efraim Flashner 52404022cf
gnu: python-pyqt: Add qtwebkit.
* gnu/packages/qt.scm (python-pyqt)[inputs]: Add qtwebkit.
2018-07-31 17:46:01 +03:00
Andreas Enge 601cb1be2b
gnu: qtwebkit: Update to 5.212.0-alpha2.
* gnu/packages/patches/qtwebkit-pbutils-include.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register the patch.
* gnu/packages/qt.scm (qtwebkit): Update to 5.212.0-alpha2.
[source]: Use new upstream location. Add patch.
[build-system]: Switch to cmake-build-system.
[inputs]: Add glib, gst-plugins-base, qtlocation, qtsensors,
qtwebchannel.
[arguments]: Disable the tests. Add new configure flags. Remove all
custom phases.
2018-07-31 17:45:58 +03:00
Efraim Flashner bca72b39c7
gnu: python-qsintilla: Fix building.
* gnu/packages/qt.scm (python-qscintilla)[arguments]: Extend custom
'configure phase to also patch the 'installed.txt' file.
2018-07-26 13:21:05 +03:00
Efraim Flashner 2a43df2270
gnu: qt: Disable parallel building.
* gnu/packages/qt.scm (qt)[arguments]: Disable parallel-build.
2018-07-25 20:27:55 +03:00
Efraim Flashner d13c1d3363
gnu: qt: Apply changes from qtbase.
* gnu/packages/qt.scm (qt)[arguments]: In custom 'configure phase, add
flags to specify custom destination directories. Use system pcre. Add
flags to support older versions of the linux kernel. Add custom
'patch-mkspecs phase to search in their new location. Add custom
'patch-paths phase to prevent dynamic loading of certain libraries.
[native-search-paths]: New field.
[license]: Update it.
2018-07-25 20:27:52 +03:00
Efraim Flashner 2338755afa
gnu: python-pyqt: Don't use private sip file.
* gnu/packages/qt.scm (python-sip)[arguments]: Don't use '--sip-module'
flag in custom 'configure phase.
(python-pyqt)[sources]: Add patch.
* gnu/packages/patches/pyqt-public-sip.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
2018-07-22 20:43:01 +03:00
Efraim Flashner fac1447bf3
gnu: python-sip: Update to 4.19.12.
* gnu/packages/qt.scm (python-sip): Update to 4.19.12.
2018-07-22 20:42:55 +03:00
Efraim Flashner bba6069708
gnu: python-pyqt-4: Remove variable.
* gnu/packages/qt.scm (python-pyqt-4): Remove variable.
(python2-pyqt-4): Don't inherit from python-pyqt-4.
2018-07-22 20:42:48 +03:00
Efraim Flashner 8911d85b9c
gnu: qsintilla: Update to 2.10.7.
* gnu/packages/qt.scm (qscintilla): Update to 2.10.7.
2018-07-11 11:08:48 +03:00
Efraim Flashner a01a3763fc
gnu: python-pyqt: Update to 5.11.2.
* gnu/packages/qt.scm (python-pyqt): Update to 5.11.2.
[arguments]: Substitute INVOKE for SYSTEM*.
(python2-pyqt)[inputs]: Add python2-enum34.
2018-07-11 11:08:48 +03:00
Efraim Flashner e3232b2627
gnu: python-sip: Update to 4.19.11.
* gnu/packages/qt.scm (python-sip): Update to 4.19.11.
[arguments]: Substitute INVOKE for SYSTEM*. Add flag to build private
sip module PyQt5.sip.
2018-07-11 11:08:48 +03:00
Efraim Flashner f79c7e9747
gnu: qt: Update to 5.11.1.
* gnu/packages/qt.scm (qt): Update to 5.11.1.
[source]: Update snippet.
[inputs]: Remove sqlite.
[arguments]: Don't use system sqlite.
2018-07-11 11:08:48 +03:00
Efraim Flashner 64a64fa72a
gnu: python-pyqt: Remove qt-5.11 compat phase.
* gnu/packages/qt.scm (python-pyqt)[arguments]: Remove custom phase to
fix compatibility with qt-5.11.
2018-07-11 11:08:47 +03:00
Efraim Flashner b6476ecc8b
gnu: qt: Update to 5.11.1.
* gnu/packages/qt.scm (qtbase, qtsvg, qtimageformats, qtx11extras,
qtxmlpatterns, qtdeclarative, qtconnectivity, qtwebsockets, qtsensors,
qtmultimedia, qtwayland, qtserialport, qtserialbus, qtwebchannel,
qtwebglplugin, qtwebview, qtlocation, qttools, qtscript,
qtquickcontrols, qtquickcontrols2, qtgrapgicaleffects, qtgamepad,
qtscxml, qtpurchasing, qtcanvas3d, qtcharts, qtdatavis3d, qtnetworkauth,
qtremoteobjects, qtspeech): Update to 5.11.1.
(qtwebglplugin)[arguments]: Add custom phase to disable network tests.
[inputs]: Add qtdeclarative.
(qtremoteobjects)[arguments]: Add another test to the skip list.
(qtspeech)[arguments]: Disable tests.
2018-07-11 11:08:47 +03:00
Hartmut Goebel b5792b9cb8
gnu: Add qtwebglplugin.
* gnu/packages/qt.scm (qtwebglplugin): New variable.

Co-authored-by: 宋文武 <iyzsong@member.fsf.org>
2018-06-12 22:47:01 +02:00
Hartmut Goebel 359e30c9ea
gnu: Add qtwebview.
* gnu/packages/qt.scm (qtwebview): New variable.
2018-06-12 22:47:01 +02:00
Ricardo Wurmus 32da38d572
Merge branch 'master' into core-updates 2018-06-04 11:25:48 +02:00
Efraim Flashner c0e7a52996
gnu: python-pyqt: Update to 5.10.1.
* gnu/packages/qt.scm (python-pyqt): Update to 5.10.1.
[inputs]: Remove qtwebkit.
[arguments]: Add custom phase to fix compilation with Qt 5.11.
2018-06-04 11:06:00 +03:00
Efraim Flashner 9cdd868450
gnu: python-sip: Update to 4.19.8.
* gnu/packages/qt.scm (python-sip): Update to 4.19.8.
2018-06-04 11:05:57 +03:00
Ludovic Courtès a13c1bf4ca
Merge branch 'master' into core-updates 2018-06-01 23:41:40 +02:00
Ricardo Wurmus 65a9f6b6cf
gnu: qtbase: Fix build on older kernels.
* gnu/packages/qt.scm (qtbase)[arguments]: Add configure flags
"-no-feature-getentropy" and "-no-feature-renameat2".
2018-06-01 17:33:25 +02:00
Mark H Weaver 82b695b834
Merge branch 'master' into core-updates 2018-05-28 20:45:37 -04:00
Efraim Flashner 865003433f
gnu: qtconnectivity: Enable previously failing test.
* gnu/packages/qt.scm (qtconnectivity)[arguments]: Remove custom
'disable-failing-tests phase.
2018-05-27 10:21:33 +03:00
Efraim Flashner 1f52eb7be7
gnu: qt: Update to 5.11.0.
* gnu/packages/qt.scm (qtbase, qtsvg, qtimageformats, qtx11extras,
qtxmlpatterns, qtdeclarative, qtconnectivity, qtwebsockets, qtsensors,
qtmultimedia, qtwayland, qtserialport, qtserialbus, qtwebchannel,
qtlocation, qttools, qtscript, qtquickcontrols, qtquickcontrols2,
qtgraphicaleffects, qtgamepad, qtscxml, qtpurchasing, qtcanvas3d,
qtcharts, qtdatavis3d, qtnetworkauth, qtremoteobjects, qtspeech):
Update to 5.11.0.
[source]: Update source uri.
(qtbase)[source]: Don't remove bundled sqlite.
[inputs]: Remove sqlite.
[arguments]: Use 'invoke'. Use bundled sqlite.
(qtsvg, qtmultimedia, qtcanvas3d)[arguments]: Use 'invoke'.
(qtremoteobjects)[arguments]: Skip new integration test.
2018-05-27 09:05:56 +03:00
Marius Bakke 12bd588346
Merge branch 'master' into core-updates 2018-05-06 15:56:24 +02:00
Tobias Geerinckx-Rice fbf94fb121
gnu: qscintilla: Update to 2.10.3.
* gnu/packages/qt.scm (qscintilla): Update to 2.10.3.
2018-05-04 03:53:52 +02:00
Mark H Weaver c52872bfc4
Merge branch 'master' into core-updates 2018-04-21 05:02:52 -04:00
Tobias Geerinckx-Rice 7dbf4888dc
gnu: qtdatavis3d: Update to 5.9.5.
* gnu/packages/qt.scm (qtdatavis3d): Update to 5.9.5.
2018-04-17 04:02:23 +02:00
Tobias Geerinckx-Rice c972f17160
gnu: qtscxml: Update to 5.9.5.
* gnu/packages/qt.scm (qtscxml): Update to 5.9.5.
2018-04-17 04:02:22 +02:00
Tobias Geerinckx-Rice 506cbdb3c5
gnu: qtserialbus: Update to 5.9.5.
* gnu/packages/qt.scm (qtserialbus): Update to 5.9.5.
2018-04-17 04:02:22 +02:00
Mark H Weaver e3cfef22c4
gnu: Use invoke and return #t from all builders.
* gnu/packages/admin.scm, gnu/packages/android.scm, gnu/packages/audio.scm,
gnu/packages/avr.scm, gnu/packages/base.scm, gnu/packages/bioinformatics.scm,
gnu/packages/certs.scm, gnu/packages/check.scm, gnu/packages/code.scm,
gnu/packages/commencement.scm, gnu/packages/dictionaries.scm,
gnu/packages/docbook.scm, gnu/packages/emacs.scm, gnu/packages/embedded.scm,
gnu/packages/fonts.scm, gnu/packages/games.scm, gnu/packages/gnome.scm,
gnu/packages/gnu-doc.scm, gnu/packages/guile.scm, gnu/packages/hurd.scm,
gnu/packages/javascript.scm, gnu/packages/libreoffice.scm,
gnu/packages/linux.scm, gnu/packages/lisp.scm, gnu/packages/lxde.scm,
gnu/packages/mail.scm, gnu/packages/markup.scm, gnu/packages/mate.scm,
gnu/packages/pkg-config.scm, gnu/packages/qt.scm, gnu/packages/rust.scm,
gnu/packages/scheme.scm, gnu/packages/sdl.scm, gnu/packages/statistics.scm,
gnu/packages/syncthing.scm, gnu/packages/tex.scm, gnu/packages/web.scm,
gnu/packages/wine.scm, gnu/packages/xfce.scm: In the builders of packages
using 'trivial-build-system', use invoke where appropriate, raise exceptions
on errors, and otherwise return #t.
2018-03-27 21:35:41 -04:00
Mark H Weaver ac21be848a
Merge branch 'master' into core-updates 2018-03-20 14:22:06 -04:00
ng0 4a78fd4617
Correct name and Email for ng0.
* .mailmap: Correct name and Email for ng0.
* Makefile.am, doc/guix.texi, etc/completion/fish/guix.fish
gnu/packages/accessibility.scm, gnu/packages/admin.scm,
gnu/packages/audio.scm, gnu/packages/autotools.scm,
gnu/packages/cdrom.scm, gnu/packages/check.scm,
gnu/packages/cinnamon.scm, gnu/packages/compression.scm,
gnu/packages/crypto.scm, gnu/packages/databases.scm,
gnu/packages/django.scm, gnu/packages/dns.scm,
gnu/packages/emacs.scm, gnu/packages/enlightenment.scm,
gnu/packages/fonts.scm, gnu/packages/fontutils.scm,
gnu/packages/forth.scm, gnu/packages/fvwm.scm,
gnu/packages/games.scm, gnu/packages/gl.scm,
gnu/packages/gnome.scm, gnu/packages/gnunet.scm,
gnu/packages/gnupg.scm, gnu/packages/gnuzilla.scm,
gnu/packages/gtk.scm, gnu/packages/guile-wm.scm,
gnu/packages/guile.scm, gnu/packages/haskell-check.scm,
gnu/packages/haskell-crypto.scm, gnu/packages/haskell.scm,
gnu/packages/image-viewers.scm, gnu/packages/image.scm,
gnu/packages/irc.scm, gnu/packages/language.scm,
gnu/packages/libcanberra.scm, gnu/packages/linux.scm,
gnu/packages/lisp.scm, gnu/packages/lolcode.scm,
gnu/packages/lxde.scm, gnu/packages/lxqt.scm,
gnu/packages/mail.scm, gnu/packages/markup.scm,
gnu/packages/mate.scm, gnu/packages/maths.scm,
gnu/packages/mc.scm, gnu/packages/messaging.scm,
gnu/packages/music.scm, gnu/packages/ncurses.scm,
gnu/packages/networking.scm, gnu/packages/nickle.scm,
gnu/packages/openbox.scm, gnu/packages/pdf.scm,
gnu/packages/perl-check.scm, gnu/packages/perl.scm,
gnu/packages/python-crypto.scm, gnu/packages/python-web.scm,
gnu/packages/python.scm, gnu/packages/qt.scm,
gnu/packages/ruby.scm, gnu/packages/rust.scm,
gnu/packages/scheme.scm, gnu/packages/serialization.scm,
gnu/packages/shells.scm, gnu/packages/ssh.scm,
gnu/packages/suckless.scm, gnu/packages/tbb.scm,
gnu/packages/telephony.scm, gnu/packages/text-editors.scm,
gnu/packages/textutils.scm, gnu/packages/time.scm,
gnu/packages/tls.scm, gnu/packages/tor.scm,
gnu/packages/version-control.scm, gnu/packages/video.scm,
gnu/packages/vim.scm, gnu/packages/web.scm,
gnu/packages/wm.scm, gnu/packages/xdisorg.scm,
gnu/packages/xfce.scm, gnu/packages/xml.scm,
gnu/packages/xorg.scm, gnu/services/certbot.scm,
gnu/services/desktop.scm, gnu/services/version-control.scm,
gnu/services/web.scm, guix/import/hackage.scm,
guix/licenses.scm: Likewise.

Signed-off-by: Tobias Geerinckx-Rice <me@tobias.gr>
2018-03-20 17:17:58 +01:00
Mark H Weaver 647888845c
Merge branch 'master' into core-updates 2018-03-20 00:49:05 -04:00
Tobias Geerinckx-Rice c695fb769c
gnu: Fix common unquote typos.
It's easy to mistype ‘("foo" foo)’ as ‘("foo", foo)’ (which also works).
Fix such typos for the proper edification of our young.

* gnu/packages/android.scm: Move unquotes to their operands.
* gnu/packages/bootloaders.scm: Likewise.
* gnu/packages/build-tools.scm: Likewise.
* gnu/packages/chemistry.scm: Likewise.
* gnu/packages/compression.scm: Likewise.
* gnu/packages/connman.scm: Likewise.
* gnu/packages/django.scm: Likewise.
* gnu/packages/emulators.scm: Likewise.
* gnu/packages/engineering.scm: Likewise.
* gnu/packages/file-systems.scm: Likewise.
* gnu/packages/freedesktop.scm: Likewise.
* gnu/packages/games.scm: Likewise.
* gnu/packages/gimp.scm: Likewise.
* gnu/packages/gl.scm: Likewise.
* gnu/packages/gnome.scm: Likewise.
* gnu/packages/graphics.scm: Likewise.
* gnu/packages/haskell.scm: Likewise.
* gnu/packages/irc.scm: Likewise.
* gnu/packages/julia.scm: Likewise.
* gnu/packages/kde-frameworks.scm: Likewise.
* gnu/packages/linux.scm: Likewise.
* gnu/packages/lua.scm: Likewise.
* gnu/packages/mail.scm: Likewise.
* gnu/packages/make-bootstrap.scm: Likewise.
* gnu/packages/messaging.scm: Likewise.
* gnu/packages/music.scm: Likewise.
* gnu/packages/networking.scm: Likewise.
* gnu/packages/ocaml.scm: Likewise.
* gnu/packages/perl.scm: Likewise.
* gnu/packages/python.scm: Likewise.
* gnu/packages/python-web.scm: Likewise.
* gnu/packages/qt.scm: Likewise.
* gnu/packages/ratpoison.scm: Likewise.
* gnu/packages/sdl.scm: Likewise.
* gnu/packages/sml.scm: Likewise.
* gnu/packages/terminals.scm: Likewise.
* gnu/packages/text-editors.scm: Likewise.
* gnu/packages/video.scm: Likewise.
* gnu/packages/virtualization.scm: Likewise.
* gnu/packages/vulkan.scm: Likewise.
* gnu/packages/wget.scm: Likewise.
* gnu/packages/wine.scm: Likewise.
* gnu/packages/wm.scm: Likewise.
* gnu/packages/xdisorg.scm: Likewise.
* gnu/packages/xml.scm: Likewise.
* gnu/packages/xorg.scm: Likewise.
2018-03-17 16:37:27 +01:00
Ricardo Wurmus 07380d10f5
gnu: qtbase: Build with mariadb.
* gnu/packages/qt.scm (qtbase)[inputs]: Replace mysql with mariadb.
2018-03-16 17:36:02 +01:00
Ricardo Wurmus 3283f2617f
gnu: qt: Build with mariadb.
* gnu/packages/qt.scm (qt)[inputs]: Replace mysql with mariadb.
2018-03-16 17:35:42 +01:00
Mark H Weaver 6cbee49d66
gnu: All snippets report errors using exceptions, else return #t.
* gnu/packages/admin.scm, gnu/packages/algebra.scm, gnu/packages/audio.scm,
gnu/packages/backup.scm, gnu/packages/base.scm,
gnu/packages/bioinformatics.scm, gnu/packages/cdrom.scm,
gnu/packages/chez.scm, gnu/packages/code.scm, gnu/packages/compression.scm,
gnu/packages/cross-base.scm, gnu/packages/crypto.scm, gnu/packages/cups.scm,
gnu/packages/databases.scm, gnu/packages/dns.scm, gnu/packages/emacs.scm,
gnu/packages/emulators.scm, gnu/packages/engineering.scm,
gnu/packages/enlightenment.scm, gnu/packages/fpga.scm,
gnu/packages/freedesktop.scm, gnu/packages/ftp.scm, gnu/packages/games.scm,
gnu/packages/gcc.scm, gnu/packages/geo.scm, gnu/packages/ghostscript.scm,
gnu/packages/gl.scm, gnu/packages/glib.scm, gnu/packages/gnome.scm,
gnu/packages/gnuzilla.scm, gnu/packages/graphics.scm, gnu/packages/gtk.scm,
gnu/packages/guile.scm, gnu/packages/irc.scm, gnu/packages/java.scm,
gnu/packages/kerberos.scm, gnu/packages/linux.scm, gnu/packages/lisp.scm,
gnu/packages/lxde.scm, gnu/packages/machine-learning.scm,
gnu/packages/mail.scm, gnu/packages/maths.scm, gnu/packages/messaging.scm,
gnu/packages/monitoring.scm, gnu/packages/mp3.scm, gnu/packages/music.scm,
gnu/packages/netpbm.scm, gnu/packages/networking.scm, gnu/packages/node.scm,
gnu/packages/nvi.scm, gnu/packages/ocaml.scm, gnu/packages/pdf.scm,
gnu/packages/perl.scm, gnu/packages/php.scm, gnu/packages/plotutils.scm,
gnu/packages/pretty-print.scm, gnu/packages/profiling.scm,
gnu/packages/pulseaudio.scm, gnu/packages/python-crypto.scm,
gnu/packages/python.scm, gnu/packages/qt.scm, gnu/packages/robotics.scm,
gnu/packages/sawfish.scm, gnu/packages/scanner.scm, gnu/packages/scheme.scm,
gnu/packages/scribus.scm, gnu/packages/sdl.scm,
gnu/packages/serialization.scm, gnu/packages/shells.scm,
gnu/packages/slang.scm, gnu/packages/smalltalk.scm, gnu/packages/ssh.scm,
gnu/packages/sync.scm, gnu/packages/syncthing.scm, gnu/packages/tbb.scm,
gnu/packages/terminals.scm, gnu/packages/texinfo.scm,
gnu/packages/text-editors.scm, gnu/packages/textutils.scm,
gnu/packages/tls.scm, gnu/packages/unrtf.scm,
gnu/packages/version-control.scm, gnu/packages/video.scm,
gnu/packages/vpn.scm, gnu/packages/web.scm, gnu/packages/wm.scm,
gnu/packages/wxwidgets.scm, gnu/packages/xdisorg.scm, gnu/packages/xorg.scm:
In all snippets, report errors using exceptions, or else return #t.
2018-03-16 09:08:31 -04:00
Tobias Geerinckx-Rice d338321ddb
gnu: qscintilla: Use HTTPS home page.
* gnu/packages/qt.scm (qscintilla)[home-page]: Use HTTPS.
2018-03-02 15:52:55 +01:00
Marius Bakke 418cbf6e22
gnu: qt.scm: Remove unneeded import.
* gnu/packages/qt.scm (define-module): Don't import (gnu packages base).
2018-02-18 20:44:19 +01:00
Hartmut Goebel 042f7c2636
gnu: qtserialport: Use the store paths for dynamically loaded libs.
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.
2018-02-18 18:39:19 +01:00
Hartmut Goebel 64f390a409
gnu: qtbase: Use the store paths for other packages and dynamically loaded libs.
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.
2018-02-18 18:39:18 +01:00