forked from kiss-community/repo
80 lines
4.8 KiB
Diff
80 lines
4.8 KiB
Diff
diff --git a/third_party/rust/audio_thread_priority/Cargo.toml b/third_party/rust/audio_thread_priority/Cargo.toml
|
|
index 188eced..dabc898 100644
|
|
--- a/third_party/rust/audio_thread_priority/Cargo.toml
|
|
+++ b/third_party/rust/audio_thread_priority/Cargo.toml
|
|
@@ -34,7 +34,6 @@ optional = true
|
|
version = "0.15.0"
|
|
|
|
[features]
|
|
-default = ["with_dbus", "winapi"]
|
|
terminal-logging = ["simple_logger"]
|
|
with_dbus = ["dbus"]
|
|
[target."cfg(target_os = \"linux\")".dependencies.dbus]
|
|
diff --git a/third_party/rust/audio_thread_priority/.cargo-checksum.json b/third_party/rust/audio_thread_priority/.cargo-checksum.json
|
|
index 7e535d3..2c7d591 100644
|
|
--- a/third_party/rust/audio_thread_priority/.cargo-checksum.json
|
|
+++ b/third_party/rust/audio_thread_priority/.cargo-checksum.json
|
|
@@ -1 +1 @@
|
|
-{"files":{"Cargo.toml":"f2a927f4fdf4171eb2111ad9f770fd113d058d6d7dffa10fce7bd7577edda582","LICENSE":"32ee9dbf6196874fc9d406c54a888a6c4cbb9aa4a7f35b46befeaff43a78fe85","Makefile":"0f9a771cfb30c7c4b9961d82fdca4e9e229a955bb2e636474a4101389e18e938","README.md":"c123692b3b50dd621b896a8269814d609cbf1e532b461bf4a77854ddd607eb7a","atp_test.cpp":"8075a040941a65fb9e3f7cbf0535853ca6661c3ac442ec35569b42b24bbec797","audio_thread_priority.h":"f0ecaf1b674f794cde0dc834028e074d4e4675d22ae96acf08b2ae1dceb3474e","generate_osx_bindings.sh":"06e4e03450f788ced18d31fff5660919e6f6ec1119ddace363ffeb82f0518a71","src/lib.rs":"975de6a74e0adb999a08bc41f08a3bd68fe11c154731bc12c43df546ddb32949","src/mach_sys.rs":"352560fcb9b41d877cff92e5b3b04d6dc68b1f30508ce4b9aed78940120a883e","src/rt_linux.rs":"4ea9f6eb1902aff0126d1b957be7f723d599e9a8bbd75ca8013a2820ef5fe68a","src/rt_mach.rs":"e4587fdf640df37f251e50c6c9313f6a73eae4d54f4b8a84cefc6bc730e94be8","src/rt_win.rs":"c41f6e277051a92f8d38939cf9d78ee6deea736a4686b3bcd185492e47e1650a"},"package":"8b7cd1bfd03dab20ad72e0c5e58d65818d62c0d199d8dec8361053d0f073dbae"}
|
|
\ No newline at end of file
|
|
+{"files":{"Cargo.toml":"7c54f0856a9ee89d9f7b92085b7605cea741f72ea0df60754f4fa0076a19d9d5","LICENSE":"32ee9dbf6196874fc9d406c54a888a6c4cbb9aa4a7f35b46befeaff43a78fe85","Makefile":"0f9a771cfb30c7c4b9961d82fdca4e9e229a955bb2e636474a4101389e18e938","README.md":"c123692b3b50dd621b896a8269814d609cbf1e532b461bf4a77854ddd607eb7a","atp_test.cpp":"8075a040941a65fb9e3f7cbf0535853ca6661c3ac442ec35569b42b24bbec797","audio_thread_priority.h":"f0ecaf1b674f794cde0dc834028e074d4e4675d22ae96acf08b2ae1dceb3474e","generate_osx_bindings.sh":"06e4e03450f788ced18d31fff5660919e6f6ec1119ddace363ffeb82f0518a71","src/lib.rs":"975de6a74e0adb999a08bc41f08a3bd68fe11c154731bc12c43df546ddb32949","src/mach_sys.rs":"352560fcb9b41d877cff92e5b3b04d6dc68b1f30508ce4b9aed78940120a883e","src/rt_linux.rs":"4ea9f6eb1902aff0126d1b957be7f723d599e9a8bbd75ca8013a2820ef5fe68a","src/rt_mach.rs":"e4587fdf640df37f251e50c6c9313f6a73eae4d54f4b8a84cefc6bc730e94be8","src/rt_win.rs":"c41f6e277051a92f8d38939cf9d78ee6deea736a4686b3bcd185492e47e1650a"},"package":"8b7cd1bfd03dab20ad72e0c5e58d65818d62c0d199d8dec8361053d0f073dbae"}
|
|
\ No newline at end of file
|
|
diff --git a/toolkit/components/remote/moz.build b/toolkit/components/remote/moz.build
|
|
index d3bab6cf..656b32c7 100644
|
|
--- a/toolkit/components/remote/moz.build
|
|
+++ b/toolkit/components/remote/moz.build
|
|
@@ -26,7 +26,7 @@ if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
|
|
"nsUnixRemoteServer.h",
|
|
"RemoteUtils.h",
|
|
]
|
|
- else:
|
|
+ elif CONFIG["MOZ_X11"]:
|
|
SOURCES += [
|
|
"nsGTKRemoteServer.cpp",
|
|
"nsXRemoteClient.cpp",
|
|
diff --git a/toolkit/components/remote/nsRemoteService.cpp b/toolkit/components/remote/nsRemoteService.cpp
|
|
index ef4b95cb..4941f213 100644
|
|
--- a/toolkit/components/remote/nsRemoteService.cpp
|
|
+++ b/toolkit/components/remote/nsRemoteService.cpp
|
|
@@ -12,12 +12,14 @@
|
|
|
|
#ifdef MOZ_WIDGET_GTK
|
|
# include "mozilla/WidgetUtilsGtk.h"
|
|
-# ifdef MOZ_ENABLE_DBUS
|
|
+# if defined(MOZ_ENABLE_DBUS)
|
|
# include "nsDBusRemoteServer.h"
|
|
# include "nsDBusRemoteClient.h"
|
|
-# else
|
|
+# elif defined(MOZ_X11)
|
|
# include "nsGTKRemoteServer.h"
|
|
# include "nsXRemoteClient.h"
|
|
+# else
|
|
+# include "nsRemoteClient.h"
|
|
# endif
|
|
#elif defined(XP_WIN)
|
|
# include "nsWinRemoteServer.h"
|
|
@@ -102,8 +104,10 @@ RemoteResult nsRemoteService::StartClient(const char* aDesktopStartupID) {
|
|
#ifdef MOZ_WIDGET_GTK
|
|
# if defined(MOZ_ENABLE_DBUS)
|
|
client = MakeUnique<nsDBusRemoteClient>();
|
|
-# else
|
|
+# elif defined(MOZ_X11)
|
|
client = MakeUnique<nsXRemoteClient>();
|
|
+# else
|
|
+ return REMOTE_NOT_FOUND;
|
|
# endif
|
|
#elif defined(XP_WIN)
|
|
client = MakeUnique<nsWinRemoteClient>();
|
|
@@ -146,8 +150,10 @@ void nsRemoteService::StartupServer() {
|
|
#ifdef MOZ_WIDGET_GTK
|
|
# if defined(MOZ_ENABLE_DBUS)
|
|
mRemoteServer = MakeUnique<nsDBusRemoteServer>();
|
|
-# else
|
|
+# elif defined(MOZ_X11)
|
|
mRemoteServer = MakeUnique<nsGTKRemoteServer>();
|
|
+# else
|
|
+ return;
|
|
# endif
|
|
#elif defined(XP_WIN)
|
|
mRemoteServer = MakeUnique<nsWinRemoteServer>();
|