From 0129c94832a9fdd8c901848dd9e963e7c20063eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 18 Nov 2013 00:20:56 +0100 Subject: gnu: gettext: Upgrade to 0.18.3.1. * gnu/packages/gettext.scm (gettext): Upgrade to 0.18.3.1. --- gnu/packages/gettext.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gettext.scm') diff --git a/gnu/packages/gettext.scm b/gnu/packages/gettext.scm index 07d2b0d8cb..b6ea3a3f10 100644 --- a/gnu/packages/gettext.scm +++ b/gnu/packages/gettext.scm @@ -26,14 +26,14 @@ (define-public gettext (package (name "gettext") - (version "0.18.3") + (version "0.18.3.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/gettext/gettext-" version ".tar.gz")) (sha256 (base32 - "0j7rp56c61j4k1bz1xdc041hzv7186yyzhbp95fmc0zq7l2c3wrn")))) + "0p940zmmw1lndvdhck2vrazikjhr02affwy47mmpfxqvacrrm3qd")))) (build-system gnu-build-system) (arguments `(#:phases (alist-cons-before -- cgit v1.2.3 From c42a4b76c400fd8cf30e145061637c70a2b12a02 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Mon, 18 Nov 2013 21:11:49 +0100 Subject: 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(-) (limited to 'gnu/packages/gettext.scm') diff --git a/gnu/packages/gettext.scm b/gnu/packages/gettext.scm index b6ea3a3f10..7edbfa023c 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 "0p940zmmw1lndvdhck2vrazikjhr02affwy47mmpfxqvacrrm3qd")))) (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 -- cgit v1.2.3 From 1dba64079c5aaa1fb40e4b1d989f1f06efd6cb63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 20 Nov 2013 22:12:49 +0100 Subject: gnu: gettext: Rename binding to 'gnu-gettext'. * gnu/packages/gettext.scm (gettext): Rename to... (gnu-gettext): ... this. This is used to work around the circular dependency introduced in commit c42a4b7, which users with a #:renamer cannot cope with. * gnu/packages/acl.scm, gnu/packages/attr.scm, gnu/packages/cdrom.scm, gnu/packages/fdisk.scm, gnu/packages/gkrellm.scm, gnu/packages/glib.scm, gnu/packages/gnunet.scm, gnu/packages/grub.scm, gnu/packages/linux.scm, gnu/packages/maths.scm, gnu/packages/nano.scm, gnu/packages/parted.scm, gnu/packages/system.scm, gnu/packages/version-control.scm, gnu/packages/vpn.scm, gnu/packages/w3m.scm, gnu/packages/wget.scm: Adjust accordingly. --- gnu/packages/gettext.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'gnu/packages/gettext.scm') diff --git a/gnu/packages/gettext.scm b/gnu/packages/gettext.scm index 7edbfa023c..6b056055b8 100644 --- a/gnu/packages/gettext.scm +++ b/gnu/packages/gettext.scm @@ -24,7 +24,14 @@ #:use-module (guix build-system gnu) #:use-module (gnu packages xml)) -(define-public gettext +;; Use that name to avoid clashes with Guile's 'gettext' procedure. +;; +;; We used to resort to #:renamer on the user side, but that prevented +;; circular dependencies involving (gnu packages gettext). This is because +;; 'resolve-interface' (as of Guile 2.0.9) iterates eagerly over the used +;; module when there's a #:renamer, and that module may be empty at that point +;; in case or circular dependencies. +(define-public gnu-gettext (package (name "gettext") (version "0.18.3.1") -- cgit v1.2.3