Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ports/qt5-webengine/build_1.patch
Original file line number Diff line number Diff line change
@@ -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
15 changes: 5 additions & 10 deletions ports/qt5-webengine/build_2.patch
Original file line number Diff line number Diff line change
@@ -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];
}

17 changes: 0 additions & 17 deletions ports/qt5-webengine/build_3.patch

This file was deleted.

3 changes: 1 addition & 2 deletions ports/qt5-webengine/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 1 addition & 0 deletions ports/qt5-webengine/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "qt5-webengine",
"version": "5.15.3",
"port-version": 1,
"description": "Qt5 webengine Module;",
"license": null,
"supports": "!static",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -5746,7 +5746,7 @@
},
"qt5-webengine": {
"baseline": "5.15.3",
"port-version": 0
"port-version": 1
},
"qt5-webglplugin": {
"baseline": "5.15.3",
Expand Down
5 changes: 5 additions & 0 deletions versions/q-/qt5-webengine.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "533cd8995acbdf2a8cc24a96da7515777dfe7c38",
"version": "5.15.3",
"port-version": 1
},
{
"git-tree": "4b097155aca1faecdaa639daec2395e9a8c0cdad",
"version": "5.15.3",
Expand Down