From d84f6a7091c7eac12356bcd45e2ed5609b2c701c Mon Sep 17 00:00:00 2001
From: Nicolas Werner <nicolas.werner@hotmail.de>
Date: Mon, 28 Dec 2020 22:58:27 +0100
Subject: [PATCH 1/2] Link keychain in flatpak statically

---
 io.github.NhekoReborn.Nheko.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/io.github.NhekoReborn.Nheko.json b/io.github.NhekoReborn.Nheko.json
index 34b0d7e7..352ca648 100644
--- a/io.github.NhekoReborn.Nheko.json
+++ b/io.github.NhekoReborn.Nheko.json
@@ -97,7 +97,8 @@
     {
       "config-opts": [
         "-DCMAKE_BUILD_TYPE=Release",
-        "-DBUILD_TEST_APPLICATION=OFF"
+        "-DBUILD_TEST_APPLICATION=OFF",
+        "-DQTKEYCHAIN_STATIC=ON"
       ],
       "buildsystem": "cmake-ninja",
       "name": "QtKeychain",

From 63f0d6bf271a8112086dedc4f56c69dec4271bff Mon Sep 17 00:00:00 2001
From: Nicolas Werner <nicolas.werner@hotmail.de>
Date: Mon, 28 Dec 2020 23:34:42 +0100
Subject: [PATCH 2/2] Fix missing include on Windows

---
 src/UserSettingsPage.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/UserSettingsPage.h b/src/UserSettingsPage.h
index af73202e..6744d101 100644
--- a/src/UserSettingsPage.h
+++ b/src/UserSettingsPage.h
@@ -23,6 +23,8 @@
 #include <QSharedPointer>
 #include <QWidget>
 
+#include <optional>
+
 class Toggle;
 class QLabel;
 class QFormLayout;