[nautilus/use-wallpaper-portal: 2/4] build, flatpak: Add libportal dependency




commit 4c4c4e06a0076eb5f1799db851ba3f8f77bcd77f
Author: Felipe Borges <felipeborges gnome org>
Date:   Mon Aug 24 11:31:28 2020 +0200

    build, flatpak: Add libportal dependency
    
    Fixes #795

 build-aux/flatpak/org.gnome.Nautilus.json      | 15 +++++++++++++++
 build-aux/flatpak/org.gnome.Nautilus.yml       |  9 +++++++++
 build-aux/flatpak/org.gnome.NautilusMaster.yml |  9 +++++++++
 meson.build                                    |  5 +++++
 meson_options.txt                              |  6 ++++++
 src/meson.build                                |  1 +
 6 files changed, 45 insertions(+)
---
diff --git a/build-aux/flatpak/org.gnome.Nautilus.json b/build-aux/flatpak/org.gnome.Nautilus.json
index ca95c384a..1bd442db5 100644
--- a/build-aux/flatpak/org.gnome.Nautilus.json
+++ b/build-aux/flatpak/org.gnome.Nautilus.json
@@ -152,6 +152,21 @@
         }
       ]
     },
+    {
+      "name": "libportal",
+      "buildsystem": "meson",
+      "builddir": true,
+      "config-opts": [
+        "--libdir=/app/lib",
+        "--buildtype=debugoptimized"
+      ],
+      "sources" : [
+        {
+          "type": "git",
+          "url": "https://github.com/flatpak/libportal.git";
+        }
+      ]
+    },
     {
       "buildsystem": "meson",
       "builddir": true,
diff --git a/build-aux/flatpak/org.gnome.Nautilus.yml b/build-aux/flatpak/org.gnome.Nautilus.yml
index f22736fa6..db9eefb23 100644
--- a/build-aux/flatpak/org.gnome.Nautilus.yml
+++ b/build-aux/flatpak/org.gnome.Nautilus.yml
@@ -110,6 +110,15 @@ modules:
   sources:
   - type: git
     url: https://gitlab.gnome.org/GNOME/gnome-autoar.git
+- name: libportal
+  buildsystem: meson
+  builddir: true
+  config-opts:
+  - "--libdir=/app/lib"
+  -  "--buildtype=debugoptimized"
+  sources:
+  - type: git
+    url: https://github.com/flatpak/libportal.git
 - buildsystem: meson
   builddir: true
   name: nautilus
diff --git a/build-aux/flatpak/org.gnome.NautilusMaster.yml b/build-aux/flatpak/org.gnome.NautilusMaster.yml
index 10608aafd..b149dfffc 100644
--- a/build-aux/flatpak/org.gnome.NautilusMaster.yml
+++ b/build-aux/flatpak/org.gnome.NautilusMaster.yml
@@ -109,6 +109,15 @@ modules:
   sources:
   - type: git
     url: https://gitlab.gnome.org/GNOME/gnome-autoar.git
+- name: libportal
+  buildsystem: meson
+  builddir: true
+  config-opts:
+  - "--libdir=/app/lib"
+  -  "--buildtype=debugoptimized"
+  sources:
+  - type: git
+    url: https://github.com/flatpak/libportal.git
 - buildsystem: meson
   builddir: true
   name: nautilus
diff --git a/meson.build b/meson.build
index fca123061..e61b307e0 100644
--- a/meson.build
+++ b/meson.build
@@ -120,6 +120,10 @@ gmodule = dependency('gmodule-no-export-2.0', version: glib_ver)
 gnome_autoar = dependency('gnome-autoar-0', version: '>= 0.2.1')
 gnome_desktop = dependency('gnome-desktop-3.0', version: '>= 3.0.0')
 gtk = dependency('gtk+-3.0', version: '>= 3.22.27')
+libportal = []
+if get_option('libportal')
+  libportal = dependency('libportal', version: '>= 0.3')
+endif
 selinux = []
 if get_option('selinux')
   selinux = dependency('libselinux', version: '>= 2.0')
@@ -157,6 +161,7 @@ conf.set_quoted('VERSION', '@0@-@VCS_TAG@'.format(meson.project_version()))
 
 conf.set('ENABLE_PACKAGEKIT', get_option('packagekit'))
 conf.set('ENABLE_PROFILING', get_option('profiling'))
+conf.set('HAVE_LIBPORTAL', get_option('libportal'))
 conf.set('HAVE_SELINUX', get_option('selinux'))
 
 #############################################################
diff --git a/meson_options.txt b/meson_options.txt
index fce5f16f9..6e781c4ef 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -26,6 +26,12 @@ option(
 ############
 # Features #
 ############
+option(
+  'libportal',
+  type: 'boolean',
+  value: true,
+  description: 'Enable using xdg-desktop-portals for desktop integration',
+)
 option(
   'packagekit',
   type: 'boolean',
diff --git a/src/meson.build b/src/meson.build
index 51cdb06f8..a1b9bdbd2 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -283,6 +283,7 @@ nautilus_deps = [
   gnome_autoar,
   gnome_desktop,
   libgd_dep,
+  libportal,
   nautilus_extension,
   selinux,
   tracker_sparql,


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