diff options
| author |   Lars Wendler <polynomial-c@gentoo.org> | 2022-04-05 17:22:50 +0200 |
|---|---|---|
| committer | Lars Wendler <polynomial-c@gentoo.org> | 2022-04-05 17:25:22 +0200 |
| commit | 8a4b991f7876da3e73a53e78c097d2cd91ba2fae (patch) | |
| tree | 0e70ea1bd56368b910d5668dbc15a22c623d9e36 /app-misc/mc | |
| parent | kde-frameworks/kimageformats: keyword 5.92.0-r1 for ~riscv (diff) | |
| download | gentoo-8a4b991f7876da3e73a53e78c097d2cd91ba2fae.tar.gz gentoo-8a4b991f7876da3e73a53e78c097d2cd91ba2fae.tar.bz2 gentoo-8a4b991f7876da3e73a53e78c097d2cd91ba2fae.zip | |
app-misc/mc: Fixed tests
Closes: https://bugs.gentoo.org/836812
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
Diffstat (limited to 'app-misc/mc')
| -rw-r--r-- | app-misc/mc/files/mc-4.8.28-tests.patch | 35 | ||||
| -rw-r--r-- | app-misc/mc/mc-4.8.28.ebuild | 1 |
2 files changed, 36 insertions, 0 deletions
diff --git a/app-misc/mc/files/mc-4.8.28-tests.patch b/app-misc/mc/files/mc-4.8.28-tests.patch new file mode 100644 index 000000000000..ccd9dc1addc9 --- /dev/null +++ b/app-misc/mc/files/mc-4.8.28-tests.patch @@ -0,0 +1,35 @@ +START_TEST uses the variable name _i, so GCC complains about redefining it with +a different type here. + +--- mc-4.8.28/tests/lib/strutil/filevercmp.c 2022-03-20 10:02:47.000000000 +0000 ++++ mc-4.8.28/tests/lib/strutil/filevercmp.c 2022-03-27 15:31:19.812120141 +0100 +@@ -353,20 +353,20 @@ + START_TEST (filevercmp_test5) + /* *INDENT-ON* */ + { +- size_t _i; ++ size_t ii; + +- for (_i = 0; _i < filevercmp_test_ds5_len; _i++) +- for (; filevercmp_test_ds5[_i] != NULL; _i++) ++ for (ii = 0; ii < filevercmp_test_ds5_len; ii++) ++ for (; filevercmp_test_ds5[ii] != NULL; ii++) + { +- const char *i = filevercmp_test_ds5[_i]; +- size_t _j; ++ const char *i = filevercmp_test_ds5[ii]; ++ size_t jj; + +- for (_j = _i; filevercmp_test_ds5[_j] != NULL; _j++) ++ for (jj = ii; filevercmp_test_ds5[jj] != NULL; jj++) + { +- const char *j = filevercmp_test_ds5[_j]; ++ const char *j = filevercmp_test_ds5[jj]; + +- ck_assert_int_eq (test_filevercmp (i, j), 0); +- ck_assert_int_eq (test_filevercmp (j, i), 0); ++ ck_assert_int_eq (test_filevercmp (i, j), 0); ++ ck_assert_int_eq (test_filevercmp (j, i), 0); + } + } + } diff --git a/app-misc/mc/mc-4.8.28.ebuild b/app-misc/mc/mc-4.8.28.ebuild index 3b62f454f445..c9ccfbc6bf8b 100644 --- a/app-misc/mc/mc-4.8.28.ebuild +++ b/app-misc/mc/mc-4.8.28.ebuild @@ -48,6 +48,7 @@ S="${WORKDIR}/${MY_P}" PATCHES=( "${FILESDIR}"/${PN}-4.8.26-ncurses-mouse.patch + "${FILESDIR}"/${P}-tests.patch #836812 ) pkg_pretend() { |