From cac624c6d2702057e0e2722768c5c57a4a545913 Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Sun, 16 May 2021 01:38:36 +0200 Subject: nautilus: upgrade 3.36.3 -> 40.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 3.36.3 stopped building with meson 0.58.0 * backported patch can go Signed-off-by: Andreas Müller Signed-off-by: Khem Raj --- .../nautilus/0001-Drop-use-of-volatile.patch | 32 --------------- .../recipes-gnome/nautilus/nautilus_3.36.3.bb | 39 ------------------ meta-gnome/recipes-gnome/nautilus/nautilus_40.1.bb | 47 ++++++++++++++++++++++ 3 files changed, 47 insertions(+), 71 deletions(-) delete mode 100644 meta-gnome/recipes-gnome/nautilus/nautilus/0001-Drop-use-of-volatile.patch delete mode 100644 meta-gnome/recipes-gnome/nautilus/nautilus_3.36.3.bb create mode 100644 meta-gnome/recipes-gnome/nautilus/nautilus_40.1.bb (limited to 'meta-gnome') 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 deleted file mode 100644 index 46831429d..000000000 --- a/meta-gnome/recipes-gnome/nautilus/nautilus/0001-Drop-use-of-volatile.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 9ab5acb902a38b420592931ec9e46ccd0624035a Mon Sep 17 00:00:00 2001 -From: Ondrej Holy -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 deleted file mode 100644 index 3ed472bef..000000000 --- a/meta-gnome/recipes-gnome/nautilus/nautilus_3.36.3.bb +++ /dev/null @@ -1,39 +0,0 @@ -SUMMARY = "File manager for GNOME" -SECTION = "x11/gnome" - -LICENSE="GPLv3" -LIC_FILES_CHKSUM = "file://LICENSE;md5=d32239bcb673463ab874e80d47fae504" - -GNOMEBASEBUILDCLASS = "meson" - -DEPENDS = " \ - fontconfig \ - gtk+3 \ - gnome-desktop3 \ - gsettings-desktop-schemas \ - gnome-autoar \ - tracker \ -" - -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" - -REQUIRED_DISTRO_FEATURES = "x11" - -PACKAGECONFIG = "extensions" -PACKAGECONFIG[extensions] = "-Dextensions=true,-Dextensions=false, gexiv2 gstreamer1.0-plugins-base" - -FILES_${PN} += " \ - ${datadir}/dbus-1 \ - ${datadir}/metainfo \ - ${datadir}/gnome-shell \ -" - -# mandatory - not checked during configuration: -# | (org.gnome.Nautilus:863): GLib-GIO-ERROR **: 21:03:52.326: Settings schema 'org.freedesktop.Tracker.Miner.Files' is not installed -RDEPENDS_${PN} += "tracker-miners" - -PNBLACKLIST[nautilus] ?= "Does not build with latest meson, perhaps needs upgrade" diff --git a/meta-gnome/recipes-gnome/nautilus/nautilus_40.1.bb b/meta-gnome/recipes-gnome/nautilus/nautilus_40.1.bb new file mode 100644 index 000000000..bb589a86a --- /dev/null +++ b/meta-gnome/recipes-gnome/nautilus/nautilus_40.1.bb @@ -0,0 +1,47 @@ +SUMMARY = "File manager for GNOME" +SECTION = "x11/gnome" + +LICENSE="GPLv3" +LIC_FILES_CHKSUM = "file://LICENSE;md5=d32239bcb673463ab874e80d47fae504" + +GNOMEBASEBUILDCLASS = "meson" + +DEPENDS = " \ + fontconfig \ + gtk+3 \ + gnome-desktop3 \ + gsettings-desktop-schemas \ + gnome-autoar \ + tracker \ + libhandy \ + libportal \ +" + +inherit gnomebase gsettings gobject-introspection gtk-doc gettext features_check upstream-version-is-even mime-xdg + +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" + +FILES_${PN} += " \ + ${datadir}/dbus-1 \ + ${datadir}/metainfo \ + ${datadir}/gnome-shell \ + ${datadir}/tracker3 \ +" + +# mandatory - not checked during configuration: +# | (org.gnome.Nautilus:863): GLib-GIO-ERROR **: 21:03:52.326: Settings schema 'org.freedesktop.Tracker.Miner.Files' is not installed +RDEPENDS_${PN} += "tracker-miners" + +PNBLACKLIST[nautilus] ?= "Does not build with latest meson, perhaps needs upgrade" -- cgit v1.2.3-54-g00ecf