From e48089daaa37ade0450b913a3f51d5dc2c50b790 Mon Sep 17 00:00:00 2001
From: scx <scx.mail@gmail.com>
Date: Tue, 23 Apr 2019 20:34:51 +0200
Subject: [PATCH 1/5] AppData file: Fix releases

Closes #5303
---
 com.rawtherapee.RawTherapee.appdata.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/com.rawtherapee.RawTherapee.appdata.xml b/com.rawtherapee.RawTherapee.appdata.xml
index 32cfe30c7..e4fb460c2 100644
--- a/com.rawtherapee.RawTherapee.appdata.xml
+++ b/com.rawtherapee.RawTherapee.appdata.xml
@@ -36,8 +36,8 @@
     <launchable type="desktop-id">rawtherapee.desktop</launchable>
     <releases>
         <release version="5.6" date="2019-04-20" type="stable"></release>
-        <release version="5.6-rc2" date="2019-04-17" type="development"></release>
-        <release version="5.6-rc1" date="2019-04-10" type="development"></release>
+        <release version="5.6~rc2" date="2019-04-17" type="development"></release>
+        <release version="5.6~rc1" date="2019-04-10" type="development"></release>
         <release version="5.5" date="2018-12-17" type="stable"></release>
     </releases>
     <provides>

From 01894609ce10453e420e78fa075ef10399e7f0c2 Mon Sep 17 00:00:00 2001
From: scx <scx.mail@gmail.com>
Date: Tue, 23 Apr 2019 20:52:14 +0200
Subject: [PATCH 2/5] AppData file: Add OARS info

---
 com.rawtherapee.RawTherapee.appdata.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/com.rawtherapee.RawTherapee.appdata.xml b/com.rawtherapee.RawTherapee.appdata.xml
index e4fb460c2..a53ccbf06 100644
--- a/com.rawtherapee.RawTherapee.appdata.xml
+++ b/com.rawtherapee.RawTherapee.appdata.xml
@@ -26,6 +26,7 @@
         <keyword>pp3</keyword>
         <keyword>graphics</keyword>
     </keywords>
+    <content_rating type="oars-1.0" />
     <metadata_license>CC-BY-SA-4.0</metadata_license>
     <project_license>GPL-3.0+</project_license>
     <url type="bugtracker">https://github.com/Beep6581/RawTherapee/issues/new</url>

From d8482d8e00ab7ffd2f4119a3557547c806331e08 Mon Sep 17 00:00:00 2001
From: Morgan Hardwood <bugs@londonlight.org>
Date: Wed, 24 Apr 2019 16:34:46 +0200
Subject: [PATCH 3/5] Bumped year in licence file

---
 LICENSE.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/LICENSE.txt b/LICENSE.txt
index 7fb1c6515..0aa0df7c8 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,6 +1,6 @@
     RawTherapee - A powerful, cross-platform raw image processing program.
     Copyright (C) 2004-2012 Gabor Horvath <hgabor@rawtherapee.com>
-    Copyright (C) 2010-2018 RawTherapee development team.
+    Copyright (C) 2010-2019 RawTherapee development team.
 
     RawTherapee is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

From 3289835ca1076b513ba8369c3f98886b5a27ee30 Mon Sep 17 00:00:00 2001
From: Morgan Hardwood <bugs@londonlight.org>
Date: Wed, 24 Apr 2019 16:36:29 +0200
Subject: [PATCH 4/5] Bumped minimum CMake version to 3.5, closes #5302

---
 CMakeLists.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8f48ac6f4..f13231586 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,8 +1,8 @@
+cmake_minimum_required(VERSION 3.5)
+
+# Compiler id for Apple Clang
 if(APPLE)
-    cmake_minimum_required(VERSION 3.3)
     cmake_policy(SET CMP0025 NEW)
-else()
-    cmake_minimum_required(VERSION 2.8.8)
 endif()
 
 # Must stay before the project() command:

From bd2ee13e7bcded7ecb8dc599d3c0c3488362dcd9 Mon Sep 17 00:00:00 2001
From: heckflosse <heckflosse67@gmx.de>
Date: Thu, 25 Apr 2019 21:09:35 +0200
Subject: [PATCH 5/5] revert commit 6e364e4, fixes #5308

---
 rtgui/thumbbrowserbase.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rtgui/thumbbrowserbase.cc b/rtgui/thumbbrowserbase.cc
index fd7032931..334f00e51 100644
--- a/rtgui/thumbbrowserbase.cc
+++ b/rtgui/thumbbrowserbase.cc
@@ -788,7 +788,7 @@ bool ThumbBrowserBase::Internal::on_key_press_event (GdkEventKey* event)
 bool ThumbBrowserBase::Internal::on_button_press_event (GdkEventButton* event)
 {
     // Gtk signals automatically acquire the GUI (i.e. this method is enclosed by gdk_thread_enter and gdk_thread_leave)
-    //grab_focus ();
+    grab_focus ();
 
     parent->eventTime = event->time;