[chromium-freeworld: 8/8] Merge Fedora, chromium-60.0.3112.113-1

commit b3500bb49c97547995a9b7909bb6bb9e7e9a2684 Merge: 947dc77 21e3607 Author: Miro Hrončok <miro(a)hroncok.cz&gt; Date: Sun Aug 27 22:18:06 2017 +0200 Merge Fedora, chromium-60.0.3112.113-1 .gitignore | 1 + chromium-60.0.3112.101-fix-ffmpeg-aarch64.patch | 12 ++++++ ...3112.113-libavutil-timer-include-path-fix.patch | 21 +++++++++++ chromium-freeworld.spec | 43 ++++++++++++++++++---- clean_ffmpeg.sh | 15 +++++++- sources | 2 +- 6 files changed, 84 insertions(+), 10 deletions(-) --- diff --cc .gitignore index c225616,4364688..6cbb8a7 --- a/.gitignore +++ b/.gitignore @@@ -27,4 -27,5 +27,5 @@@ /chromium-59.0.3071.109-freetype.tar.bz2 /chromium-60.0.3112.90-clean.tar.xz /chromium-60.0.3112.101-clean.tar.xz -/chromium-60.0.3112.113-clean.tar.xz +/chromium-60.0.3112.101.tar.xz + /chromium-60.0.3112.113.tar.xz diff --cc sources index 9816669,c901ac2..c42a187 --- a/sources +++ b/sources @@@ -1,3 -1,3 +1,3 @@@ -SHA512 (depot_tools.git-master.tar.gz) = d3d6a1873b2b0296a8cd99e0d8d2e629a17b1808934b4972556168f8b4ccea60577ebaeab4445baf15afb1b04080808db59a832a5b61d247bd48da14fa6acf03 -SHA512 (policy_templates.zip) = 4d2a7162adb3ca224f3e1bf1d2936ae395603e8ffa3fda7753e666a16c42c7ba54c7acfcfdc742e22978ace37e471ed099d222063708d4d8a299da3daf135f15 -SHA512 (chromium-60.0.3112.113-clean.tar.xz) = 3fbcdf47485a9d655cf43f05b24f0e22e6d2662d155f54039668673b21616d2941a0620db74c3788288af91fcb0ded1d2f45497c51a8799ddcf70f7420aee2c5 +a6495be59bdbc20b2524d7c1356e82ac policy_templates.zip +49a7f897775cce21d2b69968b8af1cea depot_tools.git-master.tar.gz - 9fe9af85faeaf617cb61997c431a02e2 chromium-60.0.3112.101.tar.xz ++1220cff1514abd81680cb1ab1cd2a04c chromium-60.0.3112.113.tar.xz