From 79a4c014870451a92fbb61458465b614393f757c Mon Sep 17 00:00:00 2001
From: Nikita Karetnikov
Date: Fri, 23 Nov 2012 21:39:50 +0000
Subject: [PATCH] distro: Add GNU Gettext.
* distro/packages/gettext.scm,
distro/packages/patches/gettext-libgettextpo-gets-undeclared.patch,
distro/packages/patches/gettext-runtime-gets-undeclared.patch,
distro/packages/patches/gettext-tools-gets-undeclared.patch: New files.
* Makefile.am (MODULES): Add 'gettext.scm'.
(dist_patch_DATA): Adjust accordingly.
---
Makefile.am | 38 ++++++-----
distro/packages/gettext.scm | 76 ++++++++++++++++++++
.../gettext-libgettextpo-gets-undeclared.patch | 15 ++++
.../patches/gettext-runtime-gets-undeclared.patch | 15 ++++
.../patches/gettext-tools-gets-undeclared.patch | 15 ++++
5 files changed, 142 insertions(+), 17 deletions(-)
create mode 100644 distro/packages/gettext.scm
create mode 100644 distro/packages/patches/gettext-libgettextpo-gets-undeclared.patch
create mode 100644 distro/packages/patches/gettext-runtime-gets-undeclared.patch
create mode 100644 distro/packages/patches/gettext-tools-gets-undeclared.patch
diff --git a/Makefile.am b/Makefile.am
index ae70a26..8b7ad7c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -52,6 +52,7 @@ MODULES = \
distro/packages/flex.scm \
distro/packages/gawk.scm \
distro/packages/gdbm.scm \
+ distro/packages/gettext.scm \
distro/packages/gnupg.scm \
distro/packages/gnutls.scm \
distro/packages/gperf.scm \
@@ -83,23 +84,26 @@ GOBJECTS = $(MODULES:%.scm=%.go) guix/config.go
nobase_dist_guilemodule_DATA = $(MODULES)
patchdir = $(pkgdatadir)/patches
-dist_patch_DATA = \
- distro/packages/patches/binutils-ld-new-dtags.patch \
- distro/packages/patches/diffutils-gets-undeclared.patch \
- distro/packages/patches/flex-bison-tests.patch \
- distro/packages/patches/glibc-no-ld-so-cache.patch \
- distro/packages/patches/guile-1.8-cpp-4.5.patch \
- distro/packages/patches/guile-default-utf8.patch \
- distro/packages/patches/guile-relocatable.patch \
- distro/packages/patches/libtool-skip-tests.patch \
- distro/packages/patches/m4-gets-undeclared.patch \
- distro/packages/patches/m4-readlink-EINVAL.patch \
- distro/packages/patches/m4-s_isdir.patch \
- distro/packages/patches/make-impure-dirs.patch \
- distro/packages/patches/findutils-absolute-paths.patch \
- distro/packages/patches/perl-no-sys-dirs.patch \
- distro/packages/patches/readline-link-ncurses.patch \
- distro/packages/patches/shishi-gets-undeclared.patch \
+dist_patch_DATA = \
+ distro/packages/patches/binutils-ld-new-dtags.patch \
+ distro/packages/patches/diffutils-gets-undeclared.patch \
+ distro/packages/patches/flex-bison-tests.patch \
+ distro/packages/patches/gettext-libgettextpo-gets-undeclared.patch \
+ distro/packages/patches/gettext-runtime-gets-undeclared.patch \
+ distro/packages/patches/gettext-tools-gets-undeclared.patch \
+ distro/packages/patches/glibc-no-ld-so-cache.patch \
+ distro/packages/patches/guile-1.8-cpp-4.5.patch \
+ distro/packages/patches/guile-default-utf8.patch \
+ distro/packages/patches/guile-relocatable.patch \
+ distro/packages/patches/libtool-skip-tests.patch \
+ distro/packages/patches/m4-gets-undeclared.patch \
+ distro/packages/patches/m4-readlink-EINVAL.patch \
+ distro/packages/patches/m4-s_isdir.patch \
+ distro/packages/patches/make-impure-dirs.patch \
+ distro/packages/patches/findutils-absolute-paths.patch \
+ distro/packages/patches/perl-no-sys-dirs.patch \
+ distro/packages/patches/readline-link-ncurses.patch \
+ distro/packages/patches/shishi-gets-undeclared.patch \
distro/packages/patches/tar-gets-undeclared.patch
bootstrapdir = $(pkgdatadir)/bootstrap
diff --git a/distro/packages/gettext.scm b/distro/packages/gettext.scm
new file mode 100644
index 0000000..218e030
--- /dev/null
+++ b/distro/packages/gettext.scm
@@ -0,0 +1,76 @@
+;;; Guix --- Nix package management from Guile. -*- coding: utf-8 -*-
+;;; Copyright (C) 2012 Nikita Karetnikov
+;;;
+;;; This file is part of Guix.
+;;;
+;;; Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with Guix. If not, see .
+
+(define-module (distro packages gettext)
+ #:use-module (distro)
+ #:use-module (guix packages)
+ #:use-module (guix download)
+ #:use-module (guix build-system gnu))
+
+(define-public gettext
+ (package
+ (name "gettext")
+ (version "0.18.1.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "mirror://gnu/gettext/gettext-"
+ version
+ ".tar.gz"))
+ (sha256
+ (base32
+ "1sa3ch12qxa4h3ya6hkz119yclcccmincl9j20dhrdx5mykp3b4k"))))
+ (build-system gnu-build-system)
+ (arguments
+ `(#:patches (list (assoc-ref %build-inputs
+ "patch/gets-runtime")
+ (assoc-ref %build-inputs
+ "patch/gets-tools")
+ (assoc-ref %build-inputs
+ "patch/gets-libgettextpo"))))
+ (inputs
+ `(("patch/gets-runtime"
+ ,(search-patch "gettext-runtime-gets-undeclared.patch"))
+ ("patch/gets-tools"
+ ,(search-patch "gettext-tools-gets-undeclared.patch"))
+ ("patch/gets-libgettextpo"
+ ,(search-patch "gettext-libgettextpo-gets-undeclared.patch"))))
+ (home-page
+ "http://www.gnu.org/software/gettext/")
+ (synopsis
+ "GNU gettext, a well integrated set of translation tools and documentation")
+ (description
+ "Usually, programs are written and documented in English, and use
+English at execution time for interacting with users. Using a common
+language is quite handy for communication between developers,
+maintainers and users from all countries. On the other hand, most
+people are less comfortable with English than with their own native
+language, and would rather be using their mother tongue for day to
+day's work, as far as possible. Many would simply love seeing their
+computer screen showing a lot less of English, and far more of their
+own language.
+
+GNU `gettext' is an important step for the GNU Translation Project, as
+bit is an asset on which we may build many other steps. This package
+offers to programmers, translators, and even users, a well integrated
+set of tools and documentation. Specifically, the GNU `gettext'
+utilities are a set of tools that provides a framework to help other
+GNU packages produce multi-lingual messages.
+")
+ (license "GPLv3"))) ; some files are under GPLv2+
\ No newline at end of file
diff --git a/distro/packages/patches/gettext-libgettextpo-gets-undeclared.patch b/distro/packages/patches/gettext-libgettextpo-gets-undeclared.patch
new file mode 100644
index 0000000..c0b3526
--- /dev/null
+++ b/distro/packages/patches/gettext-libgettextpo-gets-undeclared.patch
@@ -0,0 +1,15 @@
+--- gettext-0.18.1.1/gettext-tools/libgettextpo/stdio.in.h-orig 2012-11-24 01:13:14.000000000 +0400
++++ gettext-0.18.1.1/gettext-tools/libgettextpo/stdio.in.h 2012-11-24 01:13:46.000000000 +0400
+@@ -137,12 +137,6 @@
+ "use gnulib module fflush for portable POSIX compliance");
+ #endif
+
+-/* It is very rare that the developer ever has full control of stdin,
+- so any use of gets warrants an unconditional warning. Assume it is
+- always declared, since it is required by C89. */
+-#undef gets
+-_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
+-
+ #if @GNULIB_FOPEN@
+ # if @REPLACE_FOPEN@
+ # if !(defined __cplusplus && defined GNULIB_NAMESPACE)
diff --git a/distro/packages/patches/gettext-runtime-gets-undeclared.patch b/distro/packages/patches/gettext-runtime-gets-undeclared.patch
new file mode 100644
index 0000000..cf358ec
--- /dev/null
+++ b/distro/packages/patches/gettext-runtime-gets-undeclared.patch
@@ -0,0 +1,15 @@
+--- gettext-0.18.1.1/gettext-runtime/gnulib-lib/stdio.in.h-orig 2012-11-24 00:26:49.000000000 +0400
++++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/stdio.in.h 2012-11-24 00:45:54.000000000 +0400
+@@ -137,12 +137,6 @@
+ "use gnulib module fflush for portable POSIX compliance");
+ #endif
+
+-/* It is very rare that the developer ever has full control of stdin,
+- so any use of gets warrants an unconditional warning. Assume it is
+- always declared, since it is required by C89. */
+-#undef gets
+-_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
+-
+ #if @GNULIB_FOPEN@
+ # if @REPLACE_FOPEN@
+ # if !(defined __cplusplus && defined GNULIB_NAMESPACE)
diff --git a/distro/packages/patches/gettext-tools-gets-undeclared.patch b/distro/packages/patches/gettext-tools-gets-undeclared.patch
new file mode 100644
index 0000000..18ea1a2
--- /dev/null
+++ b/distro/packages/patches/gettext-tools-gets-undeclared.patch
@@ -0,0 +1,15 @@
+--- gettext-0.18.1.1/gettext-tools/gnulib-lib/stdio.in.h-orig 2012-11-24 01:00:26.000000000 +0400
++++ gettext-0.18.1.1/gettext-tools/gnulib-lib/stdio.in.h 2012-11-24 01:00:53.000000000 +0400
+@@ -137,12 +137,6 @@
+ "use gnulib module fflush for portable POSIX compliance");
+ #endif
+
+-/* It is very rare that the developer ever has full control of stdin,
+- so any use of gets warrants an unconditional warning. Assume it is
+- always declared, since it is required by C89. */
+-#undef gets
+-_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
+-
+ #if @GNULIB_FOPEN@
+ # if @REPLACE_FOPEN@
+ # if !(defined __cplusplus && defined GNULIB_NAMESPACE)
--
1.7.5.4