From b63f865441bedf55254adc34fbba92dd9ac62bdc Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Tue, 22 Mar 2022 08:09:13 +0800 Subject: nautilus: upgrade 41.2 -> 42.0 liportal-0.5-fix.patch removed since it's included in 42.0 Changelog: ========= * Fix HiDPI thumbnails in list view * Properly dispose pathbar to avoid crashes * Translation updates Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- .../nautilus/nautilus/liportal-0.5-fix.patch | 28 ------------- meta-gnome/recipes-gnome/nautilus/nautilus_41.2.bb | 46 ---------------------- meta-gnome/recipes-gnome/nautilus/nautilus_42.0.bb | 45 +++++++++++++++++++++ 3 files changed, 45 insertions(+), 74 deletions(-) delete mode 100644 meta-gnome/recipes-gnome/nautilus/nautilus/liportal-0.5-fix.patch delete mode 100644 meta-gnome/recipes-gnome/nautilus/nautilus_41.2.bb create mode 100644 meta-gnome/recipes-gnome/nautilus/nautilus_42.0.bb (limited to 'meta-gnome') diff --git a/meta-gnome/recipes-gnome/nautilus/nautilus/liportal-0.5-fix.patch b/meta-gnome/recipes-gnome/nautilus/nautilus/liportal-0.5-fix.patch deleted file mode 100644 index 708595a7f1..0000000000 --- a/meta-gnome/recipes-gnome/nautilus/nautilus/liportal-0.5-fix.patch +++ /dev/null @@ -1,28 +0,0 @@ -Fix an issue building Nautilus with libportal-0.5+ -where expected header is moved to different directory -in staging sysroot - -Upstream-Status: Pending -Signed-off-by: Khem Raj ---- a/meson.build -+++ b/meson.build -@@ -123,7 +123,7 @@ gtk = dependency('gtk+-3.0', version: '> - libhandy = dependency('libhandy-1', version: '>= 1.1.90') - libportal = [] - if get_option('libportal') -- libportal = dependency('libportal', version: '>= 0.3') -+ libportal = dependency('libportal-gtk3', version: '>= 0.3') - endif - selinux = [] - if get_option('selinux') ---- a/src/nautilus-files-view.c -+++ b/src/nautilus-files-view.c -@@ -92,7 +92,7 @@ - - #ifdef HAVE_LIBPORTAL - #include --#include -+#include - #endif - - /* Minimum starting update inverval */ diff --git a/meta-gnome/recipes-gnome/nautilus/nautilus_41.2.bb b/meta-gnome/recipes-gnome/nautilus/nautilus_41.2.bb deleted file mode 100644 index 66043fad34..0000000000 --- a/meta-gnome/recipes-gnome/nautilus/nautilus_41.2.bb +++ /dev/null @@ -1,46 +0,0 @@ -SUMMARY = "File manager for GNOME" -SECTION = "x11/gnome" - -LICENSE="GPL-3.0-only" -LIC_FILES_CHKSUM = "file://LICENSE;md5=d32239bcb673463ab874e80d47fae504" - -GNOMEBASEBUILDCLASS = "meson" - -DEPENDS = " \ - fontconfig \ - gtk+3 \ - gnome-desktop \ - gsettings-desktop-schemas \ - gnome-autoar \ - tracker \ - libhandy \ - libportal \ -" - -inherit gnomebase gsettings gobject-introspection gtk-doc gettext features_check mime-xdg - -def gnome_verdir(v): - return oe.utils.trim_version(v, 1) - -SRC_URI += "file://liportal-0.5-fix.patch" -SRC_URI[archive.sha256sum] = "872285b1c40a6ee418ce295ed115f5427da70907d822d95bcf51675d5498822b" - -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" diff --git a/meta-gnome/recipes-gnome/nautilus/nautilus_42.0.bb b/meta-gnome/recipes-gnome/nautilus/nautilus_42.0.bb new file mode 100644 index 0000000000..2935cc2bfe --- /dev/null +++ b/meta-gnome/recipes-gnome/nautilus/nautilus_42.0.bb @@ -0,0 +1,45 @@ +SUMMARY = "File manager for GNOME" +SECTION = "x11/gnome" + +LICENSE="GPL-3.0-only" +LIC_FILES_CHKSUM = "file://LICENSE;md5=d32239bcb673463ab874e80d47fae504" + +GNOMEBASEBUILDCLASS = "meson" + +DEPENDS = " \ + fontconfig \ + gtk+3 \ + gnome-desktop \ + gsettings-desktop-schemas \ + gnome-autoar \ + tracker \ + libhandy \ + libportal \ +" + +inherit gnomebase gsettings gobject-introspection gtk-doc gettext features_check mime-xdg + +def gnome_verdir(v): + return oe.utils.trim_version(v, 1) + +SRC_URI[archive.sha256sum] = "3c904f33ba2d2a078892bee2af71484cd608923cd78ec7e8a1517bc2155113d5" + +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" -- cgit 1.2.3-korg