Commit graph

351 commits

Author SHA1 Message Date
Marius Bakke
5ded8494ca
gnu: Add python2-pyqtwebengine.
* gnu/packages/qt.scm (python2-pyqtwebengine): New public variable.
2020-06-08 19:13:28 +02:00
Marius Bakke
4c1ca82487
gnu: python2-pyqt: Propagate requireed inputs.
* gnu/packages/qt.scm (python2-pyqt)[propagated-inputs]: Add PYTHON2-SIP and
PYTHON-ENUM34.  New field.
2020-06-08 19:12:31 +02:00
Marius Bakke
dd2d3ed2d3
Merge branch 'master' into staging 2020-06-08 19:05:56 +02:00
Marius Bakke
24b61fb8ea
gnu: python-pyqtwebengine: Remove duplicate input.
* gnu/packages/qt.scm (python-pyqtwebengine)[inputs]: Remove PYTHON-PYQT.
2020-06-07 22:43:00 +02:00
Marius Bakke
7c7e9ac716
gnu: python-pyqtwebengine: Update to 5.14.0.
* gnu/packages/qt.scm (python-pyqtwebengine): Update to 5.14.0.
[source](uri): Add PyPI mirror.
2020-06-07 22:42:27 +02:00
Marius Bakke
3c48fe3658
gnu: python-pyqt: Use PYTHON-VERSION.
* gnu/packages/qt.scm (python-pyqt)[arguments]: Add #:modules.  Use
PYTHON-VERSION from PYTHON-BUILD-SYSTEM instead of custom implementation.
2020-06-07 22:41:14 +02:00
Marius Bakke
fd702f8e95
gnu: python-pyqt: Update to 5.14.2.
* gnu/packages/qt.scm (python-pyqt): Update to 5.14.2.
[source](uri): Add PyPI mirror.
[source](patches): Remove obsolete.
* gnu/packages/patches/pyqt-unbundled-qt.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
2020-06-07 22:39:55 +02:00
Marius Bakke
8cbb32da7d
gnu: python-sip: Use PYTHON-VERSION.
* gnu/packages/qt.scm (python-sip)[arguments]: Add #:imported-modules.
Rewrite phase to use PYTHON-VERSION instead of custom implementation.
2020-06-07 22:38:30 +02:00
Marius Bakke
9097f99448
gnu: python-sip: Update to 4.19.22.
* gnu/packages/qt.scm (python-sip): Update to 4.19.22.
2020-06-07 22:36:03 +02:00
Tobias Geerinckx-Rice
d8a85f8200
gnu: qwt: Update to 6.1.5.
* gnu/packages/qt.scm (qwt): Update to 6.1.5.
2020-06-07 18:43:38 +02:00
Marius Bakke
0ec1622cb2
gnu: grantlee: Update to 5.2.0.
* gnu/packages/qt.scm (grantlee): Update to 5.2.0.
[inputs]: Add QTDECLARATIVE.
[arguments]: Remove #:configure-flags.  Remove obsolete phase.
2020-06-06 22:13:25 +02:00
Marius Bakke
7ce1b5e7b7
Merge branch 'master' into staging 2020-06-06 21:25:43 +02:00
Marius Bakke
75c5d360d9
gnu: grantlee: Correct license.
* gnu/packages/qt.scm (grantlee)[license]: Set to LGPL2.1+.
2020-06-06 21:14:17 +02:00
Marius Bakke
c37b621cf3
gnu: qtwebengine: Fix build failure.
* gnu/packages/qt.scm (qtwebengine)[source](snippet): Preserve the included
Mesa headers, to avoid an incompatibility with system Mesa.  Also adjust some
files to use system Vulkan headers.  Preserve third_party/emoji-segmenter.
[inputs]: Remove obsolete comment (LCMS is already in inputs).
2020-05-26 22:36:12 +02:00
Jonathan Brielmaier
20b5f14981
gnu: qtdeclarative: Fix reference on qmlcachegen.
* gnu/packages/qt.scm (qtdeclarative)[arguments]: Add phase to fix the
reference on qmlcachegen in an installed cmake file.
2020-05-26 22:36:11 +02:00
TomZ
8d1ab36a56
gnu: Qt: Update to 5.14.2.
* gnu/packages/qt.scm (qtsvg, qtimageformats, qtx11extras,
qtxmlpatterns, qtconnectivity, qtwebsockets, qtsensors,
qtmultimedia, qtserialport, qtserialbus, qtwebchannel,
qtwebview, qtlocation, qttools, qtscript, qtquickcontrols,
qtquickcontrols2, qtgraphicaleffects, qtgamepad, qtscxml,
qtpurchasing, qtcharts, qtdatavis3d, qtnetworkauth,
qtspeech, qtwebengine): Update to 5.14.2.
(qtcanvas3d): Remove variable.  Upstream deprecated it.
(qtbase)[source](patches): Remove qtbase-QTBUG-81715.patch.
[arguments]: Drop X11lib substitution: patched dir no longer exists.
(qtwayland)[arguments]: Disable two tests, and add phase to prevent fatal DBus
warnings.
(qtwebglplugin)[inputs]: Add ZLIB.
(qtremoteobjects): Disable some tests that fail due to missing network.
(qtdeclarative)[native-inputs]: Add VULKAN-HEADERS.
(qtwebengine)[source](snippet): Adjust list of preserved files.
[inputs]: Add VULKAN-HEADERS.
* gnu/packages/patches/qtbase-QTBUG-81715.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.

