diff options
| author | António Fernandes <antoniojpfernandes@gmail.com> | 2021-12-21 23:30:27 +0000 |
|---|---|---|
| committer | António Fernandes <antoniojpfernandes@gmail.com> | 2021-12-21 23:30:27 +0000 |
| commit | 87b93eb803586b7c4c45316bc19722d1b4e9859c (patch) | |
| tree | 5191478197993d78b8db52f4eab1df63bd72bc0e | |
| parent | ae752ea07895b918683f664fe78950255f7faab0 (diff) | |
| download | nautilus-87b93eb803586b7c4c45316bc19722d1b4e9859c.tar.gz | |
Revert "general: Add libportal-gtk3 dependency"
This reverts commit ae752ea07895b918683f664fe78950255f7faab0
| -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, 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 4626fa0bb..927216636 100644 --- a/meson.build +++ b/meson.build @@ -122,10 +122,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 d7fb76d53..682d6f3a3 100644 --- a/src/meson.build +++ b/src/meson.build @@ -285,7 +285,6 @@ 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 61cb169b3..64ca4377b 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-gtk3/portal-gtk3.h> +#include <libportal/portal-gtk3.h> #endif /* Minimum starting update inverval */ |