/[packages]/updates/8/chromium-browser-stable/current/SPECS/chromium-browser-stable.spec

Diff of /updates/8/chromium-browser-stable/current/SPECS/chromium-browser-stable.spec

Parent Directory | Revision Log | View Patch Patch

-revision 1642598 by ns80,
Wed Nov  4 13:38:11 2020 UTC
+revision 1653801 by cjw,
Sun Dec  6 14:32:10 2020 UTC
 Line 1
  # eu-strip crashes on chrome binary from this build
- %define _enable_debug_packages %{nil}
+ %define _enable_debug_packages 0
  %global debug_package          %{nil}
  %global __debug_install_post   %{nil}
- %global use_clang 1
+ %global use_clang 0
  %global system_icu 1
  %global system_openjpeg 1
  %global system_libtiff 1
- %global system_libvpx 0
+ %global system_libvpx 1
- %global system_dav1d 0
+ %global system_dav1d 1
+ %global system_re2 1
+ %global system_fontconfig 1
  # system libevent causes the renderer to get stuck
  %global system_libevent 0
-Line 21
+Line 23
  %if %{system_dav1d}
  %define gn_dav1d dav1d
  %endif
+ %if %{system_re2}
+ %define gn_re2 re2
+ %endif
+ %if %{system_fontconfig}
+ %define gn_fontconfig fontconfig
+ %endif
  %if %{system_libevent}
  %define gn_libevent libevent
  %endif
-Line 45
+Line 53
  %define    google_default_client_secret mRHXPjlS4cLpp1beCiXoYbLZ
  Name:           chromium-browser-stable
- Version:        86.0.4240.183
+ Version:        87.0.4280.88
  Release:        %mkrel 1
  Summary:        A fast webkit-based web browser
  Group:          Networking/WWW
-Line 56 
 URL:           http://www.chromium.org/Home
+Line 64 
 URL:           http://www.chromium.org/Home
  Source0:        http://commondatastorage.googleapis.com/chromium-browser-official/chromium-%{version}.tar.xz
  Source1:        chromium-wrapper
  Source2:        chromium-browser.desktop
+ # from gentoo: compiler setup
+ Patch1:         chromium-compiler-r4.patch
  # fix googleisms in man page
  Patch2:         chromium-mageia.patch
  # (ns80) use a patch rather than a source file for widevine
-Line 76 
 Patch11:       chromium-third-party-cookies-of
+Line 86 
 Patch11:       chromium-third-party-cookies-of
  Patch19:        chromium-50-codec-warnings.patch
  # (cjw) remove assertion on "chromium" branding in combination with enabled "proprietary codecs"
  Patch22:        chromium-54-proprietary-codecs-assert.patch
+ # (cjw) disable werror for a compilation warning that causes the build to fail
+ Patch23:        chromium-53-bignum-werror-fix.patch
  # (cjw) add -Wno-error=depecated-declarations because ffmpeg deprecations cause the build to fail
  Patch24:        chromium-53-ffmpeg-no-deprecation-errors.patch
+ # (cjw) link several libraries directly instead of loading them using dlopen()
+ Patch27:        chromium-53-link-libgio-libpci-libudev-libbrlapi.patch
  # (cjw) add missing unbundle gn files (1)
  Patch28:        chromium-53-gn-system-icu-jsoncpp.patch
  # (cjw) add missing unbundle gn files (2)
  Patch29:        chromium-53-gn-system-opus.patch
+ %if %{system_libtiff}
+ # (cjw) build pdfium with system libtiff
+ Patch30:        chromium-52-pdfium-system-libtiff-libpng.patch
+ %endif
  %if %{system_openjpeg}
  # (cjw) fix pdfium build with system openjpeg
  Patch31:        chromium-74-pdfium-system-libopenjpeg2.patch
-Line 94 
 Patch37:       chromium-58-system-nodejs.patch
+Line 112 
 Patch37:       chromium-58-system-nodejs.patch
  Patch40:        chromium-59-gcc5.patch
  # (cjw) system libvpx
  Patch42:        chromium-60-system-libvpx.patch
