[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
27/74: gnu: glib-networking: Update to 2.56.1.
From: |
guix-commits |
Subject: |
27/74: gnu: glib-networking: Update to 2.56.1. |
Date: |
Fri, 30 Nov 2018 09:07:17 -0500 (EST) |
rekado pushed a commit to branch wip-gnome-upgrades
in repository guix.
commit 390ddf10da09874557939c5fb88b7816080ed13f
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)))
- 34/74: gnu: libgudev: Update to 232., (continued)
- 34/74: gnu: libgudev: Update to 232., guix-commits, 2018/11/30
- 33/74: gnu: eog: Update to 3.28.2., guix-commits, 2018/11/30
- 39/74: gnu: gnome-mines: Update to 3.28.0., guix-commits, 2018/11/30
- 16/74: gnu: Add libimobiledevice., guix-commits, 2018/11/30
- 42/74: gnu: orca: Update to 3.28.1., guix-commits, 2018/11/30
- 41/74: gnu: gjs: Update to 1.52.3., guix-commits, 2018/11/30
- 38/74: gnu: librsvg: Build Vala bindings., guix-commits, 2018/11/30
- 44/74: gnu: network-manager: Update to 1.10.10., guix-commits, 2018/11/30
- 45/74: gnu: gnome-session: Update to 3.28.1., guix-commits, 2018/11/30
- 46/74: gnu: zenity: Update to 3.28.1., guix-commits, 2018/11/30
- 27/74: gnu: glib-networking: Update to 2.56.1.,
guix-commits <=
- 53/74: gnu: gnome-shell-extensions: Update to 3.28.1., guix-commits, 2018/11/30
- 26/74: gnu: gnumeric: Update to 1.12.41., guix-commits, 2018/11/30
- 56/74: gnu: gnome-todo: Update to 3.28.1., guix-commits, 2018/11/30
- 21/74: gnu: gcr: Update to 3.28.0., guix-commits, 2018/11/30
- 57/74: gnu: gnome-clocks: Update to 3.28.0., guix-commits, 2018/11/30
- 68/74: gnu: dconf-editor: Update to 3.28.0., guix-commits, 2018/11/30
- 60/74: gnu: gnome-bluetooth: Update to 3.28.0., guix-commits, 2018/11/30
- 69/74: gnu: cups-filters: Fix build with newer version of poppler., guix-commits, 2018/11/30
- 63/74: gnu: gdm: Update to 3.28.2., guix-commits, 2018/11/30
- 64/74: gnu: evolution-data-server: Update to 3.28.3., guix-commits, 2018/11/30