glib/libcharset/libcharset-glib.patch

   1 # Patch against libcharset version 1.4
   2 --- libiconv-1.12/libcharset//lib/localcharset.c        2006-10-18 07:55:49.000000000 -0400
   3 +++ localcharset.c      2008-05-20 18:36:24.000000000 -0400
   4 @@ -103,8 +103,8 @@
   5  static const char * volatile charset_aliases;
   6
   7  /* Return a pointer to the contents of the charset.alias file.  */
   8 -static const char *
   9 -get_charset_aliases (void)
  10 +const char *
  11 +_g_locale_get_charset_aliases (void)
  12  {
  13    const char *cp;
  14
  15 @@ -280,14 +280,10 @@
  16     If the canonical name cannot be determined, the result is a non-canonical
  17     name.  */
  18
  19 -#ifdef STATIC
  20 -STATIC
  21 -#endif
  22  const char *
  23 -locale_charset (void)
  24 +_g_locale_charset_raw (void)
  25  {
  26    const char *codeset;
  27 -  const char *aliases;
  28
  29  #if !(defined WIN32_NATIVE || defined OS2)
  30
  31 @@ -436,12 +432,20 @@
  32
  33  #endif
  34
  35 +  return codeset;
  36 +}
  37 +
  38 +const char *
  39 +_g_locale_charset_unalias (const char *codeset)
  40 +{
  41 +  const char *aliases;
  42 +
  43    if (codeset == NULL)
  44      /* The canonical name cannot be determined.  */
  45      codeset = "";
  46
  47    /* Resolve alias. */
  48 -  for (aliases = get_charset_aliases ();
  49 +  for (aliases = _g_locale_get_charset_aliases ();
  50         *aliases != '\0';
  51         aliases += strlen (aliases) + 1, aliases += strlen (aliases) + 1)
  52      if (strcmp (codeset, aliases) == 0
  53 --- libiconv-1.12/libcharset//include/libcharset.h.in   2005-05-19 13:14:56.000000000 -0400
  54 +++ libcharset.h        2008-05-20 18:39:44.000000000 -0400
  55 @@ -19,7 +19,7 @@
  56  #ifndef _LIBCHARSET_H
  57  #define _LIBCHARSET_H
  58
  59 -#include <localcharset.h>
  60 +#include "localcharset.h"
  61
  62
  63  #ifdef __cplusplus
  64 --- libiconv-1.12/libcharset//include/localcharset.h.in 2005-05-19 13:14:57.000000000 -0400
  65 +++ localcharset.h      2008-05-20 18:36:24.000000000 -0400
  66 @@ -31,8 +31,9 @@
  67     The result must not be freed; it is statically allocated.
  68     If the canonical name cannot be determined, the result is a non-canonical
  69     name.  */
  70 -extern const char * locale_charset (void);
  71 -
  72 +extern const char * _g_locale_charset_raw (void);
  73 +extern const char * _g_locale_charset_unalias (const char *codeset);
  74 +extern const char * _g_locale_get_charset_aliases (void);
  75
  76  #ifdef __cplusplus
  77  }