Commit Graph

533 Commits

Author SHA1 Message Date
Marius Bakke d19b14c834
Merge branch 'master' into core-updates 2020-03-21 22:16:02 +01:00
Tobias Geerinckx-Rice 69669b2877
gnu: guile-rsvg: Use HTTPS home page.
* gnu/packages/gtk.scm (guile-rsvg)[home-page]: Use HTTPS.
2020-03-21 03:09:51 +01:00
Brendan Tildesley d2793ed696
gnu: Add gtk-layer-shell.
* gnu/packages/gtk.scm (gtk-layer-shell): New variable.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2020-03-19 15:14:08 +01:00
Marius Bakke c4d769d359
Merge branch 'master' into core-updates 2020-03-18 19:41:08 +01:00
Marius Bakke 96941537ee
gnu: at-spi2-core: Remove obsolete input.
* gnu/packages/gtk.scm (at-spi2-core)[native-inputs]: Remove INTLTOOL.  Add
GETTEXT-MINIMAL.
2020-03-18 19:23:47 +01:00
Ludovic Courtès b6bee63bed
gnu: Default to Guile 3.0.
This patch changes three things:

  1. package derivations are built using Guile 3.0;

  2. 'gexp->derivation' defaults to Guile 3.0;

  3. "guile3.0-" packages are deprecated aliases for the regular
     package, which now depends on Guile 3.0; "guile2.2-" packages are
     introduced; "guile-next" is renamed to "guile".

