27/74: gnu: glib-networking: Update to 2.56.1.

[guix-commits]

rekado pushed a commit to branch wip-gnome-upgrades
in repository guix.

commit def113da420828f7c10d83c44c9cee27df82731d
Author: Ricardo Wurmus <address@hidden>
Date:   Mon Aug 6 11:18:27 2018 +0200

    gnu: glib-networking: Update to 2.56.1.
    
    * gnu/packages/gnome.scm (glib-networking): Update to 2.56.1.
    [build-system]: Use meson-build-system.
    [arguments]: Adjust configure flags; remove phase "patch-giomoduledir"; add
    phase "trust-that-the-certs-will-be-there".
    [native-inputs]: Add gettext-minimal and glib:bin; remove intltool.
    [inputs]: Add libproxy.
---
 gnu/packages/gnome.scm | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 5a946a8..0fc0161 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -2409,7 +2409,7 @@ library.")
 (define-public glib-networking
   (package
     (name "glib-networking")
-    (version "2.54.1")
+    (version "2.56.1")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/glib-networking/"
@@ -2417,22 +2417,22 @@ library.")
                                   name "-" version ".tar.xz"))
               (sha256
                (base32
-                "0bq16m9nh3gcz9x2fvygr0iwxd2pxcbrm3lj3kihsnh1afv8g9za"))
+                "1j1myqlrzwam986b8sq2bq2wrcylipvbsv44n7vdrlipl3hb0iyz"))
               (patches
                (search-patches "glib-networking-ssl-cert-file.patch"))))
-    (build-system gnu-build-system)
+    (build-system meson-build-system)
     (arguments
      `(#:configure-flags
-       '("--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt")
+       '("-Dca_certificates_path=/etc/ssl/certs/ca-certificates.crt")
        #:phases
        (modify-phases %standard-phases
-         (add-before 'configure 'patch-giomoduledir
-           ;; Install GIO modules into $out/lib/gio/modules.
+         ;; The configured location of ca-certificates.crt is unavailable in
+         ;; the build environment.
+         (add-after 'unpack 'trust-that-the-certs-will-be-there
            (lambda _
-             (substitute* "configure"
-               (("GIO_MODULE_DIR=.*")
-                (string-append "GIO_MODULE_DIR=" %output
-                               "/lib/gio/modules\n")))
+             (substitute* "meson.build"
+               (("assert\\(res\\.returncode\\(\\) == 0" m)
+                (string-append "#" m)))
              #t))
          (add-before 'check 'use-empty-ssl-cert-file
            (lambda _
@@ -2442,9 +2442,11 @@ library.")
              #t)))))
     (native-inputs
      `(("pkg-config" ,pkg-config)
-       ("intltool" ,intltool)))
+       ("gettext" ,gettext-minimal)
+       ("glib" ,glib "bin")))
     (inputs
      `(("glib" ,glib)
+       ("libproxy" ,libproxy)
        ("gnutls" ,gnutls)
        ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
        ("p11-kit" ,p11-kit)))