commit f865964f59aa08da44264b5e94607604c8ebac70 Merge: d9ae7f1 b7162c3 Author: Miro Hrončok <miro(a)hroncok.cz&gt; Date: Wed Jul 19 12:44:01 2017 +0200 Merge 'fedora/master' b7162c3, 59.0.3071.115-2 .gitignore | 3 + chromium-59.0.3071.115-ucontext-fix.patch | 214 ++++ chromium-libs-media-freeworld.spec | 1927 ++++++++++++++++++++++++++--- sources | 4 +- 4 files changed, 1980 insertions(+), 168 deletions(-) --- diff --cc .gitignore index 1b635bc,ce8a184..baad048 --- a/.gitignore +++ b/.gitignore @@@ -20,10 -20,8 +20,13 @@@ /chromium-57.0.2987.133-clean.tar.xz /chromium-58.0.3029.81-clean.tar.xz /chromium-58.0.3029.110-clean.tar.xz +/chromium-58.0.3029.110.tar.xz /chromium-59.0.3071.86-clean.tar.xz +/chromium-59.0.3071.86.tar.xz /chromium-59.0.3071.104-clean.tar.xz +/chromium-59.0.3071.104.tar.xz /chromium-59.0.3071.109-clean.tar.xz +/chromium-59.0.3071.109.tar.xz + /chromium-59.0.3071.115-clean.tar.xz + /chromium-59.0.3071.109-freetype.tar.bz2 ++/chromium-59.0.3071.115.tar.xz diff --cc chromium-libs-media-freeworld.spec index e7a943c,b3b2262..e7d294c --- a/chromium-libs-media-freeworld.spec +++ b/chromium-libs-media-freeworld.spec @@@ -1,5 -1,10 +1,10 @@@ - # gn is the new new new buildtool. *sigh* - %global use_gn 1 + # NEVER EVER EVER turn this on in official builds -%global freeworld 0 ++%global freeworld 1 + %if %{freeworld} + %global lsuffix freeworld + %else + %global lsuffix fedora + %endif # Leave this alone, please. %global target out/Release diff --cc sources index 1d68007,db65c06..167f02c --- a/sources +++ b/sources @@@ -1,3 -1,4 +1,3 @@@ - 81885367434a85aecdb7b5a8d666590d chromium-59.0.3071.109.tar.xz -SHA512 (depot_tools.git-master.tar.gz) = d3d6a1873b2b0296a8cd99e0d8d2e629a17b1808934b4972556168f8b4ccea60577ebaeab4445baf15afb1b04080808db59a832a5b61d247bd48da14fa6acf03 -SHA512 (policy_templates.zip) = a997bd5d410cf8f0f104fb5b69b60699c9e60eb3f99b42e0aff167843f3a45923a9a99c881cac9cd4472a60ca9c7d1ba897e15d485fbfd66c996419e7fadd3f8 -SHA512 (chromium-59.0.3071.115-clean.tar.xz) = 001e6d9b4cae244767de7e85575d4071421d588422ca434461939e9652549bcd43c56fe0c510ab0d7d0a050e97d98f4086b8bf102dbadd7f83dc8827b9ea7ed1 -SHA512 (chromium-59.0.3071.109-freetype.tar.bz2) = 62a698c0229c0eb5ed4d31efd211db70f1183f4f86558bd68a6110214b2f0a61eecdde27efcab359ecee684b3df819b37a75505c1b9ea6bec407d289d6e78a66 ++ba48a28cf7ebc531a0775284e3a6809f policy_templates.zip +49a7f897775cce21d2b69968b8af1cea depot_tools.git-master.tar.gz - e3b580196d31ba2fe66ad12f17974a1e policy_templates.zip ++249b4ce6844d5e2424967287c638c55c chromium-59.0.3071.115.tar.xz