* gnu/packages/guile.scm (guile-2.0/fixed): Remove.
(guile-3.0/fixed): New variable.
(package-for-guile-3.0): Remove.
(package-for-guile-2.2): New variable.
(define-deprecated-guile3.0-package): New macro.
(guile-3.0)[name]: Change to "guile".
(guile-json-3)[native-inputs, inputs]: New fields.
(guile2.2-json): New variable.
(guile3.0-json): Deprecate.
(guile-gdbm-ffi)[native-inputs]: Switch to GUILE-3.0.
(guile2.2-gdbm-ffi): New variable.
(guile3.0-gdbm-ffi): Deprecate.
(guile-sqlite3): Switch to GUILE-3.0.
(guile2.2-sqlite3): New variable.
(guile3.0-sqlite3): Deprecate.
(guile-bytestructures): Switch to GUILE-3.0.
(guile2.2-bytestructures): New variable.
(guile3.0-bytestructures): Deprecate.
(guile-git): Switch to GUILE-3.0.
(guile2.2-git): New variable.
(guile3.0-git): Deprecate.
(guile-2.2/bug-fix):
* gnu/packages/ci.scm (cuirass): Switch to GUILE-3.0.
* gnu/packages/emacs-xyz.scm (emacs-guix): Switch to GUILE-3.0.
* gnu/packages/gtk.scm (guile-cairo)[arguments]: New field.
Switch to GUILE-3.0.
(guile2.2-cairo): New variable.
(guile3.0-cairo): Deprecate.
(guile-rsvg): Switch to GUILE-3.0.
(guile2.2-cairo): New variable.
(guile3.0-cairo): Deprecate.
(guile-present): Switch to GUILE-3.0.
(guile2.2-present): New variable.
(guile3.0-present): Deprecate.
(guile-gnome)[propagated-inputs]: Use GUILE2.2-CAIRO and GUILE2.2-LIB.
* gnu/packages/guile-xyz.scm (guile-fibers)[arguments]: Add #:configure-flags.
Switch to GUILE-3.0.
(guile2.2-fibers): New variable.
(guile3.0-fibers): Deprecate.
(guile-syntax-highlight): Switch to GUILE-3.0.
(guile2.2-syntax-highlight): New variable.
(guile3.0-syntax-highlight): Deprecate.
(guile-colorized): Switch to GUILE-3.0.
(guile2.2-colorized): New variable.
(guile3.0-colorized): Deprecate.
(guile-pfds): Switch to GUILE-3.0.
(guile2.2-pfds): New variable.
(guile3.0-pfds): Deprecate.
(guile-simple-zmq): Switch to GUILE-3.0.
(guile2.2-simple-zmq): New variable.
(guile3.0-simple-zmq): Deprecate.
(guile-newt): Switch to GUILE-3.0.
(guile2.2-newt): New variable.
(guile3.0-newt): Deprecate.
(guile-parted): Switch to GUILE-3.0.
(guile2.2-parted): New variable.
(guile3.0-parted): Deprecate.
(guile-config): Switch to GUILE-3.0.
(guile2.2-config): New variable.
(guile3.0-config): Deprecate.
(guile-hall): Switch to GUILE-3.0.
(guile2.2-hall): New variable.
(guile3.0-hall): Deprecate.
(guile-ics): Switch to GUILE-3.0.
(guile2.2-ics): New variable.
(guile3.0-ics): Deprecate.
(guile-wisp)[arguments]: Add 'support-guile-3.0' phase.
Switch to GUILE-3.0.
(guile2.2-wisp): New variable.
(guile3.0-wisp): Deprecate.
(guile-lib): Switch to GUILE-3.0.
(guile2.2-lib): New variable.
(guile3.0-lib): Deprecate.
(guile-minikanren): Switch to GUILE-3.0.
(guile2.2-minikanren): New variable.
(guile3.0-minikanren): Deprecate.
(guile-irregex): Switch to GUILE-3.0.
(guile2.2-irregex): New variable.
(guile3.0-irregex): Deprecate.
(haunt): Switch to GUILE-3.0, and remove GUILE-READER.
(guile2.2-haunt): New variable.
(guile3.0-haunt): Deprecate.
(guile-commonmark): Switch to GUILE-3.0.
(guile2.2-commonmark): New variable.
(guile3.0-commonmark): Deprecate.
(mcron): Switch to GUILE-3.0.
(guile2.0-mcron): New variable.
(guile3.0-mcron): Deprecate.
(guile-picture-language): Switch to GUILE-3.0.
(guile2.2-picture-language): New variable.
(guile3.0-picture-language): Deprecate.
(guile-gi): Switch to GUILE-3.0.
(guile2.2-gi): New variable.
(guile3.0-gi): Deprecate.
(guile-hashing): Switch to GUILE-3.0.
(guile2.2-hashing): New variable.
(guile3.0-hashing): Deprecate.
* gnu/packages/package-management.scm (guix): Switch to GUILE-3.0.
(guile2.2-guix): New variable.
(guile3.0-guix): Deprecate.
(gwl): Replace "guile3.0-" with "guile-".
(guix-jupyter)[source]: Adjust for Guile 3.0.
Switch to GUILE-3.0.
* gnu/packages/ssh.scm (guile-ssh): Switch to GUILE-3.0.
(guile2.2-ssh): New variable.
(guile3.0-ssh): Deprecate.
* gnu/packages/admin.scm (shepherd): Switch to GUILE-3.0.
(guile2.2-shepherd): New variable.
(guile3.0-shepherd): Deprecate.
* gnu/packages/mail.scm (mailutils): Switch to GUILE-3.0.
(guile2.2-mailutils): New variable.
(guile3.0-mailutils): Deprecate.
* gnu/packages/plotutils.scm (guile-charting): Switch to GUILE-3.0.
(guile2.2-charting): New variable.
(guile3.0-charting): Deprecate.
* gnu/packages/version-control.scm (libgit2): Switch to GUILE-3.0.
* gnu/packages/vpn.scm (vpnc-scripts): Switch to GUILE-3.0.
* gnu/packages/web.scm (guix-data-service): Switch to GUILE-3.0.
(hpcguix-web): Switch to GUILE-3.0.
* guix/self.scm (specification->package): Refer to the "guile-" variants
instead of "guile3.0-".
* guix/gexp.scm (default-guile): Change to GUILE-3.0.
* build-aux/build-self.scm (build): #:guile-version defaults to "3.0".
* gnu/packages/commencement.scm (guile-final): Base on GUILE-3.0/FIXED.
2020-03-16 15:44:02 +01:00
Marius Bakke 961d2ee269
Merge branch 'master' into core-updates 2020-03-14 13:13:40 +01:00
Tobias Geerinckx-Rice 5acaec829f
gnu: pangomm: Update home page.
* gnu/packages/gtk.scm (pangomm)[home-page]: Follow (HTTPS)
redirection.
2020-03-14 22:01:40 +01:00
Marius Bakke 41c6e4f2b4
Merge branch 'master' into staging 2020-03-11 22:58:11 +01:00
Tobias Geerinckx-Rice 806b0c2c6e
gnu: graphene: Use HTTPS home page.
* gnu/packages/gtk.scm (graphene)[home-page]: Use HTTPS.
2020-03-11 00:13:56 +01:00
Marius Bakke c67ee58c72
gnu: pangox-compat: Build with pango@1.42.
* gnu/packages/gtk.scm (pangox-compat)[inputs]: Change from PANGO to PANGO-1.42.
2020-03-06 12:54:47 +01:00
Marius Bakke b8e08aa2e4
gnu: pango@1.42: Do not inherit replacements from pango@1.44.
* gnu/packages/gtk.scm (pango-1.42): Do not use PACKAGE/INHERIT.
2020-03-06 12:54:47 +01:00
Marius Bakke b6f946f039
Merge branch 'master' into staging 2020-03-06 00:17:50 +01:00
Marius Bakke ebb7cf9e21
Merge branch 'master' into core-updates 2020-03-04 23:16:17 +01:00
Tobias Geerinckx-Rice 8863477245
gnu: girara: Update to 0.3.4.
* gnu/packages/gtk.scm (girara): Update to 0.3.4.
2020-03-04 20:59:52 +01:00
Marius Bakke bb618a0f78
gnu: gtk+: Update to 3.24.14.
* gnu/packages/gtk.scm (gtk+): Update to 3.24.14.
2020-02-24 19:41:34 +01:00
Tobias Geerinckx-Rice 35f985cb52
gnu: guile-present: Use HTTPS home page.
* gnu/packages/gtk.scm (guile-present)[home-page]: Use HTTPS.
2020-02-17 03:21:45 +01:00
Alexandros Theodotou bbd1e4e7ed
gnu: cairo: Add support for XML.
* gnu/packages/gtk.scm (cairo)[arguments]: Add enable-xml flag.

