[chromium-libs-media-freeworld: 21/85] disable unavailable Requires on epel7
by Miro Hrončok
commit d0d4125df53e5005d3847e335adbd7599642fc32
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Thu Aug 18 15:47:59 2016 -0400
disable unavailable Requires on epel7
chromium.spec | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
---
diff --git a/chromium.spec b/chromium.spec
index ead6778..9c914ee 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -85,7 +85,7 @@ BuildRequires: libicu-devel >= 5.4
Name: chromium%{chromium_channel}
Version: 52.0.2743.116
-Release: 10%{?dist}
+Release: 11%{?dist}
Summary: A WebKit (Blink) powered web browser
Url: http://www.chromium.org/Home
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)
@@ -313,8 +313,10 @@ Requires: nss-mdns%{_isa}
# GTK modules it expects to find for some reason.
Requires: libcanberra-gtk2%{_isa}
+%if 0%{?fedora}
# This enables support for u2f tokens
Requires: u2f-hidraw-policy
+%endif
# Once upon a time, we tried to split these out... but that's not worth the effort anymore.
Provides: chromium-ffmpegsumo = %{version}-%{release}
@@ -1594,6 +1596,9 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
%{chromium_path}/chromedriver
%changelog
+* Thu Aug 18 2016 Tom Callaway <spot(a)fedoraproject.org> 52.0.2743.116-11
+- conditionalize Requires: u2f-hidraw-policy so that it is only used on Fedora
+
* Thu Aug 18 2016 Tom Callaway <spot(a)fedoraproject.org> 52.0.2743.116-10
- disable gtk3 because it breaks lots of things
- re-enable hidpi setting
6 years, 10 months
[chromium-libs-media-freeworld: 20/85] disable gtk3 because it breaks lots of things
by Miro Hrončok
commit 496fc08b11ca8f65185bfeb211ac2c454fe17d2b
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Thu Aug 18 09:37:04 2016 -0400
disable gtk3 because it breaks lots of things
chromium.spec | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/chromium.spec b/chromium.spec
index afd0848..ead6778 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -63,7 +63,8 @@ BuildRequires: libicu-devel >= 5.4
%global bundlere2 0
-%global gtk3 1
+# Chromium breaks on wayland, hidpi, and colors with gtk3 enabled.
+%global gtk3 0
%if 0%{?rhel} == 7
%global bundleopus 1
@@ -84,7 +85,7 @@ BuildRequires: libicu-devel >= 5.4
Name: chromium%{chromium_channel}
Version: 52.0.2743.116
-Release: 9%{?dist}
+Release: 10%{?dist}
Summary: A WebKit (Blink) powered web browser
Url: http://www.chromium.org/Home
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)
@@ -719,7 +720,7 @@ export CHROMIUM_BROWSER_GYP_DEFINES="\
-Dlogging_like_official_build=1 \
-Denable_hotwording=0 \
-Duse_aura=1 \
- -Denable_hidpi=0 \
+ -Denable_hidpi=1 \
-Denable_touch_ui=1 \
-Denable_pepper_cdms=1 \
-Denable_webrtc=1 \
@@ -1593,6 +1594,10 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
%{chromium_path}/chromedriver
%changelog
+* Thu Aug 18 2016 Tom Callaway <spot(a)fedoraproject.org> 52.0.2743.116-10
+- disable gtk3 because it breaks lots of things
+- re-enable hidpi setting
+
* Tue Aug 16 2016 Tom Callaway <spot(a)fedoraproject.org> 52.0.2743.116-9
- filter out Requires/Provides for chromium-only libs and plugins
6 years, 10 months
[chromium-libs-media-freeworld: 19/85] filter out private requires/provides
by Miro Hrončok
commit a05dc02e80bed1923d168a96d024a766d770e691
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Tue Aug 16 15:30:37 2016 -0400
filter out private requires/provides
chromium.spec | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
---
diff --git a/chromium.spec b/chromium.spec
index af8c149..afd0848 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -8,6 +8,13 @@
%global chromium_path %{_libdir}/chromium-browser%{chromium_channel}
%global crd_path %{_libdir}/chrome-remote-desktop
%global tests 0
+
+# We don't want any libs in these directories to generate Provides
+# Requires is trickier.
+%global __provides_exclude_from %{chromium_path}/.*\\.so|%{chromium_path}/lib/.*\\.so
+%global privlibs libaccessibility|libaura_extra|libaura|libbase_i18n|libbase|libblink_common|libblink_platform|libblink_web|libboringssl|libbrowser_ui_views|libcaptive_portal|libcc_blink|libcc_ipc|libcc_proto|libcc|libcc_surfaces|libchromium_sqlite3|libcloud_policy_proto_generated_compile|libcloud_policy_proto|libcompositor|libcontent|libcrcrypto|libdbus|libdevice_battery|libdevice_bluetooth|libdevice_core|libdevice_event_log_component|libdevice_vibration|libdisplay_compositor|libdisplay|libdisplay_types|libdisplay_util|libdomain_reliability|libEGL|libevents_base|libevents_devices|libevents_devices_x11|libevents_ipc|libevents_ozone_layout|libevents_platform|libevents|libevents_x|libffmpeg|libgcm_driver_common|libgcm|libgesture_detection|libgfx_geometry|libgfx_ipc_geometry|libgfx_ipc_skia|libgfx_ipc|libgfx_range|libgfx|libgfx_vector_icons|libgfx_x11|libgin|libgles2_c_lib|libgles2_implementation|libgles2_utils|libGLESv2|libgl_init|libgl_wrapper|libgpu|libgtk2ui|libicui18n|libicuuc|lib
ipc_mojo|libipc|libkeyboard|libkeyboard_with_content|libkeycodes_x11|libkeyed_service_content|libkeyed_service_core|libmedia_blink|libmedia_gpu|libmedia|libmessage_center|libmidi|libmodules|libmojo_common_lib|libmojo_geometry_lib|libmojo_system_impl|libnative_theme|libnet|libnet_with_v8|libonc_component|libplatform_handle|libpolicy_component|libppapi_host|libppapi_proxy|libppapi_shared|libprefs|libprinting|libprotobuf_lite|libproxy_config|libsandbox_services|libscheduler|libseccomp_bpf_helpers|libseccomp_bpf|libsessions_content|libshared_memory_support|libshell_dialogs|libskia|libsnapshot|libsql|libstorage_common|libstorage|libsuid_sandbox_client|libsurface|libsync_core|libsync_proto|libtracing|libtranslator|libui_base_ime|libui_base|libui_base_x|libui_data_pack|libui_touch_selection|liburl_ipc|liburl_lib|liburl_matcher|libuser_prefs|libv8|libviews|libwallpaper|libwebcore_shared|libwebdata_common|libweb_dialogs|libwebview|libwm|libwtf|libx11_events_platform
+%global __requires_exclude ^(%{privlibs})\\.so
+
# Try to not use the Xvfb as it is slow..
%global tests_force_display 0
# If we build with shared on, then chrome-remote-desktop depends on chromium libs.
@@ -77,7 +84,7 @@ BuildRequires: libicu-devel >= 5.4
Name: chromium%{chromium_channel}
Version: 52.0.2743.116
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: A WebKit (Blink) powered web browser
Url: http://www.chromium.org/Home
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)
@@ -430,6 +437,7 @@ can include.
%else
%package libs-media
Summary: Shared libraries used by the chromium media subsystem
+Requires: chromium-libs%{_isa} = %{version}
%description libs-media
Shared libraries used by the chromium media subsystem.
@@ -1585,6 +1593,9 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
%{chromium_path}/chromedriver
%changelog
+* Tue Aug 16 2016 Tom Callaway <spot(a)fedoraproject.org> 52.0.2743.116-9
+- filter out Requires/Provides for chromium-only libs and plugins
+
* Tue Aug 16 2016 Tom Callaway <spot(a)fedoraproject.org> 52.0.2743.116-8
- fix path on Requires(post) line for semanage
6 years, 10 months
[chromium-libs-media-freeworld: 18/85] fix path on semanage Requires(post) line
by Miro Hrončok
commit 4644b6d7e7e03f657fcd7b03baedeba8c228def8
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Tue Aug 16 09:19:02 2016 -0400
fix path on semanage Requires(post) line
chromium.spec | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/chromium.spec b/chromium.spec
index 37b107c..af8c149 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -77,7 +77,7 @@ BuildRequires: libicu-devel >= 5.4
Name: chromium%{chromium_channel}
Version: 52.0.2743.116
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: A WebKit (Blink) powered web browser
Url: http://www.chromium.org/Home
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)
@@ -402,7 +402,7 @@ Provides: bundled(x86inc) = 0
Provides: bundled(zlib) = 1.2.5
# For selinux scriptlet
-Requires(post): /sbin/semanage
+Requires(post): /usr/sbin/semanage
Requires(post): /usr/sbin/restorecon
%description
@@ -1585,6 +1585,9 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
%{chromium_path}/chromedriver
%changelog
+* Tue Aug 16 2016 Tom Callaway <spot(a)fedoraproject.org> 52.0.2743.116-8
+- fix path on Requires(post) line for semanage
+
* Mon Aug 15 2016 Tom Callaway <spot(a)fedoraproject.org> 52.0.2743.116-7
- add Requires(post) items for selinux scriptlets
6 years, 10 months
[chromium-libs-media-freeworld: 17/85] add Requires(post) for selinux scriplet
by Miro Hrončok
commit 5c56e25b5883596622451e6bd6b1aeb57bf77135
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Mon Aug 15 16:31:57 2016 -0400
add Requires(post) for selinux scriplet
chromium.spec | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
---
diff --git a/chromium.spec b/chromium.spec
index 4bb9b21..37b107c 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -77,7 +77,7 @@ BuildRequires: libicu-devel >= 5.4
Name: chromium%{chromium_channel}
Version: 52.0.2743.116
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: A WebKit (Blink) powered web browser
Url: http://www.chromium.org/Home
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)
@@ -401,6 +401,10 @@ Provides: bundled(xdg-user-dirs)
Provides: bundled(x86inc) = 0
Provides: bundled(zlib) = 1.2.5
+# For selinux scriptlet
+Requires(post): /sbin/semanage
+Requires(post): /usr/sbin/restorecon
+
%description
Chromium is an open-source web browser, powered by WebKit (Blink).
@@ -1581,6 +1585,9 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
%{chromium_path}/chromedriver
%changelog
+* Mon Aug 15 2016 Tom Callaway <spot(a)fedoraproject.org> 52.0.2743.116-7
+- add Requires(post) items for selinux scriptlets
+
* Mon Aug 15 2016 Tom Callaway <spot(a)fedoraproject.org> 52.0.2743.116-6
- disable the "hidpi" setting
- unset MADV_FREE if set (should get F25+ working again)
6 years, 10 months
[chromium-libs-media-freeworld: 16/85] fixup widevine handling, fix PepperFlash dir, add freeworld conditional for testing only, disable hi
by Miro Hrončok
commit ed9314722e4305ff9772dc11500f6d9356ef36c2
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Mon Aug 15 14:13:53 2016 -0400
fixup widevine handling, fix PepperFlash dir, add freeworld conditional for testing only, disable hidpi setting, unset MADV_FREE if set
chromium-52.0.2743.116-unset-madv_free.patch | 15 ++++++
chromium.spec | 77 +++++++++++++++++++++++++---
2 files changed, 86 insertions(+), 6 deletions(-)
---
diff --git a/chromium-52.0.2743.116-unset-madv_free.patch b/chromium-52.0.2743.116-unset-madv_free.patch
new file mode 100644
index 0000000..2867c79
--- /dev/null
+++ b/chromium-52.0.2743.116-unset-madv_free.patch
@@ -0,0 +1,15 @@
+diff -up chromium-52.0.2743.116/third_party/WebKit/Source/wtf/allocator/PageAllocator.cpp.madv_free chromium-52.0.2743.116/third_party/WebKit/Source/wtf/allocator/PageAllocator.cpp
+--- chromium-52.0.2743.116/third_party/WebKit/Source/wtf/allocator/PageAllocator.cpp.madv_free 2016-08-15 13:07:29.279655676 -0400
++++ chromium-52.0.2743.116/third_party/WebKit/Source/wtf/allocator/PageAllocator.cpp 2016-08-15 13:08:38.447317416 -0400
+@@ -41,6 +41,11 @@
+ #include <errno.h>
+ #include <sys/mman.h>
+
++#if OS(LINUX) && defined(MADV_FREE)
++// Added in Linux 4.5, but it breaks the sandbox.
++#undef MADV_FREE
++#endif
++
+ #ifndef MADV_FREE
+ #define MADV_FREE MADV_DONTNEED
+ #endif
diff --git a/chromium.spec b/chromium.spec
index 2b68728..4bb9b21 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -1,3 +1,6 @@
+# NEVER EVER EVER turn this on in official builds
+%global freeworld 0
+
# %%{nil} for Stable; -beta for Beta; -dev for Devel
# dash in -beta and -dev is intentional !
%global chromium_channel %{nil}
@@ -74,7 +77,7 @@ BuildRequires: libicu-devel >= 5.4
Name: chromium%{chromium_channel}
Version: 52.0.2743.116
-Release: 1%{?dist}
+Release: 6%{?dist}
Summary: A WebKit (Blink) powered web browser
Url: http://www.chromium.org/Home
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)
@@ -107,8 +110,6 @@ Patch11: chromium-52.0.2723.2-PNGImageDecoder-fix-cast.patch
# Ignore deprecations in cups 2.2
# https://bugs.chromium.org/p/chromium/issues/detail?id=622493
Patch12: chromium-52.0.2743.82-cups22.patch
-# Fix widevine compilation
-Patch13: chromium-52.0.2743.82-widevinefix.patch
# Add ICU Text Codec aliases (from openSUSE via Russian Fedora)
Patch14: chromium-52.0.2743.82-more-codec-aliases.patch
# Use PIE in the Linux sandbox (from openSUSE via Russian Fedora)
@@ -119,6 +120,9 @@ Patch16: chromium-52.0.2743.82-arm-webrtc.patch
Patch17: chromium-52.0.2743.82-arm-icu-fix.patch
# Use /etc/chromium for master_prefs
Patch18: chromium-52.0.2743.82-master-prefs-path.patch
+# Disable MADV_FREE (if set by glibc)
+# https://bugzilla.redhat.com/show_bug.cgi?id=1361157
+Patch19: chromium-52.0.2743.116-unset-madv_free.patch
### Chromium Tests Patches ###
Patch100: chromium-46.0.2490.86-use_system_opus.patch
@@ -130,7 +134,11 @@ Patch102: chromium-52.0.2723.2-sync_link_zlib.patch
# For Chromium Fedora use chromium-latest.py --stable --ffmpegclean --ffmpegarm
# If you want to include the ffmpeg arm sources append the --ffmpegarm switch
# https://commondatastorage.googleapis.com/chromium-browser-official/chromi...
+%if %{freeworld}
+Source0: https://commondatastorage.googleapis.com/chromium-browser-official/chromi...
+%else
Source0: chromium-%{version}-clean.tar.xz
+%endif
%if 0%{tests}
Source1: https://commondatastorage.googleapis.com/chromium-browser-official/chromi...
%endif
@@ -404,12 +412,25 @@ Requires: chromium-libs-media%{_isa} = %{version}
%description libs
Shared libraries used by chromium (and chrome-remote-desktop).
+%if %{freeworld}
+%package libs-media-freeworld
+Summary: Chromium media libraries built with all possible codecs
+Provides: chromium-libs-media = %{version}-%{release}
+Provides: chromium-libs-media%{_isa} = %{version}-%{release}
+
+%description libs-media-freeworld
+Chromium media libraries built with all possible codecs. Chromium is an
+open-source web browser, powered by WebKit (Blink). This package replaces
+the default chromium-libs-media package, which is limited in what it
+can include.
+%else
%package libs-media
Summary: Shared libraries used by the chromium media subsystem
%description libs-media
Shared libraries used by the chromium media subsystem.
%endif
+%endif
%package -n chrome-remote-desktop
Requires(pre): shadow-utils
@@ -464,12 +485,12 @@ members of the Chromium and WebDriver teams.
%patch10 -p1 -b .unbundle-fix
%patch11 -p1 -b .fixcast
%patch12 -p1 -b .cups22
-%patch13 -p1 -b .widevinefix
%patch14 -p1 -b .morealiases
%patch15 -p1 -b .sandboxpie
%patch16 -p1 -b .armwebrtc
%patch17 -p1 -b .armfix
%patch18 -p1 -b .etc
+%patch19 -p1 -b .madv_free
### Chromium Tests Patches ###
%patch100 -p1 -b .use_system_opus
@@ -665,8 +686,13 @@ export CHROMIUM_BROWSER_GYP_DEFINES="\
-Dlibspeechd_h_prefix=speech-dispatcher/ \
%endif
\
+%if %{freeworld}
+ -Dffmpeg_branding=ChromeOS \
+ -Dproprietary_codecs=1 \
+%else
-Dffmpeg_branding=Chromium \
-Dproprietary_codecs=0 \
+%endif
%if 0%{?shared}
-Dbuild_ffmpegsumo=1 \
-Dffmpeg_component=shared_library \
@@ -681,7 +707,7 @@ export CHROMIUM_BROWSER_GYP_DEFINES="\
-Dlogging_like_official_build=1 \
-Denable_hotwording=0 \
-Duse_aura=1 \
- -Denable_hidpi=1 \
+ -Denable_hidpi=0 \
-Denable_touch_ui=1 \
-Denable_pepper_cdms=1 \
-Denable_webrtc=1 \
@@ -721,6 +747,9 @@ build/linux/unbundle/remove_bundled_libraries.py \
'third_party/libwebp' \
'third_party/libxml' \
'third_party/libxslt' \
+%if %{freeworld}
+ 'third_party/openh264' \
+%endif
%if 0%{?bundlere2}
'third_party/re2' \
%endif
@@ -860,6 +889,13 @@ build/gyp_chromium \
rm -rf third_party/libusb/src/libusb/libusb.h
%endif
+# make up a version for widevine
+sed '14i#define WIDEVINE_CDM_VERSION_STRING "Something fresh"' -i "third_party/widevine/cdm/stub/widevine_cdm_version.h"
+
+# Hard code extra version
+FILE=chrome/common/channel_info_posix.cc
+sed -i.orig -e 's/getenv("CHROME_VERSION_EXTRA")/"Fedora Project"/' $FILE
+
%build
%if %{?tests}
@@ -986,6 +1022,12 @@ cp -a snapshot_blob.bin %{buildroot}%{chromium_path}
%if 0%{?shared}
cp -a lib %{buildroot}%{chromium_path}
%endif
+# clearkeycdm and widevine bits
+# EXCEPT libwidevinecdm*.so*. At least libwidevinecdm.so is just an empty shim,
+# because the chromium sources don't have the prebuilt binary.
+# You'll have to get libwidevinecdm*.so*
+# from Google Chrome and copy it in /usr/lib64/chromium-browser/
+cp -a libclearkeycdm.so* %{buildroot}%{chromium_path}
# chromedriver
cp -a chromedriver %{buildroot}%{chromium_path}/chromedriver
@@ -1421,10 +1463,10 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
%if 0%{?nacl}
%{chromium_path}/nacl_helper*
%{chromium_path}/*.nexe
-%dir %{chromium_path}/PepperFlash/
%{chromium_path}/pnacl/
%{chromium_path}/tls_edit
%endif
+%dir %{chromium_path}/PepperFlash/
%{chromium_path}/protoc
# %%{chromium_path}/remoting_locales/
%{chromium_path}/pseudo_locales/
@@ -1499,8 +1541,13 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
%exclude %{chromium_path}/lib/libffmpeg.so*
%exclude %{chromium_path}/lib/libmedia.so*
%{chromium_path}/lib/
+%{chromium_path}/libclearkeycdm.so*
+%if %{freeworld}
+%files libs-media-freeworld
+%else
%files libs-media
+%endif
%{chromium_path}/lib/libffmpeg.so*
%{chromium_path}/lib/libmedia.so*
%endif
@@ -1534,6 +1581,24 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
%{chromium_path}/chromedriver
%changelog
+* Mon Aug 15 2016 Tom Callaway <spot(a)fedoraproject.org> 52.0.2743.116-6
+- disable the "hidpi" setting
+- unset MADV_FREE if set (should get F25+ working again)
+
+* Fri Aug 12 2016 Tom Callaway <spot(a)fedoraproject.org> 52.0.2743.116-5
+- do not package libwidevinecdm*.so, they are just empty shells
+ instead, to enable widevine, get these files from Google Chrome
+
+* Fri Aug 12 2016 Tom Callaway <spot(a)fedoraproject.org> 52.0.2743.116-4
+- add "freeworld" conditional for testing netflix/widevine
+
+* Fri Aug 12 2016 Tom Callaway <spot(a)fedoraproject.org> 52.0.2743.116-3
+- move PepperFlash directory out of the nacl conditional (thanks to churchyard)
+- fix widevine (thanks to David Vásquez and UnitedRPMS)
+
+* Wed Aug 10 2016 Tom Callaway <spot(a)fedoraproject.org> 52.0.2743.116-2
+- include clearkeycdm and widevinecdm files in libs-media
+
* Mon Aug 8 2016 Tom Callaway <spot(a)fedoraproject.org> 52.0.2743.116-1
- update to 52.0.2743.116
6 years, 10 months
[chromium-libs-media-freeworld: 15/85] 52.0.2743.116
by Miro Hrončok
commit 8a15fdfccca6239b2ae167d7200a37c4fb86ab39
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Mon Aug 8 13:37:48 2016 -0400
52.0.2743.116
.gitignore | 1 +
chromium-52.0.2743.82-arm-icu-fix.patch | 12 ++
chromium-52.0.2743.82-arm-webrtc.patch | 51 ++++++++
chromium-52.0.2743.82-master-prefs-path.patch | 15 +++
chromium-52.0.2743.82-more-codec-aliases.patch | 15 +++
chromium-52.0.2743.82-sandbox-pie.patch | 15 +++
chromium.spec | 158 ++++++++++++++++++++++++-
master_preferences | 18 +++
sources | 4 +-
9 files changed, 282 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 271132b..a553dc5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
/depot_tools.git-master.tar.gz
/policy_templates.zip
/chromium-52.0.2743.82-clean.tar.xz
+/chromium-52.0.2743.116-clean.tar.xz
diff --git a/chromium-52.0.2743.82-arm-icu-fix.patch b/chromium-52.0.2743.82-arm-icu-fix.patch
new file mode 100644
index 0000000..acac356
--- /dev/null
+++ b/chromium-52.0.2743.82-arm-icu-fix.patch
@@ -0,0 +1,12 @@
+diff -up chromium-52.0.2743.82/third_party/icu/icu.gyp.armfix chromium-52.0.2743.82/third_party/icu/icu.gyp
+--- chromium-52.0.2743.82/third_party/icu/icu.gyp.armfix 2016-08-03 09:39:02.159874067 +0200
++++ chromium-52.0.2743.82/third_party/icu/icu.gyp 2016-08-03 09:39:17.953765034 +0200
+@@ -44,7 +44,7 @@
+ }],
+ ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" \
+ or OS=="netbsd" or OS=="mac" or OS=="android" or OS=="qnx") and \
+- (target_arch=="arm" or target_arch=="ia32" or \
++ (target_arch=="ia32" or \
+ target_arch=="mipsel")', {
+ 'target_conditions': [
+ ['_toolset=="host"', {
diff --git a/chromium-52.0.2743.82-arm-webrtc.patch b/chromium-52.0.2743.82-arm-webrtc.patch
new file mode 100644
index 0000000..f1a6629
--- /dev/null
+++ b/chromium-52.0.2743.82-arm-webrtc.patch
@@ -0,0 +1,51 @@
+diff -up chromium-52.0.2743.82/third_party/webrtc/system_wrappers/source/cpu_features.cc.armwebrtc chromium-52.0.2743.82/third_party/webrtc/system_wrappers/source/cpu_features.cc
+--- chromium-52.0.2743.82/third_party/webrtc/system_wrappers/source/cpu_features.cc.armwebrtc 2016-08-03 09:30:53.922861020 +0200
++++ chromium-52.0.2743.82/third_party/webrtc/system_wrappers/source/cpu_features.cc 2016-08-03 09:32:00.337498174 +0200
+@@ -18,6 +18,47 @@
+
+ #include "webrtc/typedefs.h"
+
++#include <elf.h>
++#ifdef __arm__
++#include <fcntl.h>
++#include <unistd.h>
++#include <linux/auxvec.h>
++#include <asm/hwcap.h>
++#endif
++
++#ifdef __arm__
++uint64_t WebRtc_GetCPUFeaturesARM() {
++ static bool detected = false;
++ static uint64_t have_neon = 0;
++
++ int fd;
++ Elf32_auxv_t auxv;
++ unsigned int hwcaps;
++
++ if (!detected) {
++ int fd;
++ Elf32_auxv_t auxv;
++ unsigned int hwcaps;
++
++ fd = open("/proc/self/auxv", O_RDONLY);
++ if (fd >= 0) {
++ while (read(fd, &auxv, sizeof(Elf32_auxv_t)) == sizeof(Elf32_auxv_t)) {
++ if (auxv.a_type == AT_HWCAP) {
++ have_neon = (auxv.a_un.a_val & HWCAP_NEON) ? kCPUFeatureNEON : 0;
++ break;
++ }
++ }
++ close (fd);
++ } else {
++ have_neon = 0;
++ }
++ detected = true;
++ }
++
++ return 0 | have_neon; // others here as we need them
++}
++#endif
++
+ // No CPU feature is available => straight C path.
+ int GetCPUInfoNoASM(CPUFeature feature) {
+ (void)feature;
diff --git a/chromium-52.0.2743.82-master-prefs-path.patch b/chromium-52.0.2743.82-master-prefs-path.patch
new file mode 100644
index 0000000..6ddd26f
--- /dev/null
+++ b/chromium-52.0.2743.82-master-prefs-path.patch
@@ -0,0 +1,15 @@
+diff -up chromium-52.0.2743.82/chrome/browser/first_run/first_run_internal_linux.cc.etc chromium-52.0.2743.82/chrome/browser/first_run/first_run_internal_linux.cc
+--- chromium-52.0.2743.82/chrome/browser/first_run/first_run_internal_linux.cc.etc 2016-08-03 10:15:57.980692109 +0200
++++ chromium-52.0.2743.82/chrome/browser/first_run/first_run_internal_linux.cc 2016-08-03 10:16:44.553325229 +0200
+@@ -19,9 +19,9 @@ bool IsOrganicFirstRun() {
+
+ base::FilePath MasterPrefsPath() {
+ // The standard location of the master prefs is next to the chrome binary.
++ // ...but we patch it to use /etc/chromium
+ base::FilePath master_prefs;
+- if (!PathService::Get(base::DIR_EXE, &master_prefs))
+- return base::FilePath();
++ master_prefs = base::FilePath("/etc/chromium");
+ return master_prefs.AppendASCII(installer::kDefaultMasterPrefs);
+ }
+
diff --git a/chromium-52.0.2743.82-more-codec-aliases.patch b/chromium-52.0.2743.82-more-codec-aliases.patch
new file mode 100644
index 0000000..606a5e6
--- /dev/null
+++ b/chromium-52.0.2743.82-more-codec-aliases.patch
@@ -0,0 +1,15 @@
+diff -up chromium-52.0.2743.82/third_party/WebKit/Source/wtf/text/TextCodecICU.cpp.morealiases chromium-52.0.2743.82/third_party/WebKit/Source/wtf/text/TextCodecICU.cpp
+--- chromium-52.0.2743.82/third_party/WebKit/Source/wtf/text/TextCodecICU.cpp.morealiases 2016-08-03 08:55:48.293159940 +0200
++++ chromium-52.0.2743.82/third_party/WebKit/Source/wtf/text/TextCodecICU.cpp 2016-08-03 08:57:05.192505191 +0200
+@@ -208,7 +208,11 @@ void TextCodecICU::registerEncodingNames
+ registrar("iso_8859-6", "ISO-8859-6");
+ registrar("iso_8859-7", "ISO-8859-7");
+ registrar("iso_8859-8", "ISO-8859-8");
++ registrar("ISO_8859-8-I", "ISO-8859-8-I");
+ registrar("iso_8859-9", "windows-1254");
++ registrar("ISO_8859-10", "ISO-8859-10");
++ registrar("ISO_8859-13", "ISO-8859-13");
++ registrar("ISO_8859-14", "ISO-8859-14");
+ registrar("iso_8859-15", "ISO-8859-15");
+ registrar("koi8_r", "KOI8-R");
+ registrar("x-cp1253", "windows-1253");
diff --git a/chromium-52.0.2743.82-sandbox-pie.patch b/chromium-52.0.2743.82-sandbox-pie.patch
new file mode 100644
index 0000000..8913c12
--- /dev/null
+++ b/chromium-52.0.2743.82-sandbox-pie.patch
@@ -0,0 +1,15 @@
+diff -up chromium-52.0.2743.82/sandbox/linux/sandbox_linux.gypi.pie chromium-52.0.2743.82/sandbox/linux/sandbox_linux.gypi
+--- chromium-52.0.2743.82/sandbox/linux/sandbox_linux.gypi.pie 2016-08-03 09:06:41.617923620 +0200
++++ chromium-52.0.2743.82/sandbox/linux/sandbox_linux.gypi 2016-08-03 09:11:49.747463317 +0200
+@@ -205,7 +205,10 @@
+ ],
+ 'cflags': [
+ # For ULLONG_MAX
+- '-std=gnu99',
++ '-std=gnu99 -fPIE',
++ ],
++ 'ldflags': [
++ '-pie',
+ ],
+ 'include_dirs': [
+ '../..',
diff --git a/chromium.spec b/chromium.spec
index ba81688..2b68728 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -53,6 +53,16 @@ BuildRequires: libicu-devel >= 5.4
%global bundlere2 0
+%global gtk3 1
+
+%if 0%{?rhel} == 7
+%global bundleopus 1
+%global bundlelibusbx 1
+%else
+%global bundleopus 0
+%global bundlelibusbx 0
+%endif
+
### Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
### Note: These are for Fedora use ONLY.
### For your own distribution, please get your own set of keys.
@@ -63,8 +73,8 @@ BuildRequires: libicu-devel >= 5.4
%global chromoting_client_id 449907151817-8vnlfih032ni8c4jjps9int9t86k546t.apps.googleusercontent.com
Name: chromium%{chromium_channel}
-Version: 52.0.2743.82
-Release: 9%{?dist}
+Version: 52.0.2743.116
+Release: 1%{?dist}
Summary: A WebKit (Blink) powered web browser
Url: http://www.chromium.org/Home
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)
@@ -99,6 +109,16 @@ Patch11: chromium-52.0.2723.2-PNGImageDecoder-fix-cast.patch
Patch12: chromium-52.0.2743.82-cups22.patch
# Fix widevine compilation
Patch13: chromium-52.0.2743.82-widevinefix.patch
+# Add ICU Text Codec aliases (from openSUSE via Russian Fedora)
+Patch14: chromium-52.0.2743.82-more-codec-aliases.patch
+# Use PIE in the Linux sandbox (from openSUSE via Russian Fedora)
+Patch15: chromium-52.0.2743.82-sandbox-pie.patch
+# Enable ARM CPU detection for webrtc (from archlinux via Russian Fedora)
+Patch16: chromium-52.0.2743.82-arm-webrtc.patch
+# Do not force -m32 in icu compile on ARM (from archlinux via Russian Fedora)
+Patch17: chromium-52.0.2743.82-arm-icu-fix.patch
+# Use /etc/chromium for master_prefs
+Patch18: chromium-52.0.2743.82-master-prefs-path.patch
### Chromium Tests Patches ###
Patch100: chromium-46.0.2490.86-use_system_opus.patch
@@ -130,6 +150,7 @@ Source9: chromium-browser.xml
Source10: https://dl.google.com/dl/edgedl/chrome/policy/policy_templates.zip
Source11: chrome-remote-desktop.service
Source12: chromium-browser.appdata.xml
+Source13: master_preferences
# We can assume gcc and binutils.
BuildRequires: gcc-c++
@@ -218,8 +239,12 @@ BuildRequires: libpng-devel
BuildRequires: libsrtp-devel >= 1.4.4
%endif
BuildRequires: libudev-devel
+%if %{bundlelibusbx}
+# Do nothing
+%else
Requires: libusbx >= 1.0.21-0.1.git448584a
BuildRequires: libusbx-devel >= 1.0.21-0.1.git448584a
+%endif
# We don't use libvpx anymore because Chromium loves to
# use bleeding edge revisions here that break other things
# ... so we just use the bundled libvpx.
@@ -229,8 +254,15 @@ BuildRequires: libxslt-devel
# BuildRequires: libyuv-devel
BuildRequires: minizip-devel
BuildRequires: nspr-devel
+%if %{bundleopus}
+# Do nothing
+%else
BuildRequires: opus-devel
+%endif
BuildRequires: perl(Switch)
+%if 0%{gtk3}
+BuildRequires: pkgconfig(gtk+-3.0)
+%endif
BuildRequires: pulseaudio-libs-devel
BuildRequires: python-beautifulsoup4
BuildRequires: python-BeautifulSoup
@@ -281,6 +313,8 @@ Provides: webrtc = 0.2
Obsoletes: webrtc <= 0.1
%if 0%{?shared}
Requires: chromium-libs%{_isa} = %{version}-%{release}
+# This is broken out so it can be replaced.
+Requires: chromium-libs-media%{_isa} = %{version}-%{release}
# Nothing to do here. chromium-libs is real.
%else
Provides: chromium-libs = %{version}-%{release}
@@ -320,6 +354,9 @@ Provides: bundled(libaddressinput) = 0
Provides: bundled(libjingle) = 9564
Provides: bundled(libphonenumber) = svn584
Provides: bundled(libsrtp) = 1.5.2
+%if %{bundlelibusbx}
+Provides: bundled(libusbx) = 1.0.17
+%endif
Provides: bundled(libvpx) = 1.4.0
Provides: bundled(libwebp) = 0.4.3
Provides: bundled(libXNVCtrl) = 302.17
@@ -330,6 +367,9 @@ Provides: bundled(mesa) = 9.0.3
Provides: bundled(NSBezierPath) = 1.0
Provides: bundled(mozc)
Provides: bundled(mt19937ar) = 2002.1.26
+%if %{bundleopus}
+Provides: bundled(opus) = 1.1.2
+%endif
Provides: bundled(ots) = 767d6040439e6ebcdb867271fcb686bd3f8ac739
Provides: bundled(protobuf) = r476
Provides: bundled(qcms) = 4
@@ -359,9 +399,16 @@ Chromium is an open-source web browser, powered by WebKit (Blink).
%if 0%{?shared}
%package libs
Summary: Shared libraries used by chromium (and chrome-remote-desktop)
+Requires: chromium-libs-media%{_isa} = %{version}
%description libs
Shared libraries used by chromium (and chrome-remote-desktop).
+
+%package libs-media
+Summary: Shared libraries used by the chromium media subsystem
+
+%description libs-media
+Shared libraries used by the chromium media subsystem.
%endif
%package -n chrome-remote-desktop
@@ -378,6 +425,23 @@ Summary: Remote desktop support for google-chrome & chromium
%description -n chrome-remote-desktop
Remote desktop support for google-chrome & chromium.
+%package -n chromedriver
+Summary: WebDriver for Google Chrome/Chromium
+%if 0%{?shared}
+Requires: chromium-libs%{_isa} = %{version}-%{release}
+%endif
+# From Russian Fedora (minus the epoch)
+Provides: chromedriver-stable = %{version}-%{release}
+Conflicts: chromedriver-testing
+Conflicts: chromedriver-unstable
+
+%description -n chromedriver
+WebDriver is an open source tool for automated testing of webapps across many
+browsers. It provides capabilities for navigating to web pages, user input,
+JavaScript execution, and more. ChromeDriver is a standalone server which
+implements WebDriver's wire protocol for Chromium. It is being developed by
+members of the Chromium and WebDriver teams.
+
%prep
%setup -q -T -c -n %{name}-policies -a 10
%setup -q -T -c -n depot_tools -a 2
@@ -401,6 +465,11 @@ Remote desktop support for google-chrome & chromium.
%patch11 -p1 -b .fixcast
%patch12 -p1 -b .cups22
%patch13 -p1 -b .widevinefix
+%patch14 -p1 -b .morealiases
+%patch15 -p1 -b .sandboxpie
+%patch16 -p1 -b .armwebrtc
+%patch17 -p1 -b .armfix
+%patch18 -p1 -b .etc
### Chromium Tests Patches ###
%patch100 -p1 -b .use_system_opus
@@ -523,6 +592,7 @@ export CHROMIUM_BROWSER_GYP_DEFINES="\
-Dhost_clang=0 \
%endif
-Ddisable_glibc=1 \
+ -Dlinux_fpic=1 \
-Ddisable_sse2=1 \
%if 0%{?nonacl}
-Ddisable_nacl=1 \
@@ -541,6 +611,7 @@ export CHROMIUM_BROWSER_GYP_DEFINES="\
-Duse_system_flac=1 \
-Duse_system_harfbuzz=1 \
%if 0%{?bundleicu}
+ -Duse_system_icu=0 \
%else
-Duse_system_icu=1 \
%endif
@@ -550,12 +621,20 @@ export CHROMIUM_BROWSER_GYP_DEFINES="\
-Duse_system_libexif=1 \
-Duse_system_libjpeg=1 \
-Duse_system_libpng=1 \
+%if %{bundlelibusbx}
+ -Duse_system_libusb=0 \
+%else
-Duse_system_libusb=1 \
+%endif
-Duse_system_libxml=1 \
-Duse_system_libxslt=1 \
-Duse_system_minizip=1 \
-Duse_system_nspr=1 \
+%if %{bundleopus}
+ -Duse_system_opus=0 \
+%else
-Duse_system_opus=1 \
+%endif
-Duse_system_protobuf=0 \
%if 0%{?bundlere2}
%else
@@ -582,7 +661,9 @@ export CHROMIUM_BROWSER_GYP_DEFINES="\
-Dlinux_use_libgps=0 \
\
-Dusb_ids_path=/usr/share/hwdata/usb.ids \
+%if 0%{?fedora}
-Dlibspeechd_h_prefix=speech-dispatcher/ \
+%endif
\
-Dffmpeg_branding=Chromium \
-Dproprietary_codecs=0 \
@@ -599,9 +680,17 @@ export CHROMIUM_BROWSER_GYP_DEFINES="\
-Dremove_webcore_debug_symbols=1 \
-Dlogging_like_official_build=1 \
-Denable_hotwording=0 \
+ -Duse_aura=1 \
+ -Denable_hidpi=1 \
+ -Denable_touch_ui=1 \
-Denable_pepper_cdms=1 \
-Denable_webrtc=1 \
-Denable_widevine=1 \
+%if 0%{gtk3}
+ -Duse_gtk3=1 \
+%else
+ -Dtoolkit_uses_gtk=0 \
+%endif
%if 0
-Dbuildtype=Official \
%endif
@@ -764,8 +853,12 @@ build/gyp_chromium \
%endif
$CHROMIUM_BROWSER_GYP_DEFINES
+%if %{bundlelibusbx}
+# no hackity hack hack
+%else
# hackity hack hack
rm -rf third_party/libusb/src/libusb/libusb.h
+%endif
%build
@@ -841,7 +934,7 @@ export CHROMIUM_BROWSER_UNIT_TESTS=
%global target out/Release
-../depot_tools/ninja -C %{target} -vvv chrome chrome_sandbox policy_templates $CHROMIUM_BROWSER_UNIT_TESTS
+../depot_tools/ninja -C %{target} -vvv chrome chrome_sandbox chromedriver widevinecdmadapter clearkeycdm policy_templates $CHROMIUM_BROWSER_UNIT_TESTS
# remote client
pushd remoting
@@ -894,6 +987,10 @@ cp -a snapshot_blob.bin %{buildroot}%{chromium_path}
cp -a lib %{buildroot}%{chromium_path}
%endif
+# chromedriver
+cp -a chromedriver %{buildroot}%{chromium_path}/chromedriver
+ln -s %{chromium_path}/chromedriver %{buildroot}%{_bindir}/chromedriver
+
# Remote desktop bits
mkdir -p %{buildroot}%{crd_path}
@@ -956,6 +1053,10 @@ cp -a out/Release/gen/chrome/app/policy/linux/examples/chrome.json .
mkdir -p %{buildroot}%{_datadir}/icons/hicolor/256x256/apps
cp -a chrome/app/theme/chromium/product_logo_256.png %{buildroot}%{_datadir}/icons/hicolor/256x256/apps/%{chromium_browser_channel}.png
+# Install the master_preferences file
+mkdir -p %{buildroot}%{_sysconfdir}/%{name}
+install -m 0644 %{SOURCE13} %{buildroot}%{_sysconfdir}/%{name}/
+
mkdir -p %{buildroot}%{_datadir}/applications/
desktop-file-install --dir %{buildroot}%{_datadir}/applications %{SOURCE4}
@@ -965,6 +1066,8 @@ appstream-util validate-relax --nonet ${RPM_BUILD_ROOT}%{_datadir}/appdata/%{chr
mkdir -p %{buildroot}%{_datadir}/gnome-control-center/default-apps/
cp -a %{SOURCE9} %{buildroot}%{_datadir}/gnome-control-center/default-apps/
+mkdir -p %{buildroot}%{chromium_path}/PepperFlash
+
%check
%if 0%{tests}
%if 0%{?tests_force_display}
@@ -1305,6 +1408,9 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
%systemd_postun_with_restart chrome-remote-desktop.service
%files
+%doc AUTHORS
+%license LICENSE
+%config %{_sysconfdir}/%{name}/
%{_bindir}/%{chromium_browser_channel}
%dir %{chromium_path}
%{chromium_path}/*.bin
@@ -1315,6 +1421,7 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
%if 0%{?nacl}
%{chromium_path}/nacl_helper*
%{chromium_path}/*.nexe
+%dir %{chromium_path}/PepperFlash/
%{chromium_path}/pnacl/
%{chromium_path}/tls_edit
%endif
@@ -1385,13 +1492,17 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
%{_datadir}/appdata/*.appdata.xml
%{_datadir}/gnome-control-center/default-apps/chromium-browser.xml
-%dir %{_sysconfdir}/chromium/policies/managed
-%dir %{_sysconfdir}/chromium/policies/recommended
%doc chrome_policy_list.html *.json
%if 0%{?shared}
%files libs
+%exclude %{chromium_path}/lib/libffmpeg.so*
+%exclude %{chromium_path}/lib/libmedia.so*
%{chromium_path}/lib/
+
+%files libs-media
+%{chromium_path}/lib/libffmpeg.so*
+%{chromium_path}/lib/libmedia.so*
%endif
%files -n chrome-remote-desktop
@@ -1416,7 +1527,44 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
%endif
%endif
+%files -n chromedriver
+%doc AUTHORS
+%license LICENSE
+%{_bindir}/chromedriver
+%{chromium_path}/chromedriver
+
%changelog
+* Mon Aug 8 2016 Tom Callaway <spot(a)fedoraproject.org> 52.0.2743.116-1
+- update to 52.0.2743.116
+
+* Thu Aug 4 2016 Tom Callaway <spot(a)fedoraproject.org> 52.0.2743.82-13
+- change libs split to "libs-media", as that actually works.
+- add PepperFlash directory (nothing in it though, sorry)
+
+* Wed Aug 3 2016 Tom Callaway <spot(a)fedoraproject.org> 52.0.2743.82-12
+- split out libs package beyond ffmpeg, into libs and libs-content
+- fix libusbx conditional for el7 to not nuke libusb headers
+- disable speech-dispatcher header prefix setting if not fedora (el7)
+
+* Wed Aug 3 2016 Tom Callaway <spot(a)fedoraproject.org> 52.0.2743.82-11
+- split out chromium-libs-ffmpeg so it can be easily replaced
+- conditionalize opus and libusbx for el7
+
+* Wed Aug 3 2016 Tom Callaway <spot(a)fedoraproject.org> 52.0.2743.82-10
+- Add ICU Text Codec aliases (from openSUSE via Russian Fedora)
+- Use PIE in the Linux sandbox (from openSUSE via Russian Fedora)
+- Enable ARM CPU detection for webrtc (from archlinux via Russian Fedora)
+- Do not force -m32 in icu compile on ARM (from archlinux via Russian Fedora)
+- Enable gtk3 support (via conditional)
+- Enable fpic on linux
+- Enable hidpi
+- Force aura on
+- Enable touch_ui
+- Add chromedriver subpackage (from Russian Fedora)
+- Set default master_preferences location to /etc/chromium
+- Add master_preferences file as config file
+- Improve chromium-browser.desktop (from Russian Fedora)
+
* Thu Jul 28 2016 Tom Callaway <spot(a)fedoraproject.org> 52.0.2743.82-9
- fix conditional to disable verbose logging output unless beta/dev
diff --git a/master_preferences b/master_preferences
new file mode 100644
index 0000000..8a5347a
--- /dev/null
+++ b/master_preferences
@@ -0,0 +1,18 @@
+{
+ "distribution": {
+ "alternate_shortcut_text": false,
+ "oem_bubble": true,
+ "chrome_shortcut_icon_index": 0,
+ "create_all_shortcuts": true,
+ "show_welcome_page": true,
+ "system_level": false,
+ "verbose_logging": false
+ },
+ },
+ "first_run_tabs": [
+ "https://start.fedoraproject.org",
+ "http://tools.google.com/chrome/intl/en/welcome.html"
+ ],
+ "homepage": "https://start.fedoraproject.org",
+ "homepage_is_newtabpage": false
+}
diff --git a/sources b/sources
index 316af98..6df5f7a 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
49a7f897775cce21d2b69968b8af1cea depot_tools.git-master.tar.gz
-1389b4f03dfb2e44697e138314bd13ed chromium-52.0.2743.82-clean.tar.xz
-8ce432ed9e6b1edca19f0057f5ad76bf policy_templates.zip
+5d68885e80dec938f68f033a51639e57 chromium-52.0.2743.116-clean.tar.xz
+c0a1a388c4fb32be8e4afb5ace9e801a policy_templates.zip
6 years, 10 months
[chromium-libs-media-freeworld: 13/85] fix conditional to disable verbose logging output unless beta/dev
by Miro Hrončok
commit f5b63ce20f332e0c0608bc8c2d9bd875128f2606
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Thu Jul 28 12:56:55 2016 -0400
fix conditional to disable verbose logging output unless beta/dev
chromium.spec | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/chromium.spec b/chromium.spec
index 503d4d0..ba81688 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -64,7 +64,7 @@ BuildRequires: libicu-devel >= 5.4
Name: chromium%{chromium_channel}
Version: 52.0.2743.82
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: A WebKit (Blink) powered web browser
Url: http://www.chromium.org/Home
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)
@@ -866,11 +866,11 @@ sed -i "s|@@BUILD_TARGET@@|$BUILD_TARGET|g" %{buildroot}%{chromium_path}/%{chrom
sed -i "s|@@CHROMIUM_PATH@@|$CHROMIUM_PATH|g" %{buildroot}%{chromium_path}/%{chromium_browser_channel}.sh
sed -i "s|@@CHROMIUM_BROWSER_CHANNEL@@|$CHROMIUM_BROWSER_CHANNEL|g" %{buildroot}%{chromium_path}/%{chromium_browser_channel}.sh
%if "%{chromium_channel}" == "%%{nil}"
+sed -i "s|@@EXTRA_FLAGS@@||g" %{buildroot}%{chromium_path}/%{chromium_browser_channel}.sh
+%else
# Enable debug outputs for beta and dev channels
export EXTRA_FLAGS="--enable-logging=stderr --v=2"
sed -i "s|@@EXTRA_FLAGS@@|$EXTRA_FLAGS|g" %{buildroot}%{chromium_path}/%{chromium_browser_channel}.sh
-%else
-sed -i "s|@@EXTRA_FLAGS@@||g" %{buildroot}%{chromium_path}/%{chromium_browser_channel}.sh
%endif
ln -s %{chromium_path}/%{chromium_browser_channel}.sh %{buildroot}%{_bindir}/%{chromium_browser_channel}
@@ -1417,6 +1417,9 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
%endif
%changelog
+* Thu Jul 28 2016 Tom Callaway <spot(a)fedoraproject.org> 52.0.2743.82-9
+- fix conditional to disable verbose logging output unless beta/dev
+
* Thu Jul 28 2016 Tom Callaway <spot(a)fedoraproject.org> 52.0.2743.82-8
- disable nacl/pnacl for Fedora 23 (and older)
6 years, 10 months
[chromium-libs-media-freeworld: 12/85] remember to bump release
by Miro Hrončok
commit 4839518160ec7a93eed30f4dabdb659a53009a30
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Thu Jul 28 10:09:31 2016 -0400
remember to bump release
chromium.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/chromium.spec b/chromium.spec
index bb8ec2c..503d4d0 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -64,7 +64,7 @@ BuildRequires: libicu-devel >= 5.4
Name: chromium%{chromium_channel}
Version: 52.0.2743.82
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: A WebKit (Blink) powered web browser
Url: http://www.chromium.org/Home
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)
6 years, 10 months