From mboxrd@z Thu Jan 1 00:00:00 1970 From: Arun Isaac Subject: Re: [PATCH 2/2] gnu: gajim: Update to 0.16.6. Date: Thu, 20 Oct 2016 15:48:38 +0530 Message-ID: References: <20161019045005.3678-1-arunisaac@systemreboot.net> <20161019045005.3678-2-arunisaac@systemreboot.net> <20161019172555.GE8998@jasmine> Mime-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:41793) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bxARY-0003Mm-Bq for guix-devel@gnu.org; Thu, 20 Oct 2016 06:19:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bxARV-0005zb-6x for guix-devel@gnu.org; Thu, 20 Oct 2016 06:19:24 -0400 Received: from [117.218.232.8] (port=52228 helo=systemreboot.net) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1bxART-0005x3-C5 for guix-devel@gnu.org; Thu, 20 Oct 2016 06:19:21 -0400 Received: from [45.125.40.129] (helo=steel) by systemreboot.net with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.87) (envelope-from ) id 1bxARA-0000ut-Dz for guix-devel@gnu.org; Thu, 20 Oct 2016 15:49:03 +0530 In-reply-to: <20161019172555.GE8998@jasmine> 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" To: guix-devel@gnu.org --=-=-= Content-Type: text/plain Leo Famulari writes: >> (arguments >> - `(;; The only check done by gajim-0.16.x is to check that the >> - ;; translations are up-to-date, and in 0.16.5 they are not, so >> - ;; "make check" fails. Therefore, we disable tests for now. >> - ;; >> - ;; XXX TODO Try re-enabling tests in gajim-0.16.6 or later. >> - ;; >> - #:tests? #f > > Is that comment still true? If so, I think we can leave the tests > disabled. I was able to build gajim with the tests enabled. So, I'm assuming this comment is no longer true. >> (add-after 'install 'wrap-program >> - (lambda* (#:key outputs #:allow-other-keys) >> - ;; Make sure all Python scripts run with the correct PYTHONPATH. >> - (let ((out (assoc-ref outputs "out")) >> - (path (getenv "PYTHONPATH"))) >> - (for-each (lambda (name) >> - (let ((file (string-append out "/bin/" name))) >> - ;; Wrapping destroys identification of intended >> - ;; application, so we need to override "APP". >> - (substitute* file >> - (("APP=`basename \\$0`") >> - (string-append "APP=" name))) >> - (wrap-program file >> - `("PYTHONPATH" ":" prefix (,path))))) >> - '("gajim" "gajim-remote" "gajim-history-manager"))) >> - #t))))) >> + (lambda* (#:key outputs #:allow-other-keys) >> + ;; Make sure all Python scripts run with the correct PYTHONPATH. >> + (let ((out (assoc-ref outputs "out")) >> + (path (getenv "PYTHONPATH"))) >> + (for-each (lambda (name) >> + (let ((file (string-append out "/bin/" name))) >> + ;; Wrapping destroys identification of intended >> + ;; application, so we need to override "APP". >> + (substitute* file >> + (("APP=`basename \\$0`") >> + (string-append "APP=" name))) >> + (wrap-program file >> + `("PYTHONPATH" ":" prefix (,path))))) >> + '("gajim" "gajim-remote" "gajim-history-manager"))) >> + #t))))) > > This is just an indentation fix, right? Just checking :) Yes, this is just an indentation fix. I'll send an updated set of patches with the changes to the "version 3 only" fix incorporated. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQEcBAEBCAAGBQJYCJn/AAoJEC4l7othgCuz2P8IAMfR9FSgEj3e7ejJ8FGar0Bo SfY8s/y72SQXVK/QjsH+6BWvlJzc9kre6c5QQI3qyDTPc6FB1rgSsm3e8PGmGUwY I1PkxMhqoi3vK9GRrTePGvsLF1KhXIeAjyfi4J7kWlOhuxbkkXHr4g7+GI/Y2n9F yKmh7ATUCYV1YbZX50FXerdx84FigNf5EaGgbwIlvmhWl4LC3MvrnG73jabCMBkR lmK/KOsLHb/9wAZ44DjCTKX11m5JqcGeuy2cguEMSNsnPUZR7Jsigct9ZzLBqUQc 3VpfF+aYrdLVA6SED05MLXnNqpj8h+pxHHa0LfPpGJ6UYS7Y7Oyqfd4MCi/DWjg= =lQOG -----END PGP SIGNATURE----- --=-=-=--