diff options
| author | jlam <jlam@pkgsrc.org> | 2006-06-15 03:44:07 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2006-06-15 03:44:07 +0000 |
| commit | a2e0ee1a518266af706cfe928393c90bcaccab9d (patch) | |
| tree | af21a44a9492a3ff76221008059834be7de57434 /textproc | |
| parent | 982acd03602e3c8aa8c5ca4b32b98023b230b99c (diff) | |
| download | pkgsrc-a2e0ee1a518266af706cfe928393c90bcaccab9d.tar.gz | |
Welcome to the brave new world of gettext-0.14.5 -- if a source file
includes <libintl.h>, then it may also pull in macro redefintions for
all of the *printf() functions. Unfortunately, macros do not mix well
with C++ code which expects to be able to partition names, e.g. printf
and vprintf, into the class namespace. (Mostly) fix this problem by
undefining printf and vprintf after <libintl.h> is included. This
addresses PR pkg/33577.
Diffstat (limited to 'textproc')
| -rw-r--r-- | textproc/aspell/distinfo | 3 | ||||
| -rw-r--r-- | textproc/aspell/patches/patch-an | 16 |
2 files changed, 18 insertions, 1 deletions
diff --git a/textproc/aspell/distinfo b/textproc/aspell/distinfo index d6c3a2c7d00..a5f75ae4866 100644 --- a/textproc/aspell/distinfo +++ b/textproc/aspell/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.19 2006/06/14 19:21:54 adam Exp $ +$NetBSD: distinfo,v 1.20 2006/06/15 03:44:07 jlam Exp $ SHA1 (aspell-0.60.4.tar.gz) = 07353593eb89e64c49b1fd8dd405e3ee0ed86291 RMD160 (aspell-0.60.4.tar.gz) = e0408acd4f3304c957aeea0b17a28d0c44e11064 @@ -12,3 +12,4 @@ SHA1 (patch-aj) = 1bb74cbd4c6aaade00c0289e9f1ae5c992d2ea26 SHA1 (patch-ak) = c4e228b8712c1e36bbeb8d268f83893cfeb4e620 SHA1 (patch-al) = 2e39f1670f99c9267be2b2d214765a19a5390b9f SHA1 (patch-am) = a40d1f2e6f02c49143f04f316c992daf6f71c13f +SHA1 (patch-an) = 687cf83ad9be083da0a53e7a7b5cbaefe88f63a5 diff --git a/textproc/aspell/patches/patch-an b/textproc/aspell/patches/patch-an new file mode 100644 index 00000000000..6e82d35a4ad --- /dev/null +++ b/textproc/aspell/patches/patch-an @@ -0,0 +1,16 @@ +$NetBSD: patch-an,v 1.1 2006/06/15 03:44:07 jlam Exp $ + +--- common/gettext.h.orig 2004-11-20 21:52:22.000000000 -0500 ++++ common/gettext.h +@@ -28,6 +28,11 @@ + /* Get declarations of GNU message catalog functions. */ + # include <libintl.h> + ++/* Remove any macros (possibly) defined by libintl.h that would ++ conflict with method names declared by common/ostream.hpp. */ ++# undef printf ++# undef vprintf ++ + #else + + /* Solaris /usr/include/locale.h includes /usr/include/libintl.h, which |