+ # (cjw) fix coding errors resulting in gcc 7 warning
+ Patch54:        chromium-62-gcc7.patch
+ # (cjw) fix gcc errors and warnings
+ Patch177:       chromium-64-gcc7.patch
+ # (cjw) fix even more gcc warnings
+ Patch179:       chromium-65-gcc7.patch
+ # (cjw) fix yet mmore gcc warnings
+ Patch182:       chromium-66-gcc7.patch
+ # (cjw) fix a few more gcc warnings
+ Patch184:       chromium-67-gcc7.patch
+ # (cjw) more gcc warnings
+ Patch186:       chromium-68-gcc7.patch
  # (cjw) moore gcc warnings
  Patch188:       chromium-68-gcc8.patch
+ # (cjw) and more gcc warnings
+ Patch189:       chromium-69-gcc7.patch
  # (cjw) fix gn bootstrapping with gcc
  Patch190:       chromium-69-gn-bootstrap.patch
+ # (cjw) moooore gcc warnings
+ Patch192:       chromium-70-gcc8.patch
  # (cjw) build fixes for 64-bit arm
  Patch193:       chromium-70-aarch64.patch
  # (cjw) gn bootstrap fix
  Patch195:       chromium-72-gn-bootstrap.patch
+ # (cjw) yet more gcc warnings
+ Patch196:       chromium-72-gcc8.patch
+ # (cjw) use system closure compiler
+ Patch197:       chromium-72-system-closure-compiler.patch
  # (cjw) fix i586 build
  Patch198:       chromium-72-i586.patch
+ # (cjw) some more gcc warnings
+ Patch199:       chromium-73-gcc8.patch
+ # (cjw) gcc warnings
+ Patch200:       chromium-74-gcc8.patch
+ # (cjw) gcc warnings
+ Patch201:       chromium-75-gcc8.patch
+ # (cjw) fixes for gcc warnings that do not work with clang
+ %if !%{use_clang}
+ Patch203:       chromium-75-gcc-only.patch
+ %endif
+ # (cjw) gcc warnings
+ Patch205:       chromium-76-gcc8.patch
+ # (cjw) gcc warnings
+ Patch207:       chromium-77-gcc9.patch
  # (cjw) fix build with system icu
  Patch209:       chromium-77-system-icu.patch
+ # (cjw) fixes for gcc warnings that do not work with clang
+ %if !%{use_clang}
+ Patch211:       chromium-77-gcc-only.patch
+ %endif
+ # (cjw) force use of python2, since python3 does not work
+ Patch215:       chromium-77-python2.patch
+ # (cjw) gcc warnings
+ Patch216:       chromium-78-gcc.patch
+ # (cjw) gcc warnings
+ Patch220:       chromium-79-gcc.patch
  %if !%{use_clang}
  # fixes for gcc warnings that do not work with clang
  Patch221:       chromium-79-gcc-only.patch
  %endif
  # (cjw) support using system dav1d
  Patch224:       chromium-79-system-dav1d.patch
+ # (cjw) gcc warnings
- # (ns80) Patches found in fedora, opensuse, gentoo
+ Patch226:       chromium-80-gcc.patch
- Patch250:       chromium-78-protobuf-RepeatedPtrField-export.patch
+ %if !%{use_clang}
- Patch251:       chromium-79-gcc-protobuf-alignas.patch
+ # fixes for gcc warnings that do not work with clang
- Patch252:       chromium-80-QuicStreamSendBuffer-deleted-move-constructor.patch
+ Patch230:       chromium-80-gcc-only.patch
- Patch253:       chromium-84-blink-disable-clang-format.patch
+ %endif
- Patch254:       chromium-86-compiler.patch
+ # (cjw) gcc warnings
- Patch255:       chromium-86-ConsumeDurationNumber-constexpr.patch
+ Patch231:       chromium-81-gcc.patch
- Patch256:       chromium-86-ImageMemoryBarrierData-init.patch
+ # (cjw) gcc warnings
- Patch257:       chromium-86-nearby-explicit.patch
+ Patch232:       chromium-83-gcc.patch
- Patch258:       chromium-86-nearby-include.patch
+ # (cjw) upstream gcc build fix, via gentoo
- Patch259:       chromium-86-ServiceWorkerRunningInfo-noexcept.patch
+ Patch234:       chromium-83-gcc-iterator.patch
+ # (cjw) gcc warnings
- # (ns80) fixes for building chromium 86
+ Patch237:       chromium-84-gcc.patch
- Patch300:       chromium-86-mga-fix-build.patch
+ # (cjw) fix build with system zlib
+ Patch240:       chromium-85-system-zlib.patch
+ # (cjw) gcc warnings
+ Patch241:       chromium-85-gcc.patch
+ # (cjw) fix angle-vulkan build with system zlib
+ Patch243:       chromium-87-system-zlib.patch
+ # (cjw) gcc errors and warnings
+ Patch244:       chromium-87-gcc.patch
+ # (cjw) workarounds for gcc warnings that do not work with clang
+ Patch245:       chromium-87-gcc-only.patch
+ # crash fix from upstream
+ Patch246:       chromium-87-double-free.patch
+ # (cjw) fix occurrences of TRUE that icu headers do not define anymore
+ Patch247:       chromium-87-system-icu.patch
  Provides:       %{crname}
  Obsoletes:      chromium-browser-unstable < 26.0.1410.51
