Commit 934352c0 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files

Contribs: update gettext to 0.18.2.1

parent 70d201b4
1735599307a2d12be609ecfe1141815a11af144c6b94301f6c7101242e0b628251a3613d1d70df099ec07423befeaf10dfb53b8176f710c7e158c4fc63ea8747 gettext-0.18.1.1.tar.gz
9290efb692c25f0469fa2aec66e382603d2eb5e6873be30b3f6fea73c1c4ae99250a5d3292100316873dd7e3c791be834655ac3659e36100e8ecb128100a4235 gettext-0.18.2.1.tar.gz
--- gettext/gettext-tools/libgrep/regex_internal.h.orig 2012-01-27 16:56:14.000000000 +0100
+++ gettext/gettext-tools/libgrep/regex_internal.h 2012-01-27 16:53:34.000000000 +0100
@@ -455,7 +455,9 @@
#define re_string_skip_bytes(pstr,idx) ((pstr)->cur_idx += (idx))
#define re_string_set_index(pstr,idx) ((pstr)->cur_idx = (idx))
+#ifdef HAVE_ALLOCA_H
#include <alloca.h>
+#endif
#ifndef _LIBC
# if HAVE_ALLOCA
--- gettext/gettext-tools/src/msgmerge.c.orig 2007-10-21 03:25:52.000000000 +0200
+++ gettext/gettext-tools/src/msgmerge.c 2008-03-23 19:54:36.000000000 +0100
@@ -96,7 +96,7 @@
/* Update mode. */
static bool update_mode = false;
-static const char *version_control_string;
+static const char *version_control_string = "none";
static const char *backup_suffix_string;
/* Long options. */
--- gettext/gettext-tools/configure 2010-06-06 13:12:20.000000000 -0700
+++ gettext/gettext-tools/configure 2010-08-13 23:24:09.000000000 -0700
@@ -40606,7 +40606,9 @@ else
#include <stdlib.h>
#include <string.h> /* for strcpy */
/* The stpncpy prototype is missing in <string.h> on AIX 4. */
+#ifndef stpncpy
extern char *stpncpy (char *dest, const char *src, size_t n);
+#endif
int main () {
const char *src = "Hello";
char dest[10];
--- gettext/gettext-tools/gnulib-lib/stpncpy.c.orig 2013-01-07 23:17:13.000000000 +0100
+++ gettext/gettext-tools/gnulib-lib/stpncpy.c 2013-01-07 23:17:25.000000000 +0100
@@ -24,6 +24,8 @@
/* Specification. */
#include <string.h>
+#undef stpncpy
+
#ifndef weak_alias
# define __stpncpy stpncpy
#endif
# gettext
GETTEXT_VERSION=0.18.1.1
GETTEXT_VERSION=0.18.2.1
GETTEXT_URL=$(GNU)/gettext/gettext-$(GETTEXT_VERSION).tar.gz
PKGS += gettext
......@@ -15,10 +15,6 @@ $(TARBALLS)/gettext-$(GETTEXT_VERSION).tar.gz:
gettext: gettext-$(GETTEXT_VERSION).tar.gz .sum-gettext
$(UNPACK)
$(APPLY) $(SRC)/gettext/alloca.patch
ifdef HAVE_MACOSX
$(APPLY) $(SRC)/gettext/gettext-macosx.patch
endif
$(MOVE)
DEPS_gettext = iconv $(DEPS_iconv)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment