citra-emu
/
citra-canary
Archived
1
0
Fork 0
Code

Attempt to fix flatpak CI

This commit is contained in:
Hamish Milne 2020-03-28 15:10:35 +00:00
parent 03379b2072
commit 025960bcdd
4 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis/linux-flatpak/generate-data.sh
View File

@ -43,7 +43,7 @@ cat > /tmp/org.citra.$REPO_NAME.json <<EOF
{ {
"app-id": "org.citra.$REPO_NAME", "app-id": "org.citra.$REPO_NAME",
"runtime": "org.kde.Platform", "runtime": "org.kde.Platform",
"runtime-version": "5.12", "runtime-version": "5.13",
"sdk": "org.kde.Sdk", "sdk": "org.kde.Sdk",
"command": "citra-qt", "command": "citra-qt",
"rename-desktop-file": "citra.desktop", "rename-desktop-file": "citra.desktop",

2
externals/boost vendored

@ -1 +1 @@
Subproject commit 727f616b6e5cafaba072131c077a3b8fea87b8be Subproject commit a37867de91767e3289068997bc004f842894ce1f

1
src/audio_core/hle/hle.cpp
View File

@ -17,7 +17,6 @@
#elif HAVE_FDK #elif HAVE_FDK
#include "audio_core/hle/fdk_decoder.h" #include "audio_core/hle/fdk_decoder.h"
#endif #endif
#include <iostream>
#include "audio_core/hle/common.h" #include "audio_core/hle/common.h"
#include "audio_core/hle/decoder.h" #include "audio_core/hle/decoder.h"
#include "audio_core/hle/hle.h" #include "audio_core/hle/hle.h"

5
src/core/hle/kernel/process.cpp
View File

@ -33,9 +33,8 @@ void Process::serialize(Archive& ar, const unsigned int file_version) {
ar& resource_limit; ar& resource_limit;
ar& svc_access_mask; ar& svc_access_mask;
ar& handle_table_size; ar& handle_table_size;
ar&(boost::container::vector< ar&(boost::container::vector<AddressMapping, boost::container::dtl::static_storage_allocator<
AddressMapping, boost::container::dtl::static_storage_allocator<AddressMapping, 8>>&) AddressMapping, 8, 0, true>>&)address_mappings;
address_mappings;
ar& flags.raw; ar& flags.raw;
ar& kernel_version; ar& kernel_version;
ar& ideal_processor; ar& ideal_processor;