Signed-off-by: Marius Bakke <mbakke@fastmail.com>
2020-02-14 19:16:33 +01:00
Marius Bakke 8c81210ed0
gnu: python2-pygtk: Build with pango@1.42.
* gnu/packages/gtk.scm (python2-pygtk)[inputs]: Add PANGO-1.42.
2020-01-24 20:44:37 +01:00
Marius Bakke a5670bd45a
gnu: python-pycairo: Update to 1.19.0.
* gnu/packages/gtk.scm (python-pycairo): Update to 1.19.0.
(python2-pycairo): Stick with 1.18.2.
2020-01-24 20:44:36 +01:00
Marius Bakke 9ba3cf5782
gnu: python-pycairo: Update to 1.18.2.
* gnu/packages/gtk.scm (python-pycairo): Update to 1.18.2.
(python2-pycairo)[propagated-inputs]: Remove.
2020-01-24 20:44:34 +01:00
Marius Bakke 12d8adbfc0
Merge branch 'staging' into core-updates 2020-01-23 23:11:11 +01:00
Ludovic Courtès 2c9fd7636f
gnu: guile-present: Add "guile3.0-present".
* gnu/packages/gtk.scm (guile-present)[source](snippet): Add "3.0" to
the supported Guile versions.
(guile3.0-present): New variable.
2020-01-23 11:26:56 +01:00
Ludovic Courtès 897186c155
gnu: guile-present: Pass the right module directories in scripts.
* gnu/packages/gtk.scm (guile-present)[arguments]: In 'post-install'
phase, remove hard-coded "2.0" and replace it by a computed effective
version.  Also, pass "/site-ccache" to -C.
2020-01-23 11:26:56 +01:00
Ludovic Courtès b93cde3d8c
gnu: guile-present: Install .go files in /site-ccache.
* gnu/packages/gtk.scm (guile-present)[source]: Add 'modules' and 'snippet'.
2020-01-23 11:26:55 +01:00
Ludovic Courtès 46378df050
gnu: guile-rsvg: Add "guile3.0-rsvg" variant.
* gnu/packages/gtk.scm (guile3.0-rsvg): New variable.
2020-01-23 11:26:55 +01:00
Ludovic Courtès e4dbe0cd2e
gnu: guile-cairo: Add "guile3.0-cairo" variant.
* gnu/packages/gtk.scm (guile-cairo)[source](snippet): Add #include
<string.h> everywhere #include <libguile.h> appears.
(guile3.0-cairo): New variable.
2020-01-23 11:26:55 +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 3cfe76bec0
Merge branch 'master' into core-updates 2020-01-15 00:09:46 +01:00
Pierre Neidhardt 8fcb607780
gnu: perl-gtk2: Skip broken test.
* gnu/packages/gtk.scm (perl-gtk2)[arguments]: Skip broken test.
2020-01-13 18:26:52 +01:00
Marius Bakke b7bf02a418
Merge branch 'master' into core-updates 2020-01-11 22:38:24 +01:00
Marius Bakke 869b63cb93
gnu: pango: Update to 1.44.7.
* gnu/packages/patches/pango-skip-libthai-test.patch: New file.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/gtk.scm (pango): Update to 1.44.7.
[source](patches): New field.
[build-system]: Switch to MESON-BUILD-SYSTEM.
[arguments]: Disable tests that require the Cantarell font.
[inputs]: Move LIBXFT ...
[propagated-inputs]: ... here.
(pango-1.42): New public variable.
* gnu/packages/gnome.scm (librsvg)[inputs]: Change from PANGO to PANGO-1.42.
2020-01-11 18:59:23 +01:00
Julien Lepiller e8cbebb476
gnu: gtk+-2: Split binaries.
* gnu/packages/gtk.scm (gtk+-2): Add "bin" output.
* guix/profiles.scm (gtk-im-modules): Use "bin" output for generating gtk+-2
immodules cache file.
2019-12-14 20:54:06 +01:00
Marius Bakke 3d19c77d74
gnu: at-spi2-atk: Update to 2.34.1.
* gnu/packages/gtk.scm (at-spi2-atk): Update to 2.34.1.
2019-12-11 01:14:38 +01:00
Marius Bakke 4ebc3339ba
gnu: at-spi2-core: Update to 2.34.0.
* gnu/packages/gtk.scm (at-spi2-core): Update to 2.34.0.
2019-12-11 01:14:38 +01:00
Marius Bakke 336cf4e779
gnu: atk: Update to 2.34.1.
* gnu/packages/gtk.scm (atk): Update to 2.34.1.
2019-12-11 01:14:38 +01:00
Marius Bakke b7d8856a7f
gnu: gtk+: Update to 3.24.13.
* gnu/packages/gtk.scm (gtk+): Update to 3.24.13.
2019-12-11 01:14:36 +01:00
Marius Bakke a114b262d5
gnu: cairo: Do not build static libraries.
* gnu/packages/gtk.scm (cairo)[arguments]: Add "--disable-static" to #:configure-flags.
2019-12-05 17:59:09 +01:00
Marius Bakke c10247506a
gnu: harfbuzz: Update to 2.6.4.
* gnu/packages/gtk.scm (harfbuzz): Update to 2.6.4.
2019-12-05 17:59:03 +01:00
Tobias Geerinckx-Rice f3d4015385
gnu: girara: Fetch sources from git.
The tarball URI is having server issues.  Use the upstream git
repository instead until this is resolved.

