From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andreas Enge Subject: [PATCH] gnu: gettext: Enable "xgettext --language=glade" Date: Sun, 17 Nov 2013 13:25:46 +0100 Message-ID: <20131117122546.GA32131@debian> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="VbJkn9YxBvnuCH5J" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:57674) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vi1QM-000798-CU for guix-devel@gnu.org; Sun, 17 Nov 2013 07:26:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Vi1QF-0000Iz-Vh for guix-devel@gnu.org; Sun, 17 Nov 2013 07:25:58 -0500 Received: from moutng.kundenserver.de ([212.227.126.171]:53137) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vi1QF-0000Ip-M3 for guix-devel@gnu.org; Sun, 17 Nov 2013 07:25:51 -0500 Content-Disposition: inline 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: guix-devel@gnu.org --VbJkn9YxBvnuCH5J Content-Type: text/plain; charset=us-ascii Content-Disposition: inline As discussed yesterday on irc, the current gettext does not handle glade, as it is not linked with expat. This causes problems when patching pspp, for instance. The attached patch solves the problem and compiles on master. Is it okay to push it to core-updates, to avoid disruption on master? Since guile currently does not compile in core-updates, I cannot test the patch there. Andreas --VbJkn9YxBvnuCH5J Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="0001-gnu-gettext-Enable-xgettext-language-glade.patch" >From a1c81413937dbaae283a1fb4ea9d80c13e62dd90 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Sun, 17 Nov 2013 13:22:15 +0100 Subject: [PATCH] gnu: gettext: Enable "xgettext --language=glade". * gnu/packages/gettext.scm (gettext): Add input expat, explicitly link with it. --- gnu/packages/gettext.scm | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gettext.scm b/gnu/packages/gettext.scm index 07d2b0d..6436e26 100644 --- a/gnu/packages/gettext.scm +++ b/gnu/packages/gettext.scm @@ -17,11 +17,12 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages gettext) - #:use-module (guix licenses) + #:use-module ((guix licenses) #:select (gpl3)) #:use-module (gnu packages) #:use-module (guix packages) #:use-module (guix download) - #:use-module (guix build-system gnu)) + #:use-module (guix build-system gnu) + #:use-module (gnu packages xml)) (define-public gettext (package @@ -35,8 +36,16 @@ (base32 "0j7rp56c61j4k1bz1xdc041hzv7186yyzhbp95fmc0zq7l2c3wrn")))) (build-system gnu-build-system) + (inputs + `(("expat" ,expat))) (arguments `(#:phases (alist-cons-before + 'configure 'link-expat + (lambda _ + (substitute* "gettext-tools/configure" + (("LIBEXPAT=\"-ldl\"") "LIBEXPAT=\"-ldl -lexpat\"") + (("LTLIBEXPAT=\"-ldl\"") "LTLIBEXPAT=\"-ldl -lexpat\""))) + (alist-cons-before 'check 'patch-tests (lambda* (#:key inputs #:allow-other-keys) (let ((bash (which "sh"))) @@ -48,7 +57,7 @@ "posix_spawn") (("/bin/sh") bash)))) - %standard-phases))) + %standard-phases)))) (home-page "http://www.gnu.org/software/gettext/") (synopsis "Tools and documentation for translation") (description -- 1.8.4 --VbJkn9YxBvnuCH5J--