OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 07-Nov-2007 08:55:00
Branch: HEAD Handle: 2007110707545900
Modified files:
openpkg-src/gettext gettext.patch gettext.spec
Log:
upgrading package: gettext 0.16.1 -> 0.17
Summary:
Revision Changes Path
1.12 +9 -123 openpkg-src/gettext/gettext.patch
1.71 +3 -3 openpkg-src/gettext/gettext.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/gettext/gettext.patch
============================================================================
$ cvs diff -u -r1.11 -r1.12 gettext.patch
--- openpkg-src/gettext/gettext.patch 30 Sep 2007 08:29:21 -0000 1.11
+++ openpkg-src/gettext/gettext.patch 7 Nov 2007 07:54:59 -0000 1.12
@@ -1,6 +1,6 @@
Index: gettext-runtime/intl/libgnuintl.h.in
---- gettext-runtime/intl/libgnuintl.h.in.orig 2006-11-27 18:02:00
+0100
-+++ gettext-runtime/intl/libgnuintl.h.in 2007-09-30 10:24:14 +0200
+--- gettext-runtime/intl/libgnuintl.h.in.orig 2007-11-02 01:23:43
+0100
++++ gettext-runtime/intl/libgnuintl.h.in 2007-11-07 08:24:35 +0100
@@ -88,7 +88,7 @@
If he doesn't, we choose the method. A third possible method is
_INTL_REDIRECT_ASM, supported only by GCC. */
@@ -20,21 +20,21 @@
#else
# define _INTL_MAY_RETURN_STRING_ARG(n)
Index: gettext-runtime/intl/plural-exp.c
---- gettext-runtime/intl/plural-exp.c.orig 2006-11-27 18:02:00 +0100
-+++ gettext-runtime/intl/plural-exp.c 2007-09-30 10:24:51 +0200
+--- gettext-runtime/intl/plural-exp.c.orig 2007-10-13 17:51:52 +0200
++++ gettext-runtime/intl/plural-exp.c 2007-11-07 08:25:11 +0100
@@ -27,7 +27,7 @@
#include "plural-exp.h"
--#if (defined __GNUC__ && !(__APPLE_CC__ > 1)) \
-+#if (defined __GNUC__ && !(__APPLE_CC__+0 > 1)) \
+-#if (defined __GNUC__ && !(__APPLE_CC__ > 1) && !defined __cplusplus) \
++#if (defined __GNUC__ && !(__APPLE_CC__+0 > 1) && !defined __cplusplus) \
|| (defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L)
/* These structs are the constant expression for the germanic plural
Index: gettext-tools/gnulib-lib/execute.c
---- gettext-tools/gnulib-lib/execute.c.orig 2006-11-27 18:14:50 +0100
-+++ gettext-tools/gnulib-lib/execute.c 2007-09-30 10:23:36 +0200
-@@ -193,6 +193,9 @@
+--- gettext-tools/gnulib-lib/execute.c.orig 2007-10-07 22:29:19 +0200
++++ gettext-tools/gnulib-lib/execute.c 2007-11-07 08:24:35 +0100
+@@ -196,6 +196,9 @@
dependent which error is reported which way. We treat both cases as
equivalent. */
#if HAVE_POSIX_SPAWN
@@ -44,117 +44,3 @@
sigset_t blocked_signals;
posix_spawn_file_actions_t actions;
bool actions_allocated;
-Index: gettext-tools/gnulib-lib/vasprintf.c
---- gettext-tools/gnulib-lib/vasprintf.c.orig 2006-11-27 18:14:53
+0100
-+++ gettext-tools/gnulib-lib/vasprintf.c 2007-09-30 10:23:36 +0200
-@@ -32,13 +32,14 @@
- #endif
-
- static int
--int_vasprintf (char **result, const char *format, va_list *args)
-+int_vasprintf (char **result, const char *format, va_list args)
- {
- const char *p = format;
- /* Add one to make sure that it is never zero, which might cause malloc
- to return NULL. */
- size_t total_width = strlen (format) + 1;
-- va_list ap = *args;
-+ va_list ap;
-+ __builtin_va_copy(ap, args); /* GCC-specific to avoid Autoconf glue */
-
- while (*p != '\0')
- {
-@@ -112,7 +113,7 @@
- #endif
- *result = malloc (total_width);
- if (*result != NULL)
-- return vsprintf (*result, format, *args);
-+ return vsprintf (*result, format, args);
- else
- return -1;
- }
-@@ -120,7 +121,7 @@
- int
- vasprintf (char **result, const char *format, va_list args)
- {
-- return int_vasprintf (result, format, &args);
-+ return int_vasprintf (result, format, args);
- }
-
- int
-Index: gettext-tools/libgettextpo/vasprintf.c
---- gettext-tools/libgettextpo/vasprintf.c.orig 2006-11-27 18:15:09
+0100
-+++ gettext-tools/libgettextpo/vasprintf.c 2007-09-30 10:23:36 +0200
-@@ -32,13 +32,14 @@
- #endif
-
- static int
--int_vasprintf (char **result, const char *format, va_list *args)
-+int_vasprintf (char **result, const char *format, va_list args)
- {
- const char *p = format;
- /* Add one to make sure that it is never zero, which might cause malloc
- to return NULL. */
- size_t total_width = strlen (format) + 1;
-- va_list ap = *args;
-+ va_list ap;
-+ __builtin_va_copy(ap, args); /* GCC-specific to avoid Autoconf glue */
-
- while (*p != '\0')
- {
-@@ -112,7 +113,7 @@
- #endif
- *result = malloc (total_width);
- if (*result != NULL)
-- return vsprintf (*result, format, *args);
-+ return vsprintf (*result, format, args);
- else
- return -1;
- }
-@@ -120,7 +121,7 @@
- int
- vasprintf (char **result, const char *format, va_list args)
- {
-- return int_vasprintf (result, format, &args);
-+ return int_vasprintf (result, format, args);
- }
-
- int
-Index: gnulib-local/lib/vasprintf.c
---- gnulib-local/lib/vasprintf.c.orig 2006-09-15 14:01:51 +0200
-+++ gnulib-local/lib/vasprintf.c 2007-09-30 10:23:36 +0200
-@@ -32,13 +32,14 @@
- #endif
-
- static int
--int_vasprintf (char **result, const char *format, va_list *args)
-+int_vasprintf (char **result, const char *format, va_list args)
- {
- const char *p = format;
- /* Add one to make sure that it is never zero, which might cause malloc
- to return NULL. */
- size_t total_width = strlen (format) + 1;
-- va_list ap = *args;
-+ va_list ap;
-+ __builtin_va_copy(ap, args); /* GCC-specific to avoid Autoconf glue */
-
- while (*p != '\0')
- {
-@@ -112,7 +113,7 @@
- #endif
- *result = malloc (total_width);
- if (*result != NULL)
-- return vsprintf (*result, format, *args);
-+ return vsprintf (*result, format, args);
- else
- return -1;
- }
-@@ -120,7 +121,7 @@
- int
- vasprintf (char **result, const char *format, va_list args)
- {
-- return int_vasprintf (result, format, &args);
-+ return int_vasprintf (result, format, args);
- }
-
- int
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/gettext/gettext.spec
============================================================================
$ cvs diff -u -r1.70 -r1.71 gettext.spec
--- openpkg-src/gettext/gettext.spec 30 Sep 2007 08:29:21 -0000 1.70
+++ openpkg-src/gettext/gettext.spec 7 Nov 2007 07:54:59 -0000 1.71
@@ -32,8 +32,8 @@
Class: BASE
Group: Charset
License: GPL
-Version: 0.16.1
-Release: 20070930
+Version: 0.17
+Release: 20071107
# list of sources
Source0: ftp://ftp.gnu.org/gnu/gettext/gettext-%{version}.tar.gz
@@ -87,7 +87,7 @@
-e 's;@BUILDCSHARP@;no;g' \
gettext-tools/src/Makefile.in
%{l_shtool} subst \
- -e 's;^\(SUBDIRS =.*\)tests examples;\1;' \
+ -e 's;^\(SUBDIRS =.*\)tests gnulib-tests examples;\1;' \
gettext-tools/Makefile.in
%{l_shtool} subst \
-e 's;\#if USEJEXE;#ifdef USEJEXE;' \
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
