-
Notifications
You must be signed in to change notification settings - Fork 0
/
chromium.spec.diff
187 lines (163 loc) · 6.01 KB
/
chromium.spec.diff
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
diff --git a/chromium.spec b/chromium.spec
index b37d37c..747b446 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -31,7 +31,7 @@
ninja -j %{numjobs} -C '%1' '%2'
# enable|disable headless client build
-%global build_headless 1
+%global build_headless 0
# enable|disable chrome-remote-desktop build
%global build_remoting 0
@@ -117,7 +117,7 @@
%global remotingbuilddir out/Remoting
# enable|disable debuginfo
-%global enable_debug 1
+%global enable_debug 0
# disable debuginfo due to a bug in debugedit on el7
# error: canonicalization unexpectedly shrank by one character
# https://bugzilla.redhat.com/show_bug.cgi?id=304121
@@ -128,7 +128,7 @@
%global debug_package %{nil}
%global debug_level 0
%else
-%global debug_level 1
+%global debug_level 0
# workaround for the error empty file debugsource
%undefine _debugsource_packages
%endif
@@ -162,7 +162,7 @@
%global cfi 0
%if %{clang}
%if 0%{?fedora} || 0%{?rhel} > 7
-%global cfi 1
+%global cfi 0
%endif
%endif
@@ -175,13 +175,13 @@
# enable qt backend for el >= 8 and fedora
%if 0%{?rhel} >= 8 || 0%{?fedora}
-%global use_qt 1
+%global use_qt 0
%else
%global use_qt 0
%endif
%if 0%{?rhel} > 9 || 0%{?fedora}
-%global use_qt6 1
+%global use_qt6 0
%else
%global use_qt6 0
%endif
@@ -285,7 +285,7 @@
%endif
Name: chromium%{chromium_channel}
-Version: 120.0.6099.216
+Version: 122.0.6238.2
Release: 1%{?dist}
Summary: A WebKit (Blink) powered web browser that Google doesn't want you to use
Url: http://www.chromium.org/Home
@@ -446,6 +446,10 @@ patch356: chromium-120-disable-FFmpegAllowLists.patch
# remove ldflags -Wl,-mllvm,-disable-auto-upgrade-debug-info which is not supported
Patch357: chromium-120-clang16-disable-auto-upgrade-debug-info.patch
+Patch999: 84d1d7adcd1697348e3f821811179c525d3b5717.patch
+Patch1000: 0001-m122-OT-SVG-hook.patch
+Patch1001: 0002-m122-use-FreeType-for-non-Linux-OT-SVG-support.patch
+
# upstream patches
# Use chromium-latest.py to generate clean tarball from released build tarballs, found here:
@@ -973,7 +976,7 @@ udev.
%patch -P65 -p1 -b .java-only-allowed
%patch -P69 -p1 -b .update-rjsmin-to-1.2.0
-%patch -P70 -p1 -b .update-six-to-1.16.0
+#%patch -P70 -p1 -b .update-six-to-1.16.0
%patch -P82 -p1 -b .remoting-no-tests
%if ! %{bundlebrotli}
@@ -1029,10 +1032,10 @@ udev.
%if %{clang}
%if 0%{?rhel} < 8 || 0%{?fedora} < 38
-%patch -P300 -p1 -b .no_matching_constructor
+#%patch -P300 -p1 -b .no_matching_constructor
%patch -P301 -p1 -b .workaround_clang-SkColor4f
-%patch -P302 -p1 -b .workaround_clang_bug-structured_binding
-%patch -P303 -p1 -b .typename
+#%patch -P302 -p1 -b .workaround_clang_bug-structured_binding
+#%patch -P303 -p1 -b .typename
%patch -P304 -p1 -b .string-convert
%patch -P306 -p1 -b .assert
%endif
@@ -1044,23 +1047,23 @@ udev.
%endif
%endif
-%patch -P310 -p1 -b .missing-header-files
+#%patch -P310 -p1 -b .missing-header-files
%patch -P311 -p1 -b .clang-warnings
%patch -P312 -p1 -b .fstack-protector-strong
-%patch -P351 -p1 -b .mnemonic-error
+#%patch -P351 -p1 -b .mnemonic-error
%if %{disable_bti}
%patch -P352 -p1 -b .workaround_for_crash_on_BTI_capable_system
%endif
-%patch -P353 -p1 -b .gn-workaround-atspi
+#%patch -P353 -p1 -b .gn-workaround-atspi
%patch -P354 -p1 -b .revert-split-threshold-for-reg-with-hint
%if ! %{use_custom_libcxx}
%patch -P355 -p1 -b .nullptr_t-without-namespace-std
%endif
%patch -P356 -p1 -b .disable-FFmpegAllowLists
-%patch -P357 -p1 -b .clang16-disable-auto-upgrade-debug-info
+#%patch -P357 -p1 -b .clang16-disable-auto-upgrade-debug-info
# Change shebang in all relevant files in this directory and all subdirectories
# See `man find` for how the `-exec command {} +` syntax works
@@ -1119,6 +1122,18 @@ sed -i 's/getenv("CHROME_VERSION_EXTRA")/"Fedora Project"/' chrome/common/channe
# Fix hardcoded path in remoting code
sed -i 's|/opt/google/chrome-remote-desktop|%{crd_path}|g' remoting/host/setup/daemon_controller_delegate_linux.cc
+# third_party/rust-src is 4.3G and we had enable_rust=false
+rm -rf third_party/rust-src
+# 1.9GB
+rm -rf third_party/llvm
+
+tar -czpf ${GITHUB_WORKSPACE}/before.tgz skia third_party/ots third_party/skia third_party/blink/renderer/platform
+ls -l ${GITHUB_WORKSPACE}/before.tgz
+
+%patch -P999 -R -p1 -b .ffmpeg-breakage
+%patch -P1000 -p1 -b .ot-svg1
+%patch -P1001 -p1 -b .ot-svg2
+
%build
# utf8 issue on epel7, Internal parsing error 'ascii' codec can't
# decode byte 0xe2 in position 474: ordinal not in range(128)
@@ -1126,6 +1140,8 @@ sed -i 's|/opt/google/chrome-remote-desktop|%{crd_path}|g' remoting/host/setup/d
export LANG=en_US.UTF-8
%endif
+rm %{SOURCE0}
+
# reduce warnings
%if %{clang}
FLAGS=' -Wno-deprecated-declarations -Wno-unknown-warning-option -Wno-unused-command-line-argument'
@@ -1192,7 +1208,7 @@ CHROMIUM_CORE_GN_DEFINES+=' is_official_build=true'
sed -i 's|OFFICIAL_BUILD|GOOGLE_CHROME_BUILD|g' tools/generate_shim_headers/generate_shim_headers.py
%endif
-%if 0%{?rhel} || 0%{?fedora} < 39
+%if 0%{?rhel} || 0%{?fedora} < 40
CHROMIUM_CORE_GN_DEFINES+=' chrome_pgo_phase=0'
%endif
@@ -1379,6 +1395,10 @@ tools/gn/bootstrap/bootstrap.py --gn-gen-args="$CHROMIUM_CORE_GN_DEFINES $CHROMI
mkdir -p %{builddir} && cp -a %{_bindir}/gn %{builddir}/
%endif
+perl -pi -e 's(^.+components/qr_code_generator:unit_tests.+$)()' components/BUILD.gn
+perl -pi -e 's(^.+components/qr_code_generator:qr_code_generator_features.+$)()' chrome/services/qrcode_generator/public/cpp/BUILD.gn
+perl -pi -e 's(^.+components/qr_code_generator.+$)()' chrome/services/qrcode_generator/BUILD.gn
+
%{builddir}/gn --script-executable=%{chromium_pybin} gen --args="$CHROMIUM_CORE_GN_DEFINES $CHROMIUM_BROWSER_GN_DEFINES" %{builddir}
%if %{build_headless}
@@ -1394,6 +1414,11 @@ mkdir -p %{builddir} && cp -a %{_bindir}/gn %{builddir}/
%build_target %{headlessbuilddir} headless_shell
%endif
+%{builddir}/gn args --list %{builddir}
+%build_target %{builddir} third_party/blink/renderer/platform
+
+exit $?
+
%build_target %{builddir} chrome
%build_target %{builddir} chrome_sandbox
%build_target %{builddir} chromedriver