aboutsummaryrefslogtreecommitdiffstats
path: root/meta-gnome
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2022-01-11 11:36:29 -0800
committerKhem Raj <raj.khem@gmail.com>2022-01-12 09:22:34 -0800
commit461c04657c3151629b503fe134e9d672520aacbb (patch)
tree2fee0e0a3e1e901d9dfc4ad971f8c98ff41a68aa /meta-gnome
parentdb72adf0165c5342de2d46f9ef90a8e02f82e2c6 (diff)
downloadmeta-openembedded-contrib-461c04657c3151629b503fe134e9d672520aacbb.tar.gz
nautilus: Fix build with libportal >= 0.5
Signed-off-by: Khem Raj <raj.khem@gmail.com> Cc: Alexander Kanavin <alex@linutronix.de> Cc: Andreas Müller <schnitzeltony@gmail.com>
Diffstat (limited to 'meta-gnome')
-rw-r--r--meta-gnome/recipes-gnome/nautilus/nautilus/liportal-0.5-fix.patch28
-rw-r--r--meta-gnome/recipes-gnome/nautilus/nautilus_41.1.bb1
2 files changed, 29 insertions, 0 deletions
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
new file mode 100644
index 0000000000..708595a7f1
--- /dev/null
+++ b/meta-gnome/recipes-gnome/nautilus/nautilus/liportal-0.5-fix.patch
@@ -0,0 +1,28 @@
+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.1.bb b/meta-gnome/recipes-gnome/nautilus/nautilus_41.1.bb
index c64d49b0ba..330c361806 100644
--- a/meta-gnome/recipes-gnome/nautilus/nautilus_41.1.bb
+++ b/meta-gnome/recipes-gnome/nautilus/nautilus_41.1.bb
@@ -22,6 +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] = "3e633098853711a3e96b12fe9228b3201816e554b2823f161e7d901a8880582f"
REQUIRED_DISTRO_FEATURES = "x11"