[glibc] 01/01: debian/patches/locale/fix-LC_COLLATE-rules.diff: drop, not useful anymore and has side effects.
This is an automated email from the git hooks/post-receive script.
aurel32 pushed a commit to branch glibc-2.26
in repository glibc.
commit 1c67795072544606c92276b30133bb785c6a3959
Author: Aurelien Jarno <aurelien@aurel32.net>
Date: Sun Dec 17 14:06:15 2017 +0100
debian/patches/locale/fix-LC_COLLATE-rules.diff: drop, not useful anymore and has side effects.
* debian/patches/locale/fix-LC_COLLATE-rules.diff: drop, not useful anymore
and has side effects.
* debian/patches/localedata/local-hu_HU-sort.diff: removed, the hu_HU
collation is now the same than upstream.
---
debian/changelog | 4 ++
debian/patches/locale/fix-LC_COLLATE-rules.diff | 54 -------------------------
debian/patches/localedata/local-hu_HU-sort.diff | 28 -------------
debian/patches/series | 2 -
4 files changed, 4 insertions(+), 84 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index aa616cd..de8cb7e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,10 @@ glibc (2.26-0experimental2) UNRELEASED; urgency=medium
miscompiles at least pthread_barrier_wait.c. Mark tst-realloc as XFAIL, as
there are way to trigger the issue on older libc and/or other
architectures.
+ * debian/patches/locale/fix-LC_COLLATE-rules.diff: drop, not useful anymore
+ and has side effects.
+ * debian/patches/localedata/local-hu_HU-sort.diff: removed, the hu_HU
+ collation is now the same than upstream.
-- Aurelien Jarno <aurel32@debian.org> Wed, 22 Nov 2017 17:50:44 +0100
diff --git a/debian/patches/locale/fix-LC_COLLATE-rules.diff b/debian/patches/locale/fix-LC_COLLATE-rules.diff
deleted file mode 100644
index efbc13e..0000000
--- a/debian/patches/locale/fix-LC_COLLATE-rules.diff
+++ /dev/null
@@ -1,54 +0,0 @@
----
- locale/programs/ld-collate.c | 16 +++++++++++++++-
- 1 file changed, 15 insertions(+), 1 deletion(-)
-
---- a/locale/programs/ld-collate.c
-+++ b/locale/programs/ld-collate.c
-@@ -1554,6 +1554,7 @@
- int i;
- int need_undefined = 0;
- struct section_list *sect;
-+ enum coll_sort_rule *orules;
- int ruleidx;
- int nr_wide_elems = 0;
-
-@@ -1565,18 +1566,28 @@
- "LC_COLLATE"));
- return;
- }
-+ if (nrules == 0)
-+ {
-+ /* An error message has already been printed:
-+ empty category description not allowed. */
-+ return;
-+ }
-
- /* If this assertion is hit change the type in `element_t'. */
- assert (nrules <= sizeof (runp->used_in_level) * 8);
-
- /* Make sure that the `position' rule is used either in all sections
- or in none. */
-+ sect = collate->sections;
-+ while (sect != NULL && sect->rules == NULL)
-+ sect = sect->next;
-+ orules = sect->rules;
- for (i = 0; i < nrules; ++i)
- for (sect = collate->sections; sect != NULL; sect = sect->next)
- if (sect != collate->current_section
- && sect->rules != NULL
- && ((sect->rules[i] & sort_position)
-- != (collate->current_section->rules[i] & sort_position)))
-+ != (orules[i] & sort_position)))
- {
- WITH_CUR_LOCALE (error (0, 0, _("\
- %s: `position' must be used for a specific level in all sections or none"),
-@@ -3359,6 +3370,9 @@
- no_error = 0;
- }
- }
-+ /* Update current section. */
-+ if (collate->cursor != NULL)
-+ collate->current_section = collate->cursor->section;
-
- lr_ignore_rest (ldfile, no_error);
- }
diff --git a/debian/patches/localedata/local-hu_HU-sort.diff b/debian/patches/localedata/local-hu_HU-sort.diff
deleted file mode 100644
index b2a94e3..0000000
--- a/debian/patches/localedata/local-hu_HU-sort.diff
+++ /dev/null
@@ -1,28 +0,0 @@
-Description: Fix sorting to match what we see on Debian/Ubuntu builds.
- This might need another look sometime to figure out why this appears
- to work upstream, but not for us, but given hu_HU sorting was entirely
- wrong before 2.26 (apparently), this small discrepancy seems forgivable.
-Author: Adam Conrad <adconrad@0c3.net>
-
---- glibc/localedata/hu_HU.in 2017-08-02 06:57:16.000000000 -0600
-+++ glibc/localedata/hu_HU.in 2017-09-01 02:16:45.725379042 -0600
-@@ -241,8 +241,8 @@
- alphabet ö ; ö = ő (unless that's the only difference), but these come strictly after o and ó.
- alphabet ő
- alphabet öö
--alphabet öő
- alphabet őö
-+alphabet öő
- alphabet őő
- alphabet őp
- alphabet öq
-@@ -279,8 +279,8 @@
- alphabet űp
- alphabet üq
- alphabet üü
--alphabet üű
- alphabet űü
-+alphabet üű
- alphabet űű
- alphabet v
- alphabet w
diff --git a/debian/patches/series b/debian/patches/series
index 1d2686a..7713448 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,6 @@
git-updates.diff
locale/check-unknown-symbols.diff
-locale/fix-LC_COLLATE-rules.diff
locale/preprocessor-collate-uli-sucks.diff
locale/preprocessor-collate.diff # should not be needed anymore, but keep it anyways.
locale/locale-print-LANGUAGE.diff
@@ -29,7 +28,6 @@ localedata/locale-C.diff
localedata/submitted-en_AU-date_fmt.diff
localedata/submitted-es_MX-decimal_point.diff
localedata/submitted-it_IT-thousands_sep.diff
-localedata/local-hu_HU-sort.diff
alpha/local-gcc4.1.diff
alpha/submitted-dl-support.diff
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git
Reply to: