electron/patches/chromium/fix_export_zlib_symbols.patch

Ignoring revisions in .git-blame-ignore-revs. Click here to bypass and see the normal blame view.

23 lines
819 B
Diff
Raw Normal View History

From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Mon, 1 Jun 2020 15:30:47 -0800
Subject: fix: export zlib symbols
This patch sets ZLIB_DLL so that we properly export zlib symbols.
diff --git a/third_party/zlib/BUILD.gn b/third_party/zlib/BUILD.gn
chore: bump chromium to 116.0.5817.0 (main) (#38465) * chore: bump chromium in DEPS to 116.0.5793.3 * chore: update patches * chore: bump chromium in DEPS to 116.0.5795.0 * chore: update patches * chore: bump chromium in DEPS to 116.0.5797.0 * chore: update patches * chore: bump chromium in DEPS to 116.0.5799.0 * 4522192: [serial] Allow Bluetooth ports to be requested by service class ID. | https://chromium-review.googlesource.com/c/chromium/src/+/4522192 * 4545385: Create base::apple::Owned[frameworktype], use it for gfx::NativeEvent | https://chromium-review.googlesource.com/c/chromium/src/+/4545385 * chore: bump chromium in DEPS to 116.0.5801.0 * chore: update patches * 4562796: Use base::apple::Owned[frameworktype] for ui::PlatformEvent | https://chromium-review.googlesource.com/c/chromium/src/+/4562796 * 4559790: Manual raw_ptr rewrite: //base | https://chromium-review.googlesource.com/c/chromium/src/+/4559790 * chore: bump chromium in DEPS to 116.0.5803.0 * chore: update patches * chore: bump chromium in DEPS to 116.0.5805.2 * chore: update patches * 4547630: Move content/public/common/network_service_util.h to c/p/browser/ | https://chromium-review.googlesource.com/c/chromium/src/+/4547630 * 4510075: Adding extensions to network response experiment | https://chromium-review.googlesource.com/c/chromium/src/+/4510075 * 4566552: Auto-generate grd file for chrome://accessibility. | https://chromium-review.googlesource.com/c/chromium/src/+/4566552 * chore: bump chromium in DEPS to 116.0.5807.0 * chore: update patches * 4533536: [Privacy Hub] Geolocation manager used directly | https://chromium-review.googlesource.com/c/chromium/src/+/4533536 * chore: patch out ARC support from /chrome/browser 4571955: Convert /chrome/browser to use ARC | https://chromium-review.googlesource.com/c/chromium/src/+/4571955 * chore: bump chromium in DEPS to 116.0.5809.2 * chore: bump chromium in DEPS to 116.0.5811.0 * chore: update patches * 4573627: Adopt base::NoDestructor for KeyedService factories | https://chromium-review.googlesource.com/c/chromium/src/+/4573627 * 4576878: Reland "Shared Storage: Add mojo method for observing response headers" | https://chromium-review.googlesource.com/c/chromium/src/+/4576878 * chore: bump chromium in DEPS to 116.0.5813.0 * chore: update patches * fixup! 4566552: Auto-generate grd file for chrome://accessibility. | https://chromium-review.googlesource.com/c/chromium/src/+/4566552 * chore: fix up lint * test: (debug) use Promise.all in asan tests * chore: manually roll DEPS to 116.0.5815.0 * chore: update patches * 4585150: Convert /printing to use ARC | https://chromium-review.googlesource.com/c/chromium/src/+/4585150 * test: (asan) extend timeout, clean up debugging * chore: remove ARC chromium patch * chore: update patches after main sync * 4546398: Convert /chrome/browser to use ARC | https://chromium-review.googlesource.com/c/chromium/src/+/4546398 * build: add chrome_lib_arc for chromium_src/BUILD.gn sources * fixup! 4559790: Manual raw_ptr rewrite: //base | https://chromium-review.googlesource.com/c/chromium/src/+/4559790 --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: VerteDinde <vertedinde@electronjs.org> Co-authored-by: VerteDinde <keeleymhammond@gmail.com>
2023-06-09 23:08:36 +00:00
index 9b3971041dffa06d74999986dbacaf6fce89e49f..62834b3b9a7dc49f72172ffb5480c9c12c3635b4 100644
--- a/third_party/zlib/BUILD.gn
+++ b/third_party/zlib/BUILD.gn
chore: bump chromium to 113.0.5651.0 (main) (#37553) * chore: bump chromium in DEPS to 113.0.5645.0 * chore: update patches/chromium/mas_avoid_usage_of_private_macos_apis.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4300129 Fix simple code shear * chore: update patches/chromium/build_only_use_the_mas_build_config_in_the_required_components.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4297496 Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4327491 patch-fuzz update; no manual changes * chore: remove patches/chromium/fix_x11_window_restore_minimized_maximized_window.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4252946 Upstreamed by zcbenz, so local patch is no longer needed * chore: update chromium/printing.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4313019 Remove cookie parameter from PrintViewManagerBase::UpdatePrintSettings() * chore: remove NOTIMPLEMENTED BrowserProcessImpl::GetBreadcrumbPersistentStorageManager() Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4247145 method removed upstream, so we do not need to add a stub for it in the subclass * chore: remove PrintViewManagerElectron::UpdatePrintSettings() Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4313019 Previously, our implementation checked to see if we recognized the cookie param that was passed in. If so, we reported a bad message. Otherwise, we passed it up to the base class' UpdatePrintSettings(). CL4313019 removed the cookie param, so checking for a bad cookie param is no longer necessary / no longer possible. Since the only remaining task was to pass the work up to the base class, this commit removes the subclass implmentation entirely. * chore: update patches * chore: bump chromium in DEPS to 113.0.5647.0 * chore: bump chromium in DEPS to 113.0.5649.2 * chore: bump chromium in DEPS to 113.0.5651.0 * chore: update patches --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: deepak1556 <hop2deep@gmail.com>
2023-03-15 09:20:32 +00:00
@@ -326,6 +326,10 @@ component("zlib") {
defines = []
deps = []
+ if (is_win) {
+ defines += [ "ZLIB_DLL" ]
+ }
+
if (!use_x86_x64_optimizations && !use_arm_neon_optimizations) {
# Apparently android_cronet bot builds with NEON disabled and
# we also should disable optimizations for iOS@x86 (a.k.a. simulator).