From 025960bcdd486f9747dd25cefa89ff014b414b27 Mon Sep 17 00:00:00 2001
From: Hamish Milne <hamishmilne83@gmail.com>
Date: Sat, 28 Mar 2020 15:10:35 +0000
Subject: [PATCH] Attempt to fix flatpak CI

---
 .travis/linux-flatpak/generate-data.sh | 2 +-
 externals/boost                        | 2 +-
 src/audio_core/hle/hle.cpp             | 1 -
 src/core/hle/kernel/process.cpp        | 5 ++---
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/.travis/linux-flatpak/generate-data.sh b/.travis/linux-flatpak/generate-data.sh
index aaecd0500..799f0f1b8 100644
--- a/.travis/linux-flatpak/generate-data.sh
+++ b/.travis/linux-flatpak/generate-data.sh
@@ -43,7 +43,7 @@ cat > /tmp/org.citra.$REPO_NAME.json <<EOF
 {
     "app-id": "org.citra.$REPO_NAME",
     "runtime": "org.kde.Platform",
-    "runtime-version": "5.12",
+    "runtime-version": "5.13",
     "sdk": "org.kde.Sdk",
     "command": "citra-qt",
     "rename-desktop-file": "citra.desktop",
diff --git a/externals/boost b/externals/boost
index 727f616b6..a37867de9 160000
--- a/externals/boost
+++ b/externals/boost
@@ -1 +1 @@
-Subproject commit 727f616b6e5cafaba072131c077a3b8fea87b8be
+Subproject commit a37867de91767e3289068997bc004f842894ce1f
diff --git a/src/audio_core/hle/hle.cpp b/src/audio_core/hle/hle.cpp
index 6ced77481..f4e372f85 100644
--- a/src/audio_core/hle/hle.cpp
+++ b/src/audio_core/hle/hle.cpp
@@ -17,7 +17,6 @@
 #elif HAVE_FDK
 #include "audio_core/hle/fdk_decoder.h"
 #endif
-#include <iostream>
 #include "audio_core/hle/common.h"
 #include "audio_core/hle/decoder.h"
 #include "audio_core/hle/hle.h"
diff --git a/src/core/hle/kernel/process.cpp b/src/core/hle/kernel/process.cpp
index ea3449c21..b72081ad5 100644
--- a/src/core/hle/kernel/process.cpp
+++ b/src/core/hle/kernel/process.cpp
@@ -33,9 +33,8 @@ void Process::serialize(Archive& ar, const unsigned int file_version) {
     ar& resource_limit;
     ar& svc_access_mask;
     ar& handle_table_size;
-    ar&(boost::container::vector<
-        AddressMapping, boost::container::dtl::static_storage_allocator<AddressMapping, 8>>&)
-        address_mappings;
+    ar&(boost::container::vector<AddressMapping, boost::container::dtl::static_storage_allocator<
+                                                     AddressMapping, 8, 0, true>>&)address_mappings;
     ar& flags.raw;
     ar& kernel_version;
     ar& ideal_processor;