diff options
-rw-r--r-- | meta-gnome/recipes-gnome/nautilus/nautilus/liportal-0.5-fix.patch | 28 | ||||
-rw-r--r-- | meta-gnome/recipes-gnome/nautilus/nautilus_41.1.bb | 1 |
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 @@ | |||
1 | Fix an issue building Nautilus with libportal-0.5+ | ||
2 | where expected header is moved to different directory | ||
3 | in staging sysroot | ||
4 | |||
5 | Upstream-Status: Pending | ||
6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
7 | --- a/meson.build | ||
8 | +++ b/meson.build | ||
9 | @@ -123,7 +123,7 @@ gtk = dependency('gtk+-3.0', version: '> | ||
10 | libhandy = dependency('libhandy-1', version: '>= 1.1.90') | ||
11 | libportal = [] | ||
12 | if get_option('libportal') | ||
13 | - libportal = dependency('libportal', version: '>= 0.3') | ||
14 | + libportal = dependency('libportal-gtk3', version: '>= 0.3') | ||
15 | endif | ||
16 | selinux = [] | ||
17 | if get_option('selinux') | ||
18 | --- a/src/nautilus-files-view.c | ||
19 | +++ b/src/nautilus-files-view.c | ||
20 | @@ -92,7 +92,7 @@ | ||
21 | |||
22 | #ifdef HAVE_LIBPORTAL | ||
23 | #include <libportal/portal.h> | ||
24 | -#include <libportal/portal-gtk3.h> | ||
25 | +#include <libportal-gtk3/portal-gtk3.h> | ||
26 | #endif | ||
27 | |||
28 | /* 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 | |||
22 | def gnome_verdir(v): | 22 | def gnome_verdir(v): |
23 | return oe.utils.trim_version(v, 1) | 23 | return oe.utils.trim_version(v, 1) |
24 | 24 | ||
25 | SRC_URI += "file://liportal-0.5-fix.patch" | ||
25 | SRC_URI[archive.sha256sum] = "3e633098853711a3e96b12fe9228b3201816e554b2823f161e7d901a8880582f" | 26 | SRC_URI[archive.sha256sum] = "3e633098853711a3e96b12fe9228b3201816e554b2823f161e7d901a8880582f" |
26 | 27 | ||
27 | REQUIRED_DISTRO_FEATURES = "x11" | 28 | REQUIRED_DISTRO_FEATURES = "x11" |