Reported by Marius Bakke <mbakke@fastmail.com>.

* gnu/packages/gtk.scm (girara)[source]: Switch to GIT-FETCH.
2019-12-04 23:10:21 +01:00
Marius Bakke 33b59c1a3e
Merge branch 'staging' 2019-12-04 20:12:41 +01:00
Tobias Geerinckx-Rice efa45291b7
gnu: girara: Update to 0.3.3.
* gnu/packages/gtk.scm (girara): Update to 0.3.3.
2019-12-03 21:50:04 +01:00
Marius Bakke 0897ad7fac
Merge branch 'master' into staging 2019-11-28 00:38:25 +01:00
Marius Bakke ff3375251d
gnu: Use the test-only Xorg variant for tests.
* gnu/packages/education.scm (gcompris-qt)[native-inputs]: Change XORG-SERVER
to XORG-SERVER-FOR-TESTS.
* gnu/packages/engineering.scm (pcb, qucs, openscad)[native-inputs]: Likewise.
* gnu/packages/gnome.scm (libbonoboui, d-feet, gspell, libdazzle, libhandy)[native-inputs]: Likewise.
* gnu/packages/gnupg.scm (parcimonie)[native-inputs]: Likewise.
* gnu/packages/graphics.scm (opensubdiv, rapicorn)[native-inputs]: Likewise.
* gnu/packages/gtk.scm (gtksourceview-2, gtksourceview)[native-inputs]: Likewise.
* gnu/packages/image-processing.scm (opencv)[native-inputs]: Likewise.
* gnu/packages/kde-frameworks.scm (kconfig, kcoreaddons, kwidgetsaddons,
kwindowsystem, kdeclarative)[native-inputs]: Likewise.
* gnu/packages/kde-plasma.scm (kscreenlocker)[native-inputs]: Likewise.
* gnu/packages/messaging.scm (gajim)[native-inputs]: Likewise.
* gnu/packages/python-xyz.scm (python-seaborn)[native-inputs]: Likewise.
2019-11-28 00:33:47 +01:00
Tobias Geerinckx-Rice 2767beb3d0
gnu: perl-cairo: Update to 1.107.
* gnu/packages/gtk.scm (perl-cairo): Update to 1.107.
2019-11-23 15:40:10 +01:00
Marius Bakke f056553c6b
Merge branch 'master' into staging 2019-11-15 20:11:35 +01:00
Tobias Geerinckx-Rice 2223cbdefa
gnu: yad: Update to 5.0.
* gnu/packages/gtk.scm (yad): Update to 5.0.
[build-system]: Use Glib-or-Gtk build system.
[arguments]: Remove obsolete or ineffective #:configure-flags.
Use the default ‘bootstrap’ phase followed by an ‘intltoolize’ one.
[inputs]: Add gspell.
2019-11-01 20:16:34 +01:00
Marius Bakke 998e6cdcd2
Merge branch 'master' into staging 2019-10-30 14:32:53 +01:00
Tobias Geerinckx-Rice b3cbae3836
gnu: gtkmm: Update to 3.24.2.
* gnu/packages/gtk.scm (gtkmm): Update to 3.24.2.
2019-10-28 23:10:46 +01:00
Marius Bakke b95d1b3289
Merge branch 'master' into staging 2019-10-18 18:10:47 +02:00