From 4da4f5edbf9de5c4269cf66d70044f4cb3abdc41 Mon Sep 17 00:00:00 2001 From: Hiroki Tagato Date: Wed, 24 Nov 2021 17:28:24 +0900 Subject: devel/electron13: update to 13.6.2 (and rename from devel/electron12) Changelog: https://www.electronjs.org/blog/electron-13-0 --- .../files/patch-mojo_public_c_system_thunks.cc | 46 ++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 devel/electron13/files/patch-mojo_public_c_system_thunks.cc (limited to 'devel/electron13/files/patch-mojo_public_c_system_thunks.cc') diff --git a/devel/electron13/files/patch-mojo_public_c_system_thunks.cc b/devel/electron13/files/patch-mojo_public_c_system_thunks.cc new file mode 100644 index 000000000000..93e18d477750 --- /dev/null +++ b/devel/electron13/files/patch-mojo_public_c_system_thunks.cc @@ -0,0 +1,46 @@ +--- mojo/public/c/system/thunks.cc.orig 2021-01-07 00:36:37 UTC ++++ mojo/public/c/system/thunks.cc +@@ -20,7 +20,7 @@ + #include "mojo/public/c/system/core.h" + #include "mojo/public/c/system/macros.h" + +-#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_WIN) ++#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) + #include "base/environment.h" + #include "base/files/file_path.h" + #include "base/optional.h" +@@ -68,7 +68,7 @@ class CoreLibraryInitializer { + ~CoreLibraryInitializer() = default; + + MojoResult LoadLibrary(base::FilePath library_path) { +-#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_WIN) ++#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) + if (library_ && library_->is_valid()) + return MOJO_RESULT_OK; + +@@ -82,7 +82,7 @@ class CoreLibraryInitializer { + + if (library_path.empty()) { + // Default to looking for the library in the current working directory. +-#if defined(OS_CHROMEOS) || defined(OS_LINUX) ++#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD) + const base::FilePath::CharType kDefaultLibraryPathValue[] = + FILE_PATH_LITERAL("./libmojo_core.so"); + #elif defined(OS_WIN) +@@ -126,13 +126,13 @@ class CoreLibraryInitializer { + + library_ = std::move(library); + return MOJO_RESULT_OK; +-#else // defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_WIN) ++#else // defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) + return MOJO_RESULT_UNIMPLEMENTED; +-#endif // defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_WIN) ++#endif // defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) + } + + private: +-#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_WIN) ++#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) + base::Optional library_; + #endif + }; -- cgit v1.2.3