| 1 |
commit: 8a4b991f7876da3e73a53e78c097d2cd91ba2fae |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Apr 5 15:22:50 2022 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Apr 5 15:25:22 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a4b991f |
| 7 |
|
| 8 |
app-misc/mc: Fixed tests |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/836812 |
| 11 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
| 12 |
|
| 13 |
app-misc/mc/files/mc-4.8.28-tests.patch | 35 +++++++++++++++++++++++++++++++++ |
| 14 |
app-misc/mc/mc-4.8.28.ebuild | 1 + |
| 15 |
2 files changed, 36 insertions(+) |
| 16 |
|
| 17 |
diff --git a/app-misc/mc/files/mc-4.8.28-tests.patch b/app-misc/mc/files/mc-4.8.28-tests.patch |
| 18 |
new file mode 100644 |
| 19 |
index 000000000000..ccd9dc1addc9 |
| 20 |
--- /dev/null |
| 21 |
+++ b/app-misc/mc/files/mc-4.8.28-tests.patch |
| 22 |
@@ -0,0 +1,35 @@ |
| 23 |
+START_TEST uses the variable name _i, so GCC complains about redefining it with |
| 24 |
+a different type here. |
| 25 |
+ |
| 26 |
+--- mc-4.8.28/tests/lib/strutil/filevercmp.c 2022-03-20 10:02:47.000000000 +0000 |
| 27 |
++++ mc-4.8.28/tests/lib/strutil/filevercmp.c 2022-03-27 15:31:19.812120141 +0100 |
| 28 |
+@@ -353,20 +353,20 @@ |
| 29 |
+ START_TEST (filevercmp_test5) |
| 30 |
+ /* *INDENT-ON* */ |
| 31 |
+ { |
| 32 |
+- size_t _i; |
| 33 |
++ size_t ii; |
| 34 |
+ |
| 35 |
+- for (_i = 0; _i < filevercmp_test_ds5_len; _i++) |
| 36 |
+- for (; filevercmp_test_ds5[_i] != NULL; _i++) |
| 37 |
++ for (ii = 0; ii < filevercmp_test_ds5_len; ii++) |
| 38 |
++ for (; filevercmp_test_ds5[ii] != NULL; ii++) |
| 39 |
+ { |
| 40 |
+- const char *i = filevercmp_test_ds5[_i]; |
| 41 |
+- size_t _j; |
| 42 |
++ const char *i = filevercmp_test_ds5[ii]; |
| 43 |
++ size_t jj; |
| 44 |
+ |
| 45 |
+- for (_j = _i; filevercmp_test_ds5[_j] != NULL; _j++) |
| 46 |
++ for (jj = ii; filevercmp_test_ds5[jj] != NULL; jj++) |
| 47 |
+ { |
| 48 |
+- const char *j = filevercmp_test_ds5[_j]; |
| 49 |
++ const char *j = filevercmp_test_ds5[jj]; |
| 50 |
+ |
| 51 |
+- ck_assert_int_eq (test_filevercmp (i, j), 0); |
| 52 |
+- ck_assert_int_eq (test_filevercmp (j, i), 0); |
| 53 |
++ ck_assert_int_eq (test_filevercmp (i, j), 0); |
| 54 |
++ ck_assert_int_eq (test_filevercmp (j, i), 0); |
| 55 |
+ } |
| 56 |
+ } |
| 57 |
+ } |
| 58 |
|
| 59 |
diff --git a/app-misc/mc/mc-4.8.28.ebuild b/app-misc/mc/mc-4.8.28.ebuild |
| 60 |
index 3b62f454f445..c9ccfbc6bf8b 100644 |
| 61 |
--- a/app-misc/mc/mc-4.8.28.ebuild |
| 62 |
+++ b/app-misc/mc/mc-4.8.28.ebuild |
| 63 |
@@ -48,6 +48,7 @@ S="${WORKDIR}/${MY_P}" |
| 64 |
|
| 65 |
PATCHES=( |
| 66 |
"${FILESDIR}"/${PN}-4.8.26-ncurses-mouse.patch |
| 67 |
+ "${FILESDIR}"/${P}-tests.patch #836812 |
| 68 |
) |
| 69 |
|
| 70 |
pkg_pretend() { |
Archives