mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-24 21:38:07 -05:00
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.
This commit is contained in:
Ricardo Wurmus
Kei Kebreau
parent
e7041c8ef8
commit
6c237a2d7b
1 changed files with 49 additions and 23 deletions
|
|
@ -53,6 +53,7 @@ (define-module (gnu packages glib)
|
|||
#: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)
|
||||
|
|
@ -159,7 +160,7 @@ (define dbus
|
|||
(define glib
|
||||
(package
|
||||
(name "glib")
|
||||
(version "2.56.3")
|
||||
(version "2.58.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnome/sources/"
|
||||
|
|
@ -167,19 +168,20 @@ (define glib
|
|||
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
|
||||
|
|
@ -189,11 +191,14 @@ (define glib
|
|||
("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")
|
||||
|
|
@ -202,14 +207,8 @@ (define glib
|
|||
;; 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)
|
||||
|
|
@ -228,6 +227,15 @@ (define pattern+procs
|
|||
;; 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.
|
||||
|
|
@ -273,12 +281,30 @@ (define pattern+procs
|
|||
(;; 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.
|
||||
|
|
|
|||
Loading…
Reference in a new issue