From ee3b3400b208f171f33e086d538d7c787349c1ee Mon Sep 17 00:00:00 2001
From: Fabio Valentini <decathorpe@gmail.com>
Date: Aug 27 2018 17:53:33 +0000
Subject: fix ftbfs issue with vala 0.42


---

diff --git a/00-fix-vala-042-type-error.patch b/00-fix-vala-042-type-error.patch
new file mode 100644
index 0000000..54d2cce
--- /dev/null
+++ b/00-fix-vala-042-type-error.patch
@@ -0,0 +1,13 @@
+diff --git a/src/direct/DirectPhotoPage.vala b/src/direct/DirectPhotoPage.vala
+index f44be66..509ec4b 100644
+--- a/src/direct/DirectPhotoPage.vala
++++ b/src/direct/DirectPhotoPage.vala
+@@ -435,7 +435,7 @@ public class DirectPhotoPage : EditingHostPage {
+      * Returns true if the code parameter matches the keycode of the keyval parameter for
+      * any keyboard group or level (in order to allow for non-QWERTY keyboards)
+      */
+-    protected bool match_keycode (int keyval, uint code) {
++    protected bool match_keycode (uint keyval, uint code) {
+         Gdk.KeymapKey [] keys;
+         Gdk.Keymap keymap = Gdk.Keymap.get_default ();
+         if (keymap.get_entries_for_keyval (keyval, out keys)) {
diff --git a/elementary-photos.spec b/elementary-photos.spec
index a005ec0..c4f7d8a 100644
--- a/elementary-photos.spec
+++ b/elementary-photos.spec
@@ -6,12 +6,16 @@
 Name:           elementary-photos
 Summary:        Photo manager and viewer from elementary
 Version:        0.2.5
-Release:        4%{?dist}
+Release:        5%{?dist}
 License:        LGPLv2+
 
 URL:            https://github.com/elementary/%{srcname}
 Source0:        %{url}/archive/%{version}/%{name}-%{version}.tar.gz
 
+# Add upstream change to fix building with vala 0.42+
+# https://github.com/elementary/photos/commit/c1f4887
+Patch0:         00-fix-vala-042-type-error.patch
+
 BuildRequires:  cmake
 BuildRequires:  desktop-file-utils
 BuildRequires:  gcc
@@ -107,6 +111,9 @@ appstream-util validate-relax --nonet \
 
 
 %changelog
+* Mon Aug 27 2018 Fabio Valentini <decathorpe@gmail.com> - 0.2.5-5
+- Fix FTBFS issue with vala 0.42.
+
 * Thu Jul 19 2018 Adam Williamson <awilliam@redhat.com> - 0.2.5-4
 - Rebuild for new libraw