commit fee4be033b68b26de055b2e2a3e8da08f4050abc Merge: 32e2c66 b94d551 Author: Akarshan Biswas <akarshan.biswas(a)gmail.com&gt; Date: Sun Apr 28 17:33:32 2019 +0000 Merge branch 'master' into f29 .gitignore | 13 +--- chromium-color_utils-use-std-sqrt.patch | 48 ------------- chromium-glibc-2.29.patch | 98 +++++++++++++++++++++++++++ chromium-media-fix-build-with-libstdc++.patch | 48 ------------- chromium-vaapi.sh | 1 + chromium-vaapi.spec | 55 +++++++++++---- nounrar.patch | 14 ++-- sources | 2 +- stopVsyncspam.patch | 32 --------- 9 files changed, 150 insertions(+), 161 deletions(-) --- diff --cc chromium-vaapi.spec index cfd599e,a3b4435..dd8acd8 --- a/chromium-vaapi.spec +++ b/chromium-vaapi.spec @@@ -204,11 -206,9 +206,8 @@@ Patch54: brand.patc #Stolen from Fedora to fix building with pipewire # https://src.fedoraproject.org/rpms/chromium/blob/master/f/chromium-73.0.3... Patch65: chromium-73.0.3683.75-pipewire-cstring-fix.patch - # Stop Vsync error spam when chromium runs on Wayland (Reviewed upstream) - Patch66: stopVsyncspam.patch - #Fix chromium color - Patch67: chromium-color_utils-use-std-sqrt.patch - Patch68: chromium-media-fix-build-with-libstdc++.patch + # Update Linux Seccomp syscall restrictions to EPERM posix_spawn/vfork + Patch66: chromium-glibc-2.29.patch - %description chromium-vaapi is an open-source web browser, powered by WebKit (Blink) ############################################PREP########################################################### @@@ -228,10 -228,13 +227,14 @@@ %if 0%{?fedora} >= 29 %patch65 -p1 -b .pipewire %endif - %patch66 -p1 -b .vsync - %patch67 -p1 -b .color - %patch68 -p1 -b .media + %patch66 -p1 -b .glibc + + %if 0%{?fedora} >= 30 + # Add a workaround for a race condition in clang-llvm8+ compiler + sed -i 's|const std::vector<Delta> deltas_;|std::vector<Delta> deltas_;|' chrome/browser/ui/tabs/tab_strip_model_observer.h + %endif + ++>>>>>>> master #Let's change the default shebang of python files. find -depth -type f -writable -name "*.py" -exec sed -iE '1s=^#! */usr/bin/\(python\|env python\)[23]\?=#!%{__python2}=' {} + ./build/linux/unbundle/remove_bundled_libraries.py --do-remove \ @@@ -464,15 -469,13 +469,19 @@@ sed -i 's|//third_party/usb_ids|/usr/share/hwdata|g' device/usb/BUILD.gn - # Don't use static libstdc++ - sed -i '/-static-libstdc++/d' tools/gn/build/gen.py + + # Remove compiler flags not supported by our system clang + # sed -i \ + # -e '/"-Wno-ignored-pragma-optimize"/d' \ + # build/config/compiler/BUILD.gn + +# Remove compiler flags not supported by our system clang + sed -i \ + -e '/"-Wno-ignored-pragma-optimize"/d' \ + build/config/compiler/BUILD.gn + + rmdir third_party/markupsafe ln -s %{python2_sitearch}/markupsafe third_party/markupsafe diff --cc nounrar.patch index 7395711,b3be4fa..a9a28b5 --- a/nounrar.patch +++ b/nounrar.patch @@@ -186,3 -186,4 +186,5 @@@ index 94d6ec0e16f8..2eda4f378bcc 10064 const std::unique_ptr<service_manager::ServiceContextRef> service_ref_; + ++