[eog: 2/2] Merge branch 'make-libportal-dep-optional' into 'master'

[Felix Riemann <friemann src gnome org>]

commit 52847923b54903775cf91b49af0fd49dc4d9293a
Merge: e47b0cef0 ca73abc36
Author: Felix Riemann <friemann gnome org>
Date:   Wed Jul 15 16:57:19 2020 +0000

    Merge branch 'make-libportal-dep-optional' into 'master'
    
    build: Make libportal dependency optional
    
    Closes #137
    
    See merge request GNOME/eog!66

 meson.build       | 13 ++++++++++++-
 meson_options.txt |  1 +
 src/eog-util.c    |  4 ++++
 src/eog-util.h    |  2 ++
 src/eog-window.c  |  7 +++++--
 src/meson.build   |  1 -
 6 files changed, 24 insertions(+), 4 deletions(-)
---