SOURCES: exif-nls.patch - updated for 0.6.15 (the opposite now: if...

[qboosh]

Author: qboosh                       Date: Sat May 26 19:12:48 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated for 0.6.15 (the opposite now: if libexif uses native codeset, don't try to convert it from UTF-8)

---- Files affected:
SOURCES:
   exif-nls.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/exif-nls.patch
diff -u SOURCES/exif-nls.patch:1.1 SOURCES/exif-nls.patch:1.2
--- SOURCES/exif-nls.patch:1.1	Mon Mar 21 20:09:18 2005
+++ SOURCES/exif-nls.patch	Sat May 26 21:12:43 2007
@@ -1,30 +1,11 @@
---- exif-0.6.9/exif/exif-i18n.c.orig	2004-05-25 23:52:57.000000000 +0200
-+++ exif-0.6.9/exif/exif-i18n.c	2005-03-21 19:53:12.354117328 +0100
-@@ -2,6 +2,7 @@
- #include "exif-i18n.h"
- 
- #include <iconv.h>
-+#include <langinfo.h>
- #include <string.h>
- #include <sys/types.h>
- 
-@@ -20,7 +21,7 @@
- 	if (!in) return NULL;
- 
- 	memset (buf, 0, sizeof (buf));
--	if (!tr) tr = iconv_open ("ISO-8859-1", "UTF-8");
-+	if (!tr) tr = iconv_open (nl_langinfo(CODESET), "UTF-8");
- 	iconv (tr, (char **) &in, &t, (char **) &out, &buf_size);
- 	return buf;
- }
---- exif-0.6.9/configure.in.orig	2005-03-21 18:44:16.317890000 +0100
-+++ exif-0.6.9/configure.in	2005-03-21 20:00:02.609748992 +0100
-@@ -10,7 +10,7 @@
- dnl ---------------------------------------------------------------------------
- dnl i18n support
- dnl ---------------------------------------------------------------------------
--AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[The gettext domain we're
-+AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$PACKAGE",[The gettext domain we're
- using])
- ALL_LINGUAS="de es fr pl"
- AM_GNU_GETTEXT([external])
+--- exif-0.6.15/exif/exif-i18n.c.orig	2007-05-26 21:03:24.477034281 +0200
++++ exif-0.6.15/exif/exif-i18n.c	2007-05-26 21:03:37.153756687 +0200
+@@ -15,7 +15,7 @@
+ const char *
+ exif_i18n_convert_utf8_to_lat1 (const char *in)
+ {
+-#ifdef HAVE_ICONV
++#if 0 /*def HAVE_ICONV*/
+ 	static iconv_t tr = 0;
+ 	size_t t = (in ? strlen (in) : 0);
+ 	static char buf[2048];
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/exif-nls.patch?r1=1.1&r2=1.2&f=u