graphics/eog
graphics/eog
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/eog synced 2024-10-18 14:04:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'pgriffis/update-libportal-usage' into 'master'

Browse source 
Update libportal usage

See merge request GNOME/eog!115
This commit is contained in:
Abderrahim Kitouni 2021-12-25 19:41:25 +00:00
parent d0d5b787c7 a06e632590
commit f61f6b1ba3
3 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
meson.build
View file

@ -165,11 +165,15 @@ config_h.set('HAVE_EXEMPI', enable_xmp)
# xdg-desktop-portal support with libportal (optional)
enable_libportal = get_option('libportal')
if enable_libportal
libportal_dep = dependency('libportal', version: '>= 0.3', required: false)
libportal_dep = dependency('libportal', version: '>= 0.5', required: false)
assert(libportal_dep.found() and cc.has_header('libportal/portal.h', dependencies: libportal_dep),
'xdg-desktop-portal support requested but library not found. Please use -Dlibportal=false')
common_deps += libportal_dep
libportal_gtk3_dep = dependency('libportal-gtk3', version: '>= 0.5', required: false)
assert(libportal_gtk3_dep.found() and cc.has_header('libportal-gtk3/portal-gtk3.h', dependencies: libportal_gtk3_dep),
'xdg-desktop-portal support requested but library not found. Please use -Dlibportal=false')
common_deps += [libportal_dep, libportal_gtk3_dep]
endif
config_h.set('HAVE_LIBPORTAL', enable_libportal)

9
org.gnome.Eog.json
View file

@ -48,16 +48,17 @@
{
"name" : "libportal",
"config-opts" : [
"--libdir=/app/lib",
"--buildtype=debugoptimized"
"--buildtype=debugoptimized",
"-Dbackends=gtk3",
"-Dintrospection=false",
"-Ddocs=false"
],
"buildsystem" : "meson",
"builddir" : true,
"sources" : [
{
"type" : "git",
"url" : "https://github.com/flatpak/libportal.git",
"tag" : "0.4"
"tag" : "0.5"
}
]
},

2
src/eog-util.c
View file

@ -45,7 +45,7 @@
#include <glib/gi18n.h>
#ifdef HAVE_LIBPORTAL
#include <libportal/portal.h>
#include <libportal/portal-gtk3.h>
#include <libportal-gtk3/portal-gtk3.h>
#endif
void