宋文武 <iyzs...@gmail.com> writes:
> * gnu/packages/xfce.scm (xfconf): Update to 4.12.0.
> [arguments]: Add #:phases. Remove #:parallel-tests? argument.
I'm sorry, but I pushed my own urgent update of 'xfconf' before noticing
that you had already proposed this commit, which is better than mine
because it preserves the test suite.
The problem is that you pushed the other updates before pushing this
one, which resulted in almost all of the xfce builds failing. I then
felt compelled to quickly fix things up.
Would you like to change the 'xfconf' package to match what you have
below? Also, please remember to add "2015" to your copyright line at
the top of xfce.scm.
Thanks!
Mark
> ---
> gnu/packages/xfce.scm | 17 ++++++++++++++---
> 1 file changed, 14 insertions(+), 3 deletions(-)
>
> diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
> index 3679eb0..0e45ee4 100644
> --- a/gnu/packages/xfce.scm
> +++ b/gnu/packages/xfce.scm
> @@ -89,7 +89,7 @@ Xfce Desktop Environment.")
> (define-public xfconf
> (package
> (name "xfconf")
> - (version "4.10.0")
> + (version "4.12.0")
> (source (origin
> (method url-fetch)
> (uri (string-append "http://archive.xfce.org/xfce/";
> @@ -97,9 +97,20 @@ Xfce Desktop Environment.")
> "/src/" name "-" version ".tar.bz2"))
> (sha256
> (base32
> - "0xh520z0qh0ib0ijgnyrgii9h5d4pc53n6mx1chhyzfc86j1jlhp"))))
> + "0mmi0g30aln3x98y5p507g17pipq0dj0bwypshan8cq5hkmfl44r"))))
> (build-system gnu-build-system)
> - (arguments '(#:parallel-tests? #f)) ; parallel tests failed
> + (arguments
> + '(#:phases
> + ;; Swap check and install phases.
> + (alist-cons-after
> + 'install 'check
> + (lambda _
> + (setenv "HOME" (getenv "TMPDIR")) ; xfconfd requires a writable
> HOME
> + ;; Run test-suite under a dbus session.
> + (setenv "XDG_DATA_DIRS" ; for finding org.xfce.Xfconf.service
> + (string-append %output "/share"))
> + (zero? (system* "dbus-launch" "make" "check")))
> + (alist-delete 'check %standard-phases))))
> (native-inputs
> `(("pkg-config" ,pkg-config)
> ("intltool" ,intltool)))
