1 |
commit: 46f716736cde3356966f1f3eb97ae1bb4035a9d9 |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Jan 14 20:41:37 2022 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Jan 14 20:45:32 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46f71673 |
7 |
|
8 |
dev-libs/icu: backport test failure fix for ARM; add missing BDEPEND |
9 |
|
10 |
- Backport test failure fix (not within test itself so let's revbump |
11 |
as could affect runtime behaviour). Noticed after Exherbo committed |
12 |
it, so gave the test suite a go on arm, and indeed it failed & this |
13 |
sorts it out. |
14 |
|
15 |
(Only usage is within the test suite but it seems to be an exported |
16 |
function, so let's not take the risk.) |
17 |
|
18 |
- Add missing autoconf-archive BDEPEND (thanks juippis). |
19 |
|
20 |
Closes: https://bugs.gentoo.org/827034 |
21 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
22 |
|
23 |
dev-libs/icu/files/icu-70.1-fix-ucptrietest.patch | 38 ++++++++++++++++++++++ |
24 |
.../icu/{icu-70.1.ebuild => icu-70.1-r1.ebuild} | 6 ++-- |
25 |
2 files changed, 42 insertions(+), 2 deletions(-) |
26 |
|
27 |
diff --git a/dev-libs/icu/files/icu-70.1-fix-ucptrietest.patch b/dev-libs/icu/files/icu-70.1-fix-ucptrietest.patch |
28 |
new file mode 100644 |
29 |
index 000000000000..05d390a1284a |
30 |
--- /dev/null |
31 |
+++ b/dev-libs/icu/files/icu-70.1-fix-ucptrietest.patch |
32 |
@@ -0,0 +1,38 @@ |
33 |
+Fixes test failure on arm. |
34 |
+ |
35 |
+https://github.com/unicode-org/icu/pull/1925 |
36 |
+https://unicode-org.atlassian.net/browse/ICU-21793 |
37 |
+ |
38 |
+From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Lal?= <kapouer@×××××.org> |
39 |
+Date: Wed, 3 Nov 2021 02:31:18 +0100 |
40 |
+Subject: [PATCH] ICU-21793 Fix ucptrietest golden diff |
41 |
+ |
42 |
+--- a/tools/toolutil/toolutil.cpp |
43 |
++++ b/tools/toolutil/toolutil.cpp |
44 |
+@@ -228,18 +228,19 @@ uprv_compareGoldenFiles( |
45 |
+ std::ifstream ifs(goldenFilePath, std::ifstream::in); |
46 |
+ int32_t pos = 0; |
47 |
+ char c; |
48 |
+- while ((c = ifs.get()) != std::char_traits<char>::eof() && pos < bufferLen) { |
49 |
++ while (ifs.get(c) && pos < bufferLen) { |
50 |
+ if (c != buffer[pos]) { |
51 |
+ // Files differ at this position |
52 |
+- return pos; |
53 |
++ break; |
54 |
+ } |
55 |
+ pos++; |
56 |
+ } |
57 |
+- if (pos < bufferLen || c != std::char_traits<char>::eof()) { |
58 |
+- // Files are different lengths |
59 |
+- return pos; |
60 |
++ if (pos == bufferLen && ifs.eof()) { |
61 |
++ // Files are same lengths |
62 |
++ pos = -1; |
63 |
+ } |
64 |
+- return -1; |
65 |
++ ifs.close(); |
66 |
++ return pos; |
67 |
+ } |
68 |
+ |
69 |
+ /*U_CAPI UDate U_EXPORT2 |
70 |
+ |
71 |
|
72 |
diff --git a/dev-libs/icu/icu-70.1.ebuild b/dev-libs/icu/icu-70.1-r1.ebuild |
73 |
similarity index 95% |
74 |
rename from dev-libs/icu/icu-70.1.ebuild |
75 |
rename to dev-libs/icu/icu-70.1-r1.ebuild |
76 |
index 83163eaec2b6..c2095a985a40 100644 |
77 |
--- a/dev-libs/icu/icu-70.1.ebuild |
78 |
+++ b/dev-libs/icu/icu-70.1-r1.ebuild |
79 |
@@ -1,4 +1,4 @@ |
80 |
-# Copyright 1999-2021 Gentoo Authors |
81 |
+# Copyright 1999-2022 Gentoo Authors |
82 |
# Distributed under the terms of the GNU General Public License v2 |
83 |
|
84 |
EAPI=8 |
85 |
@@ -17,6 +17,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~ |
86 |
IUSE="debug doc examples static-libs" |
87 |
|
88 |
BDEPEND="${PYTHON_DEPS} |
89 |
+ sys-devel/autoconf-archive |
90 |
virtual/pkgconfig |
91 |
doc? ( app-doc/doxygen[dot] ) |
92 |
" |
93 |
@@ -29,9 +30,10 @@ PATCHES=( |
94 |
"${FILESDIR}/${PN}-65.1-remove-bashisms.patch" |
95 |
"${FILESDIR}/${PN}-64.2-darwin.patch" |
96 |
"${FILESDIR}/${PN}-68.1-nonunicode.patch" |
97 |
- # Should be in the next rleease, but check |
98 |
+ # Should both be in the next release, but check |
99 |
# https://bugs.gentoo.org/788112 |
100 |
"${FILESDIR}/${PN}-69.1-fix-ub-units.patch" |
101 |
+ "${FILESDIR}/${PN}-70.1-fix-ucptrietest.patch" |
102 |
) |
103 |
|
104 |
src_prepare() { |