[nautilus/wip/exalm/dark: 140/141] build: Adapt to libportal changes




commit b7ee6f3ee2bf0210c84710380379e39309e29cb3
Author: Alexander Mikhaylenko <alexm gnome org>
Date:   Sat Dec 11 17:59:55 2021 +0500

    build: Adapt to libportal changes

 build-aux/flatpak/org.gnome.Nautilus.json | 6 +++---
 meson.build                               | 1 +
 src/meson.build                           | 1 +
 src/nautilus-files-view.c                 | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/build-aux/flatpak/org.gnome.Nautilus.json b/build-aux/flatpak/org.gnome.Nautilus.json
index 2857124c5..c0225e72d 100644
--- a/build-aux/flatpak/org.gnome.Nautilus.json
+++ b/build-aux/flatpak/org.gnome.Nautilus.json
@@ -118,13 +118,13 @@
       "builddir": true,
       "config-opts": [
         "--libdir=/app/lib",
-        "--buildtype=debugoptimized"
+        "--buildtype=debugoptimized",
+        "-Dbackends=['gtk3']"
       ],
       "sources" : [
         {
           "type": "git",
-          "url": "https://github.com/flatpak/libportal.git";,
-          "tag": "0.4"
+          "url": "https://github.com/flatpak/libportal.git";
         }
       ]
     },
diff --git a/meson.build b/meson.build
index 927216636..726c0d977 100644
--- a/meson.build
+++ b/meson.build
@@ -124,6 +124,7 @@ libhandy = dependency('libhandy-1', version: '>= 1.1.90')
 libportal = []
 if get_option('libportal')
   libportal = dependency('libportal', version: '>= 0.3')
+  libportal_gtk3 = dependency('libportal-gtk3', version: '>= 0.3')
 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 64ca4377b..61cb169b3 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 */


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]