[shotwell: 14/14] Merge branch 'wip/phako/flatpak' into 'master'

[Jens Georg <jensgeorg src gnome org>]

commit 4013f43a62ca437b01b03b3cf503c277c0113f79
Merge: 80b9417c 501613cc
Author: Jens Georg <mail jensge org>
Date:   Tue Jun 5 10:23:11 2018 +0000

    Merge branch 'wip/phako/flatpak' into 'master'
    
    Add flatpak for shotwell
    
    See merge request GNOME/shotwell!1

 flatpak/org.gnome.Shotwell.json               | 159 ++++++++++++++++++++++++++
 flatpak/org.gnome.Shotwell.nightly.flatpakref |   8 ++
 flatpak/patches/0001-wip-Temporary-fix.patch  |  25 ++++
 flatpak/patches/exiv2-no-builddir.patch       |  25 ++++
 flatpak/patches/libraw-pkgconfig.patch        |  43 +++++++
 meson.build                                   |   8 +-
 meson_options.txt                             |   1 +
 src/Application.vala                          |   4 +-
 src/camera/CameraTable.vala                   |  22 +++-
 9 files changed, 289 insertions(+), 6 deletions(-)
---