Skip to content

Commit

Permalink
Upgrade to 106.0.5249.91 version (#11)
Browse files Browse the repository at this point in the history
Co-authored-by: rogurotus <[email protected]>
  • Loading branch information
instrumentisto-bot and rogurotus authored Oct 4, 2022
1 parent 4c93810 commit ba74672
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 21 deletions.
4 changes: 2 additions & 2 deletions VERSION
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ CCACHE_VERSION=4.6

# WebRTC doesn't have its own versioning, so we use Chromium versions:
# https://chromiumdash.appspot.com/releases
WEBRTC_VERSION=105.0.5195.125
WEBRTC_VERSION=106.0.5249.91
# Look for the concrete revision for WebRTC in:
# https://chromium.googlesource.com/chromium/src/+/refs/tags/<WEBRTC_VERSION>/DEPS
WEBRTC_COMMIT=42be4ae879ed6870dfc5ca554d11062b536da717
WEBRTC_COMMIT=17f085c1d7f6f0cad9e6041aa55a22594925eca5

PACKAGE_NAMES= \
linux-arm64 \
Expand Down
2 changes: 1 addition & 1 deletion build.windows.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ Exec { git apply --ignore-space-change -v $PATCH_DIR\add_licenses.patch }
Exec { git apply --ignore-space-change -v $PATCH_DIR\webrtc_voice_engine.patch }
Exec { git apply --ignore-space-change -v $PATCH_DIR\win_dynamic_crt.patch }
Exec { git apply --ignore-space-change -v $PATCH_DIR\windows_fix_towupper.patch }
Exec { git apply --ignore-space-change -v $PATCH_DIR\windows_fix_type_traits.patch }
Exec { git apply --ignore-space-change -v $PATCH_DIR\windows_fix_abseil.patch }
Pop-Location

Get-PSDrive
Expand Down
15 changes: 15 additions & 0 deletions patch/windows_fix_abseil.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
diff --git a/src/third_party/abseil-cpp/absl/types/internal/optional.h b/src/third_party/abseil-cpp/absl/types/internal/optional.h
index 6ed0c669..681acb7a 100644
--- a/src/third_party/abseil-cpp/absl/types/internal/optional.h
+++ b/src/third_party/abseil-cpp/absl/types/internal/optional.h
@@ -179,8 +179,8 @@ class optional_data_base : public optional_data_dtor_base<T> {
// Also, we should be checking is_trivially_copyable here, which is not
// supported now, so we use is_trivially_* traits instead.
template <typename T,
- bool unused = absl::is_trivially_copy_constructible<T>::value&&
- absl::is_trivially_copy_assignable<typename std::remove_cv<
+ bool unused = std::is_trivially_copy_constructible<T>::value&&
+ std::is_trivially_copy_assignable<typename std::remove_cv<
T>::type>::value&& std::is_trivially_destructible<T>::value>
class optional_data;

18 changes: 0 additions & 18 deletions patch/windows_fix_type_traits.patch

This file was deleted.

0 comments on commit ba74672

Please sign in to comment.