glib-2.0: Fix signature of close_range
PATCH 1/2 glib-2.0: Fix signature of close_range
glibc 2.34 provides this function which exposes a latest issue w.r.t. function parameters
Signed-off-by Khem Raj <[email protected]>
--- ...tly-use-3-parameters-for-close_range.patch | 29 +++++++++++++++++++ meta/recipes-core/glib-2.0/glib-2.0_2.68.3.bb | 1 + 2 files changed, 30 insertions(+) create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0001-correctly-use-3-parameters-for-close_range.patch
meta/recipes-core/glib-2.0/glib-2.0/0001-correctly-use-3-parameters-for-close_range.patch new file +29 -0
@@ -0,0 +1,29 @@ +From b71117d89434db83d34bc1b981ca03d4be299576 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Thu, 8 Jul 2021 17:26:43 -0700 +Subject: [PATCH] correctly use 3 parameters for close_range + +libc implementation has 3 parameter e.g. +https://www.freebsd.org/cgi/man.cgi?query=close_range&sektion=2&format=html + +Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2180] +Signed-off-by: Khem Raj <[email protected]> +--- + glib/gspawn.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/glib/gspawn.c b/glib/gspawn.c +index 899647c2f..3073a10a4 100644 +--- a/glib/gspawn.c ++++ b/glib/gspawn.c +@@ -1520,7 +1520,7 @@ safe_closefrom (int lowfd) + * + * Handle ENOSYS in case it’s supported in libc but not the kernel; if so, + * fall back to safe_fdwalk(). */ +- if (close_range (lowfd, G_MAXUINT) != 0 && errno == ENOSYS) ++ if (close_range (lowfd, G_MAXUINT, 0) != 0 && errno == ENOSYS) + #endif /* HAVE_CLOSE_RANGE */ + (void) safe_fdwalk (close_func, GINT_TO_POINTER (lowfd)); + #endif +-- +2.32.0
meta/recipes-core/glib-2.0/glib-2.0_2.68.3.bb +1 -0
@@ -18,6 +18,7 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ file://0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch \ file://0001-gio-tests-codegen.py-bump-timeout-to-100-seconds.patch \ file://time-test.patch \ + file://0001-correctly-use-3-parameters-for-close_range.patch \ " SRC_URI_append_class-native = " file://relocate-modules.patch"
Signature · 1 line
2.32.0
PATCH 2/2 gnome-desktop-testing: Fix non-literal format string warning
This fixes build with clang
Signed-off-by Khem Raj <[email protected]>
--- ...teral-format-string-issue-with-clang.patch | 31 +++++++++++++++++++ .../gnome-desktop-testing_2021.1.bb | 4 ++- 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing/0001-fix-non-literal-format-string-issue-with-clang.patch
meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing/0001-fix-non-literal-format-string-issue-with-clang.patch new file +31 -0
@@ -0,0 +1,31 @@ +From df625a36be8e0c7afa68b3dd23907dc7d658c59a Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Thu, 8 Jul 2021 23:13:30 -0700 +Subject: [PATCH] fix non-literal format string issue with clang + +clang errors out when using -Werror=format-nonliteral +since the definition of g_strdup_vprintf() from glib-2.0 +is using va_list and clang seems to still warn where as +gcc doesn't do that for va_list arguments + +Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gnome-desktop-testing/-/merge_requests/9] +Signed-off-by: Khem Raj <[email protected]> +--- + src/gnome-desktop-testing-runner.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/gnome-desktop-testing-runner.c b/src/gnome-desktop-testing-runner.c +index d75b71c..da49e14 100644 +--- a/src/gnome-desktop-testing-runner.c ++++ b/src/gnome-desktop-testing-runner.c +@@ -74,7 +74,7 @@ static const char * const test_log_message_ids[] = { + static gboolean opt_quiet = FALSE; + static gboolean opt_tap = FALSE; + +-static void ++static void G_GNUC_PRINTF (3, 0) + test_log (TestLog what, + const char *test_name, + const char *format, +-- +2.32.0
meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_2021.1.bb +3 -1
@@ -9,7 +9,9 @@ LICENSE = "LGPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ file://src/gnome-desktop-testing-runner.c;beginline=1;endline=20;md5=7ef3ad9da2ffcf7707dc11151fe007f4" -SRC_URI = "git://gitlab.gnome.org/GNOME/gnome-desktop-testing.git;protocol=http" +SRC_URI = "git://gitlab.gnome.org/GNOME/gnome-desktop-testing.git;protocol=http \ + file://0001-fix-non-literal-format-string-issue-with-clang.patch \ + " SRCREV = "e346cd4ed2e2102c9b195b614f3c642d23f5f6e7" DEPENDS = "glib-2.0"
Signature · 1 line
2.32.0