kkebreau pushed a commit to branch wip-gnome3.36
in repository guix.
commit f5f8cb4dac05b81ef82846c2e8b22e58df382e24
Author: Kei Kebreau <[email protected]>
AuthorDate: Fri Apr 17 22:49:15 2020 -0400
gnu: cogl: Update to 1.22.6.
* gnu/packages/gnome.scm (cogl): Update to 1.22.6.
[native-inputs]: Add xorg-server-for-tests.
[arguments]: Re-enable tests.
---
gnu/packages/gnome.scm | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 23954a8..0b26839 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -4435,7 +4435,7 @@ throughout GNOME for API documentation).")
(define-public cogl
(package
(name "cogl")
- (version "1.22.4")
+ (version "1.22.6")
(source
(origin
(method url-fetch)
@@ -4443,14 +4443,14 @@ throughout GNOME for API documentation).")
(version-major+minor version) "/"
"cogl-" version ".tar.xz"))
(sha256
- (base32 "1q0drs82a8f6glg1v29bb6g2nf15fw0rvdx3d0rgcgfarfaby5sj"))))
+ (base32 "0x8v4n61q89qy27v824bqswpz6bmn801403w2q3pa1lcwk9ln4vd"))))
;; NOTE: mutter exports a bundled fork of cogl, so when making changes to
;; cogl, corresponding changes may be appropriate in mutter as well.
(build-system gnu-build-system)
(native-inputs
`(("glib:bin" ,glib "bin") ; for glib-mkenums
("gobject-introspection" ,gobject-introspection)
- ;;("xorg-server" ,xorg-server) ; for the test suite
+ ("xorg-server" ,xorg-server-for-tests) ; for the test suite
("pkg-config" ,pkg-config)))
(propagated-inputs
`(("glib" ,glib)
@@ -4478,12 +4478,7 @@ throughout GNOME for API documentation).")
(string-append "--with-gl-libname="
(assoc-ref %build-inputs "mesa")
"/lib/libGL.so"))
- ;; XXX FIXME: All tests fail, with many warnings printed like this:
- ;; _FontTransOpen: Unable to Parse address
- ;; ${prefix}/share/fonts/X11/misc/
- #:tests? #f
- #; #:phases
- #;
+ #:phases
(modify-phases %standard-phases
(add-before 'check 'start-xorg-server
(lambda* (#:key inputs #:allow-other-keys)