-Line 138 
 BuildRequires: gperf
+Line 213 
 BuildRequires: gperf
  %if %{system_icu}
  BuildRequires:  icu
  %endif
- BuildRequires:  java-openjdk-headless
  BuildRequires:  ninja
  BuildRequires:  python2
- BuildRequires:  python3-setuptools
  BuildRequires:  yasm
  BuildRequires:  bzip2-devel
+ #BuildRequires: closure-compiler
  BuildRequires:  cups-devel
  BuildRequires:  elfutils-devel
  BuildRequires:  ffmpeg-devel
-Line 161 
 BuildRequires: mesaglesv2-devel
+Line 235 
 BuildRequires: mesaglesv2-devel
  BuildRequires:  nodejs
  %endif
  BuildRequires:  osmesa-devel
+ #BuildRequires: protobuf-devel
  BuildRequires:  snappy-devel
  BuildRequires:  perl(Switch)
  BuildRequires:  pkgconfig(alsa)
-Line 171 
 BuildRequires: pkgconfig(dav1d)
+Line 246 
 BuildRequires: pkgconfig(dav1d)
  BuildRequires:  pkgconfig(dbus-glib-1)
  BuildRequires:  pkgconfig(expat)
  BuildRequires:  pkgconfig(flac)
+ %if %{system_fontconfig}
  BuildRequires:  pkgconfig(fontconfig)
+ %endif
  BuildRequires:  pkgconfig(freetype2)
+ BuildRequires:  pkgconfig(gbm)
  BuildRequires:  pkgconfig(glu)
  BuildRequires:  pkgconfig(gnome-keyring-1)
  BuildRequires:  pkgconfig(gnutls)
-Line 204 
 BuildRequires: pkgconfig(minizip)
+Line 282 
 BuildRequires: pkgconfig(minizip)
  BuildRequires:  pkgconfig(nspr)
  BuildRequires:  pkgconfig(nss)
  BuildRequires:  pkgconfig(opus)
+ %if %{system_re2}
+ BuildRequires:  pkgconfig(re2)
+ %endif
  BuildRequires:  pkgconfig(speech-dispatcher)
  BuildRequires:  pkgconfig(speex)
  BuildRequires:  pkgconfig(udev)
  BuildRequires:  pkgconfig(xscrnsaver)
  BuildRequires:  pkgconfig(xt)
  BuildRequires:  pkgconfig(xtst)
- BuildRequires:  pkgconfig(re2)
+ BuildRequires:  pkgconfig(zlib)
- BuildRequires:  pkgconfig(gbm)
  %if %{use_clang}
  BuildRequires:  clang
  %endif
-Line 254 
 browser.
+Line 334 
 browser.
  %setup -q -n chromium-%{version}
  %autopatch -p1
