From: Marius Bakke <mbakke@fastmail.com>
Date: Fri, 27 Sep 2019 17:11:27 +0000 (+0200)
Subject: Merge branch 'master' into core-updates
X-Git-Url: http://git.hcoop.net/jackhill/guix/guix.git/commitdiff_plain/e7f62a41b245ca30404c54f3f77930336627c2f7

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

e7f62a41b245ca30404c54f3f77930336627c2f7
diff --cc gnu/local.mk
index bee5b7024a,a6fe439904..9bd1e8882b
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -760,9 -763,10 +762,11 @@@ dist_patch_DATA =						
    %D%/packages/patches/cvs-CVE-2017-12836.patch		\
    %D%/packages/patches/darkice-workaround-fpermissive-error.patch	\
    %D%/packages/patches/dbus-helper-search-path.patch		\
 -  %D%/packages/patches/dbus-CVE-2019-12749.patch		\
 +  %D%/packages/patches/dbus-c++-gcc-compat.patch		\
 +  %D%/packages/patches/dbus-c++-threading-mutex.patch		\
    %D%/packages/patches/dealii-mpi-deprecations.patch		\
+   %D%/packages/patches/debops-constants-for-external-program-names.patch \
+   %D%/packages/patches/debops-debops-defaults-fall-back-to-less.patch \
    %D%/packages/patches/deja-dup-use-ref-keyword-for-iter.patch	\
    %D%/packages/patches/dfu-programmer-fix-libusb.patch		\
    %D%/packages/patches/diffutils-gets-undeclared.patch		\
@@@ -901,10 -896,7 +902,11 @@@
    %D%/packages/patches/glibc-versioned-locpath.patch		\
    %D%/packages/patches/glibc-2.27-git-fixes.patch		\
    %D%/packages/patches/glibc-2.28-git-fixes.patch		\
-   %D%/packages/patches/glibc-2.28-supported-locales.patch     	\
 +  %D%/packages/patches/glibc-2.29-git-updates.patch     	\
-   %D%/packages/patches/glibc-supported-locales.patch     	\
 +  %D%/packages/patches/glibc-2.27-supported-locales.patch     	\
++  %D%/packages/patches/glibc-2.28-supported-locales.patch     	\
++  %D%/packages/patches/glibc-supported-locales.patch     	\
+   %D%/packages/patches/glm-restore-install-target.patch		\
    %D%/packages/patches/glusterfs-use-PATH-instead-of-hardcodes.patch		\
    %D%/packages/patches/gmp-arm-asm-nothumb.patch		\
    %D%/packages/patches/gmp-faulty-test.patch			\
@@@ -972,9 -960,8 +974,9 @@@
    %D%/packages/patches/icedtea-6-hotspot-gcc-segfault-workaround.patch  \
    %D%/packages/patches/icedtea-7-hotspot-gcc-segfault-workaround.patch  \
    %D%/packages/patches/id3lib-CVE-2007-4460.patch			\
-   %D%/packages/patches/idris-test-no-node.patch			\
    %D%/packages/patches/ilmbase-fix-tests.patch			\
+   %D%/packages/patches/ilmbase-openexr-pkg-config.patch		\
 +  %D%/packages/patches/inkscape-poppler-0.76.patch		\
    %D%/packages/patches/intltool-perl-compatibility.patch	\
    %D%/packages/patches/irrlicht-use-system-libs.patch		\
    %D%/packages/patches/isc-dhcp-4.4.1-fixes-for-newer-bind.patch	\
diff --cc gnu/packages/glib.scm
index a2f0f2fd8e,a02cf3b7f3..3c2f346837
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@@ -9,8 -9,8 +9,9 @@@
  ;;; Copyright © 2017 Petter <petter@mykolab.ch>
  ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
  ;;; Copyright © 2018 Alex Vong <alexvong1995@gmail.com>
 +;;; Copyright © 2019 Maxim Cournoyer <maxim.cournoyer@gmail.com>
  ;;; Copyright © 2019 Giacomo Leidi <goodoldpaul@autistici.org>
+ ;;; Copyright © 2019 Marius Bakke <mbakke@fastmail.com>
  ;;;
  ;;; This file is part of GNU Guix.
  ;;;
diff --cc gnu/packages/webkit.scm
index ea7cee54e3,4864495adf..3169c7d15a
--- a/gnu/packages/webkit.scm
+++ b/gnu/packages/webkit.scm
@@@ -59,14 -121,14 +121,14 @@@ engine that uses Wayland for graphics o
  (define-public webkitgtk
    (package
      (name "webkitgtk")
-     (version "2.24.4")
 -    (version "2.20.5")
++    (version "2.26.1")
      (source (origin
                (method url-fetch)
                (uri (string-append "https://www.webkitgtk.org/releases/"
                                    name "-" version ".tar.xz"))
                (sha256
                 (base32
-                 "1n3x5g1z6rg9n1ssna7wi0z6zlprjm4wzk544v14wqi6q0lv2s46"))))
 -                "147r7an41920zl4x9srdva7fxvw2znjin5ldjkhay1cndv9gih0m"))))
++                "0mfikjfjhwcnrxbzdyh3fl9bbs2azgbdnx8h5910h41b3n022jvb"))))
      (build-system cmake-build-system)
      (outputs '("out" "doc"))
      (arguments
@@@ -128,6 -190,6 +190,7 @@@
         ("libsoup" ,libsoup)))
      (inputs
       `(("at-spi2-core" ,at-spi2-core)
++       ("bubblewrap" ,bubblewrap)
         ("enchant" ,enchant)
         ("geoclue" ,geoclue)
         ("gst-plugins-base" ,gst-plugins-base)
@@@ -139,16 -201,15 +202,20 @@@
         ("libjpeg" ,libjpeg)
         ("libnotify" ,libnotify)
         ("libpng" ,libpng)
++       ("libseccomp" ,libseccomp)
         ("libsecret" ,libsecret)
         ("libtasn1" ,libtasn1)
         ("libwebp" ,libwebp)
++       ("libwpe" ,libwpe)
         ("libxcomposite" ,libxcomposite)
         ("libxml2" ,libxml2)
         ("libxslt" ,libxslt)
         ("libxt" ,libxt)
         ("mesa" ,mesa)
 -       ("sqlite" ,sqlite)))
 +       ("openjpeg" ,openjpeg)
-        ("sqlite" ,sqlite)))
++       ("sqlite" ,sqlite)
++       ("wpebackend-fdo" ,wpebackend-fdo)
++       ("xdg-dbus-proxy" ,xdg-dbus-proxy)))
      (home-page "https://www.webkitgtk.org/")
      (synopsis "Web content engine for GTK+")
      (description
diff --cc gnu/packages/xorg.scm
index b3d9fd3cb7,e4050a1425..273788f615
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@@ -215,10 -215,10 +215,10 @@@ which can be read by any architecture."
      (source (origin
                (method url-fetch)
                (uri (string-append "mirror://xorg/individual/proto/"
-                                   name "-" version ".tar.bz2"))
+                                   "xorgproto-" version ".tar.bz2"))
                (sha256
                 (base32
 -                "180mqkp70i44rkmj430pmn9idssvffrgv4y5h19fm698a7h8bs7y"))))
 +                "16yll1kaffnslik5sizlw3qrigj1gpsgfgyq6903g3mwdixamnm6"))))
      (build-system gnu-build-system)
      (propagated-inputs
       ;; To get util-macros in (almost?) all package inputs.