From 442850ac592193bb0b157b2b2f3ed5e5aeb5cec7 Mon Sep 17 00:00:00 2001
From: Douglas Rhine <59268455+dgcampea@users.noreply.github.com>
Date: Mon, 20 Apr 2020 15:08:50 +0100
Subject: [PATCH] chore(flatpak): update runtime to 5.14

---
 flatpak/build.sh                 |  2 +-
 flatpak/io.github.qtox.qTox.json | 24 +++++-------------------
 2 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/flatpak/build.sh b/flatpak/build.sh
index 38169a452..bb2fb7bcf 100755
--- a/flatpak/build.sh
+++ b/flatpak/build.sh
@@ -45,7 +45,7 @@ flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flat
 for i in {1..5}
 do
     echo "Download try $i"
-    flatpak --system install flathub -y org.kde.Sdk/x86_64/5.12 || true
+    flatpak --system install flathub -y org.kde.Sdk/x86_64/5.14 || true
 done
 ## Workaround end
 
diff --git a/flatpak/io.github.qtox.qTox.json b/flatpak/io.github.qtox.qTox.json
index 97aaada37..c5f9533cc 100644
--- a/flatpak/io.github.qtox.qTox.json
+++ b/flatpak/io.github.qtox.qTox.json
@@ -2,7 +2,7 @@
     "app-id": "io.github.qtox.qTox",
     "runtime": "org.kde.Platform",
     "sdk": "org.kde.Sdk",
-    "runtime-version": "5.12",
+    "runtime-version": "5.14",
     "command": "qtox",
     "rename-icon": "qtox",
     "finish-args": [
@@ -24,10 +24,13 @@
     "add-extensions": {
         "org.freedesktop.Platform.ffmpeg-full": {
             "directory": "lib/ffmpeg",
-            "version": "18.08",
+            "version": "19.08",
             "add-ld-path": "."
         }
     },
+    "cleanup-commands": [
+        "mkdir -p /app/lib/ffmpeg"
+    ],
     "cleanup": [
         "/include",
         "/lib/pkgconfig",
@@ -101,23 +104,6 @@
                 }
             ]
         },
-        {
-            /* Reminder: this is included in KDE 5.13 */
-            "name": "libqrencode",
-            "buildsystem": "cmake-ninja",
-            "config-opts": [
-                "-DWITH_TOOLS=NO",
-                "-DBUILD_SHARED_LIBS=ON"
-            ],
-            "sources": [
-                {
-                    "type": "git",
-                    "url": "https://github.com/fukuchi/libqrencode",
-                    "tag": "v4.0.2",
-                    "commit": "59ee597f913fcfda7a010a6e106fbee2595f68e4"
-                }
-            ]
-        },
         {
             "name": "c-toxcore",
             "buildsystem": "cmake-ninja",