mirror of
https://github.com/microsoft/vcpkg.git
synced 2025-01-19 04:53:02 +08:00
[qt5-webengine] Fix apply patch failed (#23484)
* [qt5-webengine] Fix apply patch failed * update version Co-authored-by: Lily Wang <v-lilywang@microsoft.com>
This commit is contained in:
parent
1cbd04e45e
commit
183ba0e2f4
@ -1,12 +1,12 @@
|
||||
diff --git a/src/3rdparty/chromium/third_party/angle/BUILD.gn b/src/3rdparty/chromium/third_party/angle/BUILD.gn
|
||||
index ad7675f4e..4a43479d9 100644
|
||||
index fb57176..fa84cc5 100644
|
||||
--- a/src/3rdparty/chromium/third_party/angle/BUILD.gn
|
||||
+++ b/src/3rdparty/chromium/third_party/angle/BUILD.gn
|
||||
@@ -126,7 +126,6 @@ config("extra_warnings") {
|
||||
@@ -131,7 +131,6 @@ config("extra_warnings") {
|
||||
# Enable more default warnings on Windows.
|
||||
if (is_win) {
|
||||
cflags += [
|
||||
- "/we4244", # Conversion: possible loss of data.
|
||||
"/we4312", # Conversion: greater size.
|
||||
"/we4456", # Variable shadowing.
|
||||
"/we4458", # declaration hides class member.
|
||||
"/we4715", # not all control paths return a value
|
||||
|
@ -1,29 +1,24 @@
|
||||
diff --git a/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/circular_queue.h b/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/circular_queue.h
|
||||
index 59dbfad04..134357395 100644
|
||||
index 18ca770..5585a67 100644
|
||||
--- a/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/circular_queue.h
|
||||
+++ b/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/circular_queue.h
|
||||
@@ -74,7 +74,7 @@ class CircularQueue {
|
||||
@@ -74,16 +74,16 @@ class CircularQueue {
|
||||
return queue_->Get(pos_);
|
||||
}
|
||||
|
||||
- const T* operator->() const {
|
||||
+ T* operator->() const {
|
||||
#if PERFETTO_DCHECK_IS_ON()
|
||||
PERFETTO_DCHECK(generation_ == queue_->generation());
|
||||
#endif
|
||||
@@ -82,13 +82,13 @@ class CircularQueue {
|
||||
return const_cast<CircularQueue<T>::Iterator*>(this)->operator->();
|
||||
}
|
||||
|
||||
T& operator*() { return *(operator->()); }
|
||||
- const T& operator*() const { return *(operator->()); }
|
||||
+ T& operator*() const { return *(operator->()); }
|
||||
|
||||
value_type& operator[](difference_type i) {
|
||||
return *(*this + i);
|
||||
}
|
||||
value_type& operator[](difference_type i) { return *(*this + i); }
|
||||
|
||||
- const value_type& operator[](difference_type i) const {
|
||||
+ value_type& operator[](difference_type i) const {
|
||||
return *(*this + i);
|
||||
return const_cast<CircularQueue<T>::Iterator&>(*this)[i];
|
||||
}
|
||||
|
||||
|
@ -1,17 +0,0 @@
|
||||
diff --git a/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/lab_color_space.h b/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/lab_color_space.h
|
||||
index 78c316e04..fdb0312e0 100644
|
||||
--- a/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/lab_color_space.h
|
||||
+++ b/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/lab_color_space.h
|
||||
@@ -138,9 +138,9 @@ class LABColorSpace {
|
||||
clamp(lab.Z(), -128.0f, 128.0f)};
|
||||
|
||||
return {
|
||||
- invf((v.X() + 16.0f) / 116.0f + (v.Y() * 0.002f)) * kIlluminantD50.X(),
|
||||
- invf((v.X() + 16.0f) / 116.0f) * kIlluminantD50.Y(),
|
||||
- invf((v.X() + 16.0f) / 116.0f - (v.Z() * 0.005f)) * kIlluminantD50.Z()};
|
||||
+ (float)(invf((v.X() + 16.0f) / 116.0f + (v.Y() * 0.002f)) * kIlluminantD50.X()),
|
||||
+ (float)(invf((v.X() + 16.0f) / 116.0f) * kIlluminantD50.Y()),
|
||||
+ (float)(invf((v.X() + 16.0f) / 116.0f - (v.Z() * 0.005f)) * kIlluminantD50.Z())};
|
||||
}
|
||||
|
||||
private:
|
@ -44,8 +44,7 @@ vcpkg_add_to_path(PREPEND "${NINJA_DIR}")
|
||||
set(PATCHES common.pri.patch
|
||||
gl.patch
|
||||
build_1.patch
|
||||
build_2.patch
|
||||
build_3.patch)
|
||||
build_2.patch)
|
||||
|
||||
set(OPTIONS)
|
||||
if("proprietary-codecs" IN_LIST FEATURES)
|
||||
|
@ -1,6 +1,7 @@
|
||||
{
|
||||
"name": "qt5-webengine",
|
||||
"version": "5.15.3",
|
||||
"port-version": 1,
|
||||
"description": "Qt5 webengine Module;",
|
||||
"license": null,
|
||||
"supports": "!static",
|
||||
|
@ -5754,7 +5754,7 @@
|
||||
},
|
||||
"qt5-webengine": {
|
||||
"baseline": "5.15.3",
|
||||
"port-version": 0
|
||||
"port-version": 1
|
||||
},
|
||||
"qt5-webglplugin": {
|
||||
"baseline": "5.15.3",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "533cd8995acbdf2a8cc24a96da7515777dfe7c38",
|
||||
"version": "5.15.3",
|
||||
"port-version": 1
|
||||
},
|
||||
{
|
||||
"git-tree": "4b097155aca1faecdaa639daec2395e9a8c0cdad",
|
||||
"version": "5.15.3",
|
||||
|
Loading…
Reference in New Issue
Block a user