7
0
Files
nodejs-electron/chromium-norar.patch
Bruno Pitrus 27bbbd6d17 Accepting request 1059202 from home:dziobian:gulgul-ultron:19
- Update to 22.0.2
  * ABI break: NODE_MODULE_VERSION is now 110. Native modules may need recompiling
  * Chromium to 108.0.5359.179
  * Node v16.17.1
  * V8 v10.8
  * Added WebContents input-event event.
  * Deprecated BrowserWindow scroll-touch-* events.
  * The deprecated new-window event has been removed.
  * Added contextBridge.exposeInIsolatedWorld(worldId, key, api) to expose
    an API to an isolatedWorld within a renderer from a preload script.
  * Added webContents.close() method.
  * Added new UtilityProcess API to launch chromium child process with node integration.
  * Added new WebContents event content-bounds-updated.
  * Added support for navigator.mediaDevices.getDisplayMedia via a new
    session handler, ses.setDisplayMediaRequestHandler.
  * Added support for serialPort.forget() as well as a new event
    serial-port-revoked emitted when a given origin is revoked.
- Drop patches applied upstream
  * argument_spec-missing-isnan-isinf.patch
  * chromium-103.0.5060.53-python3-do-not-use-deprecated-mode-U.patch
  * content_language_parser-missing-string.patch
  * gtk_ui_platform_stub-incomplete-type-LinuxInputMethodContext.patch
  * node-system-libs.patch
  * pending_beacon_dispatcher-virtual-functions-cannot-be-constexpr.patch
  * std_lib_extras-missing-intptr_t.patch
  * system-abseil-missing-shims.patch
- Re-add electron_serial_delegate-ambiguous-Observer.patch due to upstream reintroducing the invalid code
- Add patches to fix build errors
  * chromium-108-abseil-shims.patch
  * crashpad-elf_image_reader-ProgramHeaderTableSpecific-expected-unqualified-id.patch
  * document_loader-private-DecodedBodyData.patch
  * first_party_set_parser-IssueWithMetadata-no-known-conversion.patch
  * print_dialog_gtk-no-kEnableOopPrintDriversJobPrint.patch
  * swiftshader-LLVMJIT-AddressSanitizerPass-dead-code-remove.patch
- Conditionally reverse upstream changes to fix build with old harfbuzz
  * harfbuzz-replace-chromium-scoped-type.patch
- Switch to bundled libjxl on Fedora 36 due to system version being too old

OBS-URL: https://build.opensuse.org/request/show/1059202
OBS-URL: https://build.opensuse.org/package/show/devel:languages:nodejs/nodejs-electron?expand=0&rev=57
2023-01-18 06:07:26 +00:00

98 lines
3.6 KiB
Diff

Index: electron-17.1.0/chrome/common/safe_browsing/BUILD.gn
===================================================================
--- electron-17.1.0.orig/chrome/common/safe_browsing/BUILD.gn 2022-03-07 17:20:32.164818543 +0100
+++ electron-17.1.0/chrome/common/safe_browsing/BUILD.gn 2022-03-09 08:25:16.218473339 +0100
@@ -58,39 +58,6 @@ if (safe_browsing_mode == 1) {
public_deps = [ "//components/safe_browsing/core/common/proto:csd_proto" ]
}
- source_set("rar_analyzer") {
- sources = [
- "rar_analyzer.cc",
- "rar_analyzer.h",
- ]
-
- deps = [
- ":archive_analyzer_results",
- ":download_type_util",
- "//base",
- "//base:i18n",
- "//components/safe_browsing/content/common:file_type_policies",
- "//components/safe_browsing/core/common",
- "//third_party/unrar:unrar",
- ]
-
- defines = [
- "_FILE_OFFSET_BITS=64",
- "LARGEFILE_SOURCE",
- "RAR_SMP",
- "SILENT",
-
- # The following is set to disable certain macro definitions in the unrar
- # source code.
- "CHROMIUM_UNRAR",
-
- # Disables exceptions in unrar, replaces them with process termination.
- "UNRAR_NO_EXCEPTIONS",
- ]
-
- public_deps = [ "//components/safe_browsing/core/common/proto:csd_proto" ]
- }
-
if (is_linux || is_win) {
source_set("document_analyzer") {
sources = [
@@ -189,7 +156,6 @@ source_set("safe_browsing") {
":archive_analyzer_results",
":binary_feature_extractor",
":download_type_util",
- ":rar_analyzer",
"//components/safe_browsing/core/common",
"//third_party/lzma_sdk/google:seven_zip_reader",
]
Index: electron-17.1.0/chrome/common/safe_browsing/DEPS
===================================================================
--- electron-17.1.0.orig/chrome/common/safe_browsing/DEPS 2022-03-07 17:20:32.164818543 +0100
+++ electron-17.1.0/chrome/common/safe_browsing/DEPS 2022-03-09 08:25:16.218473339 +0100
@@ -3,7 +3,6 @@ include_rules = [
"+components/safe_browsing/core/common",
"+third_party/maldoca",
"+third_party/protobuf",
- "+third_party/unrar",
"+third_party/zlib",
"+third_party/lzma_sdk/google",
]
Index: electron-17.1.0/chrome/services/file_util/BUILD.gn
===================================================================
--- electron-17.1.0.orig/chrome/services/file_util/BUILD.gn 2022-03-07 17:20:32.260818933 +0100
+++ electron-17.1.0/chrome/services/file_util/BUILD.gn 2022-03-09 08:25:16.218473339 +0100
@@ -60,7 +60,6 @@ source_set("file_util") {
deps += [
"//chrome/common/safe_browsing",
"//chrome/common/safe_browsing:archive_analyzer_results",
- "//chrome/common/safe_browsing:rar_analyzer",
]
if (is_linux || is_win) {
Index: electron-17.1.0/chrome/services/file_util/safe_archive_analyzer.cc
===================================================================
--- electron-17.1.0.orig/chrome/services/file_util/safe_archive_analyzer.cc 2022-03-07 17:20:32.264818949 +0100
+++ electron-17.1.0/chrome/services/file_util/safe_archive_analyzer.cc 2022-03-09 08:25:16.218473339 +0100
@@ -44,12 +44,16 @@ void SafeArchiveAnalyzer::AnalyzeDmgFile
void SafeArchiveAnalyzer::AnalyzeRarFile(base::File rar_file,
base::File temporary_file,
AnalyzeRarFileCallback callback) {
+#if 0
DCHECK(rar_file.IsValid());
safe_browsing::ArchiveAnalyzerResults results;
safe_browsing::rar_analyzer::AnalyzeRarFile(
std::move(rar_file), std::move(temporary_file), &results);
std::move(callback).Run(results);
+#else
+ NOTREACHED();
+#endif
}
void SafeArchiveAnalyzer::AnalyzeSevenZipFile(