diff options
| author | António Fernandes <antoniojpfernandes@gmail.com> | 2021-12-21 17:42:27 +0000 |
|---|---|---|
| committer | Abderrahim Kitouni <akitouni@gnome.org> | 2021-12-25 16:29:44 +0100 |
| commit | 55cfd66ccca391fc144f5863ff6bfc1f3b137e2d (patch) | |
| tree | 7a92473e7027eb9a2f60a7a9cb525c95734c8e05 | |
| parent | f4ee5c43c0e6f226189fdf98c1eb47c59ac9d753 (diff) | |
| download | nautilus-abderrahim/libportal.tar.gz | |
general: Add libportal-gtk3 dependencyabderrahim/libportal
The portal-gtk3.h header has been moved into a separate library which
binds gtk3 explicitly.
https://github.com/flatpak/libportal/pull/53
| -rw-r--r-- | build-aux/flatpak/org.gnome.Nautilus.json | 5 | ||||
| -rw-r--r-- | build-aux/flatpak/org.gnome.Nautilus.yml | 3 | ||||
| -rw-r--r-- | meson.build | 4 | ||||
| -rw-r--r-- | src/meson.build | 1 | ||||
| -rw-r--r-- | src/nautilus-files-view.c | 2 |
5 files changed, 10 insertions, 5 deletions
diff --git a/build-aux/flatpak/org.gnome.Nautilus.json b/build-aux/flatpak/org.gnome.Nautilus.json index 2857124c5..fb6213074 100644 --- a/build-aux/flatpak/org.gnome.Nautilus.json +++ b/build-aux/flatpak/org.gnome.Nautilus.json @@ -117,14 +117,15 @@ "buildsystem": "meson", "builddir": true, "config-opts": [ + "-Ddocs=false", + "-Dbackends=gtk3", "--libdir=/app/lib", "--buildtype=debugoptimized" ], "sources" : [ { "type": "git", - "url": "https://github.com/flatpak/libportal.git", - "tag": "0.4" + "url": "https://github.com/flatpak/libportal.git" } ] }, diff --git a/build-aux/flatpak/org.gnome.Nautilus.yml b/build-aux/flatpak/org.gnome.Nautilus.yml index 3e15f4b11..555f95905 100644 --- a/build-aux/flatpak/org.gnome.Nautilus.yml +++ b/build-aux/flatpak/org.gnome.Nautilus.yml @@ -85,12 +85,13 @@ modules: buildsystem: meson builddir: true config-opts: + - "-Ddocs=false" + - "-Dbackends=gtk3" - "--libdir=/app/lib" - "--buildtype=debugoptimized" sources: - type: git url: https://github.com/flatpak/libportal.git - tag: 0.4 - buildsystem: meson builddir: true name: nautilus diff --git a/meson.build b/meson.build index 927216636..4626fa0bb 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 = dependency('libportal', version: '>= 0.5') + libportal_gtk3 = dependency('libportal-gtk3', version: '>= 0.5') endif selinux = [] if get_option('selinux') diff --git a/src/meson.build b/src/meson.build index 682d6f3a3..d7fb76d53 100644 --- a/src/meson.build +++ b/src/meson.build @@ -285,6 +285,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 dfb7fb26c..a24005a11 100644 --- a/src/nautilus-files-view.c +++ b/src/nautilus-files-view.c @@ -93,7 +93,7 @@ #ifdef HAVE_LIBPORTAL #include <libportal/portal.h> -#include <libportal/portal-gtk3.h> +#include <libportal-gtk3/portal-gtk3.h> #endif /* Minimum starting update inverval */ |