From 7c40815fefdf1f7a165f041a27b8a49eef06ce1f Mon Sep 17 00:00:00 2001 From: liushuyu Date: Tue, 7 Jun 2022 18:45:48 -0600 Subject: [PATCH] patches: rebuild patches --- ...Move-webservice-settings-to-own-file.patch | 28 ++++++------ ...ve-dedicated_room-dependence-on-core.patch | 10 ++--- ...ix-web-service-after-core-separation.patch | 44 +++++++++++++++++++ ...ix-web-service-after-core-separation.patch | 33 -------------- 4 files changed, 63 insertions(+), 52 deletions(-) create mode 100644 patches/0003-Fix-web-service-after-core-separation.patch delete mode 100644 patches/0004-Fix-web-service-after-core-separation.patch diff --git a/patches/0001-Move-webservice-settings-to-own-file.patch b/patches/0001-Move-webservice-settings-to-own-file.patch index 79fef99..d189590 100644 --- a/patches/0001-Move-webservice-settings-to-own-file.patch +++ b/patches/0001-Move-webservice-settings-to-own-file.patch @@ -1,7 +1,7 @@ -From 8f0a2d3c2b03f8fc9c4d0dead498c430ea465be2 Mon Sep 17 00:00:00 2001 +From 494ce0b5ff9e63c5c83b1fdde52583120def998a Mon Sep 17 00:00:00 2001 From: Vitor Kiguchi Date: Thu, 20 Aug 2020 04:46:35 -0300 -Subject: [PATCH 1/4] Move webservice settings to own file +Subject: [PATCH 1/3] Move webservice settings to own file --- src/citra/config.cpp | 9 ++++---- @@ -23,7 +23,7 @@ Subject: [PATCH 1/4] Move webservice settings to own file create mode 100644 src/network/network_settings.h diff --git a/src/citra/config.cpp b/src/citra/config.cpp -index 6f747fcf5..3fa47b18f 100644 +index 5037c1b41..bcb97372b 100644 --- a/src/citra/config.cpp +++ b/src/citra/config.cpp @@ -18,6 +18,7 @@ @@ -34,7 +34,7 @@ index 6f747fcf5..3fa47b18f 100644 Config::Config() { // TODO: Don't hardcode the path; let the frontend decide where to put the config files. -@@ -270,12 +271,12 @@ void Config::ReadValues() { +@@ -275,12 +276,12 @@ void Config::ReadValues() { } // Web Service @@ -52,7 +52,7 @@ index 6f747fcf5..3fa47b18f 100644 // Video Dumping Settings::values.output_format = diff --git a/src/citra_qt/configuration/config.cpp b/src/citra_qt/configuration/config.cpp -index 28612bbd0..dc88444a7 100644 +index f318b2825..f48609849 100644 --- a/src/citra_qt/configuration/config.cpp +++ b/src/citra_qt/configuration/config.cpp @@ -15,6 +15,7 @@ @@ -63,7 +63,7 @@ index 28612bbd0..dc88444a7 100644 Config::Config() { // TODO: Don't hardcode the path; let the frontend decide where to put the config files. -@@ -696,15 +697,15 @@ void Config::ReadUpdaterValues() { +@@ -702,15 +703,15 @@ void Config::ReadUpdaterValues() { void Config::ReadWebServiceValues() { qt_config->beginGroup(QStringLiteral("WebService")); @@ -83,7 +83,7 @@ index 28612bbd0..dc88444a7 100644 ReadSetting(QStringLiteral("citra_token")).toString().toStdString(); qt_config->endGroup(); -@@ -1154,14 +1155,14 @@ void Config::SaveUpdaterValues() { +@@ -1160,14 +1161,14 @@ void Config::SaveUpdaterValues() { void Config::SaveWebServiceValues() { qt_config->beginGroup(QStringLiteral("WebService")); @@ -155,10 +155,10 @@ index cc7ca675f..e97a22720 100644 QMessageBox::warning( this, tr("Token not verified"), diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp -index f4ae1cb98..c4a0e8e53 100644 +index 607cd71b2..1c14da3d3 100644 --- a/src/citra_qt/main.cpp +++ b/src/citra_qt/main.cpp -@@ -83,6 +83,7 @@ +@@ -85,6 +85,7 @@ #include "core/savestate.h" #include "core/settings.h" #include "game_list_p.h" @@ -166,7 +166,7 @@ index f4ae1cb98..c4a0e8e53 100644 #include "ui_main.h" #include "video_core/renderer_base.h" #include "video_core/video_core.h" -@@ -128,7 +129,7 @@ void GMainWindow::ShowTelemetryCallout() { +@@ -130,7 +131,7 @@ void GMainWindow::ShowTelemetryCallout() { "data is collected to help improve Citra. " "

Would you like to share your usage data with us?"); if (QMessageBox::question(this, tr("Telemetry"), telemetry_message) != QMessageBox::Yes) { @@ -175,7 +175,7 @@ index f4ae1cb98..c4a0e8e53 100644 Settings::Apply(); } } -@@ -1595,7 +1596,7 @@ void GMainWindow::OnLoadComplete() { +@@ -1623,7 +1624,7 @@ void GMainWindow::OnLoadComplete() { } void GMainWindow::OnMenuReportCompatibility() { @@ -372,10 +372,10 @@ index 38acb4bac..9ae373192 100644 } diff --git a/src/core/settings.h b/src/core/settings.h -index 6030c0868..9aaac24f3 100644 +index e7339275c..98614deae 100644 --- a/src/core/settings.h +++ b/src/core/settings.h -@@ -232,12 +232,6 @@ struct Values { +@@ -230,12 +230,6 @@ struct Values { std::string log_filter; std::unordered_map lle_modules; @@ -566,5 +566,5 @@ index 000000000..eed1d56b4 + +} // namespace NetSettings -- -2.34.1 +2.36.1 diff --git a/patches/0002-remove-dedicated_room-dependence-on-core.patch b/patches/0002-remove-dedicated_room-dependence-on-core.patch index 8d2b6df..0b657fb 100644 --- a/patches/0002-remove-dedicated_room-dependence-on-core.patch +++ b/patches/0002-remove-dedicated_room-dependence-on-core.patch @@ -1,7 +1,7 @@ -From f10ca60ab74ae8be4d60d3a7808b02aef03b26d0 Mon Sep 17 00:00:00 2001 +From 689668c2e9c8d739e93560f7bd2f0093619c8df2 Mon Sep 17 00:00:00 2001 From: Vitor Kiguchi Date: Thu, 20 Aug 2020 16:54:01 -0300 -Subject: [PATCH 2/4] remove dedicated_room dependence on core +Subject: [PATCH 2/3] remove dedicated_room dependence on core --- src/citra_qt/multiplayer/chat_room.cpp | 2 +- @@ -24,7 +24,7 @@ Subject: [PATCH 2/4] remove dedicated_room dependence on core rename src/{core => network}/announce_multiplayer_session.h (98%) diff --git a/src/citra_qt/multiplayer/chat_room.cpp b/src/citra_qt/multiplayer/chat_room.cpp -index 440736978..6b303bc1e 100644 +index ffd9a0b68..1e4f2ff07 100644 --- a/src/citra_qt/multiplayer/chat_room.cpp +++ b/src/citra_qt/multiplayer/chat_room.cpp @@ -20,7 +20,7 @@ @@ -196,7 +196,7 @@ index 707efd5a4..3607d97af 100644 bool has_mod_perms = false; Network::RoomMember::CallbackHandle state_callback_handle; diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt -index 6b98a0d28..fdafd62e3 100644 +index 7cd900a9d..26fe48a57 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -1,7 +1,5 @@ @@ -308,5 +308,5 @@ index 5647972d0..97fd1e5b3 100644 -} // namespace Core +} // namespace Network -- -2.34.1 +2.36.1 diff --git a/patches/0003-Fix-web-service-after-core-separation.patch b/patches/0003-Fix-web-service-after-core-separation.patch new file mode 100644 index 0000000..69a0c04 --- /dev/null +++ b/patches/0003-Fix-web-service-after-core-separation.patch @@ -0,0 +1,44 @@ +From e01b6c031549854210d5847d792546417110ef0b Mon Sep 17 00:00:00 2001 +From: liushuyu +Date: Fri, 20 Aug 2021 05:46:35 -0600 +Subject: [PATCH 3/3] Fix web service after core separation + +--- + src/network/CMakeLists.txt | 8 ++++++++ + src/web_service/CMakeLists.txt | 3 ++- + 2 files changed, 10 insertions(+), 1 deletion(-) + +diff --git a/src/network/CMakeLists.txt b/src/network/CMakeLists.txt +index 1a9dfe836..f429e2d52 100644 +--- a/src/network/CMakeLists.txt ++++ b/src/network/CMakeLists.txt +@@ -17,4 +17,12 @@ add_library(network STATIC + + create_target_directory_groups(network) + ++if (ENABLE_WEB_SERVICE) ++ target_compile_definitions(network PRIVATE -DENABLE_WEB_SERVICE -DCPPHTTPLIB_OPENSSL_SUPPORT) ++ target_link_libraries(network PRIVATE web_service httplib) ++ if (ANDROID) ++ target_link_libraries(network PRIVATE ifaddrs) ++ endif() ++endif() ++ + target_link_libraries(network PRIVATE common enet Boost::serialization) +diff --git a/src/web_service/CMakeLists.txt b/src/web_service/CMakeLists.txt +index b43eae5d1..3b02f592a 100644 +--- a/src/web_service/CMakeLists.txt ++++ b/src/web_service/CMakeLists.txt +@@ -14,7 +14,8 @@ add_library(web_service STATIC + create_target_directory_groups(web_service) + + target_compile_definitions(web_service PRIVATE -DCPPHTTPLIB_OPENSSL_SUPPORT) +-target_link_libraries(web_service PRIVATE common network json-headers ${OPENSSL_LIBS} httplib cpp-jwt) ++target_link_libraries(web_service PRIVATE common network json-headers httplib cpp-jwt) ++target_link_libraries(web_service PUBLIC ${OPENSSL_LIBS}) + if (ANDROID) + target_link_libraries(web_service PRIVATE ifaddrs) + elseif(WIN32) +-- +2.36.1 + diff --git a/patches/0004-Fix-web-service-after-core-separation.patch b/patches/0004-Fix-web-service-after-core-separation.patch deleted file mode 100644 index 8265b49..0000000 --- a/patches/0004-Fix-web-service-after-core-separation.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 7e8299b9f50005b9fdab3da28f67db11090f7428 Mon Sep 17 00:00:00 2001 -From: liushuyu -Date: Fri, 20 Aug 2021 05:46:35 -0600 -Subject: [PATCH 4/4] Fix web service after core separation - ---- - src/network/CMakeLists.txt | 12 ++++++++++++ - 1 file changed, 12 insertions(+) - -diff --git a/src/network/CMakeLists.txt b/src/network/CMakeLists.txt -index 1a9dfe836..60dbebc90 100644 ---- a/src/network/CMakeLists.txt -+++ b/src/network/CMakeLists.txt -@@ -17,4 +17,16 @@ add_library(network STATIC - - create_target_directory_groups(network) - -+if (ENABLE_WEB_SERVICE) -+ get_directory_property(OPENSSL_LIBS -+ DIRECTORY ${PROJECT_SOURCE_DIR}/externals/libressl -+ DEFINITION OPENSSL_LIBS) -+ -+ target_compile_definitions(network PRIVATE -DENABLE_WEB_SERVICE -DCPPHTTPLIB_OPENSSL_SUPPORT) -+ target_link_libraries(network PRIVATE web_service ${OPENSSL_LIBS} httplib) -+ if (ANDROID) -+ target_link_libraries(network PRIVATE ifaddrs) -+ endif() -+endif() -+ - target_link_libraries(network PRIVATE common enet Boost::serialization) --- -2.34.1 -