me/guix
Archived
1
0
Fork 0
Code Activity

gnu: spice-vdagent: Update to 0.21.0 and enable GTK+ support.

Browse source 
* gnu/packages/spice.scm (spice-vdagent): Update to 0.21.0.
Remove trailing #t.
[make-flags]: New argument.
[phases]{fix-test-termination}: New phase.
[inputs]: Add gtk+.
[native-inputs]{procps}: New input.
This commit is contained in:
Maxim Cournoyer 2021-05-06 10:57:54 -04:00
parent 626e619590
commit a33afba4f1
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
gnu/packages/spice.scm
View file

@ -261,7 +261,7 @@ Internet and from a wide variety of machine architectures.")
(define-public spice-vdagent (define-public spice-vdagent
(package (package
(name "spice-vdagent") (name "spice-vdagent")
(version "0.20.0") (version "0.21.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -269,11 +269,14 @@ Internet and from a wide variety of machine architectures.")
"spice-vdagent-" version ".tar.bz2")) "spice-vdagent-" version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"0n9k2kna2gd1zi6jv45zsp2jlv439nz5l5jjijirxqaycwi74srf")))) "0n8jlc1pv6mkry161y656b1nk9hhhminjq6nymzmmyjl7k95ymzx"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:configure-flags `(#:configure-flags
'("--localstatedir=/var") '("--localstatedir=/var")
;; The test-session-info test fails for unknown reasons (see:
;; https://gitlab.freedesktop.org/spice/linux/vd_agent/-/issues/24).
#:make-flags '("XFAIL_TESTS=tests/test-session-info")
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'patch-makefile.in (add-after 'unpack 'patch-makefile.in
@ -281,19 +284,27 @@ Internet and from a wide variety of machine architectures.")
(substitute* "Makefile.in" (substitute* "Makefile.in"
(((string-append "\\$\\(mkdir_p\\) \\$\\(DESTDIR\\)" (((string-append "\\$\\(mkdir_p\\) \\$\\(DESTDIR\\)"
"\\$\\(localstatedir\\)/run/spice-vdagentd")) "\\$\\(localstatedir\\)/run/spice-vdagentd"))
"-$(mkdir_p) $(DESTDIR)$(localstatedir)/run/spice-vdagentd")) "-$(mkdir_p) $(DESTDIR)$(localstatedir)/run/spice-vdagentd"))))
#t))
(add-after 'unpack 'patch-spice-vdagent.desktop (add-after 'unpack 'patch-spice-vdagent.desktop
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(substitute* "data/spice-vdagent.desktop" (substitute* "data/spice-vdagent.desktop"
(("Exec=/usr/bin/spice-vdagent") (("Exec=/usr/bin/spice-vdagent")
(string-append "Exec=" (assoc-ref outputs "out") (string-append "Exec=" (assoc-ref outputs "out")
"/bin/spice-vdagent"))) "/bin/spice-vdagent")))))
#t))))) (add-after 'unpack 'fix-test-termination
(lambda _
;; The termination tests depend on finding the socket file name
;; in the spice-vdagent command line it launched, but by default
;; ps truncates its output, which causes the test to fail (see:
;; https://gitlab.freedesktop.org/spice/linux/vd_agent/-/merge_requests/36).
(substitute* "tests/test-termination.c"
(("ps -ef")
"ps -efww")))))))
(inputs (inputs
`(("alsa-lib" ,alsa-lib) `(("alsa-lib" ,alsa-lib)
("dbus" ,dbus) ("dbus" ,dbus)
("glib" ,glib) ("glib" ,glib)
("gtk+" ,gtk+)
("libdrm" ,libdrm) ("libdrm" ,libdrm)
("libpciaccess" ,libpciaccess) ("libpciaccess" ,libpciaccess)
("libx11" ,libx11) ("libx11" ,libx11)
@ -303,7 +314,8 @@ Internet and from a wide variety of machine architectures.")
("libxrandr" ,libxrandr) ("libxrandr" ,libxrandr)
("spice-protocol" ,spice-protocol))) ("spice-protocol" ,spice-protocol)))
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config))) `(("pkg-config" ,pkg-config)
("procps" ,procps))) ;tests use 'ps'
(synopsis "Spice agent for Linux") (synopsis "Spice agent for Linux")
(description "Spice-vdagent enables sharing the clipboard and guest display (description "Spice-vdagent enables sharing the clipboard and guest display
resolution scaling on graphical console window resize.") resolution scaling on graphical console window resize.")