|
|
|
|
@ -26,7 +26,7 @@
|
|
|
|
|
# Requires is trickier.
|
|
|
|
|
|
|
|
|
|
%global __provides_exclude_from %{chromium_path}/.*\\.so|%{chromium_path}/lib/.*\\.so
|
|
|
|
|
%global privlibs libEGL|libGLESv2|libVkLayer_core_validation|libVkLayer_object_tracker|libVkLayer_parameter_validation|libVkLayer_swapchain|libVkLayer_threading|libVkLayer_unique_objects|libaccessibility|libanimation|libaura|libaura_extra|libbase|libbase_i18n|libbindings|libblink_android_mojo_bindings_shared|libblink_common|libblink_controller|libblink_core|libblink_modules|libblink_mojo_bindings_shared|libblink_offscreen_canvas_mojo_bindings_shared|libblink_platform|libbluetooth|libboringssl|libbrowser_ui_views|libcaptive_portal|libcapture_base|libcapture_lib|libcc|libcc_animation|libcc_base|libcc_blink|libcc_debug|libcc_ipc|libcc_paint|libcdm_manager|libchromium_sqlite3|libclearkeycdm|libcloud_policy_proto_generated_compile|libcodec|libcolor_space|libcommon|libcompositor|libcontent|libcontent_common_mojo_bindings_shared|libcontent_public_common_mojo_bindings_shared|libcrcrypto|libdbus|libdevice_base|libdevice_event_log|libdevice_gamepad|libdevice_vr_mojo_bindings|libdevice_vr_mojo_bindings_blink|libdevice_vr_mojo_bindings_shared|libdevices|libdiscardable_memory_client|libdiscardable_memory_common|libdiscardable_memory_service|libdisplay|libdisplay_types|libdisplay_util|libdomain_reliability|libembedder|libevents|libevents_base|libevents_devices_x11|libevents_ozone_layout|libevents_x|libfingerprint|libffmpeg|libgcm|libgeolocation|libgeometry|libgeometry_skia|libgesture_detection|libgfx|libgfx_ipc|libgfx_ipc_color|libgfx_ipc_geometry|libgfx_ipc_skia|libgfx_switches|libgfx_x11|libgin|libgl_in_process_context|libgl_init|libgl_wrapper|libgles2_c_lib|libgles2_implementation|libgles2_utils|libgpu|libgtk3ui|libheadless|libhost|libicui18n|libicuuc|libinterfaces_shared|libipc|libipc_mojom|libipc_mojom_shared|libjs|libkeyboard|libkeyboard_with_content|libkeycodes_x11|libkeyed_service_content|libkeyed_service_core|libmanager|libmedia|libmedia_blink|libmedia_gpu|libmedia_mojo_services|libmessage_center|libmetrics_cpp|libmidi|libmirclient.9|libmojo_common_lib|libmojo_ime_lib|libmojo_public_system|libmojo_public_system_cpp|libmojo_system_impl|libnative_theme|libnet|libnet_with_v8|libonc|libplatform|libpolicy_component|libpolicy_proto|libppapi_host|libppapi_proxy|libppapi_shared|libprefs|libprinting|libprotobuf_lite|libproxy_config|librange|libresource_coordinator_cpp|libresource_coordinator_public_interfaces_internal_shared|libsandbox_services|libseccomp_bpf|libsensors|libservice|libservice_manager_cpp|libservice_manager_cpp_types|libservice_manager_mojom|libservice_manager_mojom_blink|libservice_manager_mojom_constants|libservice_manager_mojom_constants_blink|libservice_manager_mojom_constants_shared|libservice_manager_mojom_shared|libsessions|libshared_memory_support|libshell_dialogs|libskia|libsnapshot|libsql|libstartup_tracing|libstorage_browser|libstorage_common|libstub_window|libsuid_sandbox_client|libsurface|libtracing|libui_base|libui_base_ime|libui_base_x|libui_data_pack|libui_devtools|libui_touch_selection|libui_views_mus_lib|liburl|liburl_ipc|liburl_matcher|libuser_manager|libuser_prefs|libv8|libv8_libbase|libv8_libplatform|libviews|libviz_common|libviz_resource_format|libweb_dialogs|libwebdata_common|libwebview|libwidevinecdm.fedora|libwidevinecdmadapter|libwm|libwm_public|libwtf|libx11_events_platform|libx11_window
|
|
|
|
|
%global privlibs libEGL|libGLESv2|libVkLayer_core_validation|libVkLayer_object_tracker|libVkLayer_parameter_validation|libVkLayer_swapchain|libVkLayer_threading|libVkLayer_unique_objects|libaccessibility|libanimation|libaura|libaura_extra|libbase|libbase_i18n|libbindings|libblink_android_mojo_bindings_shared|libblink_common|libblink_controller|libblink_core|libblink_modules|libblink_mojo_bindings_shared|libblink_offscreen_canvas_mojo_bindings_shared|libblink_platform|libbluetooth|libboringssl|libbrowser_ui_views|libcaptive_portal|libcapture_base|libcapture_lib|libcc|libcc_animation|libcc_base|libcc_blink|libcc_debug|libcc_ipc|libcc_paint|libcdm_manager|libchromium_sqlite3|libclearkeycdm|libcloud_policy_proto_generated_compile|libcodec|libcolor_space|libcommon|libcompositor|libcontent|libcontent_common_mojo_bindings_shared|libcontent_public_common_mojo_bindings_shared|libcrcrypto|libdbus|libdevice_base|libdevice_event_log|libdevice_gamepad|libdevice_vr_mojo_bindings|libdevice_vr_mojo_bindings_blink|libdevice_vr_mojo_bindings_shared|libdevices|libdiscardable_memory_client|libdiscardable_memory_common|libdiscardable_memory_service|libdisplay|libdisplay_types|libdisplay_util|libdomain_reliability|libembedder|libevents|libevents_base|libevents_devices_x11|libevents_ozone_layout|libevents_x|libfingerprint|libffmpeg|libgcm|libgeolocation|libgeometry|libgeometry_skia|libgesture_detection|libgfx|libgfx_ipc|libgfx_ipc_color|libgfx_ipc_geometry|libgfx_ipc_skia|libgfx_switches|libgfx_x11|libgin|libgl_in_process_context|libgl_init|libgl_wrapper|libgles2_c_lib|libgles2_implementation|libgles2_utils|libgpu|libgtk3ui|libheadless|libhost|libicui18n|libicuuc|libinterfaces_shared|libipc|libipc_mojom|libipc_mojom_shared|libjs|libkeyboard|libkeyboard_with_content|libkeycodes_x11|libkeyed_service_content|libkeyed_service_core|libmanager|libmedia|libmedia_blink|libmedia_gpu|libmedia_mojo_services|libmessage_center|libmetrics_cpp|libmidi|libmirclient.9|libmojo_common_lib|libmojo_ime_lib|libmojo_public_system|libmojo_public_system_cpp|libmojo_system_impl|libnative_theme|libnet|libnet_with_v8|libonc|libplatform|libpolicy_component|libpolicy_proto|libppapi_host|libppapi_proxy|libppapi_shared|libprefs|libprinting|libprotobuf_lite|libproxy_config|librange|libresource_coordinator_cpp|libresource_coordinator_public_interfaces_internal_shared|libsandbox_services|libseccomp_bpf|libsensors|libservice|libservice_manager_cpp|libservice_manager_cpp_types|libservice_manager_mojom|libservice_manager_mojom_blink|libservice_manager_mojom_constants|libservice_manager_mojom_constants_blink|libservice_manager_mojom_constants_shared|libservice_manager_mojom_shared|libsessions|libshared_memory_support|libshell_dialogs|libskia|libsnapshot|libsql|libstartup_tracing|libstorage_browser|libstorage_common|libstub_window|libsuid_sandbox_client|libsurface|libtracing|libui_base|libui_base_ime|libui_base_x|libui_data_pack|libui_devtools|libui_touch_selection|libui_views_mus_lib|liburl|liburl_ipc|liburl_matcher|libuser_manager|libuser_prefs|libv8|libv8_libbase|libv8_libplatform|libviews|libviz_common|libviz_resource_format|libweb_dialogs|libwebdata_common|libwebview|libwidevinecdm|libwidevinecdmadapter|libwm|libwm_public|libwtf|libx11_events_platform|libx11_window
|
|
|
|
|
%global __requires_exclude ^(%{privlibs})\\.so
|
|
|
|
|
|
|
|
|
|
# Try to not use the Xvfb as it is slow..
|
|
|
|
|
@ -118,8 +118,8 @@ Name: chromium%{chromium_channel}%{?freeworld:-freeworld}
|
|
|
|
|
%else
|
|
|
|
|
Name: chromium%{chromium_channel}
|
|
|
|
|
%endif
|
|
|
|
|
Version: %{majorversion}.0.3202.62
|
|
|
|
|
Release: 1%{?dist}.1
|
|
|
|
|
Version: %{majorversion}.0.3202.75
|
|
|
|
|
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)
|
|
|
|
|
@ -216,9 +216,6 @@ Patch62: chromium-gcc5-r3.patch
|
|
|
|
|
Patch63: chromium-gn-bootstrap-r17.patch
|
|
|
|
|
# Fix _cplusplus conditional
|
|
|
|
|
Patch64: chromium-62.0.3202.62-correct-cplusplus-check.patch
|
|
|
|
|
# epel7 does not know about c++14
|
|
|
|
|
Patch65: chromium-62.0.3202.62-epel7-noc++14.patch
|
|
|
|
|
Patch66: chromium-62.0.3202.62-epel7-c++11-support.patch
|
|
|
|
|
|
|
|
|
|
### Chromium Tests Patches ###
|
|
|
|
|
Patch100: chromium-46.0.2490.86-use_system_opus.patch
|
|
|
|
|
@ -399,6 +396,10 @@ BuildRequires: systemd
|
|
|
|
|
# using the built from source version on aarch64
|
|
|
|
|
BuildRequires: ninja-build
|
|
|
|
|
|
|
|
|
|
%if 0%{?rhel} == 7
|
|
|
|
|
BuildRequires: devtoolset-7-toolchain, devtoolset-7-libatomic-devel
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
# We pick up an automatic requires on the library, but we need the version check
|
|
|
|
|
# because the nss shared library is unversioned.
|
|
|
|
|
# This is to prevent someone from hitting http://code.google.com/p/chromium/issues/detail?id=26448
|
|
|
|
|
@ -668,8 +669,6 @@ udev.
|
|
|
|
|
%patch59 -p1 -b .gcc-nc
|
|
|
|
|
%patch60 -p1 -b .nonullptr
|
|
|
|
|
%patch61 -p1 -b .another-rvalue-fix
|
|
|
|
|
%patch65 -p1 -b .epel7-noc++14
|
|
|
|
|
%patch66 -p1 -b .epel7-c++11
|
|
|
|
|
%endif
|
|
|
|
|
%patch50 -p1 -b .pathfix
|
|
|
|
|
%patch53 -p1 -b .nogccoptmath
|
|
|
|
|
@ -809,9 +808,6 @@ CHROMIUM_CORE_GN_DEFINES+=' treat_warnings_as_errors=false linux_use_bundled_bin
|
|
|
|
|
%ifarch aarch64
|
|
|
|
|
CHROMIUM_CORE_GN_DEFINES+=' target_cpu="arm64"'
|
|
|
|
|
%endif
|
|
|
|
|
%if 0%{?rhel} == 7
|
|
|
|
|
CHROMIUM_CORE_GN_DEFINES+=' use_cxx11=true'
|
|
|
|
|
%endif
|
|
|
|
|
export CHROMIUM_CORE_GN_DEFINES
|
|
|
|
|
|
|
|
|
|
CHROMIUM_BROWSER_GN_DEFINES=""
|
|
|
|
|
@ -990,10 +986,6 @@ build/linux/unbundle/remove_bundled_libraries.py \
|
|
|
|
|
'third_party/swiftshader/third_party/subzero' \
|
|
|
|
|
'third_party/swiftshader/third_party/LLVM' \
|
|
|
|
|
'third_party/swiftshader/third_party/llvm-subzero' \
|
|
|
|
|
%if 0%{?rhel} == 7
|
|
|
|
|
'third_party/tao' \
|
|
|
|
|
'third_party/tao/seq' \
|
|
|
|
|
%endif
|
|
|
|
|
'third_party/tcmalloc' \
|
|
|
|
|
'third_party/usb_ids' \
|
|
|
|
|
'third_party/usrsctp' \
|
|
|
|
|
@ -1077,6 +1069,10 @@ sed -i '/aarch64)/ a \ exec "/usr/bin/ninja-build" "$@";;\' ../depot_tool
|
|
|
|
|
%endif
|
|
|
|
|
sed -i 's|exec "${THIS_DIR}/ninja-linux${LONG_BIT}"|exec "/usr/bin/ninja-build"|g' ../depot_tools/ninja
|
|
|
|
|
|
|
|
|
|
%if 0%{?rhel} == 7
|
|
|
|
|
. /opt/rh/devtoolset-7/enable
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
tools/gn/bootstrap/bootstrap.py -v --gn-gen-args "$CHROMIUM_CORE_GN_DEFINES $CHROMIUM_BROWSER_GN_DEFINES"
|
|
|
|
|
%{target}/gn gen --args="$CHROMIUM_CORE_GN_DEFINES $CHROMIUM_BROWSER_GN_DEFINES" %{target}
|
|
|
|
|
|
|
|
|
|
@ -1103,6 +1099,9 @@ FILE=chrome/common/channel_info_posix.cc
|
|
|
|
|
sed -i.orig -e 's/getenv("CHROME_VERSION_EXTRA")/"Fedora Project"/' $FILE
|
|
|
|
|
|
|
|
|
|
%build
|
|
|
|
|
%if 0%{?rhel} == 7
|
|
|
|
|
. /opt/rh/devtoolset-7/enable
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%if %{?tests}
|
|
|
|
|
# Tests targets taken from testing/buildbot/chromium.linux.json and obtained with
|
|
|
|
|
@ -1910,6 +1909,10 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
|
|
* Fri Oct 27 2017 Tom Callaway <spot@fedoraproject.org> 62.0.3202.75-1
|
|
|
|
|
- update to 62.0.3202.75
|
|
|
|
|
- use devtoolset-7-toolchain to build on epel7
|
|
|
|
|
|
|
|
|
|
* Tue Oct 24 2017 Tom Callaway <spot@fedoraproject.org> 62.0.3202.62-1.1
|
|
|
|
|
- do not attempt std=c++14 on epel7
|
|
|
|
|
|
|
|
|
|
|
Tom Callaway
7 years ago