- # Remove bundled libs
+ # files we do not want from upstream source bundles
- keeplibs=(
+ rm -r --interactive=never third_party/breakpad/breakpad/src/processor/testdata/
-     base/third_party/cityhash
+ rm -r --interactive=never third_party/breakpad/breakpad/src/tools
-     base/third_party/double_conversion
+ find chrome/common/extensions/docs/ -type f \! -regex '.*\.\(gn\|gni\)' -delete
-     base/third_party/dynamic_annotations
+ rm -r --interactive=never chrome/test/data/{android,app_shim,apptest,ash,autofill,automation,automation_proxy_snapshot,banners,bookmark_html_reader,bookmarks,captive_portal,chromedriver,chrome_endure,chromeos,click_modifier,components,constrained_files,content,content_setting_bubble,devtools,diagnostics,dom_automation,dom_checker,dom_distiller,downloads,drive_first_run,dromaeo,durable,edge_database_reader,edge_profile,encoding_tests,extensions,fast_shutdown,fast_tab_close,favicon,feeds,file_select_helper,find_in_page,firefox320_profile,firefox35_profile,firefox3_nss,firefox3_nss_mac,firefox3_profile,firefox_profile,firefox_searchplugins,focus,frame_dom_access,frame_tree,ftp,fullscreen_mouselock,geolocation,google,gpu,History,image_decoding,image_search,import,indexeddb,inspector,installer,interstitial_page,login,native_messaging,navigation_interception,notifications,page_cycler,page_load_metrics,password,pepper,perf,permissions,plugin_power_saver,policy,popup_blocker,predictor,prefs,pref_service,prerender,printing,profiles,push_messaging,referrer_policy,safe_browsing,save_page,scroll,session_history,session_restore,sessions,settings,speech,ssl,subresource_filter,sunspider,sync,template_url_scraper,textinput,third_party,top_sites,translate,unit,v8_benchmark_v6,viewsource,web_app_info,webrtc,websocket,webui_test_resources.grd,whitelists,workers}
-     base/third_party/nspr
+ rm -r --interactive=never chrome/test/data/nacl/{pnacl_error_handling,cross_origin,irt_exception,pnacl_request_header,nonsfi,pnacl_url_loader,pnacl_hw_eh_disabled,pnacl_nmf_options,pnacl_dyncode_syscall_disabled,extension_mime_handler,ppapi_test_lib,bad,ppapi,manifest,pnacl_debug_url,extension_validation_cache,exit_status,progress_events,manifest_file,sysconf_nprocessors_onln,crash,pnacl_mime_type}
-     base/third_party/libevent
+ rmdir chrome/test/data/webui/{settings,extensions}/a11y
-     base/third_party/icu
+ rmdir chrome/test/data/webui/settings/chromeos/app_management
-     base/third_party/superfasthash
+ rmdir chrome/test/data/webui/{engagement,extensions,history,net_internals}
-     base/third_party/symbolize
+ rm -r --interactive=never components/test/data/update_client/jebgalgnebhfojomionfpkfelancnnkf/component1.dll
-     base/third_party/valgrind
+ rm -r --interactive=never content/test/data/
-     base/third_party/xdg_mime
+ rm -r --interactive=never ppapi/native_client/tests/
-     base/third_party/xdg_user_dirs
+ rm -r --interactive=never third_party/apache-win32/
-     buildtools/third_party/libc++
+ rm -r --interactive=never third_party/expat/{fuzz,include,src}
-     buildtools/third_party/libc++abi
+ rm -r --interactive=never third_party/ffmpeg/*/*
-     buildtools/third_party/libunwind
+ rm -r --interactive=never third_party/flac/{include,src}
-     chrome/third_party/mozilla_security_manager
+ %if %{system_icu}
-     courgette/third_party
+ rm -r --interactive=never third_party/icu/{android,android_small,common,patches,source,chromeos,ios}
-     net/third_party/mozilla_security_manager
+ %endif
-     net/third_party/nss
+ rm -r --interactive=never third_party/jsoncpp/source
-     net/third_party/quic
+ rm -r --interactive=never third_party/lcov
-     net/third_party/uri_template
+ %if %{system_libevent}
-     third_party/abseil-cpp
+ rm -r --interactive=never base/third_party/libevent/*/*
-     third_party/angle
+ rm -r --interactive=never base/third_party/libevent/*.[ch]
-     third_party/angle/src/common/third_party/base
+ %endif
-     third_party/angle/src/common/third_party/smhasher
+ %if %{system_libvpx}
-     third_party/angle/src/common/third_party/xxhash
+ rm -r --interactive=never third_party/libvpx/source/{libvpx,config}
-     third_party/angle/src/third_party/compiler
+ %endif
-     third_party/angle/src/third_party/libXNVCtrl
+ rm -r --interactive=never third_party/libaom/source
-     third_party/angle/src/third_party/trace_event
+ %if %{system_dav1d}
-     third_party/angle/src/third_party/volk
+ rm -r --interactive=never third_party/dav1d/{libdav1d,version}
-     third_party/angle/third_party/glslang
+ %endif
-     third_party/angle/third_party/spirv-headers
+ rm -r --interactive=never third_party/libjpeg_turbo/*.[ch]
-     third_party/angle/third_party/spirv-tools
+ rm -r --interactive=never third_party/libpng/*.[ch]
-     third_party/angle/third_party/vulkan-headers
+ rm -r --interactive=never third_party/libxslt/{linux,mac,src,win32}
-     third_party/angle/third_party/vulkan-loader
+ rm -r --interactive=never third_party/xdg-utils/tests/
-     third_party/angle/third_party/vulkan-tools
+ rm -r --interactive=never third_party/zlib/{*.[ch],contrib/minizip}
-     third_party/angle/third_party/vulkan-validation-layers
+ rm -r --interactive=never native_client_sdk/src/tools/lib/tests/data
-     third_party/apple_apsl
+ rm -r --interactive=never buildtools/third_party/eu-strip/bin
-     third_party/axe-core
+ rm --interactive=never third_party/pdfium/third_party/libopenjpeg20/*.[ch]
-     third_party/blanketjs
+ rm -r --interactive=never third_party/pdfium/third_party/libpng16
-     third_party/blink
+ %if %{system_libtiff}
-     third_party/boringssl
+ rm --interactive=never third_party/pdfium/third_party/libtiff/*.[ch]
-     third_party/boringssl/src/third_party/fiat
+ %endif
-     third_party/breakpad
+ %if %{system_re2}
-     third_party/breakpad/breakpad/src/third_party/curl
+ rm -r --interactive=never third_party/re2/src
-     third_party/brotli
+ %endif
-     third_party/catapult
+ %if %{system_fontconfig}
-     third_party/catapult/common/py_vulcanize/third_party/rcssmin
+ rm -r --interactive=never third_party/fontconfig/{src,include,chromium}
-     third_party/catapult/common/py_vulcanize/third_party/rjsmin
+ %endif
-     third_party/catapult/third_party/beautifulsoup4
+ rm --interactive=never native_client/tools/redirector.exe
-     third_party/catapult/third_party/google-endpoints
+ rm --interactive=never third_party/webrtc/data/voice_engine/stereo_rtp_files/rtpplay.exe
-     third_party/catapult/third_party/html5lib-python
+ rm -r --interactive=never third_party/llvm
-     third_party/catapult/third_party/polymer
+ rm --interactive=never third_party/webgl/src/sdk/demos/google/san-angeles/gles/t/SanOGLES-Gerbera.exe
-     third_party/catapult/third_party/six
+ rm --interactive=never third_party/webgl/src/sdk/demos/google/san-angeles/gles/t/SanOGLES-PVRSDK.exe
-     third_party/catapult/tracing/third_party/d3
+ rm --interactive=never third_party/webgl/src/sdk/demos/google/san-angeles/gles/t/libGLES_CM.dll
-     third_party/catapult/tracing/third_party/gl-matrix
+ rm --interactive=never third_party/webgl/src/sdk/demos/google/san-angeles/gles/bob/bob
-     third_party/catapult/tracing/third_party/jpeg-js
+ rm --interactive=never third_party/webgl/src/sdk/demos/google/san-angeles/glut/SanOGLES
-     third_party/catapult/tracing/third_party/jszip
+ rm --interactive=never third_party/lzma_sdk/Executable/7za.exe
-     third_party/catapult/tracing/third_party/mannwhitneyu
+ rm --interactive=never third_party/lzma_sdk/7zr.exe
-     third_party/catapult/tracing/third_party/oboe
+ rm --interactive=never third_party/breakpad/symupload.exe
-     third_party/catapult/tracing/third_party/pako
+ rm -r --interactive=never third_party/catapult/third_party/google-endpoints/setuptools
-     third_party/ced
+ rm -r --interactive=never third_party/catapult/third_party/vinn/third_party/v8
-     third_party/cld_3
+ rm --interactive=never third_party/depot_tools/ninja.exe
-     third_party/crashpad
+ rm --interactive=never third_party/depot_tools/ninja-linux32
-     third_party/closure_compiler
+ rm --interactive=never third_party/depot_tools/ninja-linux64
-     third_party/crashpad/crashpad/third_party/lss
+ rm -r --interactive=never native_client/tools/hermetic_cygwin
-     third_party/crashpad/crashpad/third_party/zlib
+ rm -r --interactive=never base/test/data/pe_image/
-     third_party/crc32c
+ rm -r --interactive=never base/test/data/file_version_info_unittest
-     third_party/cros_system_api
+ rm -r --interactive=never chrome/chrome_cleaner/test/resources/signed_dll
-     third_party/dav1d
+ rm --interactive=never third_party/crashpad/crashpad/handler/win/z7_test.dll
-     third_party/dawn
+ rm -r --interactive=never third_party/crashpad/crashpad/snapshot/elf/elf_image_reader_fuzzer_corpus
-     third_party/depot_tools
+ rm -r --interactive=never third_party/boringssl/src/util/ar/testdata
-     third_party/depot_tools/third_party/six
+ rm -r --interactive=never third_party/pyelftools/test/testfiles_for_unittests
-     third_party/devscripts
+ rm -r --interactive=never third_party/pyelftools/test/external_tools
-     third_party/devtools-frontend
+ rm -r --interactive=never third_party/pyelftools/test/testfiles_for_readelf
-     third_party/devtools-frontend/src/third_party/axe-core
+ rm -r --interactive=never third_party/pyelftools/examples
-     third_party/devtools-frontend/src/third_party/typescript
+ rm -r --interactive=never third_party/skia/platform_tools/android/bin
-     third_party/devtools-frontend/src/front_end/third_party/acorn
+ rm --interactive=never third_party/nasm/travis/test/tmap.o.t
-     third_party/devtools-frontend/src/front_end/third_party/chromium
+ rm -r --interactive=never components/test/data/update_client
-     third_party/devtools-frontend/src/front_end/third_party/codemirror
+ rm -r --interactive=never build/android/tests/symbolize
-     third_party/devtools-frontend/src/front_end/third_party/fabricjs
-     third_party/devtools-frontend/src/front_end/third_party/i18n
+ rm --interactive=never third_party/skia/platform_tools/android/apps/gradle/wrapper/gradle-wrapper.jar
-     third_party/devtools-frontend/src/front_end/third_party/intl-messageformat
+ rm --interactive=never third_party/libphonenumber/dist/tools/java/java-build/target/java-build-1.0-SNAPSHOT-jar-with-dependencies.jar
-     third_party/devtools-frontend/src/front_end/third_party/lighthouse
+ rm --interactive=never third_party/libphonenumber/dist/tools/java/cpp-build/target/cpp-build-1.0-SNAPSHOT-jar-with-dependencies.jar
-     third_party/devtools-frontend/src/front_end/third_party/lit-html
+ rm -r --interactive=never third_party/libphonenumber/dist/java/demo/war/WEB-INF/lib
-     third_party/devtools-frontend/src/front_end/third_party/lodash-isequal
+ rm -r --interactive=never third_party/libphonenumber/dist/java/lib
-     third_party/devtools-frontend/src/front_end/third_party/marked
+ rm --interactive=never third_party/webrtc/examples/androidapp/third_party/autobanh/lib/autobanh.jar
-     third_party/devtools-frontend/src/front_end/third_party/wasmparser
+ rm --interactive=never third_party/closure_compiler/compiler/compiler.jar
-     third_party/devtools-frontend/src/third_party
+ rm --interactive=never third_party/flatbuffers/src/android/gradle/wrapper/gradle-wrapper.jar
-     third_party/dom_distiller_js
+ rm --interactive=never third_party/flatbuffers/src/samples/android/gradle/wrapper/gradle-wrapper.jar
-     third_party/emoji-segmenter
+ rm --interactive=never third_party/devtools-frontend/src/scripts/closure/compiler.jar
-     third_party/expat
+ rm --interactive=never third_party/devtools-frontend/src/scripts/closure/closure_runner/closure_runner.jar
-     third_party/ffmpeg
+ rm --interactive=never third_party/devtools-frontend/src/scripts/jsdoc_validator/jsdoc_validator.jar
-     third_party/flac
+ rm --interactive=never third_party/gradle_wrapper/gradle/wrapper/gradle-wrapper.jar
-     third_party/flatbuffers
+ rm --interactive=never third_party/webgl/src/conformance-suites/2.0.0/deqp/compiler.jar
-     third_party/fontconfig
-     third_party/libgifcodec
+ %if %{system_libevent}
-     third_party/glslang
+ find base/third_party/libevent -type f \! -regex '.*\.\(gn\|gni\|isolate\)' -delete
-     third_party/google_input_tools
+ %endif
-     third_party/google_input_tools/third_party/closure_library
-     third_party/google_input_tools/third_party/closure_library/third_party/closure
+ %if %{system_icu}
-     third_party/google_trust_services
+ # Remove bundled ICU; its header files appear to get picked up instead of
-     third_party/googletest
+ # the system ones, leading to errors during the final link stage.
-     third_party/grpc
+ # https://groups.google.com/a/chromium.org/d/topic/chromium-packagers/BNGvJc08B6Q
-     third_party/grpc/src/third_party/nanopb
+ find third_party/icu -type f \! -regex '.*\.\(gn\|gni\|isolate\)' -delete
-     third_party/harfbuzz-ng
+ %endif
-     third_party/harfbuzz-ng/utils
-     third_party/hunspell
-     third_party/iccjpeg
-     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/libavif
-     third_party/libdrm
-     third_party/libjingle
-     third_party/libjpeg_turbo
-     third_party/libphonenumber
-     third_party/libsecret
-     third_party/libsrtp
-     third_party/libsync
-     third_party/libudev
-     third_party/libusb
-     third_party/libwebm
-     third_party/libwebp
-     third_party/libxml
-     third_party/libxml/chromium
-     third_party/libxslt
-     third_party/libyuv
-     third_party/lottie
-     third_party/lss
-     third_party/lzma_sdk
-     third_party/mako
-     third_party/markupsafe
-     third_party/mesa
-     third_party/metrics_proto
-     third_party/minigbm
-     third_party/modp_b64
-     third_party/nasm
-     third_party/nearby
-     third_party/node
-     third_party/node/node_modules/polymer-bundler/lib/third_party/UglifyJS2
-     third_party/one_euro_filter
-     third_party/opencv
-     third_party/openscreen
-     third_party/openscreen/src/third_party/mozilla
-     third_party/openscreen/src/third_party/tinycbor
-     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/eu-strip
-     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/rnnoise
-     third_party/s2cellid
-     third_party/schema_org
-     third_party/securemessage
-     third_party/simplejson
-     third_party/sinonjs
-     third_party/skia
-     third_party/skia/third_party/skcms
-     third_party/skia/third_party/vulkan
-     third_party/skia/include/third_party/vulkan/
-     third_party/skia/include/third_party/skcms/
-     third_party/smhasher
-     third_party/snappy
-     third_party/spirv-headers
-     third_party/SPIRV-Tools
-     third_party/sqlite
-     third_party/swiftshader
-     third_party/swiftshader/third_party/astc-encoder
-     third_party/swiftshader/third_party/llvm-10.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
-     third_party/tcmalloc
-     third_party/test_fonts
-     third_party/ukey2
-     third_party/usrsctp
-     third_party/vulkan
-     third_party/web-animations-js
-     third_party/webdriver
-     third_party/webrtc
-     third_party/webrtc/common_audio/third_party/ooura
-     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/wuffs
-     third_party/xcbproto
-     third_party/zxcvbn-cpp
-     third_party/zlib
-     third_party/zlib/google
-     tools/gn/src/base/third_party/icu
-     tools/grit/third_party/six
-     url/third_party/mozilla
-     v8/src/third_party/siphash
-     v8/src/third_party/valgrind
-     v8/src/third_party/utf8-decoder
-     v8/third_party/inspector_protocol
-     v8/third_party/v8
-     v8/third_party/v8/builtins
- )
- keeplibs+=(
-     third_party/v4l-utils
-     third_party/wayland
-     third_party/wayland-protocols
- )
- %if !%{system_icu}
- keeplibs+=(
-     third_party/icu
- )
- %endif
- %if !%{system_libvpx}
- keeplibs+=(
-     third_party/libvpx
-     third_party/libvpx/source/libvpx/third_party/x86inc
- )
- %endif
- # needed due to bugs in GN
- keeplibs+=(
-     third_party/adobe
-     third_party/speech-dispatcher
-     third_party/usb_ids
-     third_party/xdg-utils
- )
- python2 build/linux/unbundle/remove_bundled_libraries.py "${keeplibs[@]}" --do-remove
  # Hard code extra version
  FILE=chrome/common/channel_info_posix.cc
-Line 518 
 if diff -u $FILE $FILE.orig >/dev/null;
+Line 449 
 if diff -u $FILE $FILE.orig >/dev/null;
    exit 1
  fi
+ # version taken from: strings opt/google/chrome-unstable/chrome | grep -C 1 " (version:"
+ #define widevine_version 1.4.8.1008
+ #for chrome_arch in ia32 x64; do
+ #  mkdir -p third_party/widevine/cdm/linux/${chrome_arch}
+ #  sed -e "s/@WIDEVINE_VERSION@/%{widevine_version}/" %{SOURCE4} > third_party/widevine/cdm/linux/${chrome_arch}/widevine_cdm_version.h
+ #done
  %build
- %define system_gn_list  ffmpeg flac libwebp libxml libxslt snappy %{?gn_libvpx} libpng %{?gn_icu} jsoncpp opus re2 libdrm %{?gn_dav1d} %{?gn_libevent} freetype harfbuzz-ng
+ %define system_gn_list ffmpeg flac %{?gn_fontconfig} libwebp libxml libxslt snappy %{?gn_libvpx} libpng %{?gn_icu} zlib jsoncpp opus %{?gn_re2} libdrm %{?gn_dav1d} %{?gn_libevent}
+ # handled by upstream regular build scripts: freetype harfbuzz-ng
+ # mesa
  # v NO TABS IN HERE!
  %define gn_config use_sysroot=false \
-Line 527 
 fi
+Line 467 
 fi
                    icu_use_data_file=true \
                    enable_nacl=false \
                    is_nacl_glibc=false \
-                   binutils_path="%{_bindir}" \
                    linux_use_bundled_binutils=false \
                    custom_toolchain="//build/toolchain/linux/unbundle:default" \
                    host_toolchain="//build/toolchain/linux/unbundle:default" \
-Line 551 
 fi
+Line 490 
 fi
                    %{?gn_clang} \
                    clang_use_chrome_plugins=false \
                    use_lld=false \
+                   use_gold=false \
                    use_system_freetype=true \
                    use_system_harfbuzz=true \
                    use_system_libpng=true \
                    enable_dav1d_decoder=true enable_libaom_decoder=false \
                    use_custom_libcxx=false \
                    closure_compile=false \
+                   enable_mojom_closure_compile=false \
+                   enable_js_type_check=false \
                    google_api_key="%{google_api_key}" \
                    google_default_client_id="%{google_default_client_id}" \
-                   google_default_client_secret="%{google_default_client_secret}" \
+                   google_default_client_secret="%{google_default_client_secret}"
-                   treat_warnings_as_errors=false
  #                  enable_browser_cdms=true \
-Line 599 
 CFLAGS="$CFLAGS -msse2"
+Line 540 
 CFLAGS="$CFLAGS -msse2"
  CXXFLAGS="$CXXFLAGS -msse2"
  %endif
- tools/gn/bootstrap/bootstrap.py --gn-gen-args='%{gn_config}'
+ 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
- out/Release/gn gen --args='%{gn_config}' out/Release
+ # python...
+ mkdir out/Release/python2_root
+ cp -r %{python3_sitelib}/xcbgen out/Release/python2_root/
+ cp -r %{python3_sitelib}/setuptools out/Release/python2_root/
+ # ld.bfd needs lots of file descriptors to link chrome
+ ulimit -n 4096
  pushd out/Release
- ninja %{_smp_mflags} chrome chrome_sandbox
+ env PYTHONPATH=${PWD}/python2_root ninja %{_smp_mflags} chrome chrome_sandbox
  popd
  # man page

 Legend:



Removed from v.1642598
 


changed lines


 
Added in v.1653801
 Legend:



Removed from v.1642598
 


changed lines


 
Added in v.1653801
-Removed from v.1642598
+Added in v.1653801

	ViewVC Help
Powered by ViewVC 1.1.30