diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2021-03-02 14:13:48 -0800 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2021-03-03 11:08:29 -0800 |
| commit | 1498b3407fa723a984f58e97464caa11cd4d4c40 (patch) | |
| tree | 7ada6181f316980fb59c771f1d7caf73fa173b7a /meta-gnome | |
| parent | 70cfed4768ba3dfb5d6b2db35fa3175ade6785f9 (diff) | |
| download | meta-openembedded-1498b3407fa723a984f58e97464caa11cd4d4c40.tar.gz | |
nautilus: Drop use of volatile
volatile qualifier has been dropped in gcc11
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Cc: Andreas Müller <schnitzeltony@gmail.com>
Diffstat (limited to 'meta-gnome')
| -rw-r--r-- | meta-gnome/recipes-gnome/nautilus/nautilus/0001-Drop-use-of-volatile.patch | 32 | ||||
| -rw-r--r-- | meta-gnome/recipes-gnome/nautilus/nautilus_3.36.3.bb | 1 |
2 files changed, 33 insertions, 0 deletions
diff --git a/meta-gnome/recipes-gnome/nautilus/nautilus/0001-Drop-use-of-volatile.patch b/meta-gnome/recipes-gnome/nautilus/nautilus/0001-Drop-use-of-volatile.patch new file mode 100644 index 0000000000..46831429d0 --- /dev/null +++ b/meta-gnome/recipes-gnome/nautilus/nautilus/0001-Drop-use-of-volatile.patch @@ -0,0 +1,32 @@ +From 9ab5acb902a38b420592931ec9e46ccd0624035a Mon Sep 17 00:00:00 2001 +From: Ondrej Holy <oholy@redhat.com> +Date: Wed, 13 Jan 2021 13:22:58 +0100 +Subject: [PATCH] Drop use of volatile + +The `fedora rawhide` CI job currently fails because of usage of the +`volatile` qualifier. Let's drop the `volatile` qualifier as it doesn't +help anyway. It was dropped in GLib as well, see: +https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1719 + +Fixes: https://gitlab.gnome.org/GNOME/nautilus/-/issues/1741 +--- +Upstream-Status: Backport [https://github.com/GNOME/nautilus/commit/9b733dd9df9d6d9805c56749d05ada15a7560ef4] + src/nautilus-enum-types.c.template | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/nautilus-enum-types.c.template b/src/nautilus-enum-types.c.template +index 00155ca..9d8ac83 100644 +--- a/src/nautilus-enum-types.c.template ++++ b/src/nautilus-enum-types.c.template +@@ -13,7 +13,7 @@ + GType + @enum_name@_get_type (void) + { +- static volatile GType type_once = 0; ++ static GType type_once = 0; + + if (g_once_init_enter (&type_once)) + { +-- +2.30.1 + diff --git a/meta-gnome/recipes-gnome/nautilus/nautilus_3.36.3.bb b/meta-gnome/recipes-gnome/nautilus/nautilus_3.36.3.bb index fc9ab379d8..cf138d9739 100644 --- a/meta-gnome/recipes-gnome/nautilus/nautilus_3.36.3.bb +++ b/meta-gnome/recipes-gnome/nautilus/nautilus_3.36.3.bb @@ -17,6 +17,7 @@ DEPENDS = " \ inherit gnomebase gsettings gobject-introspection gtk-doc gettext features_check upstream-version-is-even mime-xdg +SRC_URI += "file://0001-Drop-use-of-volatile.patch" SRC_URI[archive.md5sum] = "c3c8dbb90d8eeed6c127aa568e131395" SRC_URI[archive.sha256sum] = "b6cafc7ab1e70a64383de391b6097fcccbf36b208f8502d8c46423224fd30ef8" |