Re: [BZ#13982] {PATCH 1/3] Update iso-3166.def

[Adhemerval Zanella <azanella at linux dot vnet dot ibm dot com>]

Thanks, it fixed the build.

On 10/04/2013 10:49 AM, Chris Leonard wrote:
> Please try again, there were periods instead of commas.  Sorry for the
> typo issue.
>
> On Fri, Oct 4, 2013 at 9:38 AM, Adhemerval Zanella
> <azanella@linux.vnet.ibm.com> wrote:
>> Hi Chris,
>>
>> This changes broke my GLIBC build:
>>
>> ./iso-3166.def:194:54: error: macro "DEFINE_COUNTRY_CODE" requires 4 arguments, but only 2 given
>>  DEFINE_COUNTRY_CODE ("SAINT BARTHELEMY", BL. BLM. 652)
>>                                                       ^
>> ./iso-3166.def:194:1: error: 'DEFINE_COUNTRY_CODE' undeclared here (not in a function)
>>  DEFINE_COUNTRY_CODE ("SAINT BARTHELEMY", BL. BLM. 652)
>>  ^
>> programs/ld-address.c:44:3: error: expected '}' before '{' token
>>    { #Ab2, #Ab3, Num },
>>    ^
>> ./iso-3166.def:195:1: note: in expansion of macro 'DEFINE_COUNTRY_CODE'
>>  DEFINE_COUNTRY_CODE ("SAINT HELENA", SH, SHN, 654)
>>  ^
>>
>>
>> On 10/04/2013 09:40 AM, Chris Leonard wrote:
>>> 3-step patch
>>>
>>> 1) Update iso-3166.def
>>>
>>> Add new countries, correct a few other entries based on new ISO release.
>>>
>>> 2) Split ar_SD into ar_SD and ar_SS
>>>
>>> Update country_num for Sudan
>>>
>>> 3) Copy / modify pap_AN into pap_AW and pap_CW
>>>
>>> Also tag pap_AN for future deprecation in a comment
>>>
>>> resolves [BZ#13982]
>>> pap_AN locale does not conform to ISO
>>>
>>> Modify NEWS and SUPPORTED as needed along the way.
>>>
>>>
>>> From c755294d3c1c3e7841550b4e9ccaaed5ef9ad8e5 Mon Sep 17 00:00:00 2001
>>> From: Chris Leonard <cjlhomeaddress@gmail.com>
>>> Date: Fri, 4 Oct 2013 08:35:44 -0400
>>> Subject: [PATCH] Update iso-1366.def and related occurrences
>>>
>>> ---
>>>  ChangeLog           |  4 ++++
>>>  locale/iso-3166.def | 12 +++++++++---
>>>  2 files changed, 13 insertions(+), 3 deletions(-)
>>>
>>> diff --git a/ChangeLog b/ChangeLog
>>> index 4464b83..de681c3 100644
>>> --- a/ChangeLog
>>> +++ b/ChangeLog
>>> @@ -1,3 +1,7 @@
>>> +2013-10-04  Chris Leonard  <cjl@sugarlabs,.org>
>>> +
>>> +    * locale/iso-3166.def: Update iso-1366.def and related occurrences
>>> +
>>>  2013-10-04  Siddhesh Poyarekar  <siddhesh@redhat.com>
>>>
>>>      * manual/threads.texi (Default Thread Attributes): Fix typo.
>>> diff --git a/locale/iso-3166.def b/locale/iso-3166.def
>>> index a9e1422..5aa6d43 100644
>>> --- a/locale/iso-3166.def
>>> +++ b/locale/iso-3166.def
>>> @@ -33,6 +33,7 @@ DEFINE_COUNTRY_CODE ("BENIN", BJ, BEN, 204)
>>>  DEFINE_COUNTRY_CODE ("BERMUDA", BM, BMU, 60)
>>>  DEFINE_COUNTRY_CODE ("BHUTAN", BT, BTN, 64)
>>>  DEFINE_COUNTRY_CODE ("BOLIVIA", BO, BOL, 68)
>>> +DEFINE_COUNTRY_CODE ("BONAIRE, SINT EUSTATIUS AND SABA", BQ, BES, 535)
>>>  DEFINE_COUNTRY_CODE ("BOSNIA AND HERZEGOVINA", BA, BIH, 70)
>>>  DEFINE_COUNTRY_CODE ("BOTSWANA", BW, BWA, 72)
>>>  DEFINE_COUNTRY_CODE ("BOUVET ISLAND", BV, BVT, 74)
>>> @@ -62,13 +63,13 @@ DEFINE_COUNTRY_CODE ("COSTA RICA", CR, CRI, 188)
>>>  DEFINE_COUNTRY_CODE ("COTE D'IVOIRE", CI, CIV, 384)
>>>  DEFINE_COUNTRY_CODE ("CROATIA", HR, HRV, 191)
>>>  DEFINE_COUNTRY_CODE ("CUBA", CU, CUB, 192)
>>> +DEFINE_COUNTRY_CODE ("CURACAO", CW, CUW, 531)
>>>  DEFINE_COUNTRY_CODE ("CYPRUS", CY, CYP, 196)
>>>  DEFINE_COUNTRY_CODE ("CZECH REPUBLIC", CZ, CZE, 203)
>>>  DEFINE_COUNTRY_CODE ("DENMARK", DK, DNK, 208)
>>>  DEFINE_COUNTRY_CODE ("DJIBOUTI", DJ, DJI, 262)
>>>  DEFINE_COUNTRY_CODE ("DOMINICA", DM, DMA, 212)
>>>  DEFINE_COUNTRY_CODE ("DOMINICAN REPUBLIC", DO, DOM, 214)
>>> -DEFINE_COUNTRY_CODE ("EAST TIMOR", TP, TMP, 626)
>>>  DEFINE_COUNTRY_CODE ("ECUADOR", EC, ECU, 218)
>>>  DEFINE_COUNTRY_CODE ("EGYPT", EG, EGY, 818)
>>>  DEFINE_COUNTRY_CODE ("EL SALVADOR", SV, SLV, 222)
>>> @@ -175,7 +176,7 @@ DEFINE_COUNTRY_CODE ("NORWAY", NO, NOR, 578)
>>>  DEFINE_COUNTRY_CODE ("OMAN", OM, OMN, 512)
>>>  DEFINE_COUNTRY_CODE ("PAKISTAN", PK, PAK, 586)
>>>  DEFINE_COUNTRY_CODE ("PALAU", PW, PLW, 585)
>>> -DEFINE_COUNTRY_CODE ("PALESTINIAN TERRITORY, OCCUPIED", PS, PSE, 275)
>>> +DEFINE_COUNTRY_CODE ("PALESTINE, STATE OF", PS, PSE, 275)
>>>  DEFINE_COUNTRY_CODE ("PANAMA", PA, PAN, 591)
>>>  DEFINE_COUNTRY_CODE ("PAPUA NEW GUINEA", PG, PNG, 598)
>>>  DEFINE_COUNTRY_CODE ("PARAGUAY", PY, PRY, 600)
>>> @@ -190,9 +191,11 @@ DEFINE_COUNTRY_CODE ("REUNION", RE, REU, 638)
>>>  DEFINE_COUNTRY_CODE ("ROMANIA", RO, ROU, 642)
>>>  DEFINE_COUNTRY_CODE ("RUSSIAN FEDERATION", RU, RUS, 643)
>>>  DEFINE_COUNTRY_CODE ("RWANDA", RW, RWA, 646)
>>> +DEFINE_COUNTRY_CODE ("SAINT BARTHELEMY", BL. BLM. 652)
>>>  DEFINE_COUNTRY_CODE ("SAINT HELENA", SH, SHN, 654)
>>>  DEFINE_COUNTRY_CODE ("SAINT KITTS AND NEVIS", KN, KNA, 659)
>>>  DEFINE_COUNTRY_CODE ("SAINT LUCIA", LC, LCA, 662)
>>> +DEFINE_COUNTRY_CODE ("SAINT MARTIN (fRENCH PART)",MF, MAF, 663)
>>>  DEFINE_COUNTRY_CODE ("SAINT PIERRE AND MIQUELON", PM, SPM, 666)
>>>  DEFINE_COUNTRY_CODE ("SAINT VINCENT AND THE GRENADINES", VC, VCT, 670)
>>>  DEFINE_COUNTRY_CODE ("SAMOA", WS, WSM, 882)
>>> @@ -204,15 +207,17 @@ DEFINE_COUNTRY_CODE ("SERBIA", RS, SRB, 688)
>>>  DEFINE_COUNTRY_CODE ("SEYCHELLES", SC, SYC, 690)
>>>  DEFINE_COUNTRY_CODE ("SIERRA LEONE", SL, SLE, 694)
>>>  DEFINE_COUNTRY_CODE ("SINGAPORE", SG, SGP, 702)
>>> +DEFINE_COUNTRY_CODE ("SINT MAARTEN (DUTCH PART)", SX, SXM, 534)
>>>  DEFINE_COUNTRY_CODE ("SLOVAKIA", SK, SVK, 703)
>>>  DEFINE_COUNTRY_CODE ("SLOVENIA", SI, SVN, 705)
>>>  DEFINE_COUNTRY_CODE ("SOLOMON ISLANDS", SB, SLB, 90)
>>>  DEFINE_COUNTRY_CODE ("SOMALIA", SO, SOM, 706)
>>>  DEFINE_COUNTRY_CODE ("SOUTH AFRICA", ZA, ZAF, 710)
>>>  DEFINE_COUNTRY_CODE ("SOUTH GEORGIA AND THE SOUTH SANDWICH ISLANDS",
>>> GS, SGS, 239)
>>> +DEFINE_COUNTRY_CODE ("SOUTH SUDAN", SS, SSD, 728)
>>>  DEFINE_COUNTRY_CODE ("SPAIN", ES, ESP, 724)
>>>  DEFINE_COUNTRY_CODE ("SRI LANKA", LK, LKA, 144)
>>> -DEFINE_COUNTRY_CODE ("SUDAN", SD, SDN, 736)
>>> +DEFINE_COUNTRY_CODE ("SUDAN", SD, SDN, 729)
>>>  DEFINE_COUNTRY_CODE ("SURINAME", SR, SUR, 740)
>>>  DEFINE_COUNTRY_CODE ("SVALBARD AND JAN MAYEN", SJ, SJM, 744)
>>>  DEFINE_COUNTRY_CODE ("SWAZILAND", SZ, SWZ, 748)
>>> @@ -223,6 +228,7 @@ DEFINE_COUNTRY_CODE ("TAIWAN, PROVINCE OF CHINA",
>>> TW, TWN, 158)
>>>  DEFINE_COUNTRY_CODE ("TAJIKISTAN", TJ, TJK, 762)
>>>  DEFINE_COUNTRY_CODE ("TANZANIA, UNITED REPUBLIC OF", TZ, TZA, 834)
>>>  DEFINE_COUNTRY_CODE ("THAILAND", TH, THA, 764)
>>> +DEFINE_COUNTRY_CODE ("TIMOR-LESTE", TL, TLS, 626)
>>>  DEFINE_COUNTRY_CODE ("TOGO", TG, TGO, 768)
>>>  DEFINE_COUNTRY_CODE ("TOKELAU", TK, TKL, 772)
>>>  DEFINE_COUNTRY_CODE ("TONGA", TO, TON, 776)