Mageia Bugzilla – Attachment 10149 Details for
Bug 22138
chromium-browser-stable new security issues fixed in 67.0.3396.62
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
New Account
|
Forgot Password
[patch]
add patch from Christiaan Welvaart
chromium-66.0.3359.170.patch (text/plain), 13.42 KB, created by
Adrien Guichard
on 2018-05-14 02:39:49 CEST
(
hide
)
Description:
add patch from Christiaan Welvaart
Filename:
MIME Type:
Creator:
Adrien Guichard
Created:
2018-05-14 02:39:49 CEST
Size:
13.42 KB
patch
obsolete
>Index: SOURCES/chromium-66-ffmpeg-jsoncpp.patch >=================================================================== >--- SOURCES/chromium-66-ffmpeg-jsoncpp.patch (nonexistent) >+++ SOURCES/chromium-66-ffmpeg-jsoncpp.patch (copie de travail) >@@ -0,0 +1,22 @@ >+--- chromium-66.0.3359.66/build/linux/unbundle/ffmpeg.gn.buildflag_header 2018-03-29 22:00:27.309041504 +0200 >++++ chromium-66.0.3359.66/build/linux/unbundle/ffmpeg.gn 2018-03-30 12:30:19.959072993 +0200 >+@@ -14,8 +14,8 @@ >+ ] >+ } >+ >+-buildflag_header("ffmpeg_buildflags") { >+- header = "ffmpeg_buildflags.h" >++buildflag_header("ffmpeg_features") { >++ header = "ffmpeg_features.h" >+ flags = [ "USE_SYSTEM_FFMPEG=true" ] >+ } >+ >+@@ -36,7 +36,7 @@ >+ >+ source_set("ffmpeg") { >+ deps = [ >+- ":ffmpeg_buildflags", >++ ":ffmpeg_features", >+ ":ffmpeg_shim", >+ ] >+ public_configs = [ ":system_ffmpeg", ":ffmpeg_deprecations" ] >Index: SOURCES/chromium-66-ffmpeg-no-deprecation-errors.patch >=================================================================== >--- SOURCES/chromium-66-ffmpeg-no-deprecation-errors.patch (nonexistent) >+++ SOURCES/chromium-66-ffmpeg-no-deprecation-errors.patch (copie de travail) >@@ -0,0 +1,22 @@ >+--- chromium-66.0.3359.170/build/linux/unbundle/ffmpeg.gn 2018-05-11 00:06:23.000000000 +0200 >++++ chromium-66.0.3359.170/build/linux/unbundle/ffmpeg.gn.auo 2018-05-11 17:56:38.096075726 +0200 >+@@ -19,6 +19,12 @@ >+ flags = [ "USE_SYSTEM_FFMPEG=true" ] >+ } >+ >++config("ffmpeg_deprecations") { >++ if (is_linux) { >++ cflags = [ "-Wno-error=deprecated-declarations" ] >++ } >++} >++ >+ shim_headers("ffmpeg_shim") { >+ root_path = "." >+ headers = [ >+@@ -33,5 +39,5 @@ >+ ":ffmpeg_buildflags", >+ ":ffmpeg_shim", >+ ] >+- public_configs = [ ":system_ffmpeg" ] >++ public_configs = [ ":system_ffmpeg", ":ffmpeg_deprecations" ] >+ } >Index: SOURCES/chromium-66-gcc7.patch >=================================================================== >--- SOURCES/chromium-66-gcc7.patch (nonexistent) >+++ SOURCES/chromium-66-gcc7.patch (copie de travail) >@@ -0,0 +1,71 @@ >+--- chromium-66.0.3359.170/content/browser/appcache/appcache_request_handler.cc.gcc7 2018-05-12 15:49:29.837389695 +0200 >++++ chromium-66.0.3359.170.bkup2/content/browser/appcache/appcache_request_handler.cc 2018-05-12 15:34:38.167060455 +0200 >+@@ -639,7 +639,7 @@ >+ >+ SubresourceLoaderParams params; >+ params.loader_factory_info = factory_ptr.PassInterface(); >+- return params; >++ return base::Optional<SubresourceLoaderParams>(std::move(params)); >+ } >+ >+ void AppCacheRequestHandler::MaybeCreateSubresourceLoader( >+--- chromium-66.0.3359.170/device/fido/device_response_converter.cc.gcc7 2018-05-12 16:18:29.413041350 +0200 >++++ chromium-66.0.3359.170/device/fido/device_response_converter.cc 2018-05-12 16:19:08.195931275 +0200 >+@@ -121,7 +121,7 @@ >+ response.SetNumCredentials(it->second.GetUnsigned()); >+ } >+ >+- return response; >++ return base::Optional<AuthenticatorGetAssertionResponse>(std::move(response)); >+ } >+ >+ base::Optional<AuthenticatorGetInfoResponse> ReadCTAPGetInfoResponse( >+@@ -241,7 +241,7 @@ >+ response.SetPinProtocols(std::move(supported_pin_protocols)); >+ } >+ >+- return response; >++ return base::Optional<AuthenticatorGetInfoResponse>(std::move(response)); >+ } >+ >+ } // namespace device >+--- chromium-66.0.3359.170/cc/raster/playback_image_provider.cc.gcc7 2018-05-12 16:15:35.754539759 +0200 >++++ chromium-66.0.3359.170/cc/raster/playback_image_provider.cc 2018-05-12 16:16:07.903446800 +0200 >+@@ -70,7 +70,14 @@ >+ } >+ >+ PlaybackImageProvider::Settings::Settings() = default; >+-PlaybackImageProvider::Settings::Settings(const Settings& other) = default; >++//PlaybackImageProvider::Settings::Settings(const Settings& other) = default; >++// TODO: implement copy ctor >++PlaybackImageProvider::Settings::Settings(const Settings& other) { >++ images_to_skip = other.images_to_skip; >++ image_to_current_frame_index = other.image_to_current_frame_index; >++ >++} >++ >+ PlaybackImageProvider::Settings::~Settings() = default; >+ >+ } // namespace cc >+--- chromium-66.0.3359.170/content/browser/service_worker/service_worker_controllee_request_handler.cc.gcc7 2018-05-12 15:46:36.178819758 +0200 >++++ chromium-66.0.3359.170/content/browser/service_worker/service_worker_controllee_request_handler.cc 2018-05-12 15:46:54.803773298 +0200 >+@@ -271,7 +271,7 @@ >+ controller_info->object_info = provider_host_->GetOrCreateServiceWorkerHandle( >+ provider_host_->controller()); >+ params.controller_service_worker_info = std::move(controller_info); >+- return params; >++ return base::Optional<SubresourceLoaderParams>(std::move(params)); >+ } >+ >+ void ServiceWorkerControlleeRequestHandler::PrepareForMainResource( >+--- chromium-66.0.3359.170/chrome/browser/supervised_user/supervised_user_url_filter.cc.gcc7 2018-05-12 17:54:51.845525807 +0200 >++++ chromium-66.0.3359.170/chrome/browser/supervised_user/supervised_user_url_filter.cc 2018-05-12 17:55:01.752523657 +0200 >+@@ -368,7 +368,7 @@ >+ >+ // Allow navigations to whitelisted origins (currently families.google.com). >+ static const base::NoDestructor<base::flat_set<GURL>> kWhitelistedOrigins( >+- {GURL(kFamiliesUrl).GetOrigin()}); >++ (const base::flat_set<GURL>&){GURL(kFamiliesUrl).GetOrigin()}); >+ if (base::ContainsKey(*kWhitelistedOrigins, effective_url.GetOrigin())) >+ return ALLOW; >+ >Index: SPECS/chromium-browser-stable.spec >=================================================================== >--- SPECS/chromium-browser-stable.spec (révision 1228289) >+++ SPECS/chromium-browser-stable.spec (copie de travail) >@@ -18,7 +18,7 @@ > %define google_default_client_secret mLT8XooDODav1OJG5G3bY61d > > Name: chromium-browser-stable >-Version: 65.0.3325.162 >+Version: 66.0.3359.170 > Release: %mkrel 1 > Summary: A fast webkit-based web browser > Group: Networking/WWW >@@ -43,19 +43,19 @@ > # (cjw) try to get widevine binary plugin to work (must be taken from a chrome download bundle), from gentoo > Patch14: chromium-45-widevine.patch > # (cjw) fix webrtc build with system ffmpeg >-Patch18: chromium-50-system-ffmpeg-3.patch >+##Patch18: chromium-50-system-ffmpeg-3.patch > # (cjw) fix build error due to android-specific code >-Patch19: chromium-50-codec-warnings.patch >+#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 >+## 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 >+#Patch28: chromium-53-gn-system-icu-jsoncpp.patch > # (cjw) add missing unbundle gn files (2) > Patch29: chromium-53-gn-system-opus.patch > # (cjw) build pdfium with system libtiff and libpng >@@ -69,26 +69,32 @@ > # > Patch40: chromium-59-gcc5.patch > # system libvpx >-Patch42: chromium-60-system-libvpx.patch >+#Patch42: chromium-60-system-libvpx.patch > # clang builtin subtract functions, scoped enum > Patch47: chromium-61-gcc5.patch > # enum compared with anonymous enum => warning >-Patch52: chromium-62-gcc5.patch >+#Patch52: chromium-62-gcc5.patch > # (cjw) fix build with icu 58 > Patch53: chromium-62-icu-58.patch > # (cjw) fix coding errors resulting in gcc 7 warning >-Patch54: chromium-62-gcc7.patch >+#Patch54: chromium-62-gcc7.patch > # (cjw) fix build with gtk2 >-Patch55: chromium-62-gtk2.patch >+#Patch55: chromium-62-gtk2.patch > # (cjw) fix more gcc warnings >-Patch58: chromium-63-gcc7.patch >+#Patch58: chromium-63-gcc7.patch > # (cjw) fix gcc errors and warnings >-Patch177: chromium-64-gcc7.patch >+#Patch177: chromium-64-gcc7.patch > # (cjw) fix even more gcc warnings >-Patch179: chromium-65-gcc7.patch >+#Patch179: chromium-65-gcc7.patch > # (cjw) fix build with gtk2 >-Patch180: chromium-65-gtk2.patch >- >+#Patch180: chromium-65-gtk2.patch >+#Patch181: chromium-65-match-avcodec-padding-size.patch >+# (auo) fix updated version of chromium-53-ffmpeg-no-deprecation-errors.patch >+Patch181: chromium-66-ffmpeg-no-deprecation-errors.patch >+# (auo) fix ffmpeg-features deps >+Patch182: chromium-66-ffmpeg-jsoncpp.patch >+# (auo) fix gcc errors and warnings >+Patch183: chromium-66-gcc7.patch > Provides: %{crname} > Obsoletes: chromium-browser-unstable < 26.0.1410.51 > Obsoletes: chromium-browser-beta < 26.0.1410.51 >@@ -104,7 +110,7 @@ > BuildRequires: elfutils-devel > BuildRequires: ffmpeg-devel > BuildRequires: glib2-devel >-BuildRequires: gtk2-devel >+BuildRequires: gtk3-devel > BuildRequires: libatomic-devel > #BuildRequires: libevent-devel > BuildRequires: libmesagl-devel >@@ -142,7 +148,7 @@ > BuildRequires: pkgconfig(libtiff-4) > BuildRequires: pkgconfig(libusb-1.0) > %if %mgaver >= 7 >-BuildRequires: pkgconfig(libvpx) >+#BuildRequires: pkgconfig(libvpx) > %endif > BuildRequires: pkgconfig(libwebp) > BuildRequires: pkgconfig(libxml-2.0) >@@ -214,17 +220,17 @@ > rm -rf third_party/apache-win32/ > rm -rf third_party/binutils/ > rm -rf third_party/expat/files/ >-rm -rf third_party/ffmpeg/*/* >-rm -rf third_party/ffmpeg/*.[ch] >+#rm -rf third_party/ffmpeg/*/* >+#rm -rf third_party/ffmpeg/*.[ch] > rm -rf third_party/flac/{include,src} > #rm -rf third_party/freetype/{src,include} > rm -rf third_party/icu/{android,linux,mac,patches,public,source,windows} >-rm -rf third_party/jsoncpp/source >+#rm -rf third_party/jsoncpp/source > rm -rf third_party/lcov > #rm -rf base/third_party/libevent/*/* > #rm -rf base/third_party/libevent/*.[ch] > %if %mgaver >= 7 >-rm -rf third_party/libvpx/source/{libvpx,config} >+#rm -rf third_party/libvpx/source/{libvpx,config} > %endif > rm -rf third_party/libexif/sources > rm -rf third_party/libjpeg/*.[ch] >@@ -285,7 +291,7 @@ > > %build > %if %mgaver >= 7 >-%define system_gn_list ffmpeg flac libwebp libxml libxslt snappy yasm libvpx libpng icu zlib jsoncpp opus libdrm >+%define system_gn_list ffmpeg flac libwebp libxml libxslt snappy yasm libpng icu zlib opus libdrm > %else > %define system_gn_list ffmpeg flac libwebp libxml libxslt snappy yasm libpng icu zlib jsoncpp opus libdrm freetype > %endif >@@ -293,8 +299,7 @@ > # libevent mesa > > # v NO TABS IN HERE! >-%define gn_config use_gconf=false\ >- use_sysroot=false \ >+%define gn_config use_sysroot=false\ > system_libdir="%{_lib}" \ > icu_use_data_file=true \ > enable_nacl=false \ >@@ -304,7 +309,6 @@ > use_gold=false \ > custom_toolchain="%{_sourcedir}:default" \ > proprietary_codecs=true \ >- linux_link_libgio = true \ > linux_link_libudev = true \ > linux_link_libspeechd = true \ > enable_ac3_eac3_audio_demuxing=true \ >@@ -316,7 +320,6 @@ > pdf_enable_xfa=true \ > use_pulseaudio=true \ > use_allocator="none" \ >- use_gtk3=false \ > fatal_linker_warnings=false \ > use_libpci = true \ > is_debug=false \ >@@ -326,6 +329,7 @@ > use_system_libpng=true \ > use_custom_libcxx=false \ > google_api_key="%{google_api_key}" \ >+ v8_use_external_startup_data = false \ > google_default_client_id="%{google_default_client_id}" \ > google_default_client_secret="%{google_default_client_secret}" > >@@ -345,7 +349,7 @@ > # filter out -g from CFLAGS and CXXFLAGS to fix builds > CFLAGS=$(echo "$CFLAGS"|sed -e 's/-g //') > CXXFLAGS=$(echo "$CXXFLAGS"|sed -e 's/-g //') >-CXXFLAGS="$CXXFLAGS -Wno-error=attributes -Wno-error=comment -Wno-error=unused-variable -Wno-error=noexcept-type -Wno-error=register -Wno-error=strict-overflow -Wno-error=deprecated-declarations" >+CXXFLAGS="$CXXFLAGS -Wno-error -fpermissive -Wno-error=attributes -Wno-error=comment -Wno-error=unused-variable -Wno-error=noexcept-type -Wno-error=register -Wno-error=strict-overflow -Wno-error=unused-function -Wno-error=int-in-bool-context -Wno-error=memset-elt-size -Wno-error=format= -Wno-error=switch -Wno-error=dangling-else -Wno-error=deprecated-declarations" > > python tools/gn/bootstrap/bootstrap.py --gn-gen-args='%{gn_config}' > >@@ -368,8 +372,9 @@ > install -m 644 out/Release/chrome_100_percent.pak %{buildroot}%{_crdir}/ > install -m 644 out/Release/chrome_200_percent.pak %{buildroot}%{_crdir}/ > install -m 644 out/Release/resources.pak %{buildroot}%{_crdir}/ >-install -m 644 out/Release/natives_blob.bin %{buildroot}%{_crdir}/ >-install -m 644 out/Release/snapshot_blob.bin %{buildroot}%{_crdir}/ >+# (auo) v8_use_external_startup_data = false >+#install -m 644 out/Release/natives_blob.bin %{buildroot}%{_crdir}/ >+#install -m 644 out/Release/snapshot_blob.bin %{buildroot}%{_crdir}/ > install -m 644 out/Release/keyboard_resources.pak %{buildroot}%{_crdir}/ > install -m 644 out/Release/libwidevinecdmadapter.so %{buildroot}%{_crdir}/ > install -m 755 out/Release/mksnapshot %{buildroot}%{_crdir}/ >@@ -414,8 +419,9 @@ > %attr(4755,root,root) %{_crdir}/chrome-sandbox > %{_crdir}/icudtl.dat > %{_crdir}/locales >-%{_crdir}/natives_blob.bin >-%{_crdir}/snapshot_blob.bin >+# (auo) v8_use_external_startup_data = false >+#%{_crdir}/natives_blob.bin >+#%{_crdir}/snapshot_blob.bin > %{_crdir}/chrome_100_percent.pak > %{_crdir}/chrome_200_percent.pak > %{_crdir}/keyboard_resources.pak
Index: SOURCES/chromium-66-ffmpeg-jsoncpp.patch =================================================================== --- SOURCES/chromium-66-ffmpeg-jsoncpp.patch (nonexistent) +++ SOURCES/chromium-66-ffmpeg-jsoncpp.patch (copie de travail) @@ -0,0 +1,22 @@ +--- chromium-66.0.3359.66/build/linux/unbundle/ffmpeg.gn.buildflag_header 2018-03-29 22:00:27.309041504 +0200 ++++ chromium-66.0.3359.66/build/linux/unbundle/ffmpeg.gn 2018-03-30 12:30:19.959072993 +0200 +@@ -14,8 +14,8 @@ + ] + } + +-buildflag_header("ffmpeg_buildflags") { +- header = "ffmpeg_buildflags.h" ++buildflag_header("ffmpeg_features") { ++ header = "ffmpeg_features.h" + flags = [ "USE_SYSTEM_FFMPEG=true" ] + } + +@@ -36,7 +36,7 @@ + + source_set("ffmpeg") { + deps = [ +- ":ffmpeg_buildflags", ++ ":ffmpeg_features", + ":ffmpeg_shim", + ] + public_configs = [ ":system_ffmpeg", ":ffmpeg_deprecations" ] Index: SOURCES/chromium-66-ffmpeg-no-deprecation-errors.patch =================================================================== --- SOURCES/chromium-66-ffmpeg-no-deprecation-errors.patch (nonexistent) +++ SOURCES/chromium-66-ffmpeg-no-deprecation-errors.patch (copie de travail) @@ -0,0 +1,22 @@ +--- chromium-66.0.3359.170/build/linux/unbundle/ffmpeg.gn 2018-05-11 00:06:23.000000000 +0200 ++++ chromium-66.0.3359.170/build/linux/unbundle/ffmpeg.gn.auo 2018-05-11 17:56:38.096075726 +0200 +@@ -19,6 +19,12 @@ + flags = [ "USE_SYSTEM_FFMPEG=true" ] + } + ++config("ffmpeg_deprecations") { ++ if (is_linux) { ++ cflags = [ "-Wno-error=deprecated-declarations" ] ++ } ++} ++ + shim_headers("ffmpeg_shim") { + root_path = "." + headers = [ +@@ -33,5 +39,5 @@ + ":ffmpeg_buildflags", + ":ffmpeg_shim", + ] +- public_configs = [ ":system_ffmpeg" ] ++ public_configs = [ ":system_ffmpeg", ":ffmpeg_deprecations" ] + } Index: SOURCES/chromium-66-gcc7.patch =================================================================== --- SOURCES/chromium-66-gcc7.patch (nonexistent) +++ SOURCES/chromium-66-gcc7.patch (copie de travail) @@ -0,0 +1,71 @@ +--- chromium-66.0.3359.170/content/browser/appcache/appcache_request_handler.cc.gcc7 2018-05-12 15:49:29.837389695 +0200 ++++ chromium-66.0.3359.170.bkup2/content/browser/appcache/appcache_request_handler.cc 2018-05-12 15:34:38.167060455 +0200 +@@ -639,7 +639,7 @@ + + SubresourceLoaderParams params; + params.loader_factory_info = factory_ptr.PassInterface(); +- return params; ++ return base::Optional<SubresourceLoaderParams>(std::move(params)); + } + + void AppCacheRequestHandler::MaybeCreateSubresourceLoader( +--- chromium-66.0.3359.170/device/fido/device_response_converter.cc.gcc7 2018-05-12 16:18:29.413041350 +0200 ++++ chromium-66.0.3359.170/device/fido/device_response_converter.cc 2018-05-12 16:19:08.195931275 +0200 +@@ -121,7 +121,7 @@ + response.SetNumCredentials(it->second.GetUnsigned()); + } + +- return response; ++ return base::Optional<AuthenticatorGetAssertionResponse>(std::move(response)); + } + + base::Optional<AuthenticatorGetInfoResponse> ReadCTAPGetInfoResponse( +@@ -241,7 +241,7 @@ + response.SetPinProtocols(std::move(supported_pin_protocols)); + } + +- return response; ++ return base::Optional<AuthenticatorGetInfoResponse>(std::move(response)); + } + + } // namespace device +--- chromium-66.0.3359.170/cc/raster/playback_image_provider.cc.gcc7 2018-05-12 16:15:35.754539759 +0200 ++++ chromium-66.0.3359.170/cc/raster/playback_image_provider.cc 2018-05-12 16:16:07.903446800 +0200 +@@ -70,7 +70,14 @@ + } + + PlaybackImageProvider::Settings::Settings() = default; +-PlaybackImageProvider::Settings::Settings(const Settings& other) = default; ++//PlaybackImageProvider::Settings::Settings(const Settings& other) = default; ++// TODO: implement copy ctor ++PlaybackImageProvider::Settings::Settings(const Settings& other) { ++ images_to_skip = other.images_to_skip; ++ image_to_current_frame_index = other.image_to_current_frame_index; ++ ++} ++ + PlaybackImageProvider::Settings::~Settings() = default; + + } // namespace cc +--- chromium-66.0.3359.170/content/browser/service_worker/service_worker_controllee_request_handler.cc.gcc7 2018-05-12 15:46:36.178819758 +0200 ++++ chromium-66.0.3359.170/content/browser/service_worker/service_worker_controllee_request_handler.cc 2018-05-12 15:46:54.803773298 +0200 +@@ -271,7 +271,7 @@ + controller_info->object_info = provider_host_->GetOrCreateServiceWorkerHandle( + provider_host_->controller()); + params.controller_service_worker_info = std::move(controller_info); +- return params; ++ return base::Optional<SubresourceLoaderParams>(std::move(params)); + } + + void ServiceWorkerControlleeRequestHandler::PrepareForMainResource( +--- chromium-66.0.3359.170/chrome/browser/supervised_user/supervised_user_url_filter.cc.gcc7 2018-05-12 17:54:51.845525807 +0200 ++++ chromium-66.0.3359.170/chrome/browser/supervised_user/supervised_user_url_filter.cc 2018-05-12 17:55:01.752523657 +0200 +@@ -368,7 +368,7 @@ + + // Allow navigations to whitelisted origins (currently families.google.com). + static const base::NoDestructor<base::flat_set<GURL>> kWhitelistedOrigins( +- {GURL(kFamiliesUrl).GetOrigin()}); ++ (const base::flat_set<GURL>&){GURL(kFamiliesUrl).GetOrigin()}); + if (base::ContainsKey(*kWhitelistedOrigins, effective_url.GetOrigin())) + return ALLOW; + Index: SPECS/chromium-browser-stable.spec =================================================================== --- SPECS/chromium-browser-stable.spec (révision 1228289) +++ SPECS/chromium-browser-stable.spec (copie de travail) @@ -18,7 +18,7 @@ %define google_default_client_secret mLT8XooDODav1OJG5G3bY61d Name: chromium-browser-stable -Version: 65.0.3325.162 +Version: 66.0.3359.170 Release: %mkrel 1 Summary: A fast webkit-based web browser Group: Networking/WWW @@ -43,19 +43,19 @@ # (cjw) try to get widevine binary plugin to work (must be taken from a chrome download bundle), from gentoo Patch14: chromium-45-widevine.patch # (cjw) fix webrtc build with system ffmpeg -Patch18: chromium-50-system-ffmpeg-3.patch +##Patch18: chromium-50-system-ffmpeg-3.patch # (cjw) fix build error due to android-specific code -Patch19: chromium-50-codec-warnings.patch +#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 +## 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 +#Patch28: chromium-53-gn-system-icu-jsoncpp.patch # (cjw) add missing unbundle gn files (2) Patch29: chromium-53-gn-system-opus.patch # (cjw) build pdfium with system libtiff and libpng @@ -69,26 +69,32 @@ # Patch40: chromium-59-gcc5.patch # system libvpx -Patch42: chromium-60-system-libvpx.patch +#Patch42: chromium-60-system-libvpx.patch # clang builtin subtract functions, scoped enum Patch47: chromium-61-gcc5.patch # enum compared with anonymous enum => warning -Patch52: chromium-62-gcc5.patch +#Patch52: chromium-62-gcc5.patch # (cjw) fix build with icu 58 Patch53: chromium-62-icu-58.patch # (cjw) fix coding errors resulting in gcc 7 warning -Patch54: chromium-62-gcc7.patch +#Patch54: chromium-62-gcc7.patch # (cjw) fix build with gtk2 -Patch55: chromium-62-gtk2.patch +#Patch55: chromium-62-gtk2.patch # (cjw) fix more gcc warnings -Patch58: chromium-63-gcc7.patch +#Patch58: chromium-63-gcc7.patch # (cjw) fix gcc errors and warnings -Patch177: chromium-64-gcc7.patch +#Patch177: chromium-64-gcc7.patch # (cjw) fix even more gcc warnings -Patch179: chromium-65-gcc7.patch +#Patch179: chromium-65-gcc7.patch # (cjw) fix build with gtk2 -Patch180: chromium-65-gtk2.patch - +#Patch180: chromium-65-gtk2.patch +#Patch181: chromium-65-match-avcodec-padding-size.patch +# (auo) fix updated version of chromium-53-ffmpeg-no-deprecation-errors.patch +Patch181: chromium-66-ffmpeg-no-deprecation-errors.patch +# (auo) fix ffmpeg-features deps +Patch182: chromium-66-ffmpeg-jsoncpp.patch +# (auo) fix gcc errors and warnings +Patch183: chromium-66-gcc7.patch Provides: %{crname} Obsoletes: chromium-browser-unstable < 26.0.1410.51 Obsoletes: chromium-browser-beta < 26.0.1410.51 @@ -104,7 +110,7 @@ BuildRequires: elfutils-devel BuildRequires: ffmpeg-devel BuildRequires: glib2-devel -BuildRequires: gtk2-devel +BuildRequires: gtk3-devel BuildRequires: libatomic-devel #BuildRequires: libevent-devel BuildRequires: libmesagl-devel @@ -142,7 +148,7 @@ BuildRequires: pkgconfig(libtiff-4) BuildRequires: pkgconfig(libusb-1.0) %if %mgaver >= 7 -BuildRequires: pkgconfig(libvpx) +#BuildRequires: pkgconfig(libvpx) %endif BuildRequires: pkgconfig(libwebp) BuildRequires: pkgconfig(libxml-2.0) @@ -214,17 +220,17 @@ rm -rf third_party/apache-win32/ rm -rf third_party/binutils/ rm -rf third_party/expat/files/ -rm -rf third_party/ffmpeg/*/* -rm -rf third_party/ffmpeg/*.[ch] +#rm -rf third_party/ffmpeg/*/* +#rm -rf third_party/ffmpeg/*.[ch] rm -rf third_party/flac/{include,src} #rm -rf third_party/freetype/{src,include} rm -rf third_party/icu/{android,linux,mac,patches,public,source,windows} -rm -rf third_party/jsoncpp/source +#rm -rf third_party/jsoncpp/source rm -rf third_party/lcov #rm -rf base/third_party/libevent/*/* #rm -rf base/third_party/libevent/*.[ch] %if %mgaver >= 7 -rm -rf third_party/libvpx/source/{libvpx,config} +#rm -rf third_party/libvpx/source/{libvpx,config} %endif rm -rf third_party/libexif/sources rm -rf third_party/libjpeg/*.[ch] @@ -285,7 +291,7 @@ %build %if %mgaver >= 7 -%define system_gn_list ffmpeg flac libwebp libxml libxslt snappy yasm libvpx libpng icu zlib jsoncpp opus libdrm +%define system_gn_list ffmpeg flac libwebp libxml libxslt snappy yasm libpng icu zlib opus libdrm %else %define system_gn_list ffmpeg flac libwebp libxml libxslt snappy yasm libpng icu zlib jsoncpp opus libdrm freetype %endif @@ -293,8 +299,7 @@ # libevent mesa # v NO TABS IN HERE! -%define gn_config use_gconf=false\ - use_sysroot=false \ +%define gn_config use_sysroot=false\ system_libdir="%{_lib}" \ icu_use_data_file=true \ enable_nacl=false \ @@ -304,7 +309,6 @@ use_gold=false \ custom_toolchain="%{_sourcedir}:default" \ proprietary_codecs=true \ - linux_link_libgio = true \ linux_link_libudev = true \ linux_link_libspeechd = true \ enable_ac3_eac3_audio_demuxing=true \ @@ -316,7 +320,6 @@ pdf_enable_xfa=true \ use_pulseaudio=true \ use_allocator="none" \ - use_gtk3=false \ fatal_linker_warnings=false \ use_libpci = true \ is_debug=false \ @@ -326,6 +329,7 @@ use_system_libpng=true \ use_custom_libcxx=false \ google_api_key="%{google_api_key}" \ + v8_use_external_startup_data = false \ google_default_client_id="%{google_default_client_id}" \ google_default_client_secret="%{google_default_client_secret}" @@ -345,7 +349,7 @@ # filter out -g from CFLAGS and CXXFLAGS to fix builds CFLAGS=$(echo "$CFLAGS"|sed -e 's/-g //') CXXFLAGS=$(echo "$CXXFLAGS"|sed -e 's/-g //') -CXXFLAGS="$CXXFLAGS -Wno-error=attributes -Wno-error=comment -Wno-error=unused-variable -Wno-error=noexcept-type -Wno-error=register -Wno-error=strict-overflow -Wno-error=deprecated-declarations" +CXXFLAGS="$CXXFLAGS -Wno-error -fpermissive -Wno-error=attributes -Wno-error=comment -Wno-error=unused-variable -Wno-error=noexcept-type -Wno-error=register -Wno-error=strict-overflow -Wno-error=unused-function -Wno-error=int-in-bool-context -Wno-error=memset-elt-size -Wno-error=format= -Wno-error=switch -Wno-error=dangling-else -Wno-error=deprecated-declarations" python tools/gn/bootstrap/bootstrap.py --gn-gen-args='%{gn_config}' @@ -368,8 +372,9 @@ install -m 644 out/Release/chrome_100_percent.pak %{buildroot}%{_crdir}/ install -m 644 out/Release/chrome_200_percent.pak %{buildroot}%{_crdir}/ install -m 644 out/Release/resources.pak %{buildroot}%{_crdir}/ -install -m 644 out/Release/natives_blob.bin %{buildroot}%{_crdir}/ -install -m 644 out/Release/snapshot_blob.bin %{buildroot}%{_crdir}/ +# (auo) v8_use_external_startup_data = false +#install -m 644 out/Release/natives_blob.bin %{buildroot}%{_crdir}/ +#install -m 644 out/Release/snapshot_blob.bin %{buildroot}%{_crdir}/ install -m 644 out/Release/keyboard_resources.pak %{buildroot}%{_crdir}/ install -m 644 out/Release/libwidevinecdmadapter.so %{buildroot}%{_crdir}/ install -m 755 out/Release/mksnapshot %{buildroot}%{_crdir}/ @@ -414,8 +419,9 @@ %attr(4755,root,root) %{_crdir}/chrome-sandbox %{_crdir}/icudtl.dat %{_crdir}/locales -%{_crdir}/natives_blob.bin -%{_crdir}/snapshot_blob.bin +# (auo) v8_use_external_startup_data = false +#%{_crdir}/natives_blob.bin +#%{_crdir}/snapshot_blob.bin %{_crdir}/chrome_100_percent.pak %{_crdir}/chrome_200_percent.pak %{_crdir}/keyboard_resources.pak
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 22138
:
10145
|
10146
|
10149
|
10158
|
10159