[nautilus/antoniof-master-patch-60715] general: Add libportal-gtk3 dependency
- From: António Fernandes <antoniof src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus/antoniof-master-patch-60715] general: Add libportal-gtk3 dependency
- Date: Mon, 8 Nov 2021 19:49:17 +0000 (UTC)
commit a001334fb72bd67baa0d08a973bd42d7b6c4d12d
Author: António Fernandes <antoniojpfernandes gmail com>
Date: Mon Nov 8 19:49:12 2021 +0000
general: Add libportal-gtk3 dependency
The portal-gtk3.h header has been moved into a separate library which
binds gtk3 explicitly.
https://github.com/flatpak/libportal/pull/53
build-aux/flatpak/org.gnome.Nautilus.json | 1 +
build-aux/flatpak/org.gnome.Nautilus.yml | 1 +
meson.build | 2 ++
src/meson.build | 1 +
src/nautilus-files-view.c | 2 +-
5 files changed, 6 insertions(+), 1 deletion(-)
---
diff --git a/build-aux/flatpak/org.gnome.Nautilus.json b/build-aux/flatpak/org.gnome.Nautilus.json
index e4ab02ef2..b769f9db2 100644
--- a/build-aux/flatpak/org.gnome.Nautilus.json
+++ b/build-aux/flatpak/org.gnome.Nautilus.json
@@ -117,6 +117,7 @@
"buildsystem": "meson",
"builddir": true,
"config-opts": [
+ "-Dbackends=gtk3",
"--libdir=/app/lib",
"--buildtype=debugoptimized"
],
diff --git a/build-aux/flatpak/org.gnome.Nautilus.yml b/build-aux/flatpak/org.gnome.Nautilus.yml
index 748ced249..60d832c7f 100644
--- a/build-aux/flatpak/org.gnome.Nautilus.yml
+++ b/build-aux/flatpak/org.gnome.Nautilus.yml
@@ -85,6 +85,7 @@ modules:
buildsystem: meson
builddir: true
config-opts:
+ - "-Dbackends=gtk3"
- "--libdir=/app/lib"
- "--buildtype=debugoptimized"
sources:
diff --git a/meson.build b/meson.build
index b52694658..3c9b3df88 100644
--- a/meson.build
+++ b/meson.build
@@ -122,8 +122,10 @@ gnome_desktop = dependency('gnome-desktop-3.0', version: '>= 3.0.0')
gtk = dependency('gtk+-3.0', version: '>= 3.22.27')
libhandy = dependency('libhandy-1', version: '>= 1.1.90')
libportal = []
+libportal_gtk3 = []
if get_option('libportal')
libportal = dependency('libportal', version: '>= 0.3')
+ libportal_gtk3 = dependency('libportal', version: '>= 0.3')
endif
selinux = []
if get_option('selinux')
diff --git a/src/meson.build b/src/meson.build
index 39e0b0370..c13f0b75f 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -283,6 +283,7 @@ nautilus_deps = [
libgd_dep,
libhandy,
libportal,
+ libportal_gtk3,
nautilus_extension,
selinux,
tracker_sparql,
diff --git a/src/nautilus-files-view.c b/src/nautilus-files-view.c
index f63cb4b88..95fb022b6 100644
--- 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 */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]