Co-authored-by: Marius Bakke <mbakke@fastmail.com>
2020-05-26 22:32:56 +02:00
Kei Kebreau
e792dd3244
gnu: Add libqglviewer.
* gnu/packages/qt.scm (libqglviewer): New variable.
2020-05-13 17:03:55 -04:00
nikita
3c986a7dc2
mailmap: Update entries for Nikita.
* .mailmap: change email and name for Nikita.
* 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/elixir.scm, gnu/packages/emacs-xyz.scm, gnu/packages/emacs.scm,
gnu/packages/enlightenment.scm, gnu/packages/erlang.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/gtk.scm, gnu/packages/guile-wm.scm, gnu/packages/guile-xyz.scm,
gnu/packages/haskell-apps.scm, gnu/packages/haskell-check.scm,
gnu/packages/haskell-crypto.scm, gnu/packages/haskell-xyz.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-xyz.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-compression.scm, gnu/packages/python-crypto.scm,
gnu/packages/python-web.scm, gnu/packages/python-xyz.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: Efraim Flashner <efraim@flashner.co.il>
2020-05-13 09:30:26 +03:00
Marius Bakke
16fbbf6a85
gnu: re2: Update to 2020-05-01.
* gnu/packages/regex.scm (re2): Update to 2020-05-01.
[source](modules, snippet): New fields.
* gnu/packages/chromium.scm (ungoogled-chromium)[arguments]: Add substitution
to adjust for re2 API change.
* gnu/packages/qt.scm (qtwebengine)[arguments]: Likewise.
2020-05-11 21:55:01 +02:00
Marius Bakke
030f6f489f
Merge branch 'master' into core-updates
Conflicts:
	etc/news.scm
	gnu/local.mk
	gnu/packages/bootloaders.scm
	gnu/packages/linphone.scm
	gnu/packages/linux.scm
	gnu/packages/tls.scm
	gnu/system.scm
2020-04-23 13:33:09 +02:00
Marius Bakke
808d12bb08
gnu: qt@4: Update source URI.
* gnu/packages/qt.scm (qt-4)[source](uri): Adjust to current.
2020-04-22 16:08:26 +02:00
Marius Bakke
e5109374d8
gnu: qt@4: Hide the default GCC from CPLUS_INCLUDE_PATH.
* gnu/packages/qt.scm (qt-4)[native-inputs]: Distinguish GCC-5.
[arguments]: Add phase to hide the default GCC from CPLUS_INCLUDE_PATH to fix
conflicting headers.
2020-04-22 00:08:26 +02:00
Marius Bakke
c6d02bcf1b
Merge branch 'master' into core-updates 2020-04-11 17:00:30 +02:00
Marius Bakke
67950de7e8
gnu: python-pyqtwebengine: Use 'python-version'.
* gnu/packages/qt.scm (python-pyqtwebengine)[arguments]: Add (guix build
python-build-system) to #:modules.  Adjust #:imported-modules accordingly.
Rewrite #:phases to use it instead of rolling their own, or hard-coding.
2020-04-11 15:51:07 +02:00
Marius Bakke
c7eec67a93
gnu: qtwebengine: Fix build with Ninja >= 1.10.
* gnu/packages/qt.scm (qtwebengine)[arguments]: Add phase
'patch-ninja-version-check'.
2020-04-08 21:45:23 +02:00
Marius Bakke
ae0badf5bb
Merge branch 'master' into core-updates
Conflicts:
	gnu/packages/admin.scm
	gnu/packages/commencement.scm
	gnu/packages/guile.scm
	gnu/packages/linux.scm
	gnu/packages/package-management.scm
	gnu/packages/pulseaudio.scm
	gnu/packages/web.scm
