diff --git a/build-aux/flatpak/org.gnome.Nautilus.json b/build-aux/flatpak/org.gnome.Nautilus.json index 2857124c59d4eca7561a765bd0dcd93938eb166a..fb6213074e049f9f0f1b7875e6ab29aa3bd5ccfd 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 3e15f4b11fa1b5b9f1b11870bfd930814c4d89fb..555f959050280296d0605a0facd34f12f4da437b 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 927216636a21bfc0a4de3336e084c4d0084b6624..4626fa0bb7f69f84a3ba79f13bd869b641bad428 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 682d6f3a3cd0899985ddd7a8b2a9479e5f1a5d79..d7fb76d53d5f3e6e28931734a7c55bf5443c06f7 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 dfb7fb26c0c8d2c55d76c1d4fc3a2b39fbec817b..a24005a110c40c9a1dd4954aa2d6beccd9b17182 100644 --- a/src/nautilus-files-view.c +++ b/src/nautilus-files-view.c @@ -93,7 +93,7 @@ #ifdef HAVE_LIBPORTAL #include -#include +#include #endif /* Minimum starting update inverval */