[nautilus/gtk4-preparation-trunk: 46/64] Revert "general: Add libportal-gtk3 dependency"

[António Fernandes <antoniof src gnome org>]

commit 2441470b3601551251eca705ebde1d7475b2ff20
Author: António Fernandes <antoniojpfernandes gmail com>
Date:   Tue Dec 21 23:30:27 2021 +0000

    Revert "general: Add libportal-gtk3 dependency"
    
    This reverts commit ae752ea07895b918683f664fe78950255f7faab0

 build-aux/flatpak/org.gnome.Nautilus.json | 5 ++---
 build-aux/flatpak/org.gnome.Nautilus.yml  | 3 +--
 meson.build                               | 4 +---
 src/meson.build                           | 1 -
 src/nautilus-files-view.c                 | 2 +-
 5 files changed, 5 insertions(+), 10 deletions(-)
---
diff --git a/build-aux/flatpak/org.gnome.Nautilus.json b/build-aux/flatpak/org.gnome.Nautilus.json
index fb6213074..2857124c5 100644
--- a/build-aux/flatpak/org.gnome.Nautilus.json
+++ b/build-aux/flatpak/org.gnome.Nautilus.json
@@ -117,15 +117,14 @@
       "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";
+          "url": "https://github.com/flatpak/libportal.git";,
+          "tag": "0.4"
         }
       ]
     },
diff --git a/build-aux/flatpak/org.gnome.Nautilus.yml b/build-aux/flatpak/org.gnome.Nautilus.yml
index 555f95905..3e15f4b11 100644
--- a/build-aux/flatpak/org.gnome.Nautilus.yml
+++ b/build-aux/flatpak/org.gnome.Nautilus.yml
@@ -85,13 +85,12 @@ 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 c8f28ccb3..0cdad5668 100644
--- a/meson.build
+++ b/meson.build
@@ -111,10 +111,8 @@ 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.5')
-  libportal_gtk3 = dependency('libportal-gtk3', version: '>= 0.5')
+  libportal = dependency('libportal', version: '>= 0.3')
 endif
 selinux = []
 if get_option('selinux')
diff --git a/src/meson.build b/src/meson.build
index a8c650e97..95d40311e 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -275,7 +275,6 @@ nautilus_deps = [
   gnome_desktop,
   libhandy,
   libportal,
-  libportal_gtk3,
   nautilus_extension,
   selinux,
   tracker_sparql,
diff --git a/src/nautilus-files-view.c b/src/nautilus-files-view.c
index 27e161a6b..db83175f5 100644
--- a/src/nautilus-files-view.c
+++ b/src/nautilus-files-view.c
@@ -91,7 +91,7 @@
 
 #ifdef HAVE_LIBPORTAL
 #include <libportal/portal.h>
-#include <libportal-gtk3/portal-gtk3.h>
+#include <libportal/portal-gtk3.h>
 #endif
 
 /* Minimum starting update inverval */