2020-03-30 12:17:33 +02:00
Marius Bakke
e8a225268e
gnu: qtwebkit: Update to 5.212.0-alpha4.
* gnu/packages/qt.scm (qtwebkit): Update to 5.212.0-alpha4.
[native-inputs]: Change from PYTHON-2.7 to PYTHON.
2020-03-29 13:49:18 +02:00
Marius Bakke
26e92a3025
gnu: qtbase: Patch the 'moc' executable to cope with GCCs C++ headers.
* gnu/packages/patches/qtbase-moc-ignore-gcc-macro.patch: New file.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/qt.scm (qtbase)[source](patches): Add it.
2020-03-29 11:35:04 +02:00
Marius Bakke
c4d769d359
Merge branch 'master' into core-updates 2020-03-18 19:41:08 +01:00
Marius Bakke
961d2ee269
Merge branch 'master' into core-updates 2020-03-14 13:13:40 +01:00
Marius Bakke
76e0b5ba26
gnu: python-pyside: Update to 5.12.6.
* gnu/packages/qt.scm (python-shiboken-2): Update to 5.12.6.
[source]: Download tarball release instead of git repository.
[arguments]: Add phase to make files writable and update timestamps.
(python-pyside-2): Inherit version and source from PYTHON-SHIBOKEN-2.
[native-inputs]: Remove LIBCXX-6.  Rename "python-wrapper" input to "python".
Change from CMAKE to CMAKE-MINIMAL.
[arguments]: Remove libcxx substitution.  Add "-DPYTHON_EXECUTABLE" in
 #:configure-flags.
(python-pyside-2-tools)[native-inputs]: Add PYTHON-WRAPPER.
[arguments]: Set "-DPYTHON_EXECUTABLE" in #:configure-flags.  Add phase
'go-to-source-dir'.
2020-03-15 15:09:06 +01:00
Marius Bakke
ebb7cf9e21
Merge branch 'master' into core-updates 2020-03-04 23:16:17 +01:00
Marius Bakke
132c1915a5
gnu: qtbase: Remove custom 'qtbase-patched' variant.
* gnu/packages/qt.scm (qtbase)[source](patches): Add 'qtbase-QTBUG-81715.patch.
(qtbase-patched): Remove variable.
* gnu/packages/engineering.scm (freecad)[inputs]: Change from QTBASE-PATCHED to QTBASE.
2020-02-24 19:39:17 +01:00
John Soo
e2546bb472
gnu: qtbase: Add variant that fixes file name handling in CMake macros.
* gnu/packages/patches/qtbase-QTBUG-81715.patch: New file.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/qt.scm (qtbase-patched): New public variable.

