diff options
-rw-r--r-- | build-aux/flatpak/org.gnome.Nautilus.json | 15 | ||||
-rw-r--r-- | build-aux/flatpak/org.gnome.Nautilus.yml | 9 | ||||
-rw-r--r-- | build-aux/flatpak/org.gnome.NautilusMaster.yml | 9 | ||||
-rw-r--r-- | meson.build | 5 | ||||
-rw-r--r-- | meson_options.txt | 6 | ||||
-rw-r--r-- | src/meson.build | 1 |
6 files changed, 45 insertions, 0 deletions
diff --git a/build-aux/flatpak/org.gnome.Nautilus.json b/build-aux/flatpak/org.gnome.Nautilus.json index 8956d6b68..ac9b215e0 100644 --- a/build-aux/flatpak/org.gnome.Nautilus.json +++ b/build-aux/flatpak/org.gnome.Nautilus.json @@ -108,6 +108,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, "name": "nautilus", diff --git a/build-aux/flatpak/org.gnome.Nautilus.yml b/build-aux/flatpak/org.gnome.Nautilus.yml index 7add949f5..3c11d5b98 100644 --- a/build-aux/flatpak/org.gnome.Nautilus.yml +++ b/build-aux/flatpak/org.gnome.Nautilus.yml @@ -76,6 +76,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 b467e6c40..20a21c6e2 100644 --- a/build-aux/flatpak/org.gnome.NautilusMaster.yml +++ b/build-aux/flatpak/org.gnome.NautilusMaster.yml @@ -75,6 +75,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 0939a4dac..6abf6325a 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 @@ -27,6 +27,12 @@ option( # Features # ############ option( + 'libportal', + type: 'boolean', + value: true, + description: 'Enable using xdg-desktop-portals for desktop integration', +) +option( 'packagekit', type: 'boolean', value: true, 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, |