patches/lynx-02-locale.diff
author yippi
Thu, 30 Dec 2010 23:55:02 +0000
branchgnome-2-30
changeset 21255 bd4bf493f6de
parent 18110 93461edb1490
permissions -rw-r--r--
2010-12-30 Brian Cameron <[email protected]> * specs/SUNWlynx.spec, patches/lynx-02-locale.diff: Update patch so it matches upstream code. No longer set CPPFLAGS in the spec-file.

--- lynx2-8-7/src/LYMain.c-orig	2010-12-30 16:59:09.933129015 -0600
+++ lynx2-8-7/src/LYMain.c	2010-12-30 16:59:56.506438066 -0600
@@ -57,7 +57,7 @@
 #include <io.h>
 #endif
 
-#if defined(LOCALE) && !defined(HAVE_LIBINTL_H)
+#if defined(LOCALE) && (!defined(HAVE_LIBINTL_H) || !defined(LC_ALL))
 #undef gettext			/* Solaris locale.h prototypes gettext() */
 #include <locale.h>
 #ifndef HAVE_GETTEXT