Signed-off-by: Marius Bakke <mbakke@fastmail.com>
2020-02-24 17:10:22 +01:00
Marius Bakke
52665d2b6b
Merge branch 'staging' into core-updates 2020-02-03 15:45:44 +01:00
Marius Bakke
146d0483b0
gnu: Qt: Update to 5.12.7 [fixes CVE-2020-0569, CVE-2020-0570].
* 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, qtgraphicaleffects, qtgamepad, qtscxml, qtpurchasing,
qtcanvas3d, qtcharts, qtdatavis3d, qtnetworkauth, qtremoteobjects, qtspeech,
qtwebengine): Update to 5.12.7.
2020-02-03 15:22:43 +01:00
Marius Bakke
4bd428a7ce
gnu: Replace uses of 'libjpeg' with 'libjpeg-turbo'.
* gnu/packages/abiword.scm (abiword)[inputs]: Change from LIBJPEG to
LIBJPEG-TURBO.
* gnu/packages/admin.scm (testdisk)[inputs]: Likewise.
* gnu/packages/algebra.scm (giac)[inputs]: Likewise.
* gnu/packages/animation.scm (synfig)[inputs]: Likewise.
* gnu/packages/astronomy.scm (gnuastro, celestia)[inputs]: Likewise.
* gnu/packages/cdrom.scm (dvdstyler)[inputs]: Likewise.
* gnu/packages/cran.scm (r-jpeg, r-tiff, r-readbitmap)[inputs]: Likewise.
* gnu/packages/cups.scm (cups-filters, hplip)[inputs]: Likewise.
* gnu/packages/display-managers.scm (slim)[inputs]: Likewise.
* gnu/packages/ebook.scm (fbreader)[inputs]: Likewise.
* gnu/packages/emacs.scm (emacs)[inputs]: Likewise.
* gnu/packages/enlightenment.scm (efl)[propagated-inputs]: Likewise.
* gnu/packages/fltk.scm (fltk, ntk)[inputs]: Likewise.
* gnu/packages/fontutils.scm (fontforge)[inputs]: Likewise.
* gnu/packages/freedesktop.scm (weston)[inputs]: Likewise.
* gnu/packages/game-development.scm (sfml, allegro, aseprite, python-pygame,
eureka, ioquake3)[inputs]: Likewise.
* gnu/packages/games.scm (adanaxisgpl, freedroidrpg, irrlicht, minetest,
fizmo, supertuxkart, gzdoom, xmoto, xonotic)[inputs]: Likewise.
* gnu/packages/gd.scm (gd, perl-gd)[inputs]: Likewise.
* gnu/packages/ghostscript.scm (lcms)[inputs]: Likewise.
(ghostscript)[inputs, native-inputs]: Likewise.
* gnu/packages/gimp.scm (gegl, gimp)[inputs]: Likewise.
* gnu/packages/gnome.scm (libgnomeui, eog, tracker-miners, gthumb)[inputs]: Likewise.
* gnu/packages/gnunet.scm (libextractor)[inputs]: Likewise.
* gnu/packages/gnustep.scm (windowmaker)[inputs]: Likewise.
* gnu/packages/graphics.scm (blender, blender-2.79, openimageio,
openscenegraph, openscenegraph-3.4, povray, fgallery)[inputs]: Likewise.
* gnu/packages/graphviz.scm (graphviz)[inputs]: Likewise.
* gnu/packages/gstreamer.scm (gst-plugins-good)[inputs]: Likewise.
* gnu/packages/gtk.scm (gdk-pixbuf)[inputs]: Likewise.
* gnu/packages/image-processing.scm (dcmtk, mia, vtk, opencv, vips, nip2, vxl,
insight-toolkit)[inputs]: Likewise.
* gnu/packages/image-viewers.scm (gpicview, luminance-hdr)[inputs]: Likewise.
* gnu/packages/image.scm (jpegoptim, libtiff, leptonica, imlib2, freeimage,
vigra, libwebp, libmng, jasper, steghide, jp2a)[inputs]: Likewise.
* gnu/packages/imagemagick.scm (imagemagick, graphicsmagick)[inputs]: Likewise.
* gnu/packages/java.scm (icedtea-6, icedtea-7, openjdk9, openjdk11,
openjdk12)[inputs]: Likewise.
* gnu/packages/kde-frameworks.scm (khtml)[inputs]: Likewise.
* gnu/packages/kodi.scm (kodi)[inputs]: Likewise.
* gnu/packages/machine-learning.scm (dlib, tensorflow)[inputs]: Likewise.
* gnu/packages/mate.scm (atril, eom)[inputs]: Likewise.
* gnu/packages/maths.scm (hdf4, hdf-java, hdf-eos2, netcdf)[inputs]: Likewise.
* gnu/packages/netpbm.scm (netpbm)[inputs]: Likewise.
* gnu/packages/pdf.scm (zathura-pdf-mupdf, podofo, mupdf, fbida)[inputs]: Likewise.
* gnu/packages/photo.scm (libraw, libpano13, enblend-enfuse, darktable, hugin,
rawtherapee)[inputs]: Likewise.
* gnu/packages/prolog.scm (swi-prolog)[native-inputs]: Likewise.
* gnu/packages/python-xyz.scm (python-hdf4, python-pillow)[inputs]: Likewise.
* gnu/packages/qt.scm (qtbase, qtwebkit)[inputs]: Likewise.
* gnu/packages/rdesktop.scm (freerdp)[inputs]: Likewise.
* gnu/packages/scanner.scm (sane-backends, xsane)[inputs]: Likewise.
* gnu/packages/scheme.scm (racket)[inputs]: Likewise.
* gnu/packages/scribus.scm (scribus)[inputs]: Likewise.
* gnu/packages/sdl.scm (sdl-image)[propagated-inputs]: Likewise.
(guile-sdl)[native-inputs]: Likewise.
* gnu/packages/spice.scm (spice-gtk)[inputs]: Likewise.
* gnu/packages/statistics.scm (r-with-tests)[inputs]: Likewise.
* gnu/packages/tcl.scm (perl-tk)[inputs]: Likewise.
* gnu/packages/upnp.scm (readymedia)[inputs]: Likewise.
* gnu/packages/video.scm (mplayer, mpv, v4l-utils, motion)[inputs]: Likewise.
* gnu/packages/web-browsers.scm (dillo, links)[inputs]: Likewise.
* gnu/packages/web.scm (netsurf)[inputs]: Likewise.
* gnu/packages/webkit.scm (webkitgtk)[inputs]: Likewise.
* gnu/packages/wine.scm (wine)[inputs]: Likewise.
* gnu/packages/wv.scm (wv)[inputs]: Likewise.
* gnu/packages/wxwidgets.scm (wxwidgets, wxwidgets-2)[inputs]: Likewise.
* gnu/packages/xdisorg.scm (xscreensaver)[inputs]: Likewise.
* gnu/packages/xfce.scm (tumbler)[inputs]: Likewise.
* gnu/packages/xfig.scm (xfig, transfig)[inputs]: Likewise.
* gnu/packages/xorg.scm (xpra)[inputs]: Likewise.
2020-01-22 22:12:34 +01:00
Marius Bakke
8ed9be3fac
Merge branch 'staging' into core-updates 2020-01-21 22:39:42 +01:00
Marius Bakke
715110a8a2
Merge branch 'master' into staging 2020-01-21 21:34:41 +01:00
Marius Bakke
89595f98d0
gnu: qt@4: Build with libjpeg-turbo.
* gnu/packages/qt.scm (qt-4)[inputs]: Change from LIBJPEG-8 to LIBJPEG-TURBO.
2020-01-20 21:53:52 +01:00
Mike Rosset
eb5af18e7e
gnu: Add python-pyqtwebengine.
* gnu/packages/qt.scm (python-pyqtwebengine): New variable.
2020-01-15 16:29:45 +01:00
Mike Rosset
9deae98281
gnu: python-pyqt: Substitute the full path of <qprinter.h>.
* gnu/packages/qt.scm (python-pyqt)[phases]: When building
  python-pyqtwebengine, qprinter.h can not be found.  This substitutes the full
  path of qprinter.h in the qprinter sip specification file.
