From: Jeremy Bicha Date: Thu, 12 May 2022 15:36:17 +0000 (-0400) Subject: Cherry-pick patch to fix an invalid format string X-Git-Tag: archive/raspbian/4.6.5+ds-1+rpi1~1^2~21 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=ef8160a9eb16e12e04b3cb0283c081cb537f2de0;p=gtk4.git Cherry-pick patch to fix an invalid format string --- diff --git a/debian/patches/egl-Fix-invalid-format-string.patch b/debian/patches/egl-Fix-invalid-format-string.patch new file mode 100644 index 0000000000..6bdb550e92 --- /dev/null +++ b/debian/patches/egl-Fix-invalid-format-string.patch @@ -0,0 +1,27 @@ +From: =?utf-8?q?Lo=C3=AFc_Minier?= +Date: Wed, 11 May 2022 19:43:04 +0000 +Subject: egl: Fix invalid format string + +(cherry picked from commit 4f2b1b3cfcf1f11f14993656c21105bbbb9432d7) +--- + gdk/gdkdisplay.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/gdk/gdkdisplay.c b/gdk/gdkdisplay.c +index 31f039d..07487e8 100644 +--- a/gdk/gdkdisplay.c ++++ b/gdk/gdkdisplay.c +@@ -1628,10 +1628,10 @@ gdk_display_check_egl_extensions (EGLDisplay egl_display, + /* translators: Arguments are the number of missing extensions + * followed by a comma-separated list of their names */ + g_dngettext (GETTEXT_PACKAGE, +- "EGL implementation is missing extension %2$s", +- "EGL implementation is missing %d extensions: %s", ++ "EGL implementation is missing extension %s", ++ "EGL implementation is missing %2$d extensions: %1$s", + n_missing), +- (int) n_missing, missing->str); ++ missing->str, (int) n_missing); + + g_string_free (missing, TRUE); + return FALSE; diff --git a/debian/patches/series b/debian/patches/series index 7930379e22..889004035e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -11,3 +11,4 @@ gi-docgen/templates-Remove-html5shiv.patch debian/Skip-some-known-failing-tests-on-mips-family-architecture.patch debian/Disable-clipboard-test.patch imcontextwayland-Ignore-preedit-updates-from-NULL-to-NULL.patch +egl-Fix-invalid-format-string.patch