[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
76/135: gnu: glib: Update to 2.58.1.
From: |
guix-commits |
Subject: |
76/135: gnu: glib: Update to 2.58.1. |
Date: |
Fri, 21 Dec 2018 14:37:40 -0500 (EST) |
rekado pushed a commit to branch wip-gnome3.30
in repository guix.
commit 62b9bb1fb3a06d30d06ed9567ae62668638a70b3
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 | 69 ++++++++++++++++++++++++++++++++++-----------------
1 file changed, 46 insertions(+), 23 deletions(-)
diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index 792a66b..2169abb 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.2")
+ (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
- "12d738n1wpvrn39zvy9xazg5h6vzyiwsw8z1qibcj09mh4bbsjnn"))
+ "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,9 +181,9 @@ 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
@@ -195,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)
@@ -221,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.
@@ -266,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.
- 110/135: gnu: gnome-calculator: Update to 3.30.1., (continued)
- 110/135: gnu: gnome-calculator: Update to 3.30.1., guix-commits, 2018/12/21
- 58/135: gnu: tracker: Update to 2.0.4., guix-commits, 2018/12/21
- 20/135: gnu: gcr: Update to 3.28.0., guix-commits, 2018/12/21
- 113/135: gnu: gnome-keyring: Add missing input., guix-commits, 2018/12/21
- 33/135: gnu: libgudev: Update to 232., guix-commits, 2018/12/21
- 48/135: gnu: gnome-system-monitor: Update to 3.28.2., guix-commits, 2018/12/21
- 61/135: gnu: gnome-control-center: Update to 3.28.2., guix-commits, 2018/12/21
- 74/135: gnu: atk: Update to 2.30.0., guix-commits, 2018/12/21
- 69/135: gnu: libimobiledevice: Do not hardcode Python version., guix-commits, 2018/12/21
- 125/135: gnu: epiphany: Update to 3.30.2., guix-commits, 2018/12/21
- 76/135: gnu: glib: Update to 2.58.1.,
guix-commits <=
- 105/135: gnu: atkmm: Update to 2.28.0., guix-commits, 2018/12/21
- 53/135: gnu: Add libdazzle., guix-commits, 2018/12/21