pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/devel/gettext-tools Fixed the patches to _never_ use t...
details: https://anonhg.NetBSD.org/pkgsrc/rev/8997268672e8
branches: trunk
changeset: 526505:8997268672e8
user: rillig <rillig%pkgsrc.org@localhost>
date: Mon Mar 12 23:59:47 2007 +0000
description:
Fixed the patches to _never_ use the varargs macros. This fixes the
build on Mac OS X, where the inconsistent preprocessor conditions made
the compilation fail.
diffstat:
devel/gettext-tools/distinfo | 6 +++---
devel/gettext-tools/patches/patch-aq | 24 ++++++++++++++++--------
devel/gettext-tools/patches/patch-ar | 16 +++++++++-------
3 files changed, 28 insertions(+), 18 deletions(-)
diffs (84 lines):
diff -r c9a688ba84e5 -r 8997268672e8 devel/gettext-tools/distinfo
--- a/devel/gettext-tools/distinfo Mon Mar 12 22:52:49 2007 +0000
+++ b/devel/gettext-tools/distinfo Mon Mar 12 23:59:47 2007 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2007/03/06 13:45:34 rillig Exp $
+$NetBSD: distinfo,v 1.7 2007/03/12 23:59:47 rillig Exp $
SHA1 (gettext-0.14.6.tar.gz) = 0d8ce8d9a09a719065a1530399c4f45c15a002c5
RMD160 (gettext-0.14.6.tar.gz) = 02138d12fd4d9ce0b3bda2d132f1569b30d16726
@@ -16,5 +16,5 @@
SHA1 (patch-an) = f99f345f9b23f72e4a462445bcce8281dd1e5308
SHA1 (patch-ao) = 9e81b05b6e1ee76197c360a441264588607a475c
SHA1 (patch-ap) = 2955c2d6b2b2d52248d449a0b7ea025a0d632bea
-SHA1 (patch-aq) = e3faeb0beddf878c6c87f51638e4cd23f7222873
-SHA1 (patch-ar) = 9cf5eb416ffa14aab30f3df33af8eebb3bf6f956
+SHA1 (patch-aq) = 5071a9358707ee8831fa0fcfb6a4cd35a21f7547
+SHA1 (patch-ar) = 587e9788aee5180a0425c0eb0797e6f8e68da864
diff -r c9a688ba84e5 -r 8997268672e8 devel/gettext-tools/patches/patch-aq
--- a/devel/gettext-tools/patches/patch-aq Mon Mar 12 22:52:49 2007 +0000
+++ b/devel/gettext-tools/patches/patch-aq Mon Mar 12 23:59:47 2007 +0000
@@ -1,19 +1,27 @@
-$NetBSD: patch-aq,v 1.1 2007/03/06 13:08:24 rillig Exp $
+$NetBSD: patch-aq,v 1.2 2007/03/12 23:59:47 rillig Exp $
-Don't assume that any compiler other than gcc can handle varargs macros
-where zero arguments are given for "...". Accepting zero arguments is
-not required by ISO C99.
+Don't call varargs macros with zero arguments, since that is not
+required by ISO C99 and only gcc can handle it.
Fixed in gettext-tools-0.16.
---- gettext-tools/src/po-lex.h.orig Fri May 20 17:03:44 2005
-+++ gettext-tools/src/po-lex.h Tue Mar 6 07:10:13 2007
-@@ -73,7 +73,7 @@
+--- gettext-tools/src/po-lex.h.orig 2005-05-20 23:03:44.000000000 +0200
++++ gettext-tools/src/po-lex.h 2007-03-12 23:26:26.000000000 +0100
+@@ -73,7 +73,7 @@ extern void po_lex_pass_obsolete_entries
/* ISO C 99 is smart enough to allow optimizations like this.
Note: OpenVMS 7.3 cc pretends to support ISO C 99 but chokes on '...'. */
-#if __STDC__ && (defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L && !defined __DECC)
-+#if defined(__GNUC__)
++#if 0
/* CAUTION: If you change this macro, you must also make identical
changes to the function of the same name in src/po-lex.c */
+@@ -109,7 +109,7 @@ extern void po_lex_pass_obsolete_entries
+ } while (0)
+
+ /* GCC is also smart enough to allow optimizations like this. */
+-#elif __STDC__ && defined __GNUC__ && __GNUC__ >= 2 && !defined __APPLE_CC__
++#elif 0
+
+ /* CAUTION: If you change this macro, you must also make identical
+ changes to the function of the same name in src/po-lex.c */
diff -r c9a688ba84e5 -r 8997268672e8 devel/gettext-tools/patches/patch-ar
--- a/devel/gettext-tools/patches/patch-ar Mon Mar 12 22:52:49 2007 +0000
+++ b/devel/gettext-tools/patches/patch-ar Mon Mar 12 23:59:47 2007 +0000
@@ -1,15 +1,17 @@
-$NetBSD: patch-ar,v 1.1 2007/03/06 13:45:34 rillig Exp $
+$NetBSD: patch-ar,v 1.2 2007/03/12 23:59:47 rillig Exp $
See patch-aq.
---- gettext-tools/src/po-lex.c.orig Fri May 20 17:03:44 2005
-+++ gettext-tools/src/po-lex.c Tue Mar 6 08:39:03 2007
-@@ -71,7 +71,7 @@
+--- gettext-tools/src/po-lex.c.orig 2005-05-20 23:03:44.000000000 +0200
++++ gettext-tools/src/po-lex.c 2007-03-12 23:26:10.000000000 +0100
+@@ -70,9 +70,7 @@ int gram_pos_column;
+ /* Error handling during the parsing of a PO file.
These functions can access gram_pos and gram_pos_column. */
- #if !(__STDC__ && \
+-#if !(__STDC__ && \
- ((defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L && !defined __DECC) \
-+ ((defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L && !defined __DECC && !(defined(__sgi) && !defined(__GNUC__))) \
- || (defined __GNUC__ && __GNUC__ >= 2 && !defined __APPLE_CC__)))
+- || (defined __GNUC__ && __GNUC__ >= 2 && !defined __APPLE_CC__)))
++#if 1
/* CAUTION: If you change this function, you must also make identical
+ changes to the macro of the same name in src/po-lex.h */
Home |
Main Index |
Thread Index |
Old Index