patches/glibc/ports-2.12.1/280-new-valencian-locale.patch
author "Benoît Thébaudeau" <benoit.thebaudeau@advansee.com>
Wed Dec 14 16:55:22 2011 +0100 (2011-12-14)
branch1.13
changeset 2848 1ff89596dab0
permissions -rw-r--r--
libc/eglibc: fix localedef 2.14 build

The localedef of eglibc 2.14 requires NOT_IN_libc to be defined in order to
compile intl/l10nflist.c.

This is because localedef is built separately from eglibc and uses some parts of
eglibc that don't compile in standalone without this preprocessor definition.

This fixes the following error:

[ALL ] gcc -g -O2 -DNO_SYSCONF -DNO_UNCOMPRESS
-DLOCALE_PATH='"/usr/lib/locale:/usr/share/i18n"'
-DLOCALEDIR='"/usr/lib/locale"' -DLOCALE_ALIAS_PATH='"/usr/share/locale"'
-DCHARMAP_PATH='"/usr/share/i18n/charmaps"'
-DREPERTOIREMAP_PATH='"/usr/share/i18n/repertoiremaps"'
-DLOCSRCDIR='"/usr/share/i18n/locales"' -Iglibc/locale/programs -Iglibc/locale
-I/<snip>/.build/src/eglibc-localedef-2_14/include
-I/<snip>/.build/src/eglibc-localedef-2_14 -I.
-include /<snip>/.build/src/eglibc-localedef-2_14/include/always.h -Wall
-Wno-format -c -o locarchive.o glibc/locale/programs/locarchive.c
[ALL ] glibc/locale/programs/locarchive.c: In function 'enlarge_archive':
[ALL ] glibc/locale/programs/locarchive.c:303:21: warning: variable
'oldlocrectab' set but not used [-Wunused-but-set-variable]
[ALL ] In file included from glibc/locale/programs/locarchive.c:651:0:
[ALL ] glibc/locale/programs/../../intl/l10nflist.c: In function
'_nl_normalize_codeset':
[ERROR] glibc/locale/programs/../../intl/l10nflist.c:342:9: error:
'_nl_C_locobj_ptr' undeclared (first use in this function)
[ALL ] glibc/locale/programs/../../intl/l10nflist.c:342:9: note: each
undeclared identifier is reported only once for each function it appears in
[ALL ] glibc/locale/programs/locarchive.c: In function
'add_locales_to_archive':
[ALL ] glibc/locale/programs/locarchive.c:1450:7: warning: passing argument
1 of '__xpg_basename' discards 'const' qualifier from pointer target type
[enabled by default]
[ALL ] /usr/include/libgen.h:35:14: note: expected 'char *' but argument is
of type 'const char *'
[ERROR] make[1]: *** [locarchive.o] Error 1

Signed-off-by: "Benoît Thébaudeau" <benoit.thebaudeau@advansee.com>
(transplanted from 4cd9134739b594451794cf61a6e1b137422cdafd)
yann@2437
     1
http://bugs.gentoo.org/show_bug.cgi?id=131815
yann@2437
     2
http://sourceware.org/bugzilla/show_bug.cgi?id=2522
yann@2437
     3
yann@2437
     4
diff -durN glibc-2.12.1.orig/localedata/SUPPORTED glibc-2.12.1/localedata/SUPPORTED
yann@2437
     5
--- glibc-2.12.1.orig/localedata/SUPPORTED	2009-04-18 10:43:52.000000000 +0200
yann@2437
     6
+++ glibc-2.12.1/localedata/SUPPORTED	2009-11-13 00:50:20.000000000 +0100
yann@2437
     7
@@ -72,6 +72,8 @@
yann@2437
     8
 ca_ES.UTF-8/UTF-8 \
yann@2437
     9
 ca_ES/ISO-8859-1 \
yann@2437
    10
 ca_ES@euro/ISO-8859-15 \
yann@2437
    11
+ca_ES.UTF-8@valencia/UTF-8 \
yann@2437
    12
+ca_ES@valencia/ISO-8859-15 \
yann@2437
    13
 ca_FR.UTF-8/UTF-8 \
yann@2437
    14
 ca_FR/ISO-8859-15 \
yann@2437
    15
 ca_IT.UTF-8/UTF-8 \
yann@2437
    16
diff -durN glibc-2.12.1.orig/localedata/locales/ca_ES@valencia glibc-2.12.1/localedata/locales/ca_ES@valencia
yann@2437
    17
--- glibc-2.12.1.orig/localedata/locales/ca_ES@valencia	1970-01-01 01:00:00.000000000 +0100
yann@2437
    18
+++ glibc-2.12.1/localedata/locales/ca_ES@valencia	2009-11-13 00:50:20.000000000 +0100
yann@2437
    19
@@ -0,0 +1,96 @@
yann@2437
    20
+comment_char %
yann@2437
    21
+escape_char  /
yann@2437
    22
+%
yann@2437
    23
