[nautilus/use-wallpaper-portal: 1/2] build, flatpak: Add libportal dependency
- From: Felipe Borges <felipeborges src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus/use-wallpaper-portal: 1/2] build, flatpak: Add libportal dependency
- Date: Mon, 24 Aug 2020 10:32:06 +0000 (UTC)
commit bce752522238a1d4c241ccae62cf36828ea29ed5
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 | 2 ++
src/meson.build | 4 ++++
5 files changed, 39 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..e704f3531 100644
--- a/build-aux/flatpak/org.gnome.Nautilus.yml
+++ b/build-aux/flatpak/org.gnome.Nautilus.yml
@@ -112,6 +112,15 @@ modules:
url: https://gitlab.gnome.org/GNOME/gnome-autoar.git
- buildsystem: meson
builddir: true
+- name: libportal
+ buildsystem: meson
+ builddir: true
+ config-opts:
+ - "--libdir=/app/lib"
+ - "--buildtype=debugoptimized"
+ sources:
+ - type: git
+ url: https://github.com/flatpak/libportal.git
name: nautilus
config-opts:
- "--libdir=/app/lib"
diff --git a/build-aux/flatpak/org.gnome.NautilusMaster.yml b/build-aux/flatpak/org.gnome.NautilusMaster.yml
index 10608aafd..6a1f09665 100644
--- a/build-aux/flatpak/org.gnome.NautilusMaster.yml
+++ b/build-aux/flatpak/org.gnome.NautilusMaster.yml
@@ -111,6 +111,15 @@ modules:
url: https://gitlab.gnome.org/GNOME/gnome-autoar.git
- buildsystem: meson
builddir: true
+- name: libportal
+ buildsystem: meson
+ builddir: true
+ config-opts:
+ - "--libdir=/app/lib"
+ - "--buildtype=debugoptimized"
+ sources:
+ - type: git
+ url: https://github.com/flatpak/libportal.git
name: nautilus
config-opts:
- "--libdir=/app/lib"
diff --git a/meson.build b/meson.build
index fca123061..1a56c3d6a 100644
--- a/meson.build
+++ b/meson.build
@@ -120,6 +120,7 @@ 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 = dependency('libportal', version: '>= 0.3', required: false)
selinux = []
if get_option('selinux')
selinux = dependency('libselinux', version: '>= 2.0')
@@ -157,6 +158,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', libportal.found())
conf.set('HAVE_SELINUX', get_option('selinux'))
#############################################################
diff --git a/src/meson.build b/src/meson.build
index 51cdb06f8..8d1042cc3 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -289,6 +289,10 @@ nautilus_deps = [
xml
]
+if libportal.found()
+ nautilus_deps += libportal
+endif
+
libnautilus = static_library(
'nautilus',
libnautilus_sources,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]