03/12: gnu: guile-sdl, guile-sly: Switch to Guile 2.2.

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository guix.

commit 8380a1817603e0f2b30fca2bc26923f6c93ae1c7
Author: Ludovic Courtès <address@hidden>
Date:   Sat Oct 14 15:24:19 2017 +0200

    gnu: guile-sdl, guile-sly: Switch to Guile 2.2.
    
    * gnu/packages/sdl.scm (guile-sdl)[inputs]: Replace GUILE-2.0 with
    GUILE-2.2.
    [arguments]: Add 'skip-cursor-test' phase.
    * gnu/packages/guile.scm (guile-sly)[propagated-inputs]: Switch to
    GUILE-2.2.
---
 gnu/packages/guile.scm |  2 +-
 gnu/packages/sdl.scm   | 12 +++++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm
index 6ab1207..55aeff1 100644
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@ -1374,7 +1374,7 @@ users and in some situations.")
     (native-inputs
      `(("pkg-config" ,pkg-config)))
     (propagated-inputs
-     `(("guile" ,guile-2.0)
+     `(("guile" ,guile-2.2)
        ("guile-sdl" ,guile-sdl)
        ("guile-opengl" ,guile-opengl)))
     (inputs
diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm
index bdf36f3..d3edac1 100644
--- a/gnu/packages/sdl.scm
+++ b/gnu/packages/sdl.scm
@@ -403,7 +403,7 @@ directory.")
        ("xorg-server" ,xorg-server)
        ("libjpeg" ,libjpeg)))
     (inputs
-     `(("guile" ,guile-2.0)
+     `(("guile" ,guile-2.2)
        ("sdl-union" ,(sdl-union))))
     (arguments
      '(#:configure-flags
@@ -446,6 +446,16 @@ directory.")
              (system (format #f "~a/bin/Xvfb :1 &"
                              (assoc-ref inputs "xorg-server")))
              (setenv "DISPLAY" ":1")
+             #t))
+         (add-before 'check 'skip-cursor-test
+           (lambda _
+             ;; XXX: This test sometimes enters an endless loop, and sometimes
+             ;; crashes with:
+             ;;   guile: xcb_io.c:147: append_pending_request: Assertion 
`!xcb_xlib_unknown_seq_number' failed.
+             ;; Skip it.
+             (substitute* "test/cursor.scm"
+               (("\\(SDL:init .*" all)
+                (string-append "(exit 77)  ;" all "\n")))
              #t)))))
     (synopsis "Guile interface for SDL (Simple DirectMedia Layer)")
     (description "Guile-SDL is a set of bindings to the Simple DirectMedia