+% Valencian (southern Catalan) locale for Spain with Euro
yann@2437
    24
+%
yann@2437
    25
+% Note that this locale is almost the same as ca_ES@euro.  The point of having
yann@2437
    26
+% a separate locale is only for PO translations, which have a lot of social
yann@2437
    27
+% support and are very appreciated by the Valencian-speaking community.
yann@2437
    28
+%
yann@2437
    29
+% Contact: Jordi Mallach
yann@2437
    30
+% Email: jordi@gnu.org
yann@2437
    31
+% Tel:
yann@2437
    32
+% Fax:
yann@2437
    33
+% Language: ca
yann@2437
    34
+% Territory: ES
yann@2437
    35
+% Option: euro
yann@2437
    36
+% Revision: 1.0
yann@2437
    37
+% Date: 2006-04-06
yann@2437
    38
+% Application: general
yann@2437
    39
+% Users: general
yann@2437
    40
+% Repertoiremap: mnemonic,ds
yann@2437
    41
+% Charset: ISO-8859-15
yann@2437
    42
+% Distribution and use is free, also
yann@2437
    43
+% for commercial purposes.
yann@2437
    44
+
yann@2437
    45
+LC_IDENTIFICATION
yann@2437
    46
+title      "Valencian (southern Catalan) locale for Spain with Euro"
yann@2437
    47
+source     ""
yann@2437
    48
+address    ""
yann@2437
    49
+contact    "Jordi Mallach"
yann@2437
    50
+email      "jordi@gnu.org"
yann@2437
    51
+tel        ""
yann@2437
    52
+fax        ""
yann@2437
    53
+language   "Catalan"
yann@2437
    54
+territory  "Spain"
yann@2437
    55
+revision   "1.0"
yann@2437
    56
+date       "2006-04-06"
yann@2437
    57
+%
yann@2437
    58
+category  "ca_ES@valencia:2006";LC_IDENTIFICATION
yann@2437
    59
+category  "ca_ES@valencia:2006";LC_CTYPE
yann@2437
    60
+category  "ca_ES@valencia:2006";LC_COLLATE
yann@2437
    61
+category  "ca_ES@valencia:2006";LC_MONETARY
yann@2437
    62
+category  "ca_ES@valencia:2006";LC_NUMERIC
yann@2437
    63
+category  "ca_ES@valencia:2006";LC_TIME
yann@2437
    64
+category  "ca_ES@valencia:2006";LC_MESSAGES
yann@2437
    65
+category  "ca_ES@valencia:2006";LC_PAPER
yann@2437
    66
+category  "ca_ES@valencia:2006";LC_NAME
yann@2437
    67
+category  "ca_ES@valencia:2006";LC_ADDRESS
yann@2437
    68
+category  "ca_ES@valencia:2006";LC_TELEPHONE
yann@2437
    69
+category  "ca_ES@valencia:2006";LC_MEASUREMENT
yann@2437
    70
+
yann@2437
    71
+END LC_IDENTIFICATION
yann@2437
    72
+
yann@2437
    73
+LC_CTYPE
yann@2437
    74
+copy "i18n"
yann@2437
    75
+END LC_CTYPE
yann@2437
    76
+
yann@2437
    77
+LC_COLLATE
yann@2437
    78
+copy "ca_ES"
yann@2437
    79
+END LC_COLLATE
yann@2437
    80
+
yann@2437
    81
+LC_MONETARY
yann@2437
    82
+copy "ca_ES"
yann@2437
    83
+END LC_MONETARY
yann@2437
    84
+
yann@2437
    85
+LC_NUMERIC
yann@2437
    86
+copy "ca_ES"
yann@2437
    87
+END LC_NUMERIC
yann@2437
    88
+
yann@2437
    89
+LC_TIME
yann@2437
    90
+copy "ca_ES"
yann@2437
    91
+END LC_TIME
yann@2437
    92
+
yann@2437
    93
+LC_MESSAGES
yann@2437
    94
+copy "ca_ES"
yann@2437
    95
+END LC_MESSAGES
yann@2437
    96
+
yann@2437
    97
+LC_PAPER
yann@2437
    98
+copy "ca_ES"
yann@2437
    99
+END LC_PAPER
yann@2437
   100
+
yann@2437
   101
+LC_NAME
yann@2437
   102
+copy "ca_ES"
yann@2437
   103
+END LC_NAME
yann@2437
   104
+
yann@2437
   105
+LC_ADDRESS
yann@2437
   106
+copy "ca_ES"
yann@2437
   107
+END LC_ADDRESS
yann@2437
   108
+
yann@2437
   109
+LC_TELEPHONE
yann@2437
   110
+copy "ca_ES"
yann@2437
   111
+END LC_TELEPHONE
yann@2437
   112
+
yann@2437
   113
+LC_MEASUREMENT
yann@2437
   114
+copy "ca_ES"
yann@2437
   115
+END LC_MEASUREMENT