Mageia Bugzilla – Attachment 12976 Details for
Bug 29634
Package ready for chromium-95.0.4638.69 on MGA8, built with clang and without python2 anymore
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
New Account
|
Forgot Password
[patch]
spec file diff
chromium-browser-stable-spec.patch (text/plain), 14.80 KB, created by
christian barranco
on 2021-11-07 16:43:45 CET
(
hide
)
Description:
spec file diff
Filename:
MIME Type:
Creator:
christian barranco
Created:
2021-11-07 16:43:45 CET
Size:
14.80 KB
patch
obsolete
>--- chromium-browser-stable.spec 2021-09-28 08:11:13.000000000 +0200 >+++ chromium-browser-stable.spec.95 2021-11-07 11:07:30.928736210 +0100 >@@ -3,9 +3,9 @@ > %global debug_package %{nil} > %global __debug_install_post %{nil} > >-%global use_clang 0 >+%global use_clang 1 > %global use_gold 0 >-%global warnings_as_errors 1 >+%global warnings_as_errors 0 > %global system_icu 0 > %global system_openjpeg 1 > %global system_libtiff 1 >@@ -66,7 +66,7 @@ > %define google_api_key AIzaSyDhhIHB_kQZodiWr8yDAm8E3GwEyiXmuDU > > Name: chromium-browser-stable >-Version: 94.0.4606.61 >+Version: 95.0.4638.69 > Release: %mkrel 1 > Summary: A fast webkit-based web browser > Group: Networking/WWW >@@ -79,23 +79,31 @@ Source1: chromium-wrapper > Source2: chromium-browser.desktop > Source3: pkg_resources.tar.gz > # from gentoo: compiler setup >-Patch1: chromium-compiler-r4.patch >+#squidf: adjustment for version 95.0.4638.54 >+Patch1: chromium-95-compiler-r4.patch > # fix googleisms in man page > Patch2: chromium-mageia.patch > # (ns80) use a patch rather than a source file for widevine > Patch3: chromium-71.0.3578.98-widevine-r3.patch > # (ns80) remove unrar >-Patch4: chromium-norar.patch >+#squidf: to handle code change in Chromium 95.0.4638.54 >+#squidf: remove rar_analyzer as a dep for safe_browsing >+Patch4: chromium-95_69-norar.patch > # (cjw) [1/4] Recognize mimetypes for matroska (.mkv) and AVI (.avi) formats (video/x-matroska and audio/x-matroska, video/x-msvideo) + handle A52 "AC3" and DTS compressed audio. >-Patch6: chromium-55-extra-media.patch >+#squidf: extra-media.patch splitted to account for Chromium 95 code update >+Patch6: chromium-95-extra-media.patch > # (cjw) [2/4] Recognize mimetypes for WMV (.wmv), FLV (.flv) and MPEG (.mpg) videos >-Patch7: chromium-40-wmvflvmpg.patch >+#squidf: splitted for chromium 95.0.4638.54 and merged with chromium-95-extra-media.patch >+Patch7: chromium-95-wmvflvmpg.patch > # (cjw) [3/4] Handle more video codecs. >-Patch8: chromium-40-sorenson-spark.patch >-# (cjw) [4/4] Add a profile for each added video codec >-Patch9: chromium-extra-media-video-profiles.patch >+#squidf: splitted for chromium 95.0.4638.54 and merged with chromium-95-extra-media.patch >+Patch8: chromium-95-sorenson-spark.patch >+# (cjw) [4/4] Add a profile for each added video codec and merged with chromium-95-extra-media.patch >+#squidf: splitted for chromium 95.0.4638.54 >+Patch9: chromium-95-extra-media-video-profiles.patch > # (cjw) disable external components -- this stops chromium from downloading hotword stuff, for example >-Patch10: chromium-45-no-external-components.patch >+#squidf: to handle code change in Chromium 95.0.4638.54 >+Patch10: chromium-95-no-external-components.patch > # (debian) disable third party cookies by default > Patch11: chromium-third-party-cookies-off-by-default.patch > # (cjw) fix build error due to android-specific code >@@ -129,24 +137,28 @@ Patch38: chromium-72-system-closure-comp > # (cjw) fix build with system icu > Patch39: chromium-77-system-icu.patch > # (cjw) force use of python2, since python3 does not work >-Patch40: chromium-77-python2.patch >+#squidf:python 3 should work since v93: Patch40: chromium-77-python2.patch > # (cjw) support using system dav1d > Patch41: chromium-79-system-dav1d.patch > > # (cjw) gcc errors: redefined macros > Patch80: chromium-gcc-macro-redefined.patch > # (cjw) gcc errors: include files >-Patch81: chromium-gcc-includes.patch >+#squidf: removed applied patches in Chromium 95.0.4638.54 >+Patch81: chromium-95-gcc-includes.patch > # (cjw) gcc warnings: suggested parentheses > Patch82: chromium-gcc-parentheses.patch > # (cjw) gcc warnings: missing casts >-Patch84: chromium-gcc-type-errors.patch >+#squidf: removed applied patches in Chromium 95.0.4638.54 >+Patch84: chromium-95-gcc-type-errors.patch > # (cjw) gcc errors: multiple character literals >-Patch85: chromium-gcc-character-literals.patch >+#squidf: to handle code change in Chromium 95.0.4638.54 >+Patch85: chromium-95-gcc-character-literals.patch > # (cjw) gcc constexpr problems > Patch87: chromium-gcc-constexpr.patch > # (cjw) gcc anonymous namespace problems >-Patch88: chromium-gcc-anonymous-namespace.patch >+#squidf: to handle code change in Chromium 95.0.4638.54 >+Patch88: chromium-95-gcc-anonymous-namespace.patch > # (cjw) gcc noexcept problems > Patch89: chromium-gcc-noexcept.patch > # (cjw) gcc warnings: variable assigned in own assignment rhs >@@ -154,14 +166,17 @@ Patch90: chromium-gcc-double-assignment. > # (cjw) gcc warnings: optional constructs > Patch91: chromium-gcc-optional.patch > # (cjw) gcc - unclear... >-Patch93: chromium-gcc-unsorted.patch >+#squidf: to handle code change in Chromium 95.0.4638.54 >+Patch93: chromium-95-gcc-unsorted.patch > # (cjw) gcc disabled warnings > %if !%{use_clang} >-Patch94: chromium-gcc-disabled-warnings.patch >+#squidf: to handle code change in Chromium 95.0.4638.54 >+Patch94: chromium-95-gcc-disabled-warnings.patch > Patch95: chromium-gcc-va_args.patch > %endif > # (cjw) gcc warnings: suggest explicit braces to avoid ambiguous else [-Werror=dangling-else] >-Patch97: chromium-gcc-braces.patch >+#squidf: to handle code change in Chromium 95.0.4638.54 >+Patch97: chromium-95-gcc-braces.patch > # (cjw) alignment problems > Patch188: chromium-68-gcc8.patch > # (cjw) fix gn bootstrapping with gcc >@@ -176,20 +191,33 @@ Patch240: chromium-85-system-zlib.patch > Patch243: chromium-87-system-zlib.patch > # (cjw) fix broken system libvpx build > Patch244: chromium-88-system-libvpx.patch >+#squidf: additional fix build with system zlib for Chromium 95 >+Patch245: chromium-95-system-zlib.patch > # (cjw) fix i586 build > #Patch248: chromium-87-i586.patch > # (ns80) try to fix mga#28631 >-Patch250: chromium-89-EnumTable-crash.patch >+#squidf:chromium95 and/or clang: leads to enum_table.h:359:18: error: no template named 'vector' in namespace 'std' >+#Patch250: chromium-89-EnumTable-crash.patch > # (cjw) fix build with "old" system freetype > Patch254: chromium-94-system-freetype.patch > # (cjw) fix build with system ffmpeg > Patch255: chromium-94-system-ffmpeg.patch > # (cjw) fix crash in DCHECK() while logging metrics > Patch256: chromium-94-GetNeverPromptSitesBetween-crash.patch >+#squidf: to use clang11 instead of clang13 (unknown option -ffile-compilation-dir) >+%if %{use_clang} >+Patch259: chromium-95-clang_compiler.patch >+Patch260: chromium-clang-nomerge.patch >+%endif > > # Patches from Arch Linux > #Patch300: chromium-glibc-2.33.patch > #Patch301: chromium-fix-libva-redef.patch >+#squidf: fix system zlib_common_header error with maldoca for Chromium 95 >+Patch300: chromium-95-maldoca-zlib.patch >+ >+#squidf: patch from Chromium upstream >+Patch400: chromium-95-BitstreamReader-namespace.patch > > Provides: %{crname} > Obsoletes: chromium-browser-unstable < 26.0.1410.51 >@@ -202,7 +230,14 @@ BuildRequires: gperf > BuildRequires: icu > %endif > BuildRequires: ninja >-BuildRequires: python2 >+#squidf: move to Python3: BuildRequires: python2 >+BuildRequires: python3 >+BuildRequires: python3-devel >+BuildRequires: python3-beautifulsoup4 >+BuildRequires: python3-html5lib >+BuildRequires: python3-markupsafe >+BuildRequires: python3-ply >+BuildRequires: python3-simplejson > #BuildRequires: yasm > BuildRequires: bzip2-devel > #BuildRequires: closure-compiler >@@ -293,8 +328,11 @@ ExclusiveArch: i586 x86_64 > # armv5tl armv7hl > > %description >-Chromium is a browser that combines a minimal design with sophisticated >-technology to make the web faster, safer, and easier. >+%{crname} is a distribution of ungoogled-chromium. >+ >+Ungoogled-Chromium retains the default Chromium experience as closely as >+possible. Unlike other Chromium forks that have their own visions of a web >+browser, ungoogled-chromium is essentially a drop-in replacement for Chromium. > > For certain media playback features - AAC decoding - this package > currently assumes decoder support is available, while that is only true if >@@ -326,7 +364,8 @@ browser. > # files we do not want from upstream source bundles > rm -r --interactive=never third_party/breakpad/breakpad/src/processor/testdata/ > rm -r --interactive=never third_party/breakpad/breakpad/src/tools >-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,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,sunspider,sync,template_url_scraper,textinput,third_party,top_sites,translate,unit,viewsource,web_app_info,webrtc,websocket,webui_test_resources.grd,workers} >+#squidf: ftp removed for Chromium 95 as it does not exist anymore >+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,focus,frame_dom_access,frame_tree,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,sunspider,sync,template_url_scraper,textinput,third_party,top_sites,translate,unit,viewsource,web_app_info,webrtc,websocket,webui_test_resources.grd,workers} > 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} > rmdir chrome/test/data/webui/{settings,extensions}/a11y > rmdir chrome/test/data/webui/settings/chromeos/app_management >@@ -422,7 +461,8 @@ rm --interactive=never third_party/grpc/ > rm --interactive=never third_party/grpc/src/src/android/test/interop/gradle/wrapper/gradle-wrapper.jar > rm --interactive=never third_party/tflite/src/tensorflow/lite/java/ovic/demo/gradle/wrapper/gradle-wrapper.jar > rm --interactive=never third_party/tflite/src/tensorflow/lite/java/demo/gradle/wrapper/gradle-wrapper.jar >-rm --interactive=never third_party/tflite/src/tensorflow/examples/android/gradle/wrapper/gradle-wrapper.jar >+#squidf: gradle-wrapper.jar does not exist anymore with version 95 >+#rm --interactive=never third_party/tflite/src/tensorflow/examples/android/gradle/wrapper/gradle-wrapper.jar > rm --interactive=never third_party/checkstyle/checkstyle-all.jar > rm --interactive=never build/android/stacktrace/java_deobfuscate.jar > >@@ -530,6 +570,18 @@ CXXFLAGS="$CXXFLAGS -faligned-new -Wno-a > %if %{use_clang} > CFLAGS="$CFLAGS -Wno-error=unused-result" > CXXFLAGS="$CXXFLAGS -Wno-error=deprecated-declarations -Wno-error=deprecated-copy -Wno-error=psabi -Wno-error=implicit-const-int-float-conversion -Wno-error=non-c-typedef-for-linkage -Wno-error=unused-const-variable" >+#from opensuse >+export CXXFLAGS="${CXXFLAGS} -Wno-unused-command-line-argument -Wno-unknown-warning-option" >+# extra flags to reduce warnings that aren't very useful >+export CXXFLAGS="${CXXFLAGS} -Wno-pedantic -Wno-unused-result -Wno-unused-function -Wno-unused-variable -Wno-deprecated-declarations" >+# ignore warnings for minor mistakes that are too common >+export CXXFLAGS="${CXXFLAGS} -Wno-return-type -Wno-parentheses -Wno-misleading-indentation" >+# ignore warnings that are not supported well until gcc 8 >+export CXXFLAGS="${CXXFLAGS} -Wno-attributes" >+# ignore warnings due to gcc bug (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=84055) >+export CXXFLAGS="${CXXFLAGS} -Wno-ignored-attributes" >+# ingore new gcc 8 warnings that aren't yet handled upstream >+export CXXFLAGS="${CXXFLAGS} -Wno-address -Wno-dangling-else" > %else > CXXFLAGS="$CXXFLAGS -Wno-error=class-memaccess -Wno-error=unknown-pragmas -Wno-error=array-bounds -Wno-return-type -Wno-error=nonnull -Wno-error=free-nonheap-object -Wno-error=unused -Wno-error=unused-function -Wno-error=unused-variable -Wno-error=unused-but-set-variable -Wno-error=maybe-uninitialized -Wno-error=uninitialized -Wno-error=invalid-offsetof -Wno-error=stringop-overflow -std=gnu++17" > %endif >@@ -552,30 +604,31 @@ CFLAGS="$CFLAGS -msse2" > CXXFLAGS="$CXXFLAGS -msse2" > %endif > >-python2 tools/gn/bootstrap/bootstrap.py --gn-gen-args='%{gn_config}' >+python3 tools/gn/bootstrap/bootstrap.py --gn-gen-args='%{gn_config}' > > 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/ >-pushd out/Release/python2_root/ >-tar xf %{SOURCE3} >-popd >+#mkdir out/Release/python2_root >+#cp -r %{python3_sitelib}/xcbgen out/Release/python2_root/ >+#cp -r %{python3_sitelib}/setuptools out/Release/python2_root/ >+#pushd out/Release/python2_root/ >+#tar xf %{SOURCE3} >+#popd > > %if !%{use_gold} > # ld.bfd needs lots of file descriptors to link chrome > ulimit -n 4096 > %endif > >-pushd out/Release >+#pushd out/Release > JOBS=$(echo %{_smp_mflags}|sed -re 's#^-j##') > if [ $JOBS -gt 16 ]; then > JOBS=16 > fi >-env PYTHONPATH=${PWD}/python2_root ninja -j${JOBS} chrome chrome_sandbox >-popd >+#squidf:switch to python3: env PYTHONPATH=${PWD}/python2_root ninja -j${JOBS} chrome chrome_sandbox >+ninja -j${JOBS} -C out/Release chrome chrome_sandbox >+#popd > > # man page > sed -e "s/@@PACKAGE@@/chromium/" -e "s/@@MENUNAME@@/Chromium Web Browser/" chrome/app/resources/manpage.1.in >out/Release/chromium.1 >@@ -670,6 +723,12 @@ done > > > %changelog >+* Sun Nov 7 2021 squidf <chb0@lavache.com> 95.0.4638.69-1 >+- Update to 95.0.4638.69 >+- Remove python2 >+- Fix system zlib_common_header error with maldoca >+- Additional fix to use system zlib >+ > * Tue Sep 28 2021 ns80 <ns80> 94.0.4606.61-1.mga8 > + Revision: 1746789 > - new version 94.0.4606.61 (mga#28732)
--- chromium-browser-stable.spec 2021-09-28 08:11:13.000000000 +0200 +++ chromium-browser-stable.spec.95 2021-11-07 11:07:30.928736210 +0100 @@ -3,9 +3,9 @@ %global debug_package %{nil} %global __debug_install_post %{nil} -%global use_clang 0 +%global use_clang 1 %global use_gold 0 -%global warnings_as_errors 1 +%global warnings_as_errors 0 %global system_icu 0 %global system_openjpeg 1 %global system_libtiff 1 @@ -66,7 +66,7 @@ %define google_api_key AIzaSyDhhIHB_kQZodiWr8yDAm8E3GwEyiXmuDU Name: chromium-browser-stable -Version: 94.0.4606.61 +Version: 95.0.4638.69 Release: %mkrel 1 Summary: A fast webkit-based web browser Group: Networking/WWW @@ -79,23 +79,31 @@ Source1: chromium-wrapper Source2: chromium-browser.desktop Source3: pkg_resources.tar.gz # from gentoo: compiler setup -Patch1: chromium-compiler-r4.patch +#squidf: adjustment for version 95.0.4638.54 +Patch1: chromium-95-compiler-r4.patch # fix googleisms in man page Patch2: chromium-mageia.patch # (ns80) use a patch rather than a source file for widevine Patch3: chromium-71.0.3578.98-widevine-r3.patch # (ns80) remove unrar -Patch4: chromium-norar.patch +#squidf: to handle code change in Chromium 95.0.4638.54 +#squidf: remove rar_analyzer as a dep for safe_browsing +Patch4: chromium-95_69-norar.patch # (cjw) [1/4] Recognize mimetypes for matroska (.mkv) and AVI (.avi) formats (video/x-matroska and audio/x-matroska, video/x-msvideo) + handle A52 "AC3" and DTS compressed audio. -Patch6: chromium-55-extra-media.patch +#squidf: extra-media.patch splitted to account for Chromium 95 code update +Patch6: chromium-95-extra-media.patch # (cjw) [2/4] Recognize mimetypes for WMV (.wmv), FLV (.flv) and MPEG (.mpg) videos -Patch7: chromium-40-wmvflvmpg.patch +#squidf: splitted for chromium 95.0.4638.54 and merged with chromium-95-extra-media.patch +Patch7: chromium-95-wmvflvmpg.patch # (cjw) [3/4] Handle more video codecs. -Patch8: chromium-40-sorenson-spark.patch -# (cjw) [4/4] Add a profile for each added video codec -Patch9: chromium-extra-media-video-profiles.patch +#squidf: splitted for chromium 95.0.4638.54 and merged with chromium-95-extra-media.patch +Patch8: chromium-95-sorenson-spark.patch +# (cjw) [4/4] Add a profile for each added video codec and merged with chromium-95-extra-media.patch +#squidf: splitted for chromium 95.0.4638.54 +Patch9: chromium-95-extra-media-video-profiles.patch # (cjw) disable external components -- this stops chromium from downloading hotword stuff, for example -Patch10: chromium-45-no-external-components.patch +#squidf: to handle code change in Chromium 95.0.4638.54 +Patch10: chromium-95-no-external-components.patch # (debian) disable third party cookies by default Patch11: chromium-third-party-cookies-off-by-default.patch # (cjw) fix build error due to android-specific code @@ -129,24 +137,28 @@ Patch38: chromium-72-system-closure-comp # (cjw) fix build with system icu Patch39: chromium-77-system-icu.patch # (cjw) force use of python2, since python3 does not work -Patch40: chromium-77-python2.patch +#squidf:python 3 should work since v93: Patch40: chromium-77-python2.patch # (cjw) support using system dav1d Patch41: chromium-79-system-dav1d.patch # (cjw) gcc errors: redefined macros Patch80: chromium-gcc-macro-redefined.patch # (cjw) gcc errors: include files -Patch81: chromium-gcc-includes.patch +#squidf: removed applied patches in Chromium 95.0.4638.54 +Patch81: chromium-95-gcc-includes.patch # (cjw) gcc warnings: suggested parentheses Patch82: chromium-gcc-parentheses.patch # (cjw) gcc warnings: missing casts -Patch84: chromium-gcc-type-errors.patch +#squidf: removed applied patches in Chromium 95.0.4638.54 +Patch84: chromium-95-gcc-type-errors.patch # (cjw) gcc errors: multiple character literals -Patch85: chromium-gcc-character-literals.patch +#squidf: to handle code change in Chromium 95.0.4638.54 +Patch85: chromium-95-gcc-character-literals.patch # (cjw) gcc constexpr problems Patch87: chromium-gcc-constexpr.patch # (cjw) gcc anonymous namespace problems -Patch88: chromium-gcc-anonymous-namespace.patch +#squidf: to handle code change in Chromium 95.0.4638.54 +Patch88: chromium-95-gcc-anonymous-namespace.patch # (cjw) gcc noexcept problems Patch89: chromium-gcc-noexcept.patch # (cjw) gcc warnings: variable assigned in own assignment rhs @@ -154,14 +166,17 @@ Patch90: chromium-gcc-double-assignment. # (cjw) gcc warnings: optional constructs Patch91: chromium-gcc-optional.patch # (cjw) gcc - unclear... -Patch93: chromium-gcc-unsorted.patch +#squidf: to handle code change in Chromium 95.0.4638.54 +Patch93: chromium-95-gcc-unsorted.patch # (cjw) gcc disabled warnings %if !%{use_clang} -Patch94: chromium-gcc-disabled-warnings.patch +#squidf: to handle code change in Chromium 95.0.4638.54 +Patch94: chromium-95-gcc-disabled-warnings.patch Patch95: chromium-gcc-va_args.patch %endif # (cjw) gcc warnings: suggest explicit braces to avoid ambiguous else [-Werror=dangling-else] -Patch97: chromium-gcc-braces.patch +#squidf: to handle code change in Chromium 95.0.4638.54 +Patch97: chromium-95-gcc-braces.patch # (cjw) alignment problems Patch188: chromium-68-gcc8.patch # (cjw) fix gn bootstrapping with gcc @@ -176,20 +191,33 @@ Patch240: chromium-85-system-zlib.patch Patch243: chromium-87-system-zlib.patch # (cjw) fix broken system libvpx build Patch244: chromium-88-system-libvpx.patch +#squidf: additional fix build with system zlib for Chromium 95 +Patch245: chromium-95-system-zlib.patch # (cjw) fix i586 build #Patch248: chromium-87-i586.patch # (ns80) try to fix mga#28631 -Patch250: chromium-89-EnumTable-crash.patch +#squidf:chromium95 and/or clang: leads to enum_table.h:359:18: error: no template named 'vector' in namespace 'std' +#Patch250: chromium-89-EnumTable-crash.patch # (cjw) fix build with "old" system freetype Patch254: chromium-94-system-freetype.patch # (cjw) fix build with system ffmpeg Patch255: chromium-94-system-ffmpeg.patch # (cjw) fix crash in DCHECK() while logging metrics Patch256: chromium-94-GetNeverPromptSitesBetween-crash.patch +#squidf: to use clang11 instead of clang13 (unknown option -ffile-compilation-dir) +%if %{use_clang} +Patch259: chromium-95-clang_compiler.patch +Patch260: chromium-clang-nomerge.patch +%endif # Patches from Arch Linux #Patch300: chromium-glibc-2.33.patch #Patch301: chromium-fix-libva-redef.patch +#squidf: fix system zlib_common_header error with maldoca for Chromium 95 +Patch300: chromium-95-maldoca-zlib.patch + +#squidf: patch from Chromium upstream +Patch400: chromium-95-BitstreamReader-namespace.patch Provides: %{crname} Obsoletes: chromium-browser-unstable < 26.0.1410.51 @@ -202,7 +230,14 @@ BuildRequires: gperf BuildRequires: icu %endif BuildRequires: ninja -BuildRequires: python2 +#squidf: move to Python3: BuildRequires: python2 +BuildRequires: python3 +BuildRequires: python3-devel +BuildRequires: python3-beautifulsoup4 +BuildRequires: python3-html5lib +BuildRequires: python3-markupsafe +BuildRequires: python3-ply +BuildRequires: python3-simplejson #BuildRequires: yasm BuildRequires: bzip2-devel #BuildRequires: closure-compiler @@ -293,8 +328,11 @@ ExclusiveArch: i586 x86_64 # armv5tl armv7hl %description -Chromium is a browser that combines a minimal design with sophisticated -technology to make the web faster, safer, and easier. +%{crname} is a distribution of ungoogled-chromium. + +Ungoogled-Chromium retains the default Chromium experience as closely as +possible. Unlike other Chromium forks that have their own visions of a web +browser, ungoogled-chromium is essentially a drop-in replacement for Chromium. For certain media playback features - AAC decoding - this package currently assumes decoder support is available, while that is only true if @@ -326,7 +364,8 @@ browser. # files we do not want from upstream source bundles rm -r --interactive=never third_party/breakpad/breakpad/src/processor/testdata/ rm -r --interactive=never third_party/breakpad/breakpad/src/tools -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,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,sunspider,sync,template_url_scraper,textinput,third_party,top_sites,translate,unit,viewsource,web_app_info,webrtc,websocket,webui_test_resources.grd,workers} +#squidf: ftp removed for Chromium 95 as it does not exist anymore +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,focus,frame_dom_access,frame_tree,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,sunspider,sync,template_url_scraper,textinput,third_party,top_sites,translate,unit,viewsource,web_app_info,webrtc,websocket,webui_test_resources.grd,workers} 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} rmdir chrome/test/data/webui/{settings,extensions}/a11y rmdir chrome/test/data/webui/settings/chromeos/app_management @@ -422,7 +461,8 @@ rm --interactive=never third_party/grpc/ rm --interactive=never third_party/grpc/src/src/android/test/interop/gradle/wrapper/gradle-wrapper.jar rm --interactive=never third_party/tflite/src/tensorflow/lite/java/ovic/demo/gradle/wrapper/gradle-wrapper.jar rm --interactive=never third_party/tflite/src/tensorflow/lite/java/demo/gradle/wrapper/gradle-wrapper.jar -rm --interactive=never third_party/tflite/src/tensorflow/examples/android/gradle/wrapper/gradle-wrapper.jar +#squidf: gradle-wrapper.jar does not exist anymore with version 95 +#rm --interactive=never third_party/tflite/src/tensorflow/examples/android/gradle/wrapper/gradle-wrapper.jar rm --interactive=never third_party/checkstyle/checkstyle-all.jar rm --interactive=never build/android/stacktrace/java_deobfuscate.jar @@ -530,6 +570,18 @@ CXXFLAGS="$CXXFLAGS -faligned-new -Wno-a %if %{use_clang} CFLAGS="$CFLAGS -Wno-error=unused-result" CXXFLAGS="$CXXFLAGS -Wno-error=deprecated-declarations -Wno-error=deprecated-copy -Wno-error=psabi -Wno-error=implicit-const-int-float-conversion -Wno-error=non-c-typedef-for-linkage -Wno-error=unused-const-variable" +#from opensuse +export CXXFLAGS="${CXXFLAGS} -Wno-unused-command-line-argument -Wno-unknown-warning-option" +# extra flags to reduce warnings that aren't very useful +export CXXFLAGS="${CXXFLAGS} -Wno-pedantic -Wno-unused-result -Wno-unused-function -Wno-unused-variable -Wno-deprecated-declarations" +# ignore warnings for minor mistakes that are too common +export CXXFLAGS="${CXXFLAGS} -Wno-return-type -Wno-parentheses -Wno-misleading-indentation" +# ignore warnings that are not supported well until gcc 8 +export CXXFLAGS="${CXXFLAGS} -Wno-attributes" +# ignore warnings due to gcc bug (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=84055) +export CXXFLAGS="${CXXFLAGS} -Wno-ignored-attributes" +# ingore new gcc 8 warnings that aren't yet handled upstream +export CXXFLAGS="${CXXFLAGS} -Wno-address -Wno-dangling-else" %else CXXFLAGS="$CXXFLAGS -Wno-error=class-memaccess -Wno-error=unknown-pragmas -Wno-error=array-bounds -Wno-return-type -Wno-error=nonnull -Wno-error=free-nonheap-object -Wno-error=unused -Wno-error=unused-function -Wno-error=unused-variable -Wno-error=unused-but-set-variable -Wno-error=maybe-uninitialized -Wno-error=uninitialized -Wno-error=invalid-offsetof -Wno-error=stringop-overflow -std=gnu++17" %endif @@ -552,30 +604,31 @@ CFLAGS="$CFLAGS -msse2" CXXFLAGS="$CXXFLAGS -msse2" %endif -python2 tools/gn/bootstrap/bootstrap.py --gn-gen-args='%{gn_config}' +python3 tools/gn/bootstrap/bootstrap.py --gn-gen-args='%{gn_config}' 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/ -pushd out/Release/python2_root/ -tar xf %{SOURCE3} -popd +#mkdir out/Release/python2_root +#cp -r %{python3_sitelib}/xcbgen out/Release/python2_root/ +#cp -r %{python3_sitelib}/setuptools out/Release/python2_root/ +#pushd out/Release/python2_root/ +#tar xf %{SOURCE3} +#popd %if !%{use_gold} # ld.bfd needs lots of file descriptors to link chrome ulimit -n 4096 %endif -pushd out/Release +#pushd out/Release JOBS=$(echo %{_smp_mflags}|sed -re 's#^-j##') if [ $JOBS -gt 16 ]; then JOBS=16 fi -env PYTHONPATH=${PWD}/python2_root ninja -j${JOBS} chrome chrome_sandbox -popd +#squidf:switch to python3: env PYTHONPATH=${PWD}/python2_root ninja -j${JOBS} chrome chrome_sandbox +ninja -j${JOBS} -C out/Release chrome chrome_sandbox +#popd # man page sed -e "s/@@PACKAGE@@/chromium/" -e "s/@@MENUNAME@@/Chromium Web Browser/" chrome/app/resources/manpage.1.in >out/Release/chromium.1 @@ -670,6 +723,12 @@ done %changelog +* Sun Nov 7 2021 squidf <chb0@lavache.com> 95.0.4638.69-1 +- Update to 95.0.4638.69 +- Remove python2 +- Fix system zlib_common_header error with maldoca +- Additional fix to use system zlib + * Tue Sep 28 2021 ns80 <ns80> 94.0.4606.61-1.mga8 + Revision: 1746789 - new version 94.0.4606.61 (mga#28732)
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 29634
: 12976 |
12977
|
12979