commit 50bd050b9d8daa445e2f9870d76b456d7c028c1c Author: Akarshan Biswas <akarshan.biswas(a)gmail.com&gt; Date: Wed Nov 7 19:33:26 2018 +0530 Merge master: Switch to %%setup from %%autosetup because adding conditions on patch defines is wrong chromium-vaapi.spec | 35 +++++++++++++++++++++++++++-------- llvm-arflags.patch | 26 ++++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 8 deletions(-) --- diff --git a/chromium-vaapi.spec b/chromium-vaapi.spec index 53162ca..5395239 100644 --- a/chromium-vaapi.spec +++ b/chromium-vaapi.spec @@ -70,7 +70,7 @@ ##############################Package Definitions###################################### Name: chromium-vaapi Version: 70.0.3538.77 -Release: 2%{?dist} +Release: 4%{?dist} Summary: A Chromium web browser with video decoding acceleration License: BSD and LGPLv2+ and ASL 2.0 and IJG and MIT and GPLv2+ and ISC and OpenSSL and (MPLv1.1 or GPLv2 or LGPLv2) URL: https://www.chromium.org/Home @@ -103,11 +103,9 @@ Source15: LICENSE Patch1: enable-vaapi.patch # Enable support for widevine Patch2: widevine.patch -%if %{clang} #Will use any clang patch here #Fix breaking builds caused by gcc_ar_wrapper.py from upstream Patch7: llvm-arflags.patch -%else #Gcc patches area. #Gcc produces way too many warnings. Try to silence some of it. Patch8: silencegcc.patch @@ -115,7 +113,6 @@ Patch8: silencegcc.patch Patch9: chromium-gcc8-r588316.patch Patch10: chromium-gcc8-r588547.patch Patch11: chromium-gcc8-r589614.patch -%endif # More patches to fix chromium build here # remove dependency on unrar. That's a nasty code. Patch50: unrar.patch @@ -123,10 +120,8 @@ Patch50: unrar.patch Patch51: py2-bootstrap.patch # Fix building with system icu Patch52: chromium-system-icu.patch -%if 0%{?fedora} >= 30 # Fix chromium build with harfbuzz 2 in rawhide Patch53: chromium-harfbuzz2.patch -%endif # Let's brand chromium! Patch54: brand.patch # This build should be only available to amd64 @@ -209,7 +204,25 @@ Recommends: libva-intel-driver%{?_isa} chromium-vaapi is an open-source web browser, powered by WebKit (Blink) ############################################PREP########################################################### %prep -%autosetup -n chromium-%{version} -p1 +%setup -q -n chromium-%{version} +## Apply patches here ## +%patch1 -p1 -b .vaapi +%patch2 -p1 -b .widevine +%if %{clang} +%patch7 -p1 -b .llvmarflags +%else +%patch8 -p1 -b .silencegcc +%patch9 -p1 -b .r588316 +%patch10 -p1 -b .r588547 +%patch11 -p1 -b .r589614 +%endif +%patch50 -p1 -b .unrar +%patch51 -p1 -b .py2boot +%patch52 -p1 -b .icu +%if 0%{?fedora} >= 30 +%patch53 -p1 -b .harfbuzz2 +%endif +%patch54 -p1 -b .brand #Let's change the default shebang of python files. find -depth -type f -name "*.py" -exec sed -iE '1s=^#! */usr/bin/\(python\|env python\)[23]\?=#!%{__python2}=' {} + ./build/linux/unbundle/remove_bundled_libraries.py --do-remove \ @@ -631,7 +644,13 @@ appstream-util validate-relax --nonet "%{buildroot}%{_metainfodir}/%{name}.appda %{chromiumdir}/locales/*.pak #########################################changelogs################################################# %changelog -* Wed Nov 07 2018 Akarshan Biswas <akarshan.biswas(a)hotmail.com&gt; 70.0.3538.77-2 +* Wed Nov 07 2018 Akarshan Biswas <akarshan.biswas(a)hotmail.com&gt; 70.0.3538.77-4 +- Replace %%autosetup with %%setup and fix spec file because applying condition on patch defines is wrong. + +* Wed Nov 07 2018 Akarshan Biswas <akarshan.biswas(a)hotmail.com&gt; 70.0.3538.77-3 +- Add a patch to fix building on rawhide with harfbuzz2 + +* Tue Nov 06 2018 Akarshan Biswas <akarshan.biswas(a)hotmail.com&gt; 70.0.3538.77-2 - Use correct branding in chromium - update vaapi patch diff --git a/llvm-arflags.patch b/llvm-arflags.patch new file mode 100644 index 0000000..40bc529 --- /dev/null +++ b/llvm-arflags.patch @@ -0,0 +1,26 @@ +diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn +index 08939c54483d..a7008d7278b8 100644 +--- a/build/config/compiler/BUILD.gn ++++ b/build/config/compiler/BUILD.gn +@@ -1688,7 +1688,7 @@ config("thin_archive") { + # have a "thin archive" mode (it does accept -T, but it means truncating + # archive names to 16 characters, which is not what we want). + if ((is_posix && !is_nacl && !is_mac && !is_ios) || is_fuchsia) { +- arflags = [ "-T" ] ++ arflags = [ "T" ] + } + } + +diff --git a/build/toolchain/gcc_toolchain.gni b/build/toolchain/gcc_toolchain.gni +index e7c88708c366..bdb8ab4d36a0 100644 +--- a/build/toolchain/gcc_toolchain.gni ++++ b/build/toolchain/gcc_toolchain.gni +@@ -336,7 +336,7 @@ template("gcc_toolchain") { + } else { + rspfile = "{{output}}.rsp" + rspfile_content = "{{inputs}}" +- command = "\"$ar\" {{arflags}} -r -c -s -D {{output}} @\"$rspfile\"" ++ command = "\"$ar\" rcsD{{arflags}} {{output}} @\"$rspfile\"" + } + + # Remove the output file first so that ar doesn't try to modify the