Skip to content

Commit 63d5bfb

Browse files
committed
qt5-webengine: sync with aur and fix building
Signed-off-by: Hu Butui <hot123tea123@gmail.com>
1 parent e88887d commit 63d5bfb

10 files changed

Lines changed: 586 additions & 487 deletions

archlinuxcn/qt5-webengine/qt5-webengine-pipewire-0.3.patch renamed to archlinuxcn/qt5-webengine/0000-qt5-webengine-pipewire-0.3@chromium.patch

File renamed without changes.

archlinuxcn/qt5-webengine/qt5-webengine-icu-75.patch renamed to archlinuxcn/qt5-webengine/0001-qt5-webengine-icu-75@chromium.patch

File renamed without changes.

archlinuxcn/qt5-webengine/qt5-webengine-ninja-1.12.patch renamed to archlinuxcn/qt5-webengine/0002-qt5-webengine-ninja-1.12@chromium.patch

File renamed without changes.
Lines changed: 290 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,290 @@
1+
diff --git a/chromium/ppapi/utility/completion_callback_factory_thread_traits.h b/chromium/ppapi/utility/completion_callback_factory_thread_traits.h
2+
index ac0b31a75..5d1c421d0 100644
3+
--- a/chromium/ppapi/utility/completion_callback_factory_thread_traits.h
4+
+++ b/chromium/ppapi/utility/completion_callback_factory_thread_traits.h
5+
@@ -38,6 +38,10 @@ namespace pp {
6+
/// As a further optimization, we can add support for this later.
7+
class ThreadSafeThreadTraits {
8+
public:
9+
+
10+
+ typedef pp::Lock Lock;
11+
+ typedef pp::AutoLock AutoLock;
12+
+
13+
class RefCount {
14+
public:
15+
/// Default constructor. In debug mode, this checks that the object is being
16+
@@ -67,8 +71,6 @@ class ThreadSafeThreadTraits {
17+
int32_t ref_;
18+
};
19+
20+
- typedef pp::Lock Lock;
21+
- typedef pp::AutoLock AutoLock;
22+
};
23+
24+
/// The non-thread-safe version of thread traits. Using this class as the
25+
diff --git a/chromium/ui/events/gesture_event_details.h b/chromium/ui/events/gesture_event_details.h
26+
index d20416738..8dadab3d0 100644
27+
--- a/chromium/ui/events/gesture_event_details.h
28+
+++ b/chromium/ui/events/gesture_event_details.h
29+
@@ -5,6 +5,7 @@
30+
#ifndef UI_EVENTS_GESTURE_DETECTION_GESTURE_EVENT_DETAILS_H_
31+
#define UI_EVENTS_GESTURE_DETECTION_GESTURE_EVENT_DETAILS_H_
32+
33+
+#include <cstdint>
34+
#include <string.h>
35+
36+
#include "base/check_op.h"
37+
diff --git a/chromium/ui/gl/gl_surface_glx.cc b/chromium/ui/gl/gl_surface_glx.cc
38+
index 1d5527691..ef9d5ce13 100644
39+
--- a/chromium/ui/gl/gl_surface_glx.cc
40+
+++ b/chromium/ui/gl/gl_surface_glx.cc
41+
@@ -4,6 +4,7 @@
42+
43+
#include "ui/gl/gl_surface_glx.h"
44+
45+
+#include <cstdint>
46+
#include <utility>
47+
48+
#include "base/bind.h"
49+
diff --git a/chromium/ui/gl/gl_surface_glx.h b/chromium/ui/gl/gl_surface_glx.h
50+
index ab612cd87..2178d8514 100644
51+
--- a/chromium/ui/gl/gl_surface_glx.h
52+
+++ b/chromium/ui/gl/gl_surface_glx.h
53+
@@ -5,6 +5,7 @@
54+
#ifndef UI_GL_GL_SURFACE_GLX_H_
55+
#define UI_GL_GL_SURFACE_GLX_H_
56+
57+
+#include <cstdint>
58+
#include <stdint.h>
59+
60+
#include <memory>
61+
diff --git a/chromium/third_party/webrtc/api/task_queue/task_queue_base.h b/chromium/third_party/webrtc/api/task_queue/task_queue_base.h
62+
index 90b1efd31..63526a738 100644
63+
--- a/chromium/third_party/webrtc/api/task_queue/task_queue_base.h
64+
+++ b/chromium/third_party/webrtc/api/task_queue/task_queue_base.h
65+
@@ -10,6 +10,7 @@
66+
#ifndef API_TASK_QUEUE_TASK_QUEUE_BASE_H_
67+
#define API_TASK_QUEUE_TASK_QUEUE_BASE_H_
68+
69+
+#include <cstdint>
70+
#include <memory>
71+
72+
#include "api/task_queue/queued_task.h"
73+
diff --git a/chromium/third_party/perfetto/src/trace_processor/importers/gzip/gzip_utils.cc b/chromium/third_party/perfetto/src/trace_processor/importers/gzip/gzip_utils.cc
74+
index 8a30c7f32..4934432cc 100644
75+
--- a/chromium/third_party/perfetto/src/trace_processor/importers/gzip/gzip_utils.cc
76+
+++ b/chromium/third_party/perfetto/src/trace_processor/importers/gzip/gzip_utils.cc
77+
@@ -20,6 +20,8 @@
78+
#include "perfetto/base/build_config.h"
79+
#include "perfetto/base/compiler.h"
80+
81+
+#include <cstdint>
82+
+
83+
#if PERFETTO_BUILDFLAG(PERFETTO_ZLIB)
84+
#include <zlib.h>
85+
#else
86+
diff --git a/chromium/third_party/perfetto/src/trace_processor/importers/gzip/gzip_utils.h b/chromium/third_party/perfetto/src/trace_processor/importers/gzip/gzip_utils.h
87+
index 624363ff6..6d717fba4 100644
88+
--- a/chromium/third_party/perfetto/src/trace_processor/importers/gzip/gzip_utils.h
89+
+++ b/chromium/third_party/perfetto/src/trace_processor/importers/gzip/gzip_utils.h
90+
@@ -17,6 +17,7 @@
91+
#ifndef SRC_TRACE_PROCESSOR_IMPORTERS_GZIP_GZIP_UTILS_H_
92+
#define SRC_TRACE_PROCESSOR_IMPORTERS_GZIP_GZIP_UTILS_H_
93+
94+
+#include <cstdint>
95+
#include <memory>
96+
97+
struct z_stream_s;
98+
diff --git a/chromium/third_party/perfetto/include/perfetto/ext/tracing/core/slice.h b/chromium/third_party/perfetto/include/perfetto/ext/tracing/core/slice.h
99+
index 4ce66fdea..3f3932b22 100644
100+
--- a/chromium/third_party/perfetto/include/perfetto/ext/tracing/core/slice.h
101+
+++ b/chromium/third_party/perfetto/include/perfetto/ext/tracing/core/slice.h
102+
@@ -20,6 +20,7 @@
103+
#include <stddef.h>
104+
#include <string.h>
105+
106+
+#include <cstdint>
107+
#include <memory>
108+
#include <string>
109+
#include <vector>
110+
diff --git a/chromium/third_party/perfetto/src/tracing/core/trace_packet.cc b/chromium/third_party/perfetto/src/tracing/core/trace_packet.cc
111+
index 0dea150c1..c3def1683 100644
112+
--- a/chromium/third_party/perfetto/src/tracing/core/trace_packet.cc
113+
+++ b/chromium/third_party/perfetto/src/tracing/core/trace_packet.cc
114+
@@ -19,6 +19,8 @@
115+
#include "perfetto/base/logging.h"
116+
#include "perfetto/protozero/proto_utils.h"
117+
118+
+#include <cstdint>
119+
+
120+
namespace perfetto {
121+
122+
TracePacket::TracePacket() = default;
123+
diff --git a/chromium/third_party/perfetto/include/perfetto/tracing/tracing_backend.h b/chromium/third_party/perfetto/include/perfetto/tracing/tracing_backend.h
124+
index 67b0d2eb5..3c2462de5 100644
125+
--- a/chromium/third_party/perfetto/include/perfetto/tracing/tracing_backend.h
126+
+++ b/chromium/third_party/perfetto/include/perfetto/tracing/tracing_backend.h
127+
@@ -17,6 +17,7 @@
128+
#ifndef INCLUDE_PERFETTO_TRACING_TRACING_BACKEND_H_
129+
#define INCLUDE_PERFETTO_TRACING_TRACING_BACKEND_H_
130+
131+
+#include <cstdint>
132+
#include <memory>
133+
#include <string>
134+
135+
diff --git a/chromium/base/task/thread_pool.h b/chromium/base/task/thread_pool.h
136+
index 085c249ba..afc674ca7 100644
137+
--- a/chromium/base/task/thread_pool.h
138+
+++ b/chromium/base/task/thread_pool.h
139+
@@ -5,6 +5,7 @@
140+
#ifndef BASE_TASK_THREAD_POOL_H_
141+
#define BASE_TASK_THREAD_POOL_H_
142+
143+
+#include <cstdint>
144+
#include <memory>
145+
#include <utility>
146+
147+
diff --git a/chromium/net/tools/huffman_trie/trie_entry.h b/chromium/net/tools/huffman_trie/trie_entry.h
148+
index fe70260f9..eac6a7fc2 100644
149+
--- a/chromium/net/tools/huffman_trie/trie_entry.h
150+
+++ b/chromium/net/tools/huffman_trie/trie_entry.h
151+
@@ -5,6 +5,7 @@
152+
#ifndef NET_TOOLS_HUFFMAN_TRIE_TRIE_ENTRY_H_
153+
#define NET_TOOLS_HUFFMAN_TRIE_TRIE_ENTRY_H_
154+
155+
+#include <cstdint>
156+
#include <memory>
157+
#include <string>
158+
#include <vector>
159+
diff --git a/chromium/third_party/webrtc/api/fec_controller.h b/chromium/third_party/webrtc/api/fec_controller.h
160+
index 3e5f7bb21..87777a53f 100644
161+
--- a/chromium/third_party/webrtc/api/fec_controller.h
162+
+++ b/chromium/third_party/webrtc/api/fec_controller.h
163+
@@ -11,6 +11,7 @@
164+
#ifndef API_FEC_CONTROLLER_H_
165+
#define API_FEC_CONTROLLER_H_
166+
167+
+#include <cstdint>
168+
#include <memory>
169+
#include <vector>
170+
171+
diff --git a/chromium/third_party/webrtc/modules/video_coding/timestamp_map.h b/chromium/third_party/webrtc/modules/video_coding/timestamp_map.h
172+
index c85666c9a..dfb90e447 100644
173+
--- a/chromium/third_party/webrtc/modules/video_coding/timestamp_map.h
174+
+++ b/chromium/third_party/webrtc/modules/video_coding/timestamp_map.h
175+
@@ -11,6 +11,7 @@
176+
#ifndef MODULES_VIDEO_CODING_TIMESTAMP_MAP_H_
177+
#define MODULES_VIDEO_CODING_TIMESTAMP_MAP_H_
178+
179+
+#include <cstdint>
180+
#include <memory>
181+
182+
namespace webrtc {
183+
diff --git a/chromium/third_party/webrtc/api/network_state_predictor.h b/chromium/third_party/webrtc/api/network_state_predictor.h
184+
index 9cf5ab6f0..2d165baa5 100644
185+
--- a/chromium/third_party/webrtc/api/network_state_predictor.h
186+
+++ b/chromium/third_party/webrtc/api/network_state_predictor.h
187+
@@ -11,6 +11,7 @@
188+
#ifndef API_NETWORK_STATE_PREDICTOR_H_
189+
#define API_NETWORK_STATE_PREDICTOR_H_
190+
191+
+#include <cstdint>
192+
#include <memory>
193+
#include <vector>
194+
195+
diff --git a/chromium/gpu/command_buffer/common/skia_utils.h b/chromium/gpu/command_buffer/common/skia_utils.h
196+
index 6508d79a1..a9f9528f1 100644
197+
--- a/chromium/gpu/command_buffer/common/skia_utils.h
198+
+++ b/chromium/gpu/command_buffer/common/skia_utils.h
199+
@@ -5,6 +5,7 @@
200+
#ifndef GPU_COMMAND_BUFFER_COMMON_SKIA_UTILS_H_
201+
#define GPU_COMMAND_BUFFER_COMMON_SKIA_UTILS_H_
202+
203+
+#include <cstdint>
204+
#include <memory>
205+
206+
#include "base/optional.h"
207+
diff --git a/chromium/gpu/command_buffer/service/gpu_fence_manager.h b/chromium/gpu/command_buffer/service/gpu_fence_manager.h
208+
index ee50d6fdd..576f6e3bc 100644
209+
--- a/chromium/gpu/command_buffer/service/gpu_fence_manager.h
210+
+++ b/chromium/gpu/command_buffer/service/gpu_fence_manager.h
211+
@@ -5,6 +5,7 @@
212+
#ifndef GPU_COMMAND_BUFFER_SERVICE_GPU_FENCE_MANAGER_H_
213+
#define GPU_COMMAND_BUFFER_SERVICE_GPU_FENCE_MANAGER_H_
214+
215+
+#include <cstdint>
216+
#include <memory>
217+
#include <vector>
218+
219+
diff --git a/chromium/third_party/pdfium/core/fpdfapi/page/cpdf_function.h b/chromium/third_party/pdfium/core/fpdfapi/page/cpdf_function.h
220+
index fd68b6b49..dc7c015d5 100644
221+
--- a/chromium/third_party/pdfium/core/fpdfapi/page/cpdf_function.h
222+
+++ b/chromium/third_party/pdfium/core/fpdfapi/page/cpdf_function.h
223+
@@ -7,6 +7,7 @@
224+
#ifndef CORE_FPDFAPI_PAGE_CPDF_FUNCTION_H_
225+
#define CORE_FPDFAPI_PAGE_CPDF_FUNCTION_H_
226+
227+
+#include <cstdint>
228+
#include <memory>
229+
#include <set>
230+
#include <vector>
231+
diff --git a/chromium/third_party/pdfium/core/fxcodec/jbig2/JBig2_DocumentContext.h b/chromium/third_party/pdfium/core/fxcodec/jbig2/JBig2_DocumentContext.h
232+
index 9bcdd371e..5921794f1 100644
233+
--- a/chromium/third_party/pdfium/core/fxcodec/jbig2/JBig2_DocumentContext.h
234+
+++ b/chromium/third_party/pdfium/core/fxcodec/jbig2/JBig2_DocumentContext.h
235+
@@ -7,6 +7,7 @@
236+
#ifndef CORE_FXCODEC_JBIG2_JBIG2_DOCUMENTCONTEXT_H_
237+
#define CORE_FXCODEC_JBIG2_JBIG2_DOCUMENTCONTEXT_H_
238+
239+
+#include <cstdint>
240+
#include <list>
241+
#include <memory>
242+
#include <utility>
243+
diff --git a/chromium/third_party/pdfium/third_party/base/span.h b/chromium/third_party/pdfium/third_party/base/span.h
244+
index bb07f43a0..0b7daf775 100644
245+
--- a/chromium/third_party/pdfium/third_party/base/span.h
246+
+++ b/chromium/third_party/pdfium/third_party/base/span.h
247+
@@ -9,6 +9,7 @@
248+
249+
#include <algorithm>
250+
#include <array>
251+
+#include <cstdint>
252+
#include <iterator>
253+
#include <type_traits>
254+
#include <utility>
255+
diff --git a/chromium/third_party/webrtc/video/stats_counter.h b/chromium/third_party/webrtc/video/stats_counter.h
256+
index fb6017f41..ed5530ca0 100644
257+
--- a/chromium/third_party/webrtc/video/stats_counter.h
258+
+++ b/chromium/third_party/webrtc/video/stats_counter.h
259+
@@ -11,6 +11,7 @@
260+
#ifndef VIDEO_STATS_COUNTER_H_
261+
#define VIDEO_STATS_COUNTER_H_
262+
263+
+#include <cstdint>
264+
#include <memory>
265+
#include <string>
266+
267+
diff --git a/chromium/third_party/woff2/include/woff2/output.h b/chromium/third_party/woff2/include/woff2/output.h
268+
index c325f67be..5c4dc4d18 100644
269+
--- a/chromium/third_party/woff2/include/woff2/output.h
270+
+++ b/chromium/third_party/woff2/include/woff2/output.h
271+
@@ -10,6 +10,7 @@
272+
#define WOFF2_WOFF2_OUT_H_
273+
274+
#include <algorithm>
275+
+#include <cstdint>
276+
#include <cstring>
277+
#include <memory>
278+
#include <string>
279+
diff --git a/chromium/cc/input/main_thread_scrolling_reason.h b/chromium/cc/input/main_thread_scrolling_reason.h
280+
index 4ddd536afcc..dc1bc072790 100644
281+
--- a/chromium/cc/input/main_thread_scrolling_reason.h
282+
+++ b/chromium/cc/input/main_thread_scrolling_reason.h
283+
@@ -7,6 +7,7 @@
284+
285+
#include <memory>
286+
#include <string>
287+
+#include <cstdint>
288+
#include "cc/cc_export.h"
289+
290+
namespace base {
Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
Patch-Source: https://sources.debian.org/data/main/q/qtwebengine-opensource-src/5.15.16+dfsg-3/debian/patches/python3.12-six.patch
2+
--
3+
Description: implement find_spec() for _SixMetaPathImporter
4+
Origin: upstream, https://github.com/benjaminp/six/commit/25916292d96f5f09
5+
Last-Update: 2024-03-17
6+
7+
--- a/chromium/third_party/protobuf/third_party/six/six.py
8+
+++ b/chromium/third_party/protobuf/third_party/six/six.py
9+
@@ -71,6 +71,11 @@ else:
10+
MAXSIZE = int((1 << 63) - 1)
11+
del X
12+
13+
+if PY34:
14+
+ from importlib.util import spec_from_loader
15+
+else:
16+
+ spec_from_loader = None
17+
+
18+
19+
def _add_doc(func, doc):
20+
"""Add documentation to a function."""
21+
@@ -186,6 +191,11 @@ class _SixMetaPathImporter(object):
22+
return self
23+
return None
24+
25+
+ def find_spec(self, fullname, path, target=None):
26+
+ if fullname in self.known_modules:
27+
+ return spec_from_loader(fullname, self)
28+
+ return None
29+
+
30+
def __get_module(self, fullname):
31+
try:
32+
return self.known_modules[fullname]
33+
--- a/chromium/tools/grit/third_party/six/__init__.py
34+
+++ b/chromium/tools/grit/third_party/six/__init__.py
35+
@@ -71,6 +71,11 @@ else:
36+
MAXSIZE = int((1 << 63) - 1)
37+
del X
38+
39+
+if PY34:
40+
+ from importlib.util import spec_from_loader
41+
+else:
42+
+ spec_from_loader = None
43+
+
44+
45+
def _add_doc(func, doc):
46+
"""Add documentation to a function."""
47+
@@ -186,6 +191,11 @@ class _SixMetaPathImporter(object):
48+
return self
49+
return None
50+
51+
+ def find_spec(self, fullname, path, target=None):
52+
+ if fullname in self.known_modules:
53+
+ return spec_from_loader(fullname, self)
54+
+ return None
55+
+
56+
def __get_module(self, fullname):
57+
try:
58+
return self.known_modules[fullname]

archlinuxcn/qt5-webengine/qt5-webengine-icu-78.patch renamed to archlinuxcn/qt5-webengine/0006-qt5-webengine-icu-78@chromium.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,9 @@ local/qt5-base 5.15.18+kde+r109-2 (qt5)
6565
local/qt5-webchannel 5.15.17+kde+r3-1 (qt5)
6666
* Provides access to QObject or QML objects from HTML clients for seamless integration of Qt applications with HTML/JavaScript clients
6767

68-
diff -pNaru3 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
69-
--- a/src/3rdparty/chromium/third_party/blink/renderer/platform/text/text_break_iterator.cc 2025-11-11 01:42:16.454081862 -0500
70-
+++ b/src/3rdparty/chromium/third_party/blink/renderer/platform/text/text_break_iterator.cc 2025-11-11 01:49:41.838185933 -0500
68+
diff -pNaru3 a/chromium/third_party/blink/renderer/platform/text/text_break_iterator.cc b/chromium/third_party/blink/renderer/platform/text/text_break_iterator.cc
69+
--- a/chromium/third_party/blink/renderer/platform/text/text_break_iterator.cc 2025-11-11 01:42:16.454081862 -0500
70+
+++ b/chromium/third_party/blink/renderer/platform/text/text_break_iterator.cc 2025-11-11 01:49:41.838185933 -0500
7171
@@ -163,7 +163,7 @@ static const unsigned char kAsciiLineBre
7272
// clang-format on
7373

0 commit comments

Comments
 (0)