2020-01-15 16:29:45 +01:00
Marius Bakke
3cfe76bec0
Merge branch 'master' into core-updates 2020-01-15 00:09:46 +01:00
Jakub Kądziołka
6e332fd370
gnu: qtbase: Open links properly without xdg-utils in profile
* gnu/packages/qt.scm (qtbase)[inputs]: Add XDG-UTILS.
  [arguments](patch-xdg-open): New phase.

Signed-off-by: Marius Bakke <mbakke@fastmail.com>
2020-01-13 23:28:03 +01:00
Ludovic Courtès
9b65dea806
gnu: Use the two-element 'define-deprecated' form where applicable.
* gnu/packages/guile.scm (guile-json): Use the two-element
'define-deprecated' form.
* gnu/packages/kde.scm (kdevplatform): Likewise.
* gnu/packages/mpi.scm (hwloc-2.0): Likewise.
* gnu/packages/qt.scm (qt): Likewise.
2020-01-12 00:19:09 +01:00
Marius Bakke
b7bf02a418
Merge branch 'master' into core-updates 2020-01-11 22:38:24 +01:00
Marius Bakke
2c7511fb66
gnu: qtwebengine: Purge unnecessary bundled software from the source.
* gnu/packages/qt.scm (qtwebengine)[source](modules, snippet): New fields.
[inputs]: Add CURL and VALGRIND.
2020-01-11 18:18:50 +01:00
Mike Rosset
db481636a5
gnu: Add qtwebengine.
* gnu/packages/qt.scm (qtwebengine): New variable.

Signed-off-by: Marius Bakke <mbakke@fastmail.com>
2020-01-11 18:18:50 +01:00
Guillaume Le Vaillant
3e10b2418d
gnu: qtxmlpatterns: Build QML plugin for XmlListModel.
* gnu/packages/qt.scm (qtdeclarative)[native-inputs]: Remove qtxmlpatterns.
  (qtxmlpatterns)[native-inputs]: Add qtdeclarative.
2020-01-09 16:03:56 +01:00
Mathieu Othacehe
ce9383c090
Merge remote-tracking branch 'master' into core-updates. 2019-12-31 11:04:51 +01:00