packages/openjdk-11
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

I4M067: 8239017 cmp-baseline fails because of differences in TimeZoneNames_kea

Browse Source
This commit is contained in:
kuenking111 2021-12-10 16:56:24 +08:00
parent c1ad677a9c
commit 2229be37d9
2 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
8239017-cmp-baseline-fails-because-of-differences-in-TimeZoneNames_kea.patch Executable file
View File

@ -0,0 +1,26 @@
From b2b541571c538d3ddd97066b96279882a2a23994 Mon Sep 17 00:00:00 2001
From: zhangyipeng <zhangyipeng7@huawei.com>
Date: Tue, 7 Dec 2021 10:17:09 +0800
Subject: [PATCH] 8239017: cmp-baseline fails because of differences in
TimeZoneNames_kea
---
.../src/classes/build/tools/cldrconverter/CLDRConverter.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/make/jdk/src/classes/build/tools/cldrconverter/CLDRConverter.java b/make/jdk/src/classes/build/tools/cldrconverter/CLDRConverter.java
index 034b8ade4..434912726 100644
--- a/make/jdk/src/classes/build/tools/cldrconverter/CLDRConverter.java
+++ b/make/jdk/src/classes/build/tools/cldrconverter/CLDRConverter.java
@@ -665,7 +665,7 @@ public class CLDRConverter {
}
private static Map<String, Object> extractZoneNames(Map<String, Object> map, String id) {
- Map<String, Object> names = new HashMap<>();
+ Map<String, Object> names = new TreeMap<>(KeyComparator.INSTANCE);
getAvailableZoneIds().stream().forEach(tzid -> {
// If the tzid is deprecated, get the data for the replacement id
--
2.22.0

7
openjdk-11.spec
View File

@ -740,7 +740,7 @@ Provides: java-src%{?1} = %{epoch}:%{version}-%{release}
Name: java-%{javaver}-%{origin} Name: java-%{javaver}-%{origin}
Version: %{newjavaver}.%{buildver} Version: %{newjavaver}.%{buildver}
Release: 3 Release: 4
# java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons
# and this change was brought into RHEL-4. java-1.5.0-ibm packages # and this change was brought into RHEL-4. java-1.5.0-ibm packages
# also included the epoch in their virtual provides. This created a # also included the epoch in their virtual provides. This created a
@ -865,6 +865,7 @@ Patch82: PS-introduce-UsePSRelaxedForwardee-to-enable-using-r.patch
# 11.0.13 # 11.0.13
Patch83: 8273111-Default-timezone-should-return-zone-ID-if-locatiome-is-valid-but-not-canonicalization-on-linux.patch Patch83: 8273111-Default-timezone-should-return-zone-ID-if-locatiome-is-valid-but-not-canonicalization-on-linux.patch
Patch84: fix-memcpy-compile-warning-when-building-on-linux-x86.patch Patch84: fix-memcpy-compile-warning-when-building-on-linux-x86.patch
Patch85: 8239017-cmp-baseline-fails-because-of-differences-in-TimeZoneNames_kea.patch
BuildRequires: autoconf BuildRequires: autoconf
BuildRequires: alsa-lib-devel BuildRequires: alsa-lib-devel
@ -1147,6 +1148,7 @@ pushd %{top_level_dir_name}
%patch82 -p1 %patch82 -p1
%patch83 -p1 %patch83 -p1
%patch84 -p1 %patch84 -p1
%patch85 -p1
popd # openjdk popd # openjdk
# %patch1000 # %patch1000
@ -1649,6 +1651,9 @@ require "copy_jdk_configs.lua"
%changelog %changelog
* Fri Dec 10 2021 kuenking111 <wangkun49@huawei.com> - 1:11.0.13.7-4
- add 8239017-cmp-baseline-fails-because-of-differences-in-TimeZoneNames_kea.patch
* Fri Dec 10 2021 kuenking111 <wangkun49@huawei.com> - 1:11.0.13.7-3 * Fri Dec 10 2021 kuenking111 <wangkun49@huawei.com> - 1:11.0.13.7-3
- add fix-memcpy-compile-warning-when-building-on-linux-x86.patch - add fix-memcpy-compile-warning-when-building-on-linux-x86.patch