* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/files/
@ 2016-12-01 14:04 Michael Palimaka
0 siblings, 0 replies; 17+ messages in thread
From: Michael Palimaka @ 2016-12-01 14:04 UTC (permalink / raw
To: gentoo-commits
commit: 006cf189250749e6a40080ebbf67ab9e9481881d
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 1 14:04:25 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Dec 1 14:04:34 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=006cf189
dev-qt/qtwebengine: remove patches accidentally introduced in 9f88b15ff6b650018934340b24e50d10eb15aa58
Package-Manager: portage-2.3.2
dev-qt/qtwebengine/files/a.patch | 381 ---------------------------------------
dev-qt/qtwebengine/files/b.patch | 49 -----
2 files changed, 430 deletions(-)
diff --git a/dev-qt/qtwebengine/files/a.patch b/dev-qt/qtwebengine/files/a.patch
deleted file mode 100644
index a522e8e..00000000
--- a/dev-qt/qtwebengine/files/a.patch
+++ /dev/null
@@ -1,381 +0,0 @@
-diff -ur qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime/src/3rdparty/chromium/base/base.gypi qtwebengine-opensource-src-5.6.0-beta-system-icu-utf/src/3rdparty/chromium/base/base.gypi
---- qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime/src/3rdparty/chromium/base/base.gypi 2016-01-12 03:01:20.875004550 +0100
-+++ qtwebengine-opensource-src-5.6.0-beta-system-icu-utf/src/3rdparty/chromium/base/base.gypi 2016-01-12 03:04:12.789946122 +0100
-@@ -621,8 +621,6 @@
- 'third_party/dmg_fp/dmg_fp.h',
- 'third_party/dmg_fp/dtoa_wrapper.cc',
- 'third_party/dmg_fp/g_fmt.cc',
-- 'third_party/icu/icu_utf.cc',
-- 'third_party/icu/icu_utf.h',
- 'third_party/superfasthash/superfasthash.c',
- 'third_party/xdg_mime/xdgmime.h',
- 'thread_task_runner_handle.cc',
-diff -ur qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime/src/3rdparty/chromium/base/BUILD.gn qtwebengine-opensource-src-5.6.0-beta-system-icu-utf/src/3rdparty/chromium/base/BUILD.gn
---- qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime/src/3rdparty/chromium/base/BUILD.gn 2016-01-12 03:03:08.040591492 +0100
-+++ qtwebengine-opensource-src-5.6.0-beta-system-icu-utf/src/3rdparty/chromium/base/BUILD.gn 2016-01-12 03:04:27.209025094 +0100
-@@ -504,8 +504,6 @@
- "third_party/dmg_fp/dmg_fp.h",
- "third_party/dmg_fp/dtoa_wrapper.cc",
- "third_party/dmg_fp/g_fmt.cc",
-- "third_party/icu/icu_utf.cc",
-- "third_party/icu/icu_utf.h",
- "third_party/superfasthash/superfasthash.c",
- "thread_task_runner_handle.cc",
- "thread_task_runner_handle.h",
-diff -ur qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime/src/3rdparty/chromium/base/files/file_path.cc qtwebengine-opensource-src-5.6.0-beta-system-icu-utf/src/3rdparty/chromium/base/files/file_path.cc
---- qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime/src/3rdparty/chromium/base/files/file_path.cc 2015-12-10 18:17:21.000000000 +0100
-+++ qtwebengine-opensource-src-5.6.0-beta-system-icu-utf/src/3rdparty/chromium/base/files/file_path.cc 2016-01-12 03:09:08.430565334 +0100
-@@ -20,7 +20,7 @@
-
- #if defined(OS_MACOSX)
- #include "base/mac/scoped_cftyperef.h"
--#include "base/third_party/icu/icu_utf.h"
-+#include <unicode/utf.h>
- #endif
-
- #if defined(OS_WIN)
-@@ -1140,9 +1140,9 @@
- int* index) {
- int codepoint = 0;
- while (*index < length && codepoint == 0) {
-- // CBU8_NEXT returns a value < 0 in error cases. For purposes of string
-+ // U8_NEXT returns a value < 0 in error cases. For purposes of string
- // comparison, we just use that value and flag it with DCHECK.
-- CBU8_NEXT(string, *index, length, codepoint);
-+ U8_NEXT(string, *index, length, codepoint);
- DCHECK_GT(codepoint, 0);
- if (codepoint > 0) {
- // Check if there is a subtable for this upper byte.
-diff -ur qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime/src/3rdparty/chromium/base/json/json_parser.cc qtwebengine-opensource-src-5.6.0-beta-system-icu-utf/src/3rdparty/chromium/base/json/json_parser.cc
---- qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime/src/3rdparty/chromium/base/json/json_parser.cc 2015-12-10 18:17:21.000000000 +0100
-+++ qtwebengine-opensource-src-5.6.0-beta-system-icu-utf/src/3rdparty/chromium/base/json/json_parser.cc 2016-01-12 03:12:23.701634827 +0100
-@@ -14,7 +14,7 @@
- #include "base/strings/stringprintf.h"
- #include "base/strings/utf_string_conversion_utils.h"
- #include "base/strings/utf_string_conversions.h"
--#include "base/third_party/icu/icu_utf.h"
-+#include <unicode/utf.h>
- #include "base/values.h"
-
- namespace base {
-@@ -616,8 +616,8 @@
- int32 next_char = 0;
-
- while (CanConsume(1)) {
-- pos_ = start_pos_ + index_; // CBU8_NEXT is postcrement.
-- CBU8_NEXT(start_pos_, index_, length, next_char);
-+ pos_ = start_pos_ + index_; // U8_NEXT is postcrement.
-+ U8_NEXT(start_pos_, index_, length, next_char);
- if (next_char < 0 || !IsValidCharacter(next_char)) {
- ReportError(JSONReader::JSON_UNSUPPORTED_ENCODING, 1);
- return false;
-@@ -710,7 +710,7 @@
- return false;
- }
- } else if (next_char == '"') {
-- --index_; // Rewind by one because of CBU8_NEXT.
-+ --index_; // Rewind by one because of U8_NEXT.
- out->Swap(&string);
- return true;
- } else {
-@@ -750,10 +750,10 @@
-
- // If this is a high surrogate, consume the next code unit to get the
- // low surrogate.
-- if (CBU16_IS_SURROGATE(code_unit16_high)) {
-+ if (U16_IS_SURROGATE(code_unit16_high)) {
- // Make sure this is the high surrogate. If not, it's an encoding
- // error.
-- if (!CBU16_IS_SURROGATE_LEAD(code_unit16_high))
-+ if (!U16_IS_SURROGATE_LEAD(code_unit16_high))
- return false;
-
- // Make sure that the token has more characters to consume the
-@@ -770,24 +770,24 @@
-
- NextNChars(3);
-
-- if (!CBU16_IS_TRAIL(code_unit16_low)) {
-+ if (!U16_IS_TRAIL(code_unit16_low)) {
- return false;
- }
-
-- uint32 code_point = CBU16_GET_SUPPLEMENTARY(code_unit16_high,
-- code_unit16_low);
-+ uint32 code_point = U16_GET_SUPPLEMENTARY(code_unit16_high,
-+ code_unit16_low);
- if (!IsValidCharacter(code_point))
- return false;
-
- offset = 0;
-- CBU8_APPEND_UNSAFE(code_unit8, offset, code_point);
-+ U8_APPEND_UNSAFE(code_unit8, offset, code_point);
- } else {
- // Not a surrogate.
-- DCHECK(CBU16_IS_SINGLE(code_unit16_high));
-+ DCHECK(U16_IS_SINGLE(code_unit16_high));
- if (!IsValidCharacter(code_unit16_high))
- return false;
-
-- CBU8_APPEND_UNSAFE(code_unit8, offset, code_unit16_high);
-+ U8_APPEND_UNSAFE(code_unit8, offset, code_unit16_high);
- }
-
- dest_string->append(code_unit8);
-@@ -804,9 +804,9 @@
- } else {
- char utf8_units[4] = { 0 };
- int offset = 0;
-- CBU8_APPEND_UNSAFE(utf8_units, offset, point);
-+ U8_APPEND_UNSAFE(utf8_units, offset, point);
- dest->Convert();
-- // CBU8_APPEND_UNSAFE can overwrite up to 4 bytes, so utf8_units may not be
-+ // U8_APPEND_UNSAFE can overwrite up to 4 bytes, so utf8_units may not be
- // zero terminated at this point. |offset| contains the correct length.
- dest->AppendString(std::string(utf8_units, offset));
- }
-diff -ur qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime/src/3rdparty/chromium/base/json/string_escape.cc qtwebengine-opensource-src-5.6.0-beta-system-icu-utf/src/3rdparty/chromium/base/json/string_escape.cc
---- qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime/src/3rdparty/chromium/base/json/string_escape.cc 2015-12-10 18:17:21.000000000 +0100
-+++ qtwebengine-opensource-src-5.6.0-beta-system-icu-utf/src/3rdparty/chromium/base/json/string_escape.cc 2016-01-12 03:12:46.093757468 +0100
-@@ -10,7 +10,7 @@
- #include "base/strings/stringprintf.h"
- #include "base/strings/utf_string_conversion_utils.h"
- #include "base/strings/utf_string_conversions.h"
--#include "base/third_party/icu/icu_utf.h"
-+#include <unicode/utf.h>
-
- namespace base {
-
-diff -ur qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime/src/3rdparty/chromium/base/strings/pattern.cc qtwebengine-opensource-src-5.6.0-beta-system-icu-utf/src/3rdparty/chromium/base/strings/pattern.cc
---- qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime/src/3rdparty/chromium/base/strings/pattern.cc 2015-12-10 18:17:21.000000000 +0100
-+++ qtwebengine-opensource-src-5.6.0-beta-system-icu-utf/src/3rdparty/chromium/base/strings/pattern.cc 2016-01-12 03:14:17.884254687 +0100
-@@ -4,13 +4,13 @@
-
- #include "base/strings/pattern.h"
-
--#include "base/third_party/icu/icu_utf.h"
-+#include <unicode/utf.h>
-
- namespace base {
-
- namespace {
-
--static bool IsWildcard(base_icu::UChar32 character) {
-+static bool IsWildcard(UChar32 character) {
- return character == '*' || character == '?';
- }
-
-@@ -37,9 +37,9 @@
- // Check if the chars match, if so, increment the ptrs.
- const CHAR* pattern_next = *pattern;
- const CHAR* string_next = *string;
-- base_icu::UChar32 pattern_char = next(&pattern_next, pattern_end);
-+ UChar32 pattern_char = next(&pattern_next, pattern_end);
- if (pattern_char == next(&string_next, string_end) &&
-- pattern_char != CBU_SENTINEL) {
-+ pattern_char != U_SENTINEL) {
- *pattern = pattern_next;
- *string = string_next;
- } else {
-@@ -133,20 +133,20 @@
- }
-
- struct NextCharUTF8 {
-- base_icu::UChar32 operator()(const char** p, const char* end) {
-- base_icu::UChar32 c;
-+ UChar32 operator()(const char** p, const char* end) {
-+ UChar32 c;
- int offset = 0;
-- CBU8_NEXT(*p, offset, end - *p, c);
-+ U8_NEXT(*p, offset, end - *p, c);
- *p += offset;
- return c;
- }
- };
-
- struct NextCharUTF16 {
-- base_icu::UChar32 operator()(const char16** p, const char16* end) {
-- base_icu::UChar32 c;
-+ UChar32 operator()(const char16** p, const char16* end) {
-+ UChar32 c;
- int offset = 0;
-- CBU16_NEXT(*p, offset, end - *p, c);
-+ U16_NEXT(*p, offset, end - *p, c);
- *p += offset;
- return c;
- }
-diff -ur qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime/src/3rdparty/chromium/base/strings/string_split.cc qtwebengine-opensource-src-5.6.0-beta-system-icu-utf/src/3rdparty/chromium/base/strings/string_split.cc
---- qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime/src/3rdparty/chromium/base/strings/string_split.cc 2015-12-10 18:17:21.000000000 +0100
-+++ qtwebengine-opensource-src-5.6.0-beta-system-icu-utf/src/3rdparty/chromium/base/strings/string_split.cc 2016-01-12 03:14:39.106365912 +0100
-@@ -6,7 +6,7 @@
-
- #include "base/logging.h"
- #include "base/strings/string_util.h"
--#include "base/third_party/icu/icu_utf.h"
-+#include <unicode/utf.h>
-
- namespace base {
-
-@@ -201,7 +201,7 @@
- void SplitString(const string16& str,
- char16 c,
- std::vector<string16>* result) {
-- DCHECK(CBU16_IS_SINGLE(c));
-+ DCHECK(U16_IS_SINGLE(c));
- *result = SplitStringT<string16, string16, char16>(
- str, c, TRIM_WHITESPACE, SPLIT_WANT_ALL);
-
-@@ -274,7 +274,7 @@
- void SplitStringDontTrim(StringPiece16 str,
- char16 c,
- std::vector<string16>* result) {
-- DCHECK(CBU16_IS_SINGLE(c));
-+ DCHECK(U16_IS_SINGLE(c));
- *result = SplitStringT<string16, string16, char16>(
- str, c, KEEP_WHITESPACE, SPLIT_WANT_ALL);
- }
-diff -ur qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime/src/3rdparty/chromium/base/strings/string_util.cc qtwebengine-opensource-src-5.6.0-beta-system-icu-utf/src/3rdparty/chromium/base/strings/string_util.cc
---- qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime/src/3rdparty/chromium/base/strings/string_util.cc 2015-12-10 18:17:21.000000000 +0100
-+++ qtwebengine-opensource-src-5.6.0-beta-system-icu-utf/src/3rdparty/chromium/base/strings/string_util.cc 2016-01-12 03:15:00.981480560 +0100
-@@ -24,7 +24,7 @@
- #include "base/strings/string_split.h"
- #include "base/strings/utf_string_conversion_utils.h"
- #include "base/strings/utf_string_conversions.h"
--#include "base/third_party/icu/icu_utf.h"
-+#include <unicode/utf.h>
- #include "build/build_config.h"
-
- // Remove when this entire file is in the base namespace.
-@@ -274,19 +274,19 @@
- return;
- }
- DCHECK_LE(byte_size, static_cast<uint32>(kint32max));
-- // Note: This cast is necessary because CBU8_NEXT uses int32s.
-+ // Note: This cast is necessary because U8_NEXT uses int32s.
- int32 truncation_length = static_cast<int32>(byte_size);
- int32 char_index = truncation_length - 1;
- const char* data = input.data();
-
-- // Using CBU8, we will move backwards from the truncation point
-+ // Using U8, we will move backwards from the truncation point
- // to the beginning of the string looking for a valid UTF8
- // character. Once a full UTF8 character is found, we will
- // truncate the string to the end of that character.
- while (char_index >= 0) {
- int32 prev = char_index;
-- base_icu::UChar32 code_point = 0;
-- CBU8_NEXT(data, char_index, truncation_length, code_point);
-+ UChar32 code_point = 0;
-+ U8_NEXT(data, char_index, truncation_length, code_point);
- if (!IsValidCharacter(code_point) ||
- !IsValidCodepoint(code_point)) {
- char_index = prev - 1;
-@@ -447,7 +447,7 @@
-
- while (char_index < src_len) {
- int32 code_point;
-- CBU8_NEXT(src, char_index, src_len, code_point);
-+ U8_NEXT(src, char_index, src_len, code_point);
- if (!IsValidCharacter(code_point))
- return false;
- }
-diff -ur qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime/src/3rdparty/chromium/base/strings/utf_string_conversion_utils.cc qtwebengine-opensource-src-5.6.0-beta-system-icu-utf/src/3rdparty/chromium/base/strings/utf_string_conversion_utils.cc
---- qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime/src/3rdparty/chromium/base/strings/utf_string_conversion_utils.cc 2015-12-10 18:17:21.000000000 +0100
-+++ qtwebengine-opensource-src-5.6.0-beta-system-icu-utf/src/3rdparty/chromium/base/strings/utf_string_conversion_utils.cc 2016-01-12 03:15:27.384618939 +0100
-@@ -4,7 +4,7 @@
-
- #include "base/strings/utf_string_conversion_utils.h"
-
--#include "base/third_party/icu/icu_utf.h"
-+#include <unicode/utf.h>
-
- namespace base {
-
-@@ -18,7 +18,7 @@
- // use a signed type for code_point. But this function returns false
- // on error anyway, so code_point_out is unsigned.
- int32 code_point;
-- CBU8_NEXT(src, *char_index, src_len, code_point);
-+ U8_NEXT(src, *char_index, src_len, code_point);
- *code_point_out = static_cast<uint32>(code_point);
-
- // The ICU macro above moves to the next char, we want to point to the last
-@@ -33,16 +33,16 @@
- int32 src_len,
- int32* char_index,
- uint32* code_point) {
-- if (CBU16_IS_SURROGATE(src[*char_index])) {
-- if (!CBU16_IS_SURROGATE_LEAD(src[*char_index]) ||
-+ if (U16_IS_SURROGATE(src[*char_index])) {
-+ if (!U16_IS_SURROGATE_LEAD(src[*char_index]) ||
- *char_index + 1 >= src_len ||
-- !CBU16_IS_TRAIL(src[*char_index + 1])) {
-+ !U16_IS_TRAIL(src[*char_index + 1])) {
- // Invalid surrogate pair.
- return false;
- }
-
- // Valid surrogate pair.
-- *code_point = CBU16_GET_SUPPLEMENTARY(src[*char_index],
-+ *code_point = U16_GET_SUPPLEMENTARY(src[*char_index],
- src[*char_index + 1]);
- (*char_index)++;
- } else {
-@@ -76,30 +76,30 @@
- }
-
-
-- // CBU8_APPEND_UNSAFE can append up to 4 bytes.
-+ // U8_APPEND_UNSAFE can append up to 4 bytes.
- size_t char_offset = output->length();
- size_t original_char_offset = char_offset;
-- output->resize(char_offset + CBU8_MAX_LENGTH);
-+ output->resize(char_offset + U8_MAX_LENGTH);
-
-- CBU8_APPEND_UNSAFE(&(*output)[0], char_offset, code_point);
-+ U8_APPEND_UNSAFE(&(*output)[0], char_offset, code_point);
-
-- // CBU8_APPEND_UNSAFE will advance our pointer past the inserted character, so
-+ // U8_APPEND_UNSAFE will advance our pointer past the inserted character, so
- // it will represent the new length of the string.
- output->resize(char_offset);
- return char_offset - original_char_offset;
- }
-
- size_t WriteUnicodeCharacter(uint32 code_point, string16* output) {
-- if (CBU16_LENGTH(code_point) == 1) {
-+ if (U16_LENGTH(code_point) == 1) {
- // Thie code point is in the Basic Multilingual Plane (BMP).
- output->push_back(static_cast<char16>(code_point));
- return 1;
- }
- // Non-BMP characters use a double-character encoding.
- size_t char_offset = output->length();
-- output->resize(char_offset + CBU16_MAX_LENGTH);
-- CBU16_APPEND_UNSAFE(&(*output)[0], char_offset, code_point);
-- return CBU16_MAX_LENGTH;
-+ output->resize(char_offset + U16_MAX_LENGTH);
-+ U16_APPEND_UNSAFE(&(*output)[0], char_offset, code_point);
-+ return U16_MAX_LENGTH;
- }
-
- // Generalized Unicode converter -----------------------------------------------
-diff -ur qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime/src/3rdparty/chromium/ui/gfx/utf16_indexing.cc qtwebengine-opensource-src-5.6.0-beta-system-icu-utf/src/3rdparty/chromium/ui/gfx/utf16_indexing.cc
---- qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime/src/3rdparty/chromium/ui/gfx/utf16_indexing.cc 2015-12-10 18:17:21.000000000 +0100
-+++ qtwebengine-opensource-src-5.6.0-beta-system-icu-utf/src/3rdparty/chromium/ui/gfx/utf16_indexing.cc 2016-01-12 03:15:51.205743785 +0100
-@@ -5,13 +5,13 @@
- #include "ui/gfx/utf16_indexing.h"
-
- #include "base/logging.h"
--#include "base/third_party/icu/icu_utf.h"
-+#include <unicode/utf.h>
-
- namespace gfx {
-
- bool IsValidCodePointIndex(const base::string16& s, size_t index) {
- return index == 0 || index == s.length() ||
-- !(CBU16_IS_TRAIL(s[index]) && CBU16_IS_LEAD(s[index - 1]));
-+ !(U16_IS_TRAIL(s[index]) && U16_IS_LEAD(s[index - 1]));
- }
-
- ptrdiff_t UTF16IndexToOffset(const base::string16& s, size_t base, size_t pos) {
diff --git a/dev-qt/qtwebengine/files/b.patch b/dev-qt/qtwebengine/files/b.patch
deleted file mode 100644
index dffa81e..00000000
--- a/dev-qt/qtwebengine/files/b.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -ur qtwebengine-opensource-src-5.6.0-beta/src/3rdparty/chromium/base/base.gypi qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime/src/3rdparty/chromium/base/base.gypi
---- qtwebengine-opensource-src-5.6.0-beta/src/3rdparty/chromium/base/base.gypi 2015-12-10 18:17:21.000000000 +0100
-+++ qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime/src/3rdparty/chromium/base/base.gypi 2016-01-12 03:01:20.875004550 +0100
-@@ -623,8 +623,6 @@
- 'third_party/dmg_fp/g_fmt.cc',
- 'third_party/icu/icu_utf.cc',
- 'third_party/icu/icu_utf.h',
-- 'third_party/nspr/prtime.cc',
-- 'third_party/nspr/prtime.h',
- 'third_party/superfasthash/superfasthash.c',
- 'third_party/xdg_mime/xdgmime.h',
- 'thread_task_runner_handle.cc',
-diff -ur qtwebengine-opensource-src-5.6.0-beta/src/3rdparty/chromium/base/BUILD.gn qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime/src/3rdparty/chromium/base/BUILD.gn
---- qtwebengine-opensource-src-5.6.0-beta/src/3rdparty/chromium/base/BUILD.gn 2015-12-10 18:17:21.000000000 +0100
-+++ qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime/src/3rdparty/chromium/base/BUILD.gn 2016-01-12 03:03:08.040591492 +0100
-@@ -506,8 +506,6 @@
- "third_party/dmg_fp/g_fmt.cc",
- "third_party/icu/icu_utf.cc",
- "third_party/icu/icu_utf.h",
-- "third_party/nspr/prtime.cc",
-- "third_party/nspr/prtime.h",
- "third_party/superfasthash/superfasthash.c",
- "thread_task_runner_handle.cc",
- "thread_task_runner_handle.h",
-diff -ur qtwebengine-opensource-src-5.6.0-beta/src/3rdparty/chromium/base/time/pr_time_unittest.cc qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime/src/3rdparty/chromium/base/time/pr_time_unittest.cc
---- qtwebengine-opensource-src-5.6.0-beta/src/3rdparty/chromium/base/time/pr_time_unittest.cc 2015-12-10 18:17:21.000000000 +0100
-+++ qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime/src/3rdparty/chromium/base/time/pr_time_unittest.cc 2016-01-12 03:01:20.876004555 +0100
-@@ -6,7 +6,7 @@
- #include <time.h>
-
- #include "base/compiler_specific.h"
--#include "base/third_party/nspr/prtime.h"
-+#include <nspr4/prtime.h>
- #include "base/time/time.h"
- #include "testing/gtest/include/gtest/gtest.h"
-
-diff -ur qtwebengine-opensource-src-5.6.0-beta/src/3rdparty/chromium/base/time/time.cc qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime/src/3rdparty/chromium/base/time/time.cc
---- qtwebengine-opensource-src-5.6.0-beta/src/3rdparty/chromium/base/time/time.cc 2015-12-10 18:17:21.000000000 +0100
-+++ qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime/src/3rdparty/chromium/base/time/time.cc 2016-01-12 03:01:20.877004561 +0100
-@@ -13,7 +13,8 @@
- #include "base/lazy_instance.h"
- #include "base/logging.h"
- #include "base/strings/stringprintf.h"
--#include "base/third_party/nspr/prtime.h"
-+
-+#include <nspr4/prtime.h>
-
- namespace base {
-
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/files/
@ 2018-05-13 6:56 Andreas Sturmlechner
0 siblings, 0 replies; 17+ messages in thread
From: Andreas Sturmlechner @ 2018-05-13 6:56 UTC (permalink / raw
To: gentoo-commits
commit: d8d2a3d1cc7d33634719ff54cda6ddec7665b2ba
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sat May 12 15:26:27 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun May 13 06:56:32 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8d2a3d1
dev-qt/qtwebengine: remove unused patch
.../files/qtwebengine-paxmark-mksnapshot.patch | 46 ----------------------
1 file changed, 46 deletions(-)
diff --git a/dev-qt/qtwebengine/files/qtwebengine-paxmark-mksnapshot.patch b/dev-qt/qtwebengine/files/qtwebengine-paxmark-mksnapshot.patch
deleted file mode 100644
index c71cedc223e..00000000000
--- a/dev-qt/qtwebengine/files/qtwebengine-paxmark-mksnapshot.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- qtwebengine-opensource-src-5.6.0-orig/src/3rdparty/chromium/v8/tools/gyp/v8.gyp 2016-03-04 01:48:36.000000000 +1100
-+++ qtwebengine-opensource-src-5.6.0/src/3rdparty/chromium/v8/tools/gyp/v8.gyp 2016-05-01 19:15:44.052770543 +1000
-@@ -33,6 +33,7 @@
- 'embed_script%': "",
- 'v8_extra_library_files%': [],
- 'mksnapshot_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mksnapshot<(EXECUTABLE_SUFFIX)',
-+ 'mksnapshot_u_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mksnapshot_u<(EXECUTABLE_SUFFIX)',
- 'remove_v8base_debug_symbols%': 0,
- },
- 'includes': ['../../build/toolchain.gypi', '../../build/features.gypi'],
-@@ -1913,7 +1914,7 @@
- ]
- },
- {
-- 'target_name': 'mksnapshot',
-+ 'target_name': 'mksnapshot_u',
- 'type': 'executable',
- 'dependencies': ['v8_base', 'v8_nosnapshot', 'v8_libplatform'],
- 'include_dirs+': [
-@@ -1936,5 +1937,26 @@
- }],
- ],
- },
-+ {
-+ 'target_name': 'mksnapshot',
-+ 'type': 'executable',
-+ 'dependencies': ['mksnapshot_u'],
-+ 'actions': [
-+ {
-+ 'action_name': 'paxmark_m_mksnapshot',
-+ 'inputs': [
-+ '<(mksnapshot_u_exec)',
-+ ],
-+ 'outputs': [
-+ '<(mksnapshot_exec)',
-+ ],
-+ 'action': [
-+ 'sh',
-+ '-c',
-+ 'cp <(mksnapshot_u_exec) <(mksnapshot_exec) && paxmark.sh m <(mksnapshot_exec)',
-+ ],
-+ },
-+ ],
-+ },
- ],
- }
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/files/
@ 2021-04-28 15:14 Thomas Deutschmann
0 siblings, 0 replies; 17+ messages in thread
From: Thomas Deutschmann @ 2021-04-28 15:14 UTC (permalink / raw
To: gentoo-commits
commit: 0fea9a89d6f5b1fa93dd5c5d50b424e970227240
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 28 14:52:09 2021 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Apr 28 15:14:34 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0fea9a89
dev-qt/qtwebengine: Fix missing #includes for gcc-11
Link 1: https://github.com/abseil/abseil-cpp/commit/5bf048b8425cc0a342e4647932de19e25ffd6ad7
Closes: https://bugs.gentoo.org/786231
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
.../files/qtwebengine-5.15.2_p20210406-gcc11.patch | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210406-gcc11.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210406-gcc11.patch
index ececf6896cc..7411567e74f 100644
--- a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210406-gcc11.patch
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210406-gcc11.patch
@@ -111,3 +111,16 @@ index 657a3c96b..ad641a082 100644
#include "components/bookmarks/browser/base_bookmark_model_observer.h"
namespace bookmarks {
+diff --git a/src/3rdparty/chromium/third_party/abseil-cpp/absl/synchronization/internal/graphcycles.cc b/src/3rdparty/chromium/third_party/abseil-cpp/absl/synchronization/internal/graphcycles.cc
+index 19f9aab5b..27fec2168 100644
+--- a/src/3rdparty/chromium/third_party/abseil-cpp/absl/synchronization/internal/graphcycles.cc
++++ b/src/3rdparty/chromium/third_party/abseil-cpp/absl/synchronization/internal/graphcycles.cc
+@@ -37,6 +37,7 @@
+
+ #include <algorithm>
+ #include <array>
++#include <limits>
+ #include "absl/base/internal/hide_ptr.h"
+ #include "absl/base/internal/raw_logging.h"
+ #include "absl/base/internal/spinlock.h"
+
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/files/
@ 2022-06-14 17:35 Andreas Sturmlechner
0 siblings, 0 replies; 17+ messages in thread
From: Andreas Sturmlechner @ 2022-06-14 17:35 UTC (permalink / raw
To: gentoo-commits
commit: 99a0d763f18b60559b52174c0586ab1eb6d5d785
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 14 17:34:30 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jun 14 17:34:30 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99a0d763
dev-qt/qtwebengine: Drop obsolete patch
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
| 12 ------------
1 file changed, 12 deletions(-)
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.2-extra_gn.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.2-extra_gn.patch
deleted file mode 100644
index 0488122ce92f..000000000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.15.2-extra_gn.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/core/gn_run.pro b/src/core/gn_run.pro
-index 3d6fda80e..3d0bc86fe 100644
---- a/src/core/gn_run.pro
-+++ b/src/core/gn_run.pro
-@@ -38,5 +38,6 @@ build_pass|!debug_and_release {
- }
-
-+ gn_args += $$(EXTRA_GN)
- gn_args = $$system_quote($$gn_args)
- gn_src_root = $$system_quote($$system_path($$QTWEBENGINE_ROOT/$$getChromiumSrcDir()))
- gn_build_root = $$system_quote($$system_path($$OUT_PWD/$$getConfigDir()))
- gn_python = "--script-executable=$$pythonPathForSystem()"
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/files/
@ 2022-12-10 12:25 Andreas Sturmlechner
0 siblings, 0 replies; 17+ messages in thread
From: Andreas Sturmlechner @ 2022-12-10 12:25 UTC (permalink / raw
To: gentoo-commits
commit: 995ec51fc37c00c9d554740c270692fdd51e6a24
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 10 12:17:00 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Dec 10 12:23:53 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=995ec51f
dev-qt/qtwebengine: Drop obsolete patch
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...gine-5.15.5_p20220618-fixup-CVE-2022-0796.patch | 48 ----------------------
1 file changed, 48 deletions(-)
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.5_p20220618-fixup-CVE-2022-0796.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.5_p20220618-fixup-CVE-2022-0796.patch
deleted file mode 100644
index c38bf1bdeeb3..000000000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.15.5_p20220618-fixup-CVE-2022-0796.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 7e11d69b957595a172a3eb60db17141daed29d63 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michael=20Br=C3=BCning?= <michael.bruning@qt.io>
-Date: Mon, 20 Jun 2022 17:19:58 +0200
-Subject: Fixup: CVE-2022-0796: Use after free in Media
-
-Commit ecc2bb74f1f accidentally introduced a build break due to an
-apparent typo.
-
-This fixes it.
-
-Change-Id: I746c6f10ecd2b212b847a291677e24e527d6b922
-Reviewed-by: Michal Klocek <michal.klocek@qt.io>
----
- chromium/content/renderer/media/batching_media_log.h | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/src/3rdparty/chromium/content/renderer/media/batching_media_log.h b/src/3rdparty/chromium/content/renderer/media/batching_media_log.h
-index b68535aea42..a28d426878f 100644
---- a/src/3rdparty/chromium/content/renderer/media/batching_media_log.h
-+++ b/src/3rdparty/chromium/content/renderer/media/batching_media_log.h
-@@ -72,18 +72,18 @@ class CONTENT_EXPORT BatchingMediaLog : public media::MediaLog {
- // guarantees provided by MediaLog, since SendQueuedMediaEvents must also
- // be synchronized with respect to AddEvent.
- mutable base::Lock lock_;
-- const base::TickClock* tick_clock_ GUARDED_BY(LOCK);
-- base::TimeTicks last_ipc_send_time_ GUARDED_BY(LOCK);
-- std::vector<media::MediaLogRecord> queued_media_events_ GUARDED_BY(LOCK);
-+ const base::TickClock* tick_clock_ GUARDED_BY(lock_);
-+ base::TimeTicks last_ipc_send_time_ GUARDED_BY(lock_);
-+ std::vector<media::MediaLogRecord> queued_media_events_ GUARDED_BY(lock_);
-
- // impl for sending queued events.
-- std::vector<std::unique_ptr<EventHandler>> event_handlers_ GUARDED_BY(LOCK);
-+ std::vector<std::unique_ptr<EventHandler>> event_handlers_ GUARDED_BY(lock_);
-
- // For enforcing max 1 pending send.
-- bool ipc_send_pending_ GUARDED_BY(LOCK);
-+ bool ipc_send_pending_ GUARDED_BY(lock_);
-
- // Limits the number of events we send over IPC to one.
-- std::unique_ptr<media::MediaLogRecord> last_duration_changed_event_ GUARDED_BY(LOCK);
-+ std::unique_ptr<media::MediaLogRecord> last_duration_changed_event_ GUARDED_BY(lock_);
-
- // Holds the earliest MEDIA_ERROR_LOG_ENTRY event added to this log. This is
- // most likely to contain the most specific information available describing
---
-cgit v1.2.1
-
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/files/
@ 2023-02-23 21:02 Alfredo Tupone
0 siblings, 0 replies; 17+ messages in thread
From: Alfredo Tupone @ 2023-02-23 21:02 UTC (permalink / raw
To: gentoo-commits
commit: 81237c6eedf900f69073edb9ea224594ec6883de
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Fri Feb 10 18:44:45 2023 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Thu Feb 23 21:02:10 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81237c6e
dev-qt/qtwebengine: remove unused patch
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/29535
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
.../qtwebengine-6.4.0-no-websocket-intercept.patch | 38 ----------------------
1 file changed, 38 deletions(-)
diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.4.0-no-websocket-intercept.patch b/dev-qt/qtwebengine/files/qtwebengine-6.4.0-no-websocket-intercept.patch
deleted file mode 100644
index 941c39c0a5a9..000000000000
--- a/dev-qt/qtwebengine/files/qtwebengine-6.4.0-no-websocket-intercept.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Qt Bug: https://bugreports.qt.io/browse/QTBUG-107144
-Gerrit: https://codereview.qt-project.org/c/qt/qtwebengine/+/436316
-Patch: https://codereview.qt-project.org/gitweb?p=qt%2Fqtwebengine.git;a=commit;h=81bf140583f7b7bf13cc8dd522e1ca2aba873fc4
-
-From 81bf140583f7b7bf13cc8dd522e1ca2aba873fc4 Mon Sep 17 00:00:00 2001
-From: Martin Negyokru <negyokru@inf.u-szeged.hu>
-Date: Mon, 3 Oct 2022 12:20:00 +0200
-Subject: [PATCH] Do not intercept websocket connection when there is no
- associated frame
-
-This fix is based on chrome's implementation.
-
-Fixes: QTBUG-107144
-Change-Id: If042e4156b8a4bdb27a210c4db94e3a6198aed7d
-Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
-(cherry picked from commit 64b7da9dab82713fdcb2e03d8a2715421eae5685)
-Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
----
- src/core/content_browser_client_qt.cpp | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/src/core/content_browser_client_qt.cpp b/src/core/content_browser_client_qt.cpp
-index 020ae916af..99a3aa3f4f 100644
---- a/src/core/content_browser_client_qt.cpp
-+++ b/src/core/content_browser_client_qt.cpp
-@@ -1237,8 +1237,7 @@ ContentBrowserClientQt::WillCreateURLLoaderRequestInterceptors(content::Navigati
-
- bool ContentBrowserClientQt::WillInterceptWebSocket(content::RenderFrameHost *frame)
- {
-- Q_UNUSED(frame);
-- return true; // It is probably not worth it to only intercept when interceptors are installed
-+ return frame != nullptr;
- }
-
- QWebEngineUrlRequestInterceptor *getProfileInterceptorFromFrame(content::RenderFrameHost *frame)
---
-2.16.3
-
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/files/
@ 2023-04-15 9:32 Sam James
0 siblings, 0 replies; 17+ messages in thread
From: Sam James @ 2023-04-15 9:32 UTC (permalink / raw
To: gentoo-commits
commit: 8f46bba05316d58aa6071adfa714c976aa8405e3
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 15 09:31:55 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Apr 15 09:32:30 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f46bba0
dev-qt/qtwebengine: fix build w/ gcc 13
Closes: https://bugs.gentoo.org/904342
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/qtwebengine-5.15.9_p20230404-gcc-13.patch | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.9_p20230404-gcc-13.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.9_p20230404-gcc-13.patch
index af925558b1f7..319a4dd2738e 100644
--- a/dev-qt/qtwebengine/files/qtwebengine-5.15.9_p20230404-gcc-13.patch
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.15.9_p20230404-gcc-13.patch
@@ -12,3 +12,13 @@ https://bugs.gentoo.org/904342
enum class DarkModeResult : uint8_t {
kDoNotApplyFilter,
kApplyFilter,
+--- a/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/dark_mode_image_classifier.cc
++++ b/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/dark_mode_image_classifier.cc
+@@ -4,6 +4,7 @@
+
+ #include "third_party/blink/renderer/platform/graphics/dark_mode_image_classifier.h"
+
++#include <cstdint>
+ #include <set>
+
+ #include "base/memory/singleton.h"
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/files/
@ 2023-04-15 12:32 Sam James
0 siblings, 0 replies; 17+ messages in thread
From: Sam James @ 2023-04-15 12:32 UTC (permalink / raw
To: gentoo-commits
commit: 9d46b59501945359a5a383ad634595b0f9cacc78
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 15 12:31:22 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Apr 15 12:31:54 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d46b595
dev-qt/qtwebengine: fix GCC 13 patch
Closes: https://bugs.gentoo.org/904365
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../qtwebengine-5.15.9_p20230404-gcc-13.patch | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.9_p20230404-gcc-13.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.9_p20230404-gcc-13.patch
index 319a4dd2738e..41b519b452a2 100644
--- a/dev-qt/qtwebengine/files/qtwebengine-5.15.9_p20230404-gcc-13.patch
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.15.9_p20230404-gcc-13.patch
@@ -1,17 +1,6 @@
This is on top of the GCC 13 patches in our patchset.
https://bugs.gentoo.org/904342
---- a/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/dark_mode_types.h
-+++ b/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/dark_mode_types.h
-@@ -7,6 +7,8 @@
-
- namespace blink {
-
-+#include <cstdint>
-+
- enum class DarkModeResult : uint8_t {
- kDoNotApplyFilter,
- kApplyFilter,
--- a/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/dark_mode_image_classifier.cc
+++ b/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/dark_mode_image_classifier.cc
@@ -4,6 +4,7 @@
@@ -22,3 +11,14 @@ https://bugs.gentoo.org/904342
#include <set>
#include "base/memory/singleton.h"
+--- a/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/dark_mode_types.h
++++ b/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/dark_mode_types.h
+@@ -5,6 +5,8 @@
+ #ifndef THIRD_PARTY_BLINK_RENDERER_PLATFORM_GRAPHICS_DARK_MODE_TYPES_H_
+ #define THIRD_PARTY_BLINK_RENDERER_PLATFORM_GRAPHICS_DARK_MODE_TYPES_H_
+
++#include <cstdint>
++
+ namespace blink {
+
+ enum class DarkModeResult : uint8_t {
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/files/
@ 2023-10-05 19:50 Ionen Wolkens
0 siblings, 0 replies; 17+ messages in thread
From: Ionen Wolkens @ 2023-10-05 19:50 UTC (permalink / raw
To: gentoo-commits
commit: f7e253a0c768281ef2a0a409b911ebfceb9299a8
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 5 19:48:45 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu Oct 5 19:49:24 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7e253a0
dev-qt/qtwebengine: note stdint fix link for the 87 branch in patch
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtwebengine/files/qtwebengine-6.5.2-cstdint.patch | 3 +++
dev-qt/qtwebengine/files/qtwebengine-6.6.0-cstdint.patch | 4 ++++
2 files changed, 7 insertions(+)
diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.5.2-cstdint.patch b/dev-qt/qtwebengine/files/qtwebengine-6.5.2-cstdint.patch
index cf8e55c556c6..7de101830553 100644
--- a/dev-qt/qtwebengine/files/qtwebengine-6.5.2-cstdint.patch
+++ b/dev-qt/qtwebengine/files/qtwebengine-6.5.2-cstdint.patch
@@ -6,7 +6,10 @@ include cstdint / stdint.h for the int32/64_t usage.
Partially fixed by [1] (>=chromium-110.0.5434.0) given it removes the
int64_t usage altogether in seed_response.h.
+See also [2] which fixed this for the 87 branch in Qt5.
+
[1] https://crrev.com/01e21a077a0354d85e8359195613c2781f67a3a2
+[2] https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/489133
--- a/src/3rdparty/chromium/components/variations/seed_response.h
+++ b/src/3rdparty/chromium/components/variations/seed_response.h
@@ -7,2 +7,3 @@
diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.6.0-cstdint.patch b/dev-qt/qtwebengine/files/qtwebengine-6.6.0-cstdint.patch
index d59d327af7c5..a39da477ace2 100644
--- a/dev-qt/qtwebengine/files/qtwebengine-6.6.0-cstdint.patch
+++ b/dev-qt/qtwebengine/files/qtwebengine-6.6.0-cstdint.patch
@@ -2,6 +2,10 @@ Patch status: limbo, needs upstreaming
Only manifests as an issue with gcc-13+musl which does not transitively
include cstdint / stdint.h for the int32/64_t usage.
+
+See also [1] which fixed this for the 87 branch in Qt5.
+
+[1] https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/489133
--- a/src/3rdparty/chromium/gpu/config/gpu_driver_bug_workarounds.h
+++ b/src/3rdparty/chromium/gpu/config/gpu_driver_bug_workarounds.h
@@ -7,2 +7,3 @@
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/files/
@ 2023-10-15 17:10 Ionen Wolkens
0 siblings, 0 replies; 17+ messages in thread
From: Ionen Wolkens @ 2023-10-15 17:10 UTC (permalink / raw
To: gentoo-commits
commit: bcb02840c25c7d8e2a5250605c034304e695d7ca
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sun Oct 15 16:16:56 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sun Oct 15 17:10:23 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bcb02840
dev-qt/qtwebengine: remove unused patch
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/33349
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
.../files/qtwebengine-6.6.0-cstdint.patch | 20 --------------------
1 file changed, 20 deletions(-)
diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.6.0-cstdint.patch b/dev-qt/qtwebengine/files/qtwebengine-6.6.0-cstdint.patch
deleted file mode 100644
index a39da477ace2..000000000000
--- a/dev-qt/qtwebengine/files/qtwebengine-6.6.0-cstdint.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Patch status: limbo, needs upstreaming
-
-Only manifests as an issue with gcc-13+musl which does not transitively
-include cstdint / stdint.h for the int32/64_t usage.
-
-See also [1] which fixed this for the 87 branch in Qt5.
-
-[1] https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/489133
---- a/src/3rdparty/chromium/gpu/config/gpu_driver_bug_workarounds.h
-+++ b/src/3rdparty/chromium/gpu/config/gpu_driver_bug_workarounds.h
-@@ -7,2 +7,3 @@
-
-+#include <cstdint>
- #include <vector>
---- a/src/3rdparty/chromium/third_party/webrtc/rtc_base/system/file_wrapper.h
-+++ b/src/3rdparty/chromium/third_party/webrtc/rtc_base/system/file_wrapper.h
-@@ -16,2 +16,3 @@
-
-+#include <cstdint>
- #include <string>
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/files/
@ 2023-11-20 23:35 Ionen Wolkens
0 siblings, 0 replies; 17+ messages in thread
From: Ionen Wolkens @ 2023-11-20 23:35 UTC (permalink / raw
To: gentoo-commits
commit: ba397fa71f9bc9a074d9c65b63759e0145bb9fa0
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 20 23:34:19 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Nov 20 23:34:42 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba397fa7
dev-qt/qtwebengine: add bug link to qt6 icu74 patch
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtwebengine/files/qtwebengine-6.5.3-icu74.patch | 2 ++
1 file changed, 2 insertions(+)
diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.5.3-icu74.patch b/dev-qt/qtwebengine/files/qtwebengine-6.5.3-icu74.patch
index d08ede535862..3d42f3f933c5 100644
--- a/dev-qt/qtwebengine/files/qtwebengine-6.5.3-icu74.patch
+++ b/dev-qt/qtwebengine/files/qtwebengine-6.5.3-icu74.patch
@@ -2,6 +2,8 @@ Quick fix for a static_assert failure with icu74. Still waiting
for a proper upstream fix and unknown if entirely right, but is
an extension of [1] (is now 48 rather than 43).
+https://bugs.gentoo.org/917633
+
[1] https://crrev.com/e60b571faa3f14dd9119a6792dccf12f8bf80192
--- a/src/3rdparty/chromium/third_party/blink/renderer/platform/text/text_break_iterator.cc
+++ b/src/3rdparty/chromium/third_party/blink/renderer/platform/text/text_break_iterator.cc
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/files/
@ 2024-01-17 11:18 Andreas Sturmlechner
0 siblings, 0 replies; 17+ messages in thread
From: Andreas Sturmlechner @ 2024-01-17 11:18 UTC (permalink / raw
To: gentoo-commits
commit: 830d6ed5d3210ba88a668dabd2b0d0e446602ba2
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 17 11:17:08 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jan 17 11:17:59 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=830d6ed5
dev-qt/qtwebengine: Restore accidentally dropped patch
Closes: https://bugs.gentoo.org/922312
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/files/qtwebengine-6.5.3-icu74.patch | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.5.3-icu74.patch b/dev-qt/qtwebengine/files/qtwebengine-6.5.3-icu74.patch
new file mode 100644
index 000000000000..3d42f3f933c5
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-6.5.3-icu74.patch
@@ -0,0 +1,16 @@
+Quick fix for a static_assert failure with icu74. Still waiting
+for a proper upstream fix and unknown if entirely right, but is
+an extension of [1] (is now 48 rather than 43).
+
+https://bugs.gentoo.org/917633
+
+[1] https://crrev.com/e60b571faa3f14dd9119a6792dccf12f8bf80192
+--- a/src/3rdparty/chromium/third_party/blink/renderer/platform/text/text_break_iterator.cc
++++ b/src/3rdparty/chromium/third_party/blink/renderer/platform/text/text_break_iterator.cc
+@@ -163,3 +163,5 @@
+
+-#if U_ICU_VERSION_MAJOR_NUM >= 58
++#if U_ICU_VERSION_MAJOR_NUM >= 74
++#define BA_LB_COUNT (U_LB_COUNT - 8)
++#elif U_ICU_VERSION_MAJOR_NUM >= 58
+ #define BA_LB_COUNT (U_LB_COUNT - 3)
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/files/
@ 2024-04-17 10:16 Ionen Wolkens
0 siblings, 0 replies; 17+ messages in thread
From: Ionen Wolkens @ 2024-04-17 10:16 UTC (permalink / raw
To: gentoo-commits
commit: 865b42c15b520af89040fd4a6e6e6c4cd54125c2
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 17 09:47:57 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Apr 17 10:16:04 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=865b42c1
dev-qt/qtwebengine: add one more race fix for ninja-1.12 (Qt6)
Bug: https://bugs.gentoo.org/930107
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtwebengine/files/qtwebengine-6.7.0-ninja1.12.patch | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.7.0-ninja1.12.patch b/dev-qt/qtwebengine/files/qtwebengine-6.7.0-ninja1.12.patch
index cd6f6a3cc89d..2d12daccd224 100644
--- a/dev-qt/qtwebengine/files/qtwebengine-6.7.0-ninja1.12.patch
+++ b/dev-qt/qtwebengine/files/qtwebengine-6.7.0-ninja1.12.patch
@@ -3,15 +3,13 @@ Patch status: pending being looked at upstream
Issue[1][2][3] also exist in chromium itself[4], and unclear
why this started happening only with ninja-1.12.0 at the moment.
-Just a quickfix, likely not correct and seems there may be
-further unresolved race issues[5]. Arguably better to not
-use ninja-1.12.0 for this yet (1.11.1 or samurai are fine).
+Just a quickfix, likely not fully correct and seems there may
+be further unresolved race issues.
[1] https://bugs.gentoo.org/930107
[2] https://bugreports.qt.io/browse/QTBUG-124375
[3] https://github.com/ninja-build/ninja/issues/2417
[4] https://bugs.gentoo.org/930112
-[5] https://bugs.gentoo.org/930107#c17
--- a/src/3rdparty/chromium/content/browser/BUILD.gn
+++ b/src/3rdparty/chromium/content/browser/BUILD.gn
@@ -198,2 +198,3 @@
@@ -24,3 +22,9 @@ use ninja-1.12.0 for this yet (1.11.1 or samurai are fine).
"//content/public/browser",
+ "//components/web_cache/public/mojom",
"//extensions/common",
+--- a/src/core/configure/BUILD.root.gn.in
++++ b/src/core/configure/BUILD.root.gn.in
+@@ -235,2 +235,3 @@
+ deps = [
++ "//chrome/app:generated_resources",
+ "//components/zoom",
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/files/
@ 2024-04-18 19:32 Conrad Kostecki
0 siblings, 0 replies; 17+ messages in thread
From: Conrad Kostecki @ 2024-04-18 19:32 UTC (permalink / raw
To: gentoo-commits
commit: 9ddfb399a442cf366fc13bf042e49d0c233898fc
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Thu Apr 18 18:05:17 2024 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Thu Apr 18 19:31:44 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ddfb399
dev-qt/qtwebengine: remove unused patch
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
.../files/qtwebengine-5.15.2-enable-ppc64.patch | 37 ----------------------
1 file changed, 37 deletions(-)
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.2-enable-ppc64.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.2-enable-ppc64.patch
deleted file mode 100644
index 4fb19ccdd2e5..000000000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.15.2-enable-ppc64.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 463f1234c57a36e78ff666bd55094a9d4e68f296 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Sat, 18 Jan 2020 23:52:55 +0100
-Subject: [PATCH 1/3] Enable ppc64 builds
-
----
- configure.pri | 1 +
- mkspecs/features/functions.prf | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/configure.pri b/configure.pri
-index 3a144e3f8..cabe8b24a 100644
---- a/configure.pri 2021-02-24 10:45:58.000000000 +0100
-+++ - 2021-03-07 21:18:43.124754796 +0100
-@@ -144,6 +144,7 @@
- contains(QT_ARCH, "arm")|contains(QT_ARCH, "arm64"): return(true)
- contains(QT_ARCH, "mips"): return(true)
- contains(QT_ARCH, "mips64"): return(true)
-+ contains(QT_ARCH, "power64"): return(true)
- qtLog("Architecture not supported.")
- return(false)
- }
-diff --git a/mkspecs/features/functions.prf b/mkspecs/features/functions.prf
-index 512e2523b..e31123654 100644
---- a/mkspecs/features/functions.prf 2021-02-24 10:45:58.000000000 +0100
-+++ - 2021-03-07 21:19:21.345036293 +0100
-@@ -107,6 +107,7 @@
- contains(qtArch, "mips"): return(mipsel)
- contains(qtArch, "mips64"): return(mips64el)
- contains(qtArch, "mips64el"): return(mips64el)
-+ contains(qtArch, "power64"): return(ppc64)
- return(unknown)
- }
-
---
-2.26.0
-
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/files/
@ 2024-10-30 2:55 Sam James
0 siblings, 0 replies; 17+ messages in thread
From: Sam James @ 2024-10-30 2:55 UTC (permalink / raw
To: gentoo-commits
commit: 445284d6aa7e99eea9043e09fd34e1c3d6a7f24c
Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com>
AuthorDate: Fri Aug 23 18:22:58 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Oct 30 02:54:32 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=445284d6
dev-qt/qtwebengine: 5.15.14_p20240510 Fix compilation on GCC 15
Bug: https://bugs.gentoo.org/938685
Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
...webengine-5.15.14_p20240510-gcc15-cstdint.patch | 132 ++++++++++++++++++++-
1 file changed, 131 insertions(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.14_p20240510-gcc15-cstdint.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.14_p20240510-gcc15-cstdint.patch
index 0adc39e400ab..75c3bae60905 100644
--- a/dev-qt/qtwebengine/files/qtwebengine-5.15.14_p20240510-gcc15-cstdint.patch
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.15.14_p20240510-gcc15-cstdint.patch
@@ -27,4 +27,134 @@
+#include <cstdint>
#include <memory>
#include <string>
- #include <vector>
\ No newline at end of file
+ #include <vector>
+--- a/src/3rdparty/chromium/cc/input/main_thread_scrolling_reason.h
++++ b/src/3rdparty/chromium/cc/input/main_thread_scrolling_reason.h
+@@ -5,6 +5,7 @@
+ #ifndef CC_INPUT_MAIN_THREAD_SCROLLING_REASON_H_
+ #define CC_INPUT_MAIN_THREAD_SCROLLING_REASON_H_
+
++#include <cstdint>
+ #include <memory>
+ #include <string>
+ #include "cc/cc_export.h"
+--- a/src/3rdparty/chromium/gpu/command_buffer/common/skia_utils.h
++++ b/src/3rdparty/chromium/gpu/command_buffer/common/skia_utils.h
+@@ -5,6 +5,7 @@
+ #ifndef GPU_COMMAND_BUFFER_COMMON_SKIA_UTILS_H_
+ #define GPU_COMMAND_BUFFER_COMMON_SKIA_UTILS_H_
+
++#include <cstdint>
+ #include <memory>
+
+ #include "base/optional.h"
+--- a/src/3rdparty/chromium/gpu/command_buffer/service/gpu_fence_manager.h
++++ b/src/3rdparty/chromium/gpu/command_buffer/service/gpu_fence_manager.h
+@@ -5,6 +5,7 @@
+ #ifndef GPU_COMMAND_BUFFER_SERVICE_GPU_FENCE_MANAGER_H_
+ #define GPU_COMMAND_BUFFER_SERVICE_GPU_FENCE_MANAGER_H_
+
++#include <cstdint>
+ #include <memory>
+ #include <vector>
+
+--- a/src/3rdparty/chromium/net/tools/huffman_trie/trie_entry.h
++++ b/src/3rdparty/chromium/net/tools/huffman_trie/trie_entry.h
+@@ -5,6 +5,7 @@
+ #ifndef NET_TOOLS_HUFFMAN_TRIE_TRIE_ENTRY_H_
+ #define NET_TOOLS_HUFFMAN_TRIE_TRIE_ENTRY_H_
+
++#include <cstdint>
+ #include <memory>
+ #include <string>
+ #include <vector>
+--- a/src/3rdparty/chromium/third_party/pdfium/core/fpdfapi/page/cpdf_function.h
++++ b/src/3rdparty/chromium/third_party/pdfium/core/fpdfapi/page/cpdf_function.h
+@@ -7,6 +7,7 @@
+ #ifndef CORE_FPDFAPI_PAGE_CPDF_FUNCTION_H_
+ #define CORE_FPDFAPI_PAGE_CPDF_FUNCTION_H_
+
++#include <cstdint>
+ #include <memory>
+ #include <set>
+ #include <vector>
+--- a/src/3rdparty/chromium/third_party/pdfium/core/fxcodec/jbig2/JBig2_DocumentContext.h
++++ b/src/3rdparty/chromium/third_party/pdfium/core/fxcodec/jbig2/JBig2_DocumentContext.h
+@@ -7,6 +7,7 @@
+ #ifndef CORE_FXCODEC_JBIG2_JBIG2_DOCUMENTCONTEXT_H_
+ #define CORE_FXCODEC_JBIG2_JBIG2_DOCUMENTCONTEXT_H_
+
++#include <cstdint>
+ #include <list>
+ #include <memory>
+ #include <utility>
+--- a/src/3rdparty/chromium/third_party/pdfium/third_party/base/span.h
++++ b/src/3rdparty/chromium/third_party/pdfium/third_party/base/span.h
+@@ -9,6 +9,7 @@
+
+ #include <algorithm>
+ #include <array>
++#include <cstdint>
+ #include <iterator>
+ #include <type_traits>
+ #include <utility>
+--- a/src/3rdparty/chromium/third_party/perfetto/include/perfetto/tracing/tracing_backend.h
++++ b/src/3rdparty/chromium/third_party/perfetto/include/perfetto/tracing/tracing_backend.h
+@@ -17,6 +17,7 @@
+ #ifndef INCLUDE_PERFETTO_TRACING_TRACING_BACKEND_H_
+ #define INCLUDE_PERFETTO_TRACING_TRACING_BACKEND_H_
+
++#include <cstdint>
+ #include <memory>
+ #include <string>
+
+--- a/src/3rdparty/chromium/third_party/webrtc/api/fec_controller.h
++++ b/src/3rdparty/chromium/third_party/webrtc/api/fec_controller.h
+@@ -11,6 +11,7 @@
+ #ifndef API_FEC_CONTROLLER_H_
+ #define API_FEC_CONTROLLER_H_
+
++#include <cstdint>
+ #include <memory>
+ #include <vector>
+
+--- a/src/3rdparty/chromium/third_party/webrtc/api/network_state_predictor.h
++++ b/src/3rdparty/chromium/third_party/webrtc/api/network_state_predictor.h
+@@ -11,6 +11,7 @@
+ #ifndef API_NETWORK_STATE_PREDICTOR_H_
+ #define API_NETWORK_STATE_PREDICTOR_H_
+
++#include <cstdint>
+ #include <memory>
+ #include <vector>
+
+--- a/src/3rdparty/chromium/third_party/webrtc/modules/video_coding/timestamp_map.h
++++ b/src/3rdparty/chromium/third_party/webrtc/modules/video_coding/timestamp_map.h
+@@ -11,6 +11,7 @@
+ #ifndef MODULES_VIDEO_CODING_TIMESTAMP_MAP_H_
+ #define MODULES_VIDEO_CODING_TIMESTAMP_MAP_H_
+
++#include <cstdint>
+ #include <memory>
+
+ namespace webrtc {
+--- a/src/3rdparty/chromium/third_party/webrtc/video/stats_counter.h
++++ b/src/3rdparty/chromium/third_party/webrtc/video/stats_counter.h
+@@ -11,6 +11,7 @@
+ #ifndef VIDEO_STATS_COUNTER_H_
+ #define VIDEO_STATS_COUNTER_H_
+
++#include <cstdint>
+ #include <memory>
+ #include <string>
+
+--- a/src/3rdparty/chromium/third_party/woff2/include/woff2/output.h
++++ b/src/3rdparty/chromium/third_party/woff2/include/woff2/output.h
+@@ -10,6 +10,7 @@
+ #define WOFF2_WOFF2_OUT_H_
+
+ #include <algorithm>
++#include <cstdint>
+ #include <cstring>
+ #include <memory>
+ #include <string>
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/files/
@ 2024-11-19 9:05 Ionen Wolkens
0 siblings, 0 replies; 17+ messages in thread
From: Ionen Wolkens @ 2024-11-19 9:05 UTC (permalink / raw
To: gentoo-commits
commit: fd94ed9d933d7b27ddc4a50e76397b136468630c
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 18 19:00:06 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Nov 19 08:59:02 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd94ed9d
dev-qt/qtwebengine: more race condition fixes (qt6)
Bug: https://bugs.gentoo.org/942142
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
.../files/qtwebengine-6.7.3-missing-gn-deps.patch | 19 +++++++++++++++++--
1 file changed, 17 insertions(+), 2 deletions(-)
diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.7.3-missing-gn-deps.patch b/dev-qt/qtwebengine/files/qtwebengine-6.7.3-missing-gn-deps.patch
index b9723a59d859..032a0fd617d8 100644
--- a/dev-qt/qtwebengine/files/qtwebengine-6.7.3-missing-gn-deps.patch
+++ b/dev-qt/qtwebengine/files/qtwebengine-6.7.3-missing-gn-deps.patch
@@ -1,9 +1,18 @@
Patch status: needs upstreaming
Add missing dependencies for rare race conditions, these are all
-related to Qt-specific changes as far as I can see.
+related to Qt-speific changes as far as I can see while normal
+chromium has the right dependencies.
https://bugs.gentoo.org/942142
+--- a/src/3rdparty/chromium/components/autofill/core/browser/BUILD.gn
++++ b/src/3rdparty/chromium/components/autofill/core/browser/BUILD.gn
+@@ -768,4 +768,5 @@
+ deps = []
+ deps = [
++ ":buildflags",
+ "//base",
+ "//base:i18n",
--- a/src/3rdparty/chromium/components/history/core/browser/BUILD.gn
+++ b/src/3rdparty/chromium/components/history/core/browser/BUILD.gn
@@ -184,4 +184,8 @@
@@ -17,7 +26,13 @@ https://bugs.gentoo.org/942142
--- a/src/3rdparty/chromium/qtwebengine/browser/extensions/api/BUILD.gn
+++ b/src/3rdparty/chromium/qtwebengine/browser/extensions/api/BUILD.gn
-@@ -46,4 +46,5 @@
+@@ -29,4 +29,5 @@
+
+ deps = [
++ "//build/config/chromebox_for_meetings:buildflags",
+ "//chrome/common:buildflags",
+ "//content/public/browser",
+@@ -46,4 +47,5 @@
deps = [
"//content/public/browser",
+ "//qtwebengine/common/extensions/api:api",
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/files/
@ 2024-11-23 8:44 Andreas Sturmlechner
0 siblings, 0 replies; 17+ messages in thread
From: Andreas Sturmlechner @ 2024-11-23 8:44 UTC (permalink / raw
To: gentoo-commits
commit: 35978829ce30dd940bec44fe69a8b1449359cf3e
Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com>
AuthorDate: Fri Nov 22 15:29:10 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Nov 23 08:44:21 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35978829
dev-qt/qtwebengine: 5.15.14_p20240510 add missing cstdint
Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/qtwebengine-5.15.14_p20240510-gcc15-cstdint.patch | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.14_p20240510-gcc15-cstdint.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.14_p20240510-gcc15-cstdint.patch
index 75c3bae60905..13dd63d7b9f6 100644
--- a/dev-qt/qtwebengine/files/qtwebengine-5.15.14_p20240510-gcc15-cstdint.patch
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.15.14_p20240510-gcc15-cstdint.patch
@@ -158,3 +158,13 @@
#include <cstring>
#include <memory>
#include <string>
+--- a/src/3rdparty/chromium/base/task/thread_pool.h
++++ b/src/3rdparty/chromium/base/task/thread_pool.h
+@@ -5,6 +5,7 @@
+ #ifndef BASE_TASK_THREAD_POOL_H_
+ #define BASE_TASK_THREAD_POOL_H_
+
++#include <cstdint>
+ #include <memory>
+ #include <utility>
+
^ permalink raw reply related [flat|nested] 17+ messages in thread
end of thread, other threads:[~2024-11-23 8:44 UTC | newest]
Thread overview: 17+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-05-13 6:56 [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2024-11-23 8:44 Andreas Sturmlechner
2024-11-19 9:05 Ionen Wolkens
2024-10-30 2:55 Sam James
2024-04-18 19:32 Conrad Kostecki
2024-04-17 10:16 Ionen Wolkens
2024-01-17 11:18 Andreas Sturmlechner
2023-11-20 23:35 Ionen Wolkens
2023-10-15 17:10 Ionen Wolkens
2023-10-05 19:50 Ionen Wolkens
2023-04-15 12:32 Sam James
2023-04-15 9:32 Sam James
2023-02-23 21:02 Alfredo Tupone
2022-12-10 12:25 Andreas Sturmlechner
2022-06-14 17:35 Andreas Sturmlechner
2021-04-28 15:14 Thomas Deutschmann
2016-12-01 14:04 Michael Palimaka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox