From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mark H Weaver Subject: Re: [PATCH 03/15] gnu: xfconf: Update to 4.12.0. Date: Mon, 02 Mar 2015 00:59:15 -0500 Message-ID: <87pp8s0wjw.fsf@netris.org> References: <1425189446-6455-1-git-send-email-iyzsong@gmail.com> <1425189446-6455-3-git-send-email-iyzsong@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:42133) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YSJNh-0003MO-56 for guix-devel@gnu.org; Mon, 02 Mar 2015 00:59:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YSJNc-0006XI-5t for guix-devel@gnu.org; Mon, 02 Mar 2015 00:59:05 -0500 Received: from world.peace.net ([50.252.239.5]:46667) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YSJNc-0006X7-1V for guix-devel@gnu.org; Mon, 02 Mar 2015 00:59:00 -0500 In-Reply-To: <1425189446-6455-3-git-send-email-iyzsong@gmail.com> (=?utf-8?B?IuWui+aWh+atpiIncw==?= message of "Sun, 1 Mar 2015 13:57:14 +0800") List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: =?utf-8?B?5a6L5paH5q2m?= Cc: guix-devel@gnu.org =E5=AE=8B=E6=96=87=E6=AD=A6 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 writabl= e 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)))