From e05239960eb39bc934864f7b69430ab7a1600ea4 Mon Sep 17 00:00:00 2001 From: Yue-Lan Date: Tue, 25 Apr 2023 14:51:53 +0800 Subject: [PATCH] update changelog. --- debian/changelog | 6 ++++++ debian/patches/series | 1 + debian/patches/update-changelog-2.patch | 21 +++++++++++++++++++++ 3 files changed, 28 insertions(+) create mode 100644 debian/patches/update-changelog-2.patch diff --git a/debian/changelog b/debian/changelog index 11fd903..25e17a8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +glib2.0 (2.74.5-ok3~0425build1) yangtze; urgency=medium + + * 修复riscv64架构下spawn-test失败的问题 + + -- Yue Lan Tue, 25 Apr 2023 14:51:15 +0800 + glib2.0 (2.74.5-ok3~0425) yangtze; urgency=medium * 屏蔽arm架构下threadtests，避免构建失败问题 diff --git a/debian/patches/series b/debian/patches/series index 46aa355..305edd2 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ Modify-debian-control.patch update-changelog.patch update-changelog-1.patch +update-changelog-2.patch diff --git a/debian/patches/update-changelog-2.patch b/debian/patches/update-changelog-2.patch new file mode 100644 index 0000000..426a8df --- /dev/null +++ b/debian/patches/update-changelog-2.patch @@ -0,0 +1,21 @@ +From: Yue-Lan +Date: Tue, 25 Apr 2023 14:51:53 +0800 +Subject: update changelog. + +--- + glib/tests/spawn-test.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/glib/tests/spawn-test.c b/glib/tests/spawn-test.c +index 95975f6..9fcf45f 100644 +--- a/glib/tests/spawn-test.c ++++ b/glib/tests/spawn-test.c +@@ -112,7 +112,7 @@ test_spawn_basics (void) + g_assert_true (result); + g_test_message ("sort non-existing-file.txt error output: %s", erroutput); + #ifndef G_OS_WIN32 +- g_assert_true (g_str_has_prefix (erroutput, "sort: ")); ++ g_assert_true (g_str_has_prefix (erroutput, "sort: ") || g_str_has_prefix (erroutput, "/usr/bin/sort: ")); + g_assert_nonnull (strstr (erroutput, g_strerror (ENOENT))); + #else + {