diff --git a/.abf.yml b/.abf.yml index a51753a..b91c9b1 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,7 +1,7 @@ sources: - chromium-79.0.3945.130.tar.xz: 11407561c425daf34f04d9f59be30547bb2b4e27 - chromium-gost-7c9e401ddff963f4fb9f9f923146891ff8350809.tar.gz: 18b8cbf775c48a52abe691871ec4415fdb8ed1c2 + chromium-80.0.3987.116.tar.xz: 7490f07c41a140d6a2841132c039db714602ed26 + chromium-gost-b7aeaed6f530e126a290a763183dd4c4f1f63aa7.tar.gz: 95111c520ede5b5df3d87df5f7c552d5055468ec depot_tools.tar.xz: 082b7f9a4dfa7eb03900755b4866aef2d73543a5 icons.tar.bz2: a835954af164bf38f8ea4ea80608839bed7800a3 - msspi-0e5911974e2d76d68e24eac4599c7248d0018589.tar.gz: 852d987c066ea7ab7c8e9d638b6e96a20eca6cbb + msspi-b326deaa5549b5ae2b1d33546ab33cedbd4677b6.tar.gz: 0e30bd7da5d36d54848e08b3200b06947f830f3c new-system-icons.tar.xz: 89339b8b3b05359a8745ed7968fe148902a2fa28 diff --git a/chromium-58-glib.patch b/chromium-58-glib.patch index 37c9c9a..c7ce292 100644 --- a/chromium-58-glib.patch +++ b/chromium-58-glib.patch @@ -1,11 +1,11 @@ --- chromium-58.0.3029.81/build/config/linux/BUILD.gn.glib 2017-04-19 21:06:28.000000000 +0200 +++ chromium-58.0.3029.81/build/config/linux/BUILD.gn 2017-04-23 23:12:26.097911010 +0200 -@@ -93,7 +93,7 @@ +@@ -94,7 +94,7 @@ if (use_glib) { "gthread-2.0", ] defines = [ -- "GLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_32", -+ "GLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_52", - "GLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_26", +- "GLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_40", ++ "GLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_62", + "GLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_40", ] } diff --git a/chromium-browser-stable.spec b/chromium-browser-stable.spec index 787112d..986e958 100644 --- a/chromium-browser-stable.spec +++ b/chromium-browser-stable.spec @@ -25,8 +25,8 @@ %define ffmpeg 1 %define icu 0 %define libva 0 -%define clang 1 %define jsoncpp 0 +%bcond_without clang # Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys # Note: these are for Mageia use ONLY. @@ -36,8 +36,8 @@ %define google_default_client_secret mRHXPjlS4cLpp1beCiXoYbLZ # GOST patches and sources -%define chromium_gost_commit 7c9e401ddff963f4fb9f9f923146891ff8350809 -%define msspi_commit 0e5911974e2d76d68e24eac4599c7248d0018589 +%define chromium_gost_commit b7aeaed6f530e126a290a763183dd4c4f1f63aa7 +%define msspi_commit b326deaa5549b5ae2b1d33546ab33cedbd4677b6 %define _gostsourcedir %{_builddir}/chromium-gost %if %{with gost} @@ -51,7 +51,7 @@ Summary: A fast web browser based on the Blink engine Name: chromium-browser-stable -Version: 79.0.3945.130 +Version: 80.0.3987.116 Release: 1 License: BSD, LGPL Group: Networking/WWW @@ -140,7 +140,7 @@ Patch629: chromium-60.0.3112.78-no-libpng-prefix.patch Patch631: chromium-69.0.3497.100-build-error-in-clang6.patch BuildRequires: bison -%if 0%{?clang} +%if %{with clang} BuildRequires: clang BuildRequires: lld BuildRequires: libcxx-devel @@ -215,8 +215,13 @@ BuildRequires: pkgconfig(xscrnsaver) BuildRequires: pkgconfig(xt) BuildRequires: pkgconfig(xtst) BuildRequires: pkgconfig(zlib) +%if %{mdvver} >= 201910 +#BuildRequires: python2dist(beautifulsoup4) +#BuildRequires: python2dist(html5lib) +%else BuildRequires: pythonegg(beautifulsoup4) BuildRequires: pythonegg(html5lib) +%endif %if %{with gost} BuildRequires: chrpath %endif @@ -263,7 +268,6 @@ your profile before changing channels. %{_crdir}/*.pak %{_crdir}/resources %{_crdir}/themes -%{_crdir}/default_apps %{_crdir}/swiftshader %{_crdir}/libEGL.so %{_crdir}/libGLESv2.so @@ -372,219 +376,214 @@ popd # Remove most of the bundled libraries. Libraries specified below (taken from # Gentoo's Chromium ebuild) are the libraries that needs to be preserved. -build/linux/unbundle/remove_bundled_libraries.py \ - 'buildtools/third_party/libc++' \ - 'buildtools/third_party/libc++abi' \ - 'base/third_party/cityhash' \ - 'base/third_party/double_conversion' \ - 'base/third_party/dynamic_annotations' \ - 'base/third_party/icu' \ - 'base/third_party/libevent' \ - 'base/third_party/nspr' \ - 'base/third_party/superfasthash' \ - 'base/third_party/symbolize' \ - 'base/third_party/valgrind' \ - 'base/third_party/xdg_mime' \ - 'base/third_party/xdg_user_dirs' \ - 'chrome/third_party/mozilla_security_manager' \ - 'courgette/third_party' \ - 'net/third_party/mozilla_security_manager' \ - 'net/third_party/nss' \ - 'net/third_party/quic' \ - 'net/third_party/uri_template' \ - 'third_party/abseil-cpp' \ - 'third_party/adobe' \ - 'third_party/angle' \ - 'third_party/angle/src/common/third_party/base' \ - 'third_party/angle/src/common/third_party/smhasher' \ - 'third_party/angle/src/common/third_party/xxhash' \ - 'third_party/angle/src/third_party/compiler' \ - 'third_party/angle/src/third_party/libXNVCtrl' \ - 'third_party/angle/src/third_party/trace_event' \ - 'third_party/angle/third_party/glslang' \ - 'third_party/angle/third_party/spirv-headers' \ - 'third_party/angle/third_party/spirv-tools' \ - 'third_party/angle/third_party/vulkan-headers' \ - 'third_party/angle/third_party/vulkan-loader' \ - 'third_party/angle/third_party/vulkan-tools' \ - 'third_party/angle/third_party/vulkan-validation-layers' \ - 'third_party/apple_apsl' \ - 'third_party/axe-core' \ - 'third_party/blanketjs' \ - 'third_party/blink' \ - 'third_party/boringssl' \ - 'third_party/boringssl/src/third_party/fiat' \ - 'third_party/boringssl/src/third_party/sike' \ - 'third_party/boringssl/linux-aarch64/crypto/third_party/sike' \ - 'third_party/boringssl/linux-x86_64/crypto/third_party/sike' \ - 'third_party/breakpad' \ - 'third_party/breakpad/breakpad/src/third_party/curl' \ - 'third_party/brotli' \ - 'third_party/cacheinvalidation' \ - 'third_party/catapult' \ - 'third_party/catapult/common/py_vulcanize/third_party/rcssmin' \ - 'third_party/catapult/common/py_vulcanize/third_party/rjsmin' \ - 'third_party/catapult/third_party/beautifulsoup4' \ - 'third_party/catapult/third_party/html5lib-python' \ - 'third_party/catapult/third_party/polymer' \ - 'third_party/catapult/third_party/six' \ - 'third_party/catapult/tracing/third_party/d3' \ - 'third_party/catapult/tracing/third_party/gl-matrix' \ - 'third_party/catapult/tracing/third_party/jpeg-js' \ - 'third_party/catapult/tracing/third_party/jszip' \ - 'third_party/catapult/tracing/third_party/mannwhitneyu' \ - 'third_party/catapult/tracing/third_party/oboe' \ - 'third_party/catapult/tracing/third_party/pako' \ - 'third_party/ced' \ - 'third_party/cld_3' \ - 'third_party/closure_compiler' \ - 'third_party/crashpad' \ - 'third_party/crashpad/crashpad/third_party/lss' \ - 'third_party/crashpad/crashpad/third_party/zlib' \ - 'third_party/crc32c' \ - 'third_party/cros_system_api' \ - 'third_party/dav1d' \ - 'third_party/dawn' \ - 'third_party/depot_tools' \ - 'third_party/devscripts' \ - 'third_party/dom_distiller_js' \ - 'third_party/emoji-segmenter' \ - 'third_party/expat' \ - 'third_party/ffmpeg' \ - 'third_party/flac' \ - 'third_party/flatbuffers' \ - 'third_party/flot' \ - 'third_party/fontconfig' \ - 'third_party/freetype' \ - 'third_party/glslang' \ - 'third_party/google_input_tools' \ - 'third_party/google_input_tools/third_party/closure_library' \ - 'third_party/google_input_tools/third_party/closure_library/third_party/closure' \ - 'third_party/googletest' \ - 'third_party/harfbuzz-ng' \ - 'third_party/hunspell' \ - 'third_party/iccjpeg' \ - 'third_party/icu' \ - 'third_party/inspector_protocol' \ - 'third_party/jinja2' \ - 'third_party/jsoncpp' \ - 'third_party/jstemplate' \ - 'third_party/khronos' \ - 'third_party/leveldatabase' \ - 'third_party/libXNVCtrl' \ - 'third_party/libaddressinput' \ - 'third_party/libaom' \ - 'third_party/libaom/source/libaom/third_party/vector' \ - 'third_party/libaom/source/libaom/third_party/x86inc' \ - 'third_party/libdrm' \ - 'third_party/libjingle' \ - 'third_party/libjpeg_turbo' \ - 'third_party/libphonenumber' \ - 'third_party/libpng' \ - 'third_party/libsecret' \ - 'third_party/libsrtp' \ - 'third_party/libsync' \ - 'third_party/libudev' \ - 'third_party/libusb' \ - 'third_party/libvpx' \ - 'third_party/libvpx/source/libvpx/third_party/x86inc' \ - 'third_party/libxml' \ - 'third_party/libxml/chromium' \ - 'third_party/libxslt' \ - 'third_party/libwebm' \ - 'third_party/libwebp' \ - 'third_party/libyuv' \ - 'third_party/llvm-build' \ - 'third_party/lss' \ - 'third_party/lzma_sdk' \ - 'third_party/markupsafe' \ - 'third_party/mesa' \ - 'third_party/metrics_proto' \ - 'third_party/modp_b64' \ - 'third_party/nasm' \ - 'third_party/node' \ - 'third_party/node/linux' \ - 'third_party/node/node_modules/polymer-bundler/lib/third_party/UglifyJS2' \ - 'third_party/one_euro_filter' \ - 'third_party/openh264' \ - 'third_party/openscreen' \ - 'third_party/openscreen/src/third_party/tinycbor/src/src' \ - 'third_party/opus' \ - 'third_party/ots' \ - 'third_party/pdfium' \ - 'third_party/pdfium/third_party/agg23' \ - 'third_party/pdfium/third_party/base' \ - 'third_party/pdfium/third_party/bigint' \ - 'third_party/pdfium/third_party/freetype' \ - 'third_party/pdfium/third_party/lcms' \ - 'third_party/pdfium/third_party/libopenjpeg20' \ - 'third_party/pdfium/third_party/libpng16' \ - 'third_party/pdfium/third_party/libtiff' \ - 'third_party/pdfium/third_party/skia_shared' \ - 'third_party/perfetto' \ - 'third_party/pffft' \ - 'third_party/ply' \ - 'third_party/polymer' \ - 'third_party/private-join-and-compute' \ - 'third_party/protobuf' \ - 'third_party/protobuf/third_party/six' \ - 'third_party/pyjson5' \ - 'third_party/qcms' \ - 'third_party/qunit' \ - 'third_party/re2' \ - 'third_party/rnnoise' \ - 'third_party/s2cellid' \ - 'third_party/sfntly' \ - 'third_party/simplejson' \ - 'third_party/sinonjs' \ - 'third_party/skia' \ - 'third_party/skia/include/third_party/skcms' \ - 'third_party/skia/include/third_party/vulkan' \ - 'third_party/skia/third_party/gif' \ - 'third_party/skia/third_party/skcms' \ - 'third_party/skia/third_party/vulkan' \ - 'third_party/smhasher' \ - 'third_party/snappy' \ - 'third_party/speech-dispatcher' \ - 'third_party/spirv-headers' \ - 'third_party/SPIRV-Tools' \ - 'third_party/sqlite' \ - 'third_party/swiftshader' \ - 'third_party/swiftshader/third_party/llvm-7.0' \ - 'third_party/swiftshader/third_party/llvm-subzero' \ - 'third_party/swiftshader/third_party/marl' \ - 'third_party/swiftshader/third_party/subzero' \ - 'third_party/swiftshader/third_party/SPIRV-Headers/include/spirv/unified1' \ - 'third_party/tcmalloc' \ - 'third_party/test_fonts' \ - 'third_party/unrar' \ - 'third_party/usb_ids' \ - 'third_party/usrsctp' \ - 'third_party/vulkan' \ - 'third_party/web-animations-js' \ - 'third_party/webdriver' \ - 'third_party/webrtc' \ - 'third_party/webrtc/common_audio/third_party/fft4g' \ - 'third_party/webrtc/common_audio/third_party/spl_sqrt_floor' \ - 'third_party/webrtc/modules/third_party/fft' \ - 'third_party/webrtc/modules/third_party/g711' \ - 'third_party/webrtc/modules/third_party/g722' \ - 'third_party/webrtc/rtc_base/third_party/base64' \ - 'third_party/webrtc/rtc_base/third_party/sigslot' \ - 'third_party/widevine' \ - 'third_party/woff2' \ - 'third_party/xdg-utils' \ - 'third_party/yasm' \ - 'third_party/zlib' \ - 'third_party/zlib/google' \ - 'tools/gn/base/third_party/icu' \ - 'url/third_party/mozilla' \ - 'v8/src/third_party/siphash' \ - 'v8/src/third_party/utf8-decoder' \ - 'v8/src/third_party/valgrind' \ - 'v8/third_party/inspector_protocol' \ - 'v8/third_party/v8' \ - --do-remove +# build/linux/unbundle/remove_bundled_libraries.py \ +# 'buildtools/third_party/libc++' \ +# 'buildtools/third_party/libc++abi' \ +# 'base/third_party/cityhash' \ +# 'base/third_party/double_conversion' \ +# 'base/third_party/dynamic_annotations' \ +# 'base/third_party/icu' \ +# 'base/third_party/libevent' \ +# 'base/third_party/nspr' \ +# 'base/third_party/superfasthash' \ +# 'base/third_party/symbolize' \ +# 'base/third_party/valgrind' \ +# 'base/third_party/xdg_mime' \ +# 'base/third_party/xdg_user_dirs' \ +# 'chrome/third_party/mozilla_security_manager' \ +# 'courgette/third_party' \ +# 'net/third_party/mozilla_security_manager' \ +# 'net/third_party/nss' \ +# 'net/third_party/quic' \ +# 'net/third_party/uri_template' \ +# 'third_party/abseil-cpp' \ +# 'third_party/adobe' \ +# 'third_party/angle' \ +# 'third_party/angle/src/common/third_party/base' \ +# 'third_party/angle/src/common/third_party/smhasher' \ +# 'third_party/angle/src/common/third_party/xxhash' \ +# 'third_party/angle/src/third_party/compiler' \ +# 'third_party/angle/src/third_party/libXNVCtrl' \ +# 'third_party/angle/src/third_party/trace_event' \ +# 'third_party/angle/third_party/glslang' \ +# 'third_party/angle/third_party/spirv-headers' \ +# 'third_party/angle/third_party/spirv-tools' \ +# 'third_party/angle/third_party/vulkan-headers' \ +# 'third_party/angle/third_party/vulkan-loader' \ +# 'third_party/angle/third_party/vulkan-tools' \ +# 'third_party/angle/third_party/vulkan-validation-layers' \ +# 'third_party/apple_apsl' \ +# 'third_party/axe-core' \ +# 'third_party/blanketjs' \ +# 'third_party/blink' \ +# 'third_party/boringssl' \ +# 'third_party/boringssl/src/third_party/fiat' \ +# 'third_party/breakpad' \ +# 'third_party/breakpad/breakpad/src/third_party/curl' \ +# 'third_party/brotli' \ +# 'third_party/cacheinvalidation' \ +# 'third_party/catapult' \ +# 'third_party/catapult/common/py_vulcanize/third_party/rcssmin' \ +# 'third_party/catapult/common/py_vulcanize/third_party/rjsmin' \ +# 'third_party/catapult/third_party/beautifulsoup4' \ +# 'third_party/catapult/third_party/html5lib-python' \ +# 'third_party/catapult/third_party/polymer' \ +# 'third_party/catapult/third_party/six' \ +# 'third_party/catapult/tracing/third_party/d3' \ +# 'third_party/catapult/tracing/third_party/gl-matrix' \ +# 'third_party/catapult/tracing/third_party/jpeg-js' \ +# 'third_party/catapult/tracing/third_party/jszip' \ +# 'third_party/catapult/tracing/third_party/mannwhitneyu' \ +# 'third_party/catapult/tracing/third_party/oboe' \ +# 'third_party/catapult/tracing/third_party/pako' \ +# 'third_party/ced' \ +# 'third_party/cld_3' \ +# 'third_party/closure_compiler' \ +# 'third_party/crashpad' \ +# 'third_party/crashpad/crashpad/third_party/lss' \ +# 'third_party/crashpad/crashpad/third_party/zlib' \ +# 'third_party/crc32c' \ +# 'third_party/cros_system_api' \ +# 'third_party/dav1d' \ +# 'third_party/dawn' \ +# 'third_party/depot_tools' \ +# 'third_party/devscripts' \ +# 'third_party/dom_distiller_js' \ +# 'third_party/emoji-segmenter' \ +# 'third_party/expat' \ +# 'third_party/ffmpeg' \ +# 'third_party/flac' \ +# 'third_party/flatbuffers' \ +# 'third_party/fontconfig' \ +# 'third_party/freetype' \ +# 'third_party/glslang' \ +# 'third_party/google_input_tools' \ +# 'third_party/google_input_tools/third_party/closure_library' \ +# 'third_party/google_input_tools/third_party/closure_library/third_party/closure' \ +# 'third_party/googletest' \ +# 'third_party/harfbuzz-ng' \ +# 'third_party/hunspell' \ +# 'third_party/iccjpeg' \ +# 'third_party/icu' \ +# 'third_party/inspector_protocol' \ +# 'third_party/jinja2' \ +# 'third_party/jsoncpp' \ +# 'third_party/jstemplate' \ +# 'third_party/khronos' \ +# 'third_party/leveldatabase' \ +# 'third_party/libXNVCtrl' \ +# 'third_party/libaddressinput' \ +# 'third_party/libaom' \ +# 'third_party/libaom/source/libaom/third_party/vector' \ +# 'third_party/libaom/source/libaom/third_party/x86inc' \ +# 'third_party/libdrm' \ +# 'third_party/libjingle' \ +# 'third_party/libjpeg_turbo' \ +# 'third_party/libphonenumber' \ +# 'third_party/libpng' \ +# 'third_party/libsecret' \ +# 'third_party/libsrtp' \ +# 'third_party/libsync' \ +# 'third_party/libudev' \ +# 'third_party/libusb' \ +# 'third_party/libvpx' \ +# 'third_party/libvpx/source/libvpx/third_party/x86inc' \ +# 'third_party/libxml' \ +# 'third_party/libxml/chromium' \ +# 'third_party/libxslt' \ +# 'third_party/libwebm' \ +# 'third_party/libwebp' \ +# 'third_party/libyuv' \ +# 'third_party/llvm-build' \ +# 'third_party/lss' \ +# 'third_party/lzma_sdk' \ +# 'third_party/markupsafe' \ +# 'third_party/mesa' \ +# 'third_party/metrics_proto' \ +# 'third_party/modp_b64' \ +# 'third_party/nasm' \ +# 'third_party/node' \ +# 'third_party/node/linux' \ +# 'third_party/node/node_modules/polymer-bundler/lib/third_party/UglifyJS2' \ +# 'third_party/one_euro_filter' \ +# 'third_party/openh264' \ +# 'third_party/openscreen' \ +# 'third_party/openscreen/src/third_party/tinycbor/src/src' \ +# 'third_party/opus' \ +# 'third_party/ots' \ +# 'third_party/pdfium' \ +# 'third_party/pdfium/third_party/agg23' \ +# 'third_party/pdfium/third_party/base' \ +# 'third_party/pdfium/third_party/bigint' \ +# 'third_party/pdfium/third_party/freetype' \ +# 'third_party/pdfium/third_party/lcms' \ +# 'third_party/pdfium/third_party/libopenjpeg20' \ +# 'third_party/pdfium/third_party/libpng16' \ +# 'third_party/pdfium/third_party/libtiff' \ +# 'third_party/pdfium/third_party/skia_shared' \ +# 'third_party/perfetto' \ +# 'third_party/pffft' \ +# 'third_party/ply' \ +# 'third_party/polymer' \ +# 'third_party/private-join-and-compute' \ +# 'third_party/protobuf' \ +# 'third_party/protobuf/third_party/six' \ +# 'third_party/pyjson5' \ +# 'third_party/qcms' \ +# 'third_party/qunit' \ +# 'third_party/re2' \ +# 'third_party/rnnoise' \ +# 'third_party/s2cellid' \ +# 'third_party/sfntly' \ +# 'third_party/simplejson' \ +# 'third_party/sinonjs' \ +# 'third_party/skia' \ +# 'third_party/skia/include/third_party/skcms' \ +# 'third_party/skia/include/third_party/vulkan' \ +# 'third_party/skia/third_party/skcms' \ +# 'third_party/skia/third_party/vulkan' \ +# 'third_party/smhasher' \ +# 'third_party/snappy' \ +# 'third_party/speech-dispatcher' \ +# 'third_party/spirv-headers' \ +# 'third_party/SPIRV-Tools' \ +# 'third_party/sqlite' \ +# 'third_party/swiftshader' \ +# 'third_party/swiftshader/third_party/llvm-7.0' \ +# 'third_party/swiftshader/third_party/llvm-subzero' \ +# 'third_party/swiftshader/third_party/marl' \ +# 'third_party/swiftshader/third_party/subzero' \ +# 'third_party/swiftshader/third_party/SPIRV-Headers/include/spirv/unified1' \ +# 'third_party/tcmalloc' \ +# 'third_party/test_fonts' \ +# 'third_party/unrar' \ +# 'third_party/usb_ids' \ +# 'third_party/usrsctp' \ +# 'third_party/vulkan' \ +# 'third_party/web-animations-js' \ +# 'third_party/webdriver' \ +# 'third_party/webrtc' \ +# 'third_party/webrtc/common_audio/third_party/fft4g' \ +# 'third_party/webrtc/common_audio/third_party/spl_sqrt_floor' \ +# 'third_party/webrtc/modules/third_party/fft' \ +# 'third_party/webrtc/modules/third_party/g711' \ +# 'third_party/webrtc/modules/third_party/g722' \ +# 'third_party/webrtc/rtc_base/third_party/base64' \ +# 'third_party/webrtc/rtc_base/third_party/sigslot' \ +# 'third_party/widevine' \ +# 'third_party/woff2' \ +# 'third_party/xdg-utils' \ +# 'third_party/yasm' \ +# 'third_party/zlib' \ +# 'third_party/zlib/google' \ +# 'tools/gn/base/third_party/icu' \ +# 'url/third_party/mozilla' \ +# 'v8/src/third_party/siphash' \ +# 'v8/src/third_party/utf8-decoder' \ +# 'v8/src/third_party/valgrind' \ +# 'v8/third_party/inspector_protocol' \ +# 'v8/third_party/v8' \ +# --do-remove # Hard code extra version FILE=chrome/common/channel_info_posix.cc @@ -596,6 +595,14 @@ sed -i \ -e '/"-Wno-defaulted-function-deleted"/d' \ build/config/compiler/BUILD.gn +%if %{mdvver} >= 201910 +# gn is rather convoluted and not python3 friendly -- let's make +# sure it sees python2 when it calls python +ln -s %{_bindir}/python2 python + +find . -type f -exec sed -i 's,#!/usr/bin/env python,#!/usr/bin/env python2,g' {} \; +%endif + # setup node mkdir -p third_party/node/linux/node-linux-x64/bin ln -s /usr/bin/node third_party/node/linux/node-linux-x64/bin/node @@ -614,7 +621,7 @@ ln -s /usr/bin/node third_party/node/linux/node-linux-x64/bin/node # handled by upstream regular build scripts? : freetype harfbuzz-ng # jsoncpp -%if 0%{clang} +%if %{with clang} %define is_clang true %else %define is_clang false @@ -656,8 +663,6 @@ ln -s /usr/bin/node third_party/node/linux/node-linux-x64/bin/node custom_toolchain="%{_sourcedir}:default" \ ffmpeg_branding="Chromium" \ proprietary_codecs=true \ - linux_link_libudev = true \ - linux_link_libspeechd = true \ enable_platform_ac3_eac3_audio = true \ enable_mse_mpeg2ts_stream_parser=true \ enable_platform_hevc=true \ @@ -691,7 +696,7 @@ ln -s /usr/bin/node third_party/node/linux/node-linux-x64/bin/node build/linux/unbundle/replace_gn_files.py --system-libraries %{system_gn_list} third_party/libaddressinput/chromium/tools/update-strings.py -%if 0%{?clang} +%if %{with clang} export CC=clang export CXX=clang++ export AR=ar @@ -701,6 +706,7 @@ export CFLAGS="$CFLAGS -stdlib=libc++ -Wno-unused-command-line-argument" export CXXFLAGS="$CXXFLAGS -stdlib=libc++ -Wno-unused-command-line-argument" # flags to fix i586 builds export LDFLAGS="$LDFLAGS -Wl,-z,notext -pthread -stdlib=libc++" + %else %setup_compile_flags CC=%{__cc}; export CC @@ -713,13 +719,18 @@ LD=%{__cxx}; export LD CFLAGS=$(echo "$CFLAGS"|sed -e 's/-gdwarf-4//' -e 's/-fvar-tracking-assignments//' -e 's/-frecord-gcc-switches//') CXXFLAGS=$(echo "$CXXFLAGS"|sed -e 's/-gdwarf-4//' -e 's/-fvar-tracking-assignments//' -e 's/-frecord-gcc-switches//') -CFLAGS="$CFLAGS -Wno-error=pointer-to-int-cast -Wno-error=int-to-pointer-cast" -CXXFLAGS="$CXXFLAGS -Wno-error=attributes -Wno-error=comment -Wno-error=unused-variable -Wno-error=strict-overflow -Wno-error=deprecated-declarations" +CFLAGS="$CFLAGS -Wno-error=pointer-to-int-cast -Wno-error=int-to-pointer-cast -fno-strict-aliasing" +CXXFLAGS="$CXXFLAGS -Wno-error=attributes -Wno-error=comment -Wno-error=unused-variable -Wno-error=strict-overflow -Wno-error=deprecated-declarations -fno-strict-aliasing" %endif +%if %{mdvver} >= 201910 +export PYTHON=%{__python2} +python2 tools/gn/bootstrap/bootstrap.py --gn-gen-args='%{gn_config}' +out/Release/gn gen --script-executable=/usr/bin/python2 --args='%{gn_config}' out/Release +%else python tools/gn/bootstrap/bootstrap.py --gn-gen-args='%{gn_config}' - out/Release/gn gen --args='%{gn_config}' out/Release +%endif pushd out/Release # widevinecdmadapter @@ -731,7 +742,6 @@ popd mkdir -p %{buildroot}%{_bindir} mkdir -p %{buildroot}%{_crdir}/locales mkdir -p %{buildroot}%{_crdir}/themes -mkdir -p %{buildroot}%{_crdir}/default_apps install -m 755 %{SOURCE1} %{buildroot}%{_crdir}/chromium-wrapper install -m 755 out/Release/chrome %{buildroot}%{_crdir}/ install -m 4755 out/Release/chrome_sandbox %{buildroot}%{_crdir}/chrome-sandbox @@ -741,7 +751,6 @@ install -m 644 out/Release/icudtl.dat %{buildroot}%{_crdir}/ install -m 644 out/Release/locales/*.pak %{buildroot}%{_crdir}/locales/ install -m 644 out/Release/resources.pak %{buildroot}%{_crdir}/ -install -m 644 chrome/browser/resources/default_apps/* %{buildroot}%{_crdir}/default_apps/ ln -s %{_crdir}/swiftshader/libEGL.so %{buildroot}%{_crdir}/libEGL.so ln -s %{_crdir}/swiftshader/libGLESv2.so %{buildroot}%{_crdir}/libGLESv2.so ln -s %{_crdir}/chromium-wrapper %{buildroot}%{_bindir}/%{crname} diff --git a/chromium-compiler-r4.patch b/chromium-compiler-r4.patch index 0ce377c..bc7d877 100644 --- a/chromium-compiler-r4.patch +++ b/chromium-compiler-r4.patch @@ -8,10 +8,10 @@ Subject: [PATCH] Disable various compiler configs 1 file changed, 25 insertions(+), 39 deletions(-) diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn -index a3f21b7..0a7bec6 100644 +index eef1140..b34b55b 100644 --- a/build/config/compiler/BUILD.gn +++ b/build/config/compiler/BUILD.gn -@@ -230,8 +230,6 @@ config("compiler") { +@@ -270,8 +270,6 @@ configs += [ # See the definitions below. @@ -20,7 +20,7 @@ index a3f21b7..0a7bec6 100644 ":compiler_codegen", ":compiler_deterministic", ] -@@ -471,20 +469,6 @@ config("compiler") { +@@ -503,20 +501,6 @@ } } @@ -41,7 +41,7 @@ index a3f21b7..0a7bec6 100644 # C11/C++11 compiler flags setup. # --------------------------- if (is_linux || is_android || (is_nacl && is_clang) || current_os == "aix") { -@@ -1507,38 +1502,6 @@ config("default_warnings") { +@@ -1512,56 +1496,6 @@ # Currently goma can not handle case sensitiveness for windows well. cflags += [ "-Wno-nonportable-include-path" ] } @@ -57,30 +57,48 @@ index a3f21b7..0a7bec6 100644 - # TODO(https://crbug.com/989932): Evaluate and possibly enable. - "-Wno-implicit-int-float-conversion", - -- # TODO(https://crbug.com/999871): Decide if we want to clean up the -- # codebase or just disable this. Doesn't seem super useful, but -- # also fires in only 4 files. -- "-Wno-c99-designator", -- -- # This is a side effect of -Wc99-designator; easier to clean up. -- "-Wno-reorder-init-list", -- - # TODO(https://crbug.com/999886): Clean up, enable. - "-Wno-final-dtor-non-final-class", - -- # TODO(https://crbug.com/1002945): Evaluate and possibly enable. -- "-Wno-sizeof-array-div", +- # TODO(https://crbug.com/1016947) Clean up, enable. +- "-Wno-bitwise-conditional-parentheses", +- +- # TODO(https://crbug.com/1016945) Clean up, enable. +- "-Wno-builtin-assume-aligned-alignment", +- +- # TODO(https://crbug.com/1028110): Evaluate and possible enable. +- "-Wno-deprecated-copy", - ] - +- if (is_fuchsia) { +- cflags += [ +- # TODO(https://crbug.com/999871): Clean up, enable. +- "-Wno-c99-designator", +- ] +- } +- if (is_win) { +- cflags += [ +- # TODO(https://crbug.com/1002945): Clean up, enable. +- "-Wno-sizeof-array-div", +- ] +- } +- - cflags_c += [ - # TODO(https://crbug.com/995993): Clean up and enable. - "-Wno-implicit-fallthrough", - ] +- +- if (llvm_force_head_revision) { +- cflags += [ +- # TODO(https://crbug.com/1031169): Clean up and enable. +- "-Wno-misleading-indentation", +- ] +- } - } } } } -@@ -1525,7 +1515,7 @@ config("chromium_code") { +@@ -1580,7 +1514,7 @@ defines = [ "_HAS_NODISCARD" ] } } else { @@ -89,7 +107,7 @@ index a3f21b7..0a7bec6 100644 if (treat_warnings_as_errors) { cflags += [ "-Werror" ] -@@ -1534,10 +1524,6 @@ config("chromium_code") { +@@ -1589,10 +1523,6 @@ # well. ldflags = [ "-Werror" ] }