[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
25/133: gnu: glib-networking: Update to 2.56.1.
From: |
guix-commits |
Subject: |
25/133: gnu: glib-networking: Update to 2.56.1. |
Date: |
Sun, 6 Jan 2019 16:59:31 -0500 (EST) |
rekado pushed a commit to branch wip-gnome3.30
in repository guix.
commit 4a908b7c0458345167849334c44935f4bd8a6406
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 f5419f8..aad3dac 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -2423,7 +2423,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/"
@@ -2431,22 +2431,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 _
@@ -2456,9 +2456,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)))
- 14/133: gnu: Add libusbmuxd., (continued)
- 14/133: gnu: Add libusbmuxd., guix-commits, 2019/01/06
- 26/133: gnu: five-or-more: Update to 3.28.0., guix-commits, 2019/01/06
- 36/133: gnu: librsvg: Build Vala bindings., guix-commits, 2019/01/06
- 50/133: gnu: libgnomekbd: Update to 3.26.0., guix-commits, 2019/01/06
- 55/133: gnu: gnome-clocks: Update to 3.28.0., guix-commits, 2019/01/06
- 19/133: gnu: gnome-desktop: Update to 3.28.2., guix-commits, 2019/01/06
- 33/133: gnu: libgnome-games-support: Update to 1.4.1., guix-commits, 2019/01/06
- 27/133: gnu: geocode-glib: Update to 3.26.0., guix-commits, 2019/01/06
- 31/133: gnu: eog: Update to 3.28.2., guix-commits, 2019/01/06
- 24/133: gnu: gnumeric: Update to 1.12.41., guix-commits, 2019/01/06
- 25/133: gnu: glib-networking: Update to 2.56.1.,
guix-commits <=
- 46/133: gnu: python-pyatspi: Update to 2.26.0., guix-commits, 2019/01/06
- 41/133: gnu: cheese: Propagate more inputs., guix-commits, 2019/01/06
- 51/133: gnu: gnome-shell-extensions: Update to 3.28.1., guix-commits, 2019/01/06
- 44/133: gnu: zenity: Update to 3.28.1., guix-commits, 2019/01/06
- 29/133: gnu: gnome-settings-daemon: Update to 3.28.1., guix-commits, 2019/01/06
- 52/133: gnu: Add libdazzle., guix-commits, 2019/01/06
- 59/133: gnu: nautilus: Update to 3.28.1., guix-commits, 2019/01/06
- 64/133: gnu: network-manager-openvpn: Update to 1.8.4., guix-commits, 2019/01/06
- 62/133: gnu: evolution-data-server: Update to 3.28.3., guix-commits, 2019/01/06
- 70/133: gnu: gnome-settings-daemon: Ensure RUNPATH contains library subdir., guix-commits, 2019/01/06