diff options
2 files changed, 6 insertions, 37 deletions
diff --git a/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing/0001-fix-non-literal-format-string-issue-with-clang.patch b/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing/0001-fix-non-literal-format-string-issue-with-clang.patch deleted file mode 100644 index 39efa4a4636..00000000000 --- a/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing/0001-fix-non-literal-format-string-issue-with-clang.patch +++ /dev/null @@ -1,31 +0,0 @@ -From df625a36be8e0c7afa68b3dd23907dc7d658c59a Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -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 <raj.khem@gmail.com> ---- - 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 diff --git a/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_2021.1.bb b/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_2021.1.bb index 1173dd4af35..43f2238115c 100644 --- a/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_2021.1.bb +++ b/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_2021.1.bb @@ -9,16 +9,16 @@ LICENSE = "LGPL-2.0-or-later" 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=https;branch=master \ - file://0001-fix-non-literal-format-string-issue-with-clang.patch \ - " -SRCREV = "e346cd4ed2e2102c9b195b614f3c642d23f5f6e7" +SRC_URI = "git://gitlab.gnome.org/GNOME/gnome-desktop-testing.git;protocol=https;branch=master" +SRCREV = "036b7357f1892b3bdf19aba8d0be7d7b75bda291" + +PV .= "+git" DEPENDS = "glib-2.0" S = "${WORKDIR}/git" -inherit autotools pkgconfig +inherit meson pkgconfig PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" -PACKAGECONFIG[systemd] = ",,systemd" +PACKAGECONFIG[systemd] = "-Dsystemd=enabled,-Dsystemd=disabled,systemd" |