From 37b64411051533267104bb1f589f7eb910bc7481444d8a2960c679fbfaa81e05 Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Wed, 9 Mar 2016 16:10:36 +0000 Subject: [PATCH] Accepting request 368505 from home:namtrac:branches:Base:System - Add C.UTF-8 locale (see https://sourceware.org/glibc/wiki/Proposals/C.UTF-8) and rh#902094 . Added with glibc-c-utf8-locale.patch. - Add glibc-disable-gettext-for-c-utf8.patch to disable gettext for C.UTF-8 same as C locale. - Add C.UTF-8 locale (see https://sourceware.org/glibc/wiki/Proposals/C.UTF-8) and rh#902094 . Added with glibc-c-utf8-locale.patch. - Add glibc-disable-gettext-for-c-utf8.patch to disable gettext for C.UTF-8 same as C locale. - Add C.UTF-8 locale (see https://sourceware.org/glibc/wiki/Proposals/C.UTF-8) and rh#902094 . Added with glibc-c-utf8-locale.patch. - Add glibc-disable-gettext-for-c-utf8.patch to disable gettext for C.UTF-8 same as C locale. OBS-URL: https://build.opensuse.org/request/show/368505 OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=426 --- glibc-c-utf8-locale.patch | 270 +++++++++++++++++++++++++ glibc-disable-gettext-for-c-utf8.patch | 12 ++ glibc-testsuite.changes | 8 + glibc-testsuite.spec | 6 + glibc-utils.changes | 8 + glibc-utils.spec | 6 + glibc.changes | 8 + glibc.spec | 6 + 8 files changed, 324 insertions(+) create mode 100644 glibc-c-utf8-locale.patch create mode 100644 glibc-disable-gettext-for-c-utf8.patch diff --git a/glibc-c-utf8-locale.patch b/glibc-c-utf8-locale.patch new file mode 100644 index 0000000..2aa622b --- /dev/null +++ b/glibc-c-utf8-locale.patch @@ -0,0 +1,270 @@ +From 2eda7b462b415105f5a05c1323372d4e39d46439 Mon Sep 17 00:00:00 2001 +From: Mike FABIAN +Date: Mon, 10 Aug 2015 15:58:12 +0200 +Subject: [PATCH] Add a C.UTF-8 locale + +--- + localedata/SUPPORTED | 1 + + localedata/locales/C | 238 +++++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 239 insertions(+) + create mode 100644 localedata/locales/C + +diff --git a/localedata/SUPPORTED b/localedata/SUPPORTED +index 8ca023e..2a78391 100644 +--- a/localedata/SUPPORTED ++++ b/localedata/SUPPORTED +@@ -1,6 +1,7 @@ + # This file names the currently supported and somewhat tested locales. + # If you have any additions please file a glibc bug report. + SUPPORTED-LOCALES=\ ++C.UTF-8/UTF-8 \ + aa_DJ.UTF-8/UTF-8 \ + aa_DJ/ISO-8859-1 \ + aa_ER/UTF-8 \ +diff --git a/localedata/locales/C b/localedata/locales/C +new file mode 100644 +index 0000000..fdf460e +--- /dev/null ++++ b/localedata/locales/C +@@ -0,0 +1,238 @@ ++escape_char / ++comment_char % ++% Locale for C locale in UTF-8 ++ ++LC_IDENTIFICATION ++title "C locale" ++source "" ++address "" ++contact "" ++email "mfabian@redhat.com" ++tel "" ++fax "" ++language "C" ++territory "" ++revision "1.0" ++date "2015-08-10" ++% ++category "C:2015";LC_IDENTIFICATION ++category "C:2015";LC_CTYPE ++category "C:2015";LC_COLLATE ++category "C:2015";LC_TIME ++category "C:2015";LC_NUMERIC ++category "C:2015";LC_MONETARY ++category "C:2015";LC_MESSAGES ++category "C:2015";LC_PAPER ++category "C:2015";LC_NAME ++category "C:2015";LC_ADDRESS ++category "C:2015";LC_TELEPHONE ++category "C:2015";LC_MEASUREMENT ++END LC_IDENTIFICATION ++ ++LC_CTYPE ++copy "i18n" ++ ++translit_start ++include "translit_combining";"" ++translit_end ++ ++END LC_CTYPE ++ ++LC_COLLATE ++order_start forward ++ ++.. ++ ++ ++.. ++ ++ ++.. ++ ++ ++.. ++ ++ ++.. ++ ++ ++.. ++ ++UNDEFINED ++order_end ++END LC_COLLATE ++ ++LC_MONETARY ++% This is the 14652 i18n fdcc-set definition for ++% the LC_MONETARY category ++% (except for the int_curr_symbol and currency_symbol, they are empty in ++% the 14652 i18n fdcc-set definition and also empty in ++% glibc/locale/C-monetary.c. But localedef complains in that case). ++% ++% Using "USD" for int_curr_symbol. But maybe "XXX" would be better? ++% XXX is "No currency" (https://en.wikipedia.org/wiki/ISO_4217) ++int_curr_symbol "" ++% Using "$" for currency_symbol. But maybe would be better? ++% U+00A4 is the "generic currency symbol" ++% (https://en.wikipedia.org/wiki/Currency_sign_%28typography%29) ++currency_symbol "" ++mon_decimal_point "" ++mon_thousands_sep "" ++mon_grouping -1 ++positive_sign "" ++negative_sign "" ++int_frac_digits -1 ++frac_digits -1 ++p_cs_precedes -1 ++int_p_sep_by_space -1 ++p_sep_by_space -1 ++n_cs_precedes -1 ++int_n_sep_by_space -1 ++n_sep_by_space -1 ++p_sign_posn -1 ++n_sign_posn -1 ++% ++END LC_MONETARY ++ ++LC_NUMERIC ++% This is the POSIX Locale definition for ++% the LC_NUMERIC category. ++% ++decimal_point "" ++thousands_sep "" ++grouping -1 ++END LC_NUMERIC ++ ++LC_TIME ++% This is the POSIX Locale definition for ++% the LC_TIME category. ++% ++% Abbreviated weekday names (%a) ++abday "";"";/ ++ "";"";/ ++ "";"";/ ++ "" ++ ++% Full weekday names (%A) ++day "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "" ++ ++% Abbreviated month names (%b) ++abmon "";"";/ ++ "";"";/ ++ "";"";/ ++ "";"";/ ++ "";"";/ ++ "";"" ++ ++% Full month names (%B) ++mon "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "" ++ ++% Week description, consists of three fields: ++% 1. Number of days in a week. ++% 2. Gregorian date that is a first weekday (19971130 for Sunday, 19971201 for Monday). ++% 3. The weekday number to be contained in the first week of the year. ++% ++% ISO 8601 conforming applications should use the values 7, 19971201 (a ++% Monday), and 4 (Thursday), respectively. ++week 7;19971201;4 ++first_weekday 1 ++first_workday 1 ++ ++% Appropriate date and time representation (%c) ++% "%a %b %e %H:%M:%S %Y" ++d_t_fmt "" ++ ++% Appropriate date representation (%x) ++% "%m/%d/%y" ++d_fmt "" ++ ++% Appropriate time representation (%X) ++% "%H:%M:%S" ++t_fmt "" ++ ++% Appropriate AM/PM time representation (%r) ++% "%I:%M:%S %p" ++t_fmt_ampm "" ++ ++% Equivalent of AM/PM (%p) "AM"/"PM" ++% ++am_pm "";"" ++ ++% Appropriate date representation (date(1)) "%a %b %e %H:%M:%S %Z %Y" ++date_fmt "" ++END LC_TIME ++ ++LC_MESSAGES ++% This is the POSIX Locale definition for ++% the LC_NUMERIC category. ++% ++yesexpr "" ++noexpr "" ++yesstr "" ++nostr "" ++END LC_MESSAGES ++ ++LC_PAPER ++% This is the ISO/IEC 14652 "i18n" definition for ++% the LC_PAPER category. ++% (A4 paper, this is also used in the built in C/POSIX ++% locale in glibc/locale/C-paper.c) ++height 297 ++width 210 ++END LC_PAPER ++ ++LC_NAME ++% This is the ISO/IEC 14652 "i18n" definition for ++% the LC_NAME category. ++% "%p%t%g%t%m%t%f" ++% (also used in the built in C/POSIX locale in glibc/locale/C-name.c) ++name_fmt "/ ++" ++END LC_NAME ++ ++LC_ADDRESS ++% This is the ISO/IEC 14652 "i18n" definition for ++% the LC_ADDRESS category. ++% "%a%N%f%N%d%N%b%N%s %h %e %r%N%C-%z %T%N%c%N" ++% (also used in the built in C/POSIX locale in glibc/locale/C-address.c) ++postal_fmt "/ ++/ ++/ ++/ ++" ++END LC_ADDRESS ++ ++LC_TELEPHONE ++% This is the ISO/IEC 14652 "i18n" definition for ++% the LC_TELEPHONE category. ++% "+%c %a %l" ++tel_int_fmt "/ ++" ++% (also used in the built in C/POSIX locale in glibc/locale/C-telephone.c) ++END LC_TELEPHONE ++ ++LC_MEASUREMENT ++% This is the ISO/IEC 14652 "i18n" definition for ++% the LC_MEASUREMENT category. ++% (same as in the built in C/POSIX locale in glibc/locale/C-measurement.c) ++%metric ++measurement 1 ++END LC_MEASUREMENT ++ +-- +2.4.3 + diff --git a/glibc-disable-gettext-for-c-utf8.patch b/glibc-disable-gettext-for-c-utf8.patch new file mode 100644 index 0000000..168a0c1 --- /dev/null +++ b/glibc-disable-gettext-for-c-utf8.patch @@ -0,0 +1,12 @@ +Index: glibc-2.23/intl/dcigettext.c +=================================================================== +--- glibc-2.23.orig/intl/dcigettext.c ++++ glibc-2.23/intl/dcigettext.c +@@ -714,6 +714,7 @@ DCIGETTEXT (const char *domainname, cons + /* If the current locale value is C (or POSIX) we don't load a + domain. Return the MSGID. */ + if (strcmp (single_locale, "C") == 0 ++ || strcmp (single_locale, "C.UTF-8") == 0 + || strcmp (single_locale, "POSIX") == 0) + break; + diff --git a/glibc-testsuite.changes b/glibc-testsuite.changes index acec82f..85eaf7e 100644 --- a/glibc-testsuite.changes +++ b/glibc-testsuite.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Mar 8 15:28:16 UTC 2016 - idonmez@suse.com + +- Add C.UTF-8 locale (see https://sourceware.org/glibc/wiki/Proposals/C.UTF-8) + and rh#902094 . Added with glibc-c-utf8-locale.patch. +- Add glibc-disable-gettext-for-c-utf8.patch to disable gettext for + C.UTF-8 same as C locale. + ------------------------------------------------------------------- Mon Mar 7 14:47:50 UTC 2016 - schwab@suse.de diff --git a/glibc-testsuite.spec b/glibc-testsuite.spec index 0e863e3..363fcab 100644 --- a/glibc-testsuite.spec +++ b/glibc-testsuite.spec @@ -218,6 +218,10 @@ Patch100: glibc-2.3.locales.diff.bz2 Patch102: glibc-2.4.90-no_NO.diff # PATCH-FIX-OPENSUSE -- Renames for China Patch103: glibc-2.4-china.diff +# PATCH-FIX-OPENSUSE -- Add C.UTF-8 locale +Patch104: glibc-c-utf8-locale.patch +# PATCH-FIX-OPENSUSE -- Disable gettext for C.UTF-8 locale +Patch105: glibc-disable-gettext-for-c-utf8.patch ### Broken patches in glibc that we revert for now: @@ -451,6 +455,8 @@ rm nscd/s-stamp %patch100 -p1 %patch102 -p1 %patch103 -p1 +%patch104 -p1 +%patch105 -p1 %patch300 -p1 %patch301 -p1 diff --git a/glibc-utils.changes b/glibc-utils.changes index acec82f..85eaf7e 100644 --- a/glibc-utils.changes +++ b/glibc-utils.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Mar 8 15:28:16 UTC 2016 - idonmez@suse.com + +- Add C.UTF-8 locale (see https://sourceware.org/glibc/wiki/Proposals/C.UTF-8) + and rh#902094 . Added with glibc-c-utf8-locale.patch. +- Add glibc-disable-gettext-for-c-utf8.patch to disable gettext for + C.UTF-8 same as C locale. + ------------------------------------------------------------------- Mon Mar 7 14:47:50 UTC 2016 - schwab@suse.de diff --git a/glibc-utils.spec b/glibc-utils.spec index 34306be..27e3040 100644 --- a/glibc-utils.spec +++ b/glibc-utils.spec @@ -217,6 +217,10 @@ Patch100: glibc-2.3.locales.diff.bz2 Patch102: glibc-2.4.90-no_NO.diff # PATCH-FIX-OPENSUSE -- Renames for China Patch103: glibc-2.4-china.diff +# PATCH-FIX-OPENSUSE -- Add C.UTF-8 locale +Patch104: glibc-c-utf8-locale.patch +# PATCH-FIX-OPENSUSE -- Disable gettext for C.UTF-8 locale +Patch105: glibc-disable-gettext-for-c-utf8.patch ### Broken patches in glibc that we revert for now: @@ -451,6 +455,8 @@ rm nscd/s-stamp %patch100 -p1 %patch102 -p1 %patch103 -p1 +%patch104 -p1 +%patch105 -p1 %patch300 -p1 %patch301 -p1 diff --git a/glibc.changes b/glibc.changes index acec82f..85eaf7e 100644 --- a/glibc.changes +++ b/glibc.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Mar 8 15:28:16 UTC 2016 - idonmez@suse.com + +- Add C.UTF-8 locale (see https://sourceware.org/glibc/wiki/Proposals/C.UTF-8) + and rh#902094 . Added with glibc-c-utf8-locale.patch. +- Add glibc-disable-gettext-for-c-utf8.patch to disable gettext for + C.UTF-8 same as C locale. + ------------------------------------------------------------------- Mon Mar 7 14:47:50 UTC 2016 - schwab@suse.de diff --git a/glibc.spec b/glibc.spec index 0109691..b1d06fb 100644 --- a/glibc.spec +++ b/glibc.spec @@ -218,6 +218,10 @@ Patch100: glibc-2.3.locales.diff.bz2 Patch102: glibc-2.4.90-no_NO.diff # PATCH-FIX-OPENSUSE -- Renames for China Patch103: glibc-2.4-china.diff +# PATCH-FIX-OPENSUSE -- Add C.UTF-8 locale +Patch104: glibc-c-utf8-locale.patch +# PATCH-FIX-OPENSUSE -- Disable gettext for C.UTF-8 locale +Patch105: glibc-disable-gettext-for-c-utf8.patch ### Broken patches in glibc that we revert for now: @@ -451,6 +455,8 @@ rm nscd/s-stamp %patch100 -p1 %patch102 -p1 %patch103 -p1 +%patch104 -p1 +%patch105 -p1 %patch300 -p1 %patch301 -p1