diff mbox series

[meta-gnome] nautilus: upgrade 41.2 -> 42.0

Message ID 1647907753-1930-4-git-send-email-wangmy@fujitsu.com
State Under Review
Headers show
Series [meta-gnome] nautilus: upgrade 41.2 -> 42.0 | expand

Commit Message

Mingyu Wang (Fujitsu) March 22, 2022, 12:09 a.m. UTC 
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 <wangmy@fujitsu.com>
---
 .../nautilus/nautilus/liportal-0.5-fix.patch  | 28 -------------------
 .../{nautilus_41.2.bb => nautilus_42.0.bb}    |  3 +-
 2 files changed, 1 insertion(+), 30 deletions(-)
 delete mode 100644 meta-gnome/recipes-gnome/nautilus/nautilus/liportal-0.5-fix.patch
 rename meta-gnome/recipes-gnome/nautilus/{nautilus_41.2.bb => nautilus_42.0.bb} (88%)
diff mbox series

Patch

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 <raj.khem@gmail.com>
---- 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 <libportal/portal.h>
--#include <libportal/portal-gtk3.h>
-+#include <libportal-gtk3/portal-gtk3.h>
- #endif
- 
- /* Minimum starting update inverval */
diff --git a/meta-gnome/recipes-gnome/nautilus/nautilus_41.2.bb b/meta-gnome/recipes-gnome/nautilus/nautilus_42.0.bb
similarity index 88%
rename from meta-gnome/recipes-gnome/nautilus/nautilus_41.2.bb
rename to meta-gnome/recipes-gnome/nautilus/nautilus_42.0.bb
index 66043fad34..2935cc2bfe 100644
--- a/meta-gnome/recipes-gnome/nautilus/nautilus_41.2.bb
+++ b/meta-gnome/recipes-gnome/nautilus/nautilus_42.0.bb
@@ -22,8 +22,7 @@  inherit gnomebase gsettings gobject-introspection gtk-doc gettext features_check
 def gnome_verdir(v):
     return oe.utils.trim_version(v, 1)
 
-SRC_URI += "file://liportal-0.5-fix.patch"
-SRC_URI[archive.sha256sum] = "872285b1c40a6ee418ce295ed115f5427da70907d822d95bcf51675d5498822b"
+SRC_URI[archive.sha256sum] = "3c904f33ba2d2a078892bee2af71484cd608923cd78ec7e8a1517bc2155113d5"
 
 REQUIRED_DISTRO_FEATURES = "x11"