nautilus: upgrade 3.36.3 -> 40.1

* 3.36.3 stopped building with meson 0.58.0
* backported patch can go

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Andreas Müller
2021-05-16 01:38:36 +02:00
committed by Khem Raj
parent 1c97ec5a76
commit cac624c6d2
2 changed files with 11 additions and 35 deletions
@@ -1,32 +0,0 @@
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
@@ -13,16 +13,23 @@ DEPENDS = " \
gsettings-desktop-schemas \
gnome-autoar \
tracker \
libhandy \
libportal \
"
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"
def gnome_verdir(v):
return oe.utils.trim_version(v, 1)
SRC_URI[archive.sha256sum] = "8ecfb90174a0bd5815b1ceb9cbfcd91fec0fb5e34907a4f2df2d05e5d6c99d33"
REQUIRED_DISTRO_FEATURES = "x11"
EXTRA_OEMESON += " \
-Dtests=none \
"
PACKAGECONFIG = "extensions"
PACKAGECONFIG[extensions] = "-Dextensions=true,-Dextensions=false, gexiv2 gstreamer1.0-plugins-base"
@@ -30,6 +37,7 @@ FILES_${PN} += " \
${datadir}/dbus-1 \
${datadir}/metainfo \
${datadir}/gnome-shell \
${datadir}/tracker3 \
"
# mandatory - not checked during configuration: