[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/48: gnu: glib: Update to 2.58.1.
From: |
guix-commits |
Subject: |
01/48: gnu: glib: Update to 2.58.1. |
Date: |
Fri, 3 May 2019 12:12:11 -0400 (EDT) |
rekado pushed a commit to branch wip-gnome3.30
in repository guix.
commit 50b0ee0d7d6347932b20ee35e4d85b6ed2102896
Author: Ricardo Wurmus <address@hidden>
Date: Mon Dec 3 16:11:52 2018 +0100
gnu: glib: Update to 2.58.1.
* gnu/packages/glib.scm (glib): Update to 2.58.1.
[build-system]: Use meson-build-system.
[outputs]: Remove "doc" as the documentation files are no longer included.
[inputs]: Move libffi, util-linux, and zlib from here...
[propagated-inputs]: ...to here; add libselinux.
[arguments]: Remove key "disallowed-references" as it is not supported by
the
meson-build-system; delete "bootstrap" phase to prevent use of autotools;
adjust "pre-build" phase; move "disable-failing-tests" phase after "unpack";
disable two more tests in "disable-failing-tests" phase; add phase
"move-executables"; remove configure flags.
---
gnu/packages/glib.scm | 72 +++++++++++++++++++++++++++++++++++----------------
1 file changed, 49 insertions(+), 23 deletions(-)
diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index 98b227c..e83bed2 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -50,6 +50,7 @@
#:use-module (gnu packages perl-check)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
+ #:use-module (gnu packages selinux)
#:use-module (gnu packages web)
#:use-module (gnu packages xml)
#:use-module (gnu packages xorg)
@@ -149,7 +150,7 @@ shared NFS home directories.")
(define glib
(package
(name "glib")
- (version "2.56.3")
+ (version "2.58.1")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/"
@@ -157,19 +158,20 @@ shared NFS home directories.")
name "-" version ".tar.xz"))
(sha256
(base32
- "1cjcqz77m62zrx7224vl3f2cxwqf28r5xpqb2jy7av0vr2scb959"))
+ "1mnp4vankish8bqxymdl591p9v1ynk7pfc5dmpx3vamn4vcskmlp"))
(patches (search-patches "glib-tests-timer.patch"))))
- (build-system gnu-build-system)
+ (build-system meson-build-system)
(outputs '("out" ; everything
- "bin" ; glib-mkenums, gtester, etc.; depends on Python
- "doc")) ; 20 MiB of GTK-Doc reference
+ "bin")) ; glib-mkenums, gtester, etc.; depends on Python
(propagated-inputs
- `(("pcre" ,pcre))) ; in the Requires.private field of glib-2.0.pc
- (inputs
- `(("coreutils" ,coreutils)
+ `(("pcre" ,pcre) ; in the Requires.private field of glib-2.0.pc
+ ("libffi" ,libffi) ; in the Requires.private field of gobject-2.0.pc
+ ;; These are in the Requires.private field of gio-2.0.pc
("util-linux" ,util-linux) ; for libmount
- ("libffi" ,libffi)
+ ("libselinux" ,libselinux)
("zlib" ,zlib)))
+ (inputs
+ `(("coreutils" ,coreutils)))
(native-inputs
`(("gettext" ,gettext-minimal)
("dbus" ,dbus) ; for GDBus tests
@@ -179,11 +181,14 @@ shared NFS home directories.")
("bash" ,bash)
("tzdata" ,tzdata-for-tests))) ; for tests/gdatetime.c
(arguments
- `(#:disallowed-references (,tzdata-for-tests)
- #:phases
+ `(#:phases
(modify-phases %standard-phases
+ (delete 'bootstrap)
(add-before 'build 'pre-build
(lambda* (#:key inputs outputs #:allow-other-keys)
+ ;; For building deterministic pyc files
+ (setenv "DETERMINISTIC_BUILD" "1")
+
;; For tests/gdatetime.c.
(setenv "TZDIR"
(string-append (assoc-ref inputs "tzdata")
@@ -192,14 +197,8 @@ shared NFS home directories.")
;; Some tests want write access there.
(setenv "HOME" (getcwd))
(setenv "XDG_CACHE_HOME" (getcwd))
-
- (substitute* '("glib/gspawn.c"
- "glib/tests/utils.c"
- "tests/spawn-test.c")
- (("/bin/sh")
- (string-append (assoc-ref inputs "bash") "/bin/sh")))
#t))
- (add-before 'check 'disable-failing-tests
+ (add-after 'unpack 'disable-failing-tests
(lambda _
(let ((disable
(lambda (test-file test-paths)
@@ -218,6 +217,15 @@ shared NFS home directories.")
;; recognize it.
"/thread/thread4"))
+ ;; This tries to find programs in FHS directories.
+ ("glib/tests/utils.c"
+ ("/utils/find-program"))
+
+ ;; This fails because "glib/tests/echo-script" cannot be
+ ;; found.
+ ("glib/tests/spawn-singlethread.c"
+ ("/gthread/spawn-script"))
+
("glib/tests/timer.c"
(;; fails if compiler optimizations are enabled, which
they
;; are by default.
@@ -263,12 +271,30 @@ shared NFS home directories.")
(;; Requires /etc/machine-id.
"/gdbus/x11-autolaunch")))))
(for-each (lambda (x) (apply disable x)) failing-tests)
+ #t)))
+ ;; TODO: meson does not permit the bindir to be outside of prefix.
+ ;; See https://github.com/mesonbuild/meson/issues/2561
+ ;; We can remove this once meson is patched.
+ (add-after 'install 'move-executables
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out"))
+ (bin (assoc-ref outputs "bin")))
+ (mkdir-p bin)
+ (rename-file (string-append out "/bin")
+ (string-append bin "/bin"))
+ ;; Do not refer to "bindir", which points to "${prefix}/bin".
+ ;; We don't patch "bindir" to point to "$bin/bin", because that
+ ;; would create a reference cycle between the "out" and "bin"
+ ;; outputs.
+ (substitute* (list (string-append out
"/lib/pkgconfig/gio-2.0.pc")
+ (string-append out
"/lib/pkgconfig/glib-2.0.pc"))
+ (("bindir=\\$\\{prefix\\}/bin") "")
+ (("=\\$\\{bindir\\}/") "="))
#t))))
-
- ;; Note: `--docdir' and `--htmldir' are not honored, so work around it.
- #:configure-flags (list (string-append "--with-html-dir="
- (assoc-ref %outputs "doc")
- "/share/gtk-doc/html"))
+ ;; TODO: see above for explanation.
+ ;; #:configure-flags (list (string-append "--bindir="
+ ;; (assoc-ref %outputs "bin")
+ ;; "/bin"))
;; In 'gio/tests', 'gdbus-test-codegen-generated.h' is #included in a
;; file that gets compiled possibly before it has been fully generated.
- branch wip-gnome3.30 created (now 514cac6), guix-commits, 2019/05/03
- 03/48: gnu: gmime: Update to 3.2.3., guix-commits, 2019/05/03
- 01/48: gnu: glib: Update to 2.58.1.,
guix-commits <=
- 04/48: gnu: glibmm: Update to 2.58.0., guix-commits, 2019/05/03
- 05/48: gnu: gnome-desktop: Update to 3.30.2., guix-commits, 2019/05/03
- 08/48: gnu: gsettings-desktop-schemas: Update to 3.28.1., guix-commits, 2019/05/03
- 09/48: gnu: adwaita-icon-theme: Update to 3.30.1., guix-commits, 2019/05/03
- 10/48: gnu: libgnomeprint: Update to 2.18.8., guix-commits, 2019/05/03
- 11/48: gnu: libgnomeprintui: Update to 2.18.6., guix-commits, 2019/05/03
- 06/48: gnu: gnome-disk-utility: Update to 3.30.2., guix-commits, 2019/05/03
- 02/48: gnu: gobject-introspection: Update to 1.58.1., guix-commits, 2019/05/03
- 07/48: gnu: evince: Update to 3.30.2., guix-commits, 2019/05/03
- 12/48: gnu: libwnck: Update to 3.30.0., guix-commits, 2019/05/03