[chromium-freeworld: 3/5] fixup spec
by Miro Hrončok
commit 02b89a300d0d8ba8f3b68ee0e517e1bad98292ba
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Mon Jun 4 09:01:56 2018 -0400
fixup spec
.gitignore | 3 +++
chromium.spec | 62 +++++++++++++++++++++++++++++++++++++++++------------------
sources | 3 +++
3 files changed, 49 insertions(+), 19 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9e6dbec..adc3998 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,3 +45,6 @@
/chromium-66.0.3359.139-clean.tar.xz
/chromium-66.0.3359.170-clean.tar.xz
/chromium-66.0.3359.181-clean.tar.xz
+/chromium-67.0.3396.62-clean.tar.xz
+/gelasio.zip
+/MuktiNarrow-0.94.tar.bz2
diff --git a/chromium.spec b/chromium.spec
index b34dbd1..1c3ae3b 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -29,13 +29,13 @@
# 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 __provides_exclude_from %{chromium_path}/.*\\.so|%{chromium_path}/lib/.*\\.so|%{chromium_path}/lib/.*\\.so.*
%if 0%{?rhel} == 7
-%global privlibs libaccessibility|libanimation|libaura_extra|libaura|libbase_i18n|libbase|libbindings_base|libbindings|libblink_android_mojo_bindings_shared|libblink_common|libblink_controller|libblink_core_mojo_bindings_shared|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|libcbor|libcc_animation|libcc_base|libcc_blink|libcc_debug|libcc_ipc|libcc_paint|libcc|libcdm_manager|libchromium_sqlite3|libclearkeycdm|libclient|libcloud_policy_proto_generated_compile|libcodec|libcolor_space|libcommon|libcompositor|libcontent_common_mojo_bindings_shared|libcontent_public_common_mojo_bindings_shared|libcontent|libcrash_key|libcrcrypto|libdbus|libdevice_base|libdevice_event_log|libdevice_features|libdevice_gamepad|libdevices|libdevice_vr_mojo_bindings_blink|libdevice_vr_mojo_bindings_shared|libdevice_vr_mojo_bindings|libdevi
ce_vr|libdiscardable_memory_client|libdiscardable_memory_common|libdiscardable_memory_service|libdisplay|libdisplay_types|libdisplay_util|libdomain_reliability|libEGL|libembedder|libembedder_switches|libevents_base|libevents_devices_x11|libevents_ozone_layout|libevents|libevents_x|libffmpeg|libfingerprint|libfontconfig|libfreetype_harfbuzz|libgcm|libgeolocation|libgeometry_skia|libgeometry|libgesture_detection|libgfx_ipc_buffer_types|libgfx_ipc_color|libgfx_ipc_geometry|libgfx_ipc_skia|libgfx_ipc|libgfx|libgfx_switches|libgfx_x11|libgin|libgles2_implementation|libgles2|libgles2_utils|libGLESv2|libgl_init|libgl_in_process_context|libgl_wrapper|libgpu_ipc_service|libgpu|libgpu_util|libgtk3ui|libheadless|libhost|libicui18n|libicuuc|libinterfaces_shared|libipc_mojom_shared|libipc_mojom|libipc|libkeyboard|libkeyboard_with_content|libkeycodes_x11|libkeyed_service_content|libkeyed_service_core|libleveldatabase|libmanager|libmedia_blink|libmedia_devices_mojo_bindings_shared|libmedia_gpu|lib
media_mojo_services|libmedia|libmessage_center|libmessage_support|libmetrics_cpp|libmidi|libmojo_base_lib|libmojo_base_mojom_blink|libmojo_base_mojom_shared|libmojo_base_mojom|libmojo_base_shared_typemap_traits|libmojo_common_lib|libmojo_ime_lib|libmojo_mojom_bindings_shared|libmojo_mojom_bindings|libmojom_platform_shared|libmojom_shared|libmojo_public_system_cpp|libmojo_public_system|libmojo_system_impl|libnative_theme|libnet|libnet_with_v8|libnetwork_cpp_base|libnetwork_cpp|libnetwork_service|libnetwork_session_configurator|libonc|libplatform|libpolicy_component|libpolicy_proto|libppapi_host|libppapi_proxy|libppapi_shared|libprefs|libprinting|libprotobuf_lite|libproxy_config|libpublic|librange|libraster|libresource_coordinator_cpp_base|libresource_coordinator_cpp|libresource_coordinator_public_mojom_blink|libresource_coordinator_public_mojom_shared|libresource_coordinator_public_mojom|libsandbox_services|libsandbox|libseccomp_bpf|libservice_manager_cpp|libservice_manager_cpp_types
|libservice_manager_mojom_blink|libservice_manager_mojom_constants_blink|libservice_manager_mojom_constants_shared|libservice_manager_mojom_constants|libservice_manager_mojom_shared|libservice_manager_mojom|libservice|libsessions|libshared_memory_support|libshell_dialogs|libskia|libsnapshot|libsql|libstartup_tracing|libstorage_browser|libstorage_common|libstub_window|libsuid_sandbox_client|libsurface|libtracing_cpp|libtracing_mojom_shared|libtracing_mojom|libtracing|libui_base_ime|libui_base|libui_base_x|libui_data_pack|libui_devtools|libui_message_center_cpp|libui_touch_selection|libui_views_mus_lib|liburl_ipc|liburl_matcher|liburl|libuser_manager|libuser_prefs|libv8_libbase|libv8_libplatform|libv8|libviews|libviz_common|libviz_resource_format|libVkLayer_core_validation|libVkLayer_object_tracker|libVkLayer_parameter_validation|libVkLayer_threading|libVkLayer_unique_objects|libwebdata_common|libweb_dialogs|libwebview|libwidevinecdmadapter|libwidevinecdm|libwm_public|libwm|libwtf|lib
x11_events_platform|libx11_window
+%global privlibs libaccessibility|libanimation|libapdu|libaura_extra|libaura|libbase_i18n|libbase|libbindings_base|libbindings|libblink_android_mojo_bindings_shared|libblink_common|libblink_controller|libblink_core_mojo_bindings_shared|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|libcbor|libcc_animation|libcc_base|libcc_blink|libcc_debug|libcc_ipc|libcc_paint|libcc|libcdm_manager|libchromium_sqlite3|libclearkeycdm|libclient|libcloud_policy_proto_generated_compile|libcodec|libcolor_space|libcommon|libcompositor|libcontent_common_mojo_bindings_shared|libcontent_public_common_mojo_bindings_shared|libcontent|libcrash_key|libcrcrypto|libdbus|libdevice_base|libdevice_event_log|libdevice_features|libdevice_gamepad|libdevices|libdevice_vr_mojo_bindings_blink|libdevice_vr_mojo_bindings_shared|libdevice_vr_mojo_bindings
|libdevice_vr|libdiscardable_memory_client|libdiscardable_memory_common|libdiscardable_memory_service|libdisplay|libdisplay_types|libdisplay_util|libdomain_reliability|libEGL|libembedder|libembedder_switches|libevents_base|libevents_devices_x11|libevents_ozone_layout|libevents|libevents_x|libffmpeg|libfido|libfingerprint|libfreetype_harfbuzz|libgcm|libgeolocation|libgeometry_skia|libgeometry|libgesture_detection|libgfx_ipc_buffer_types|libgfx_ipc_color|libgfx_ipc_geometry|libgfx_ipc_skia|libgfx_ipc|libgfx|libgfx_switches|libgfx_x11|libgin|libgles2_implementation|libgles2|libgles2_utils|libGLESv2|libgl_init|libgl_in_process_context|libgl_wrapper|libgpu_ipc_service|libgpu|libgpu_util|libgtk3ui|libheadless|libhost|libicui18n|libicuuc|libinterfaces_shared|libipc_mojom_shared|libipc_mojom|libipc|libkeyboard|libkeycodes_x11|libkeyed_service_content|libkeyed_service_core|libleveldatabase|libmanager|libmedia_blink|libmedia_devices_mojo_bindings_shared|libmedia_gpu|libmedia_mojo_services|lib
media|libmessage_center|libmessage_support|libmetrics_cpp|libmidi|libmirclient|libmojo_base_lib|libmojo_base_mojom_blink|libmojo_base_mojom_shared|libmojo_base_mojom|libmojo_base_shared_typemap_traits|libmojo_edk_ports|libmojo_edk|libmojo_ime_lib|libmojom_core_shared|libmojo_mojom_bindings_shared|libmojo_mojom_bindings|libmojom_platform_shared|libmojo_public_system_cpp|libmojo_public_system|libnative_theme|libnet|libnet_with_v8|libnetwork_cpp_base|libnetwork_cpp|libnetwork_service|libnetwork_session_configurator|libonc|libplatform|libpolicy_component|libpolicy_proto|libppapi_host|libppapi_proxy|libppapi_shared|libprefs|libprinting|libprotobuf_lite|libproxy_config|libpublic|librange|libraster|libresource_coordinator_cpp_base|libresource_coordinator_cpp|libresource_coordinator_public_mojom_blink|libresource_coordinator_public_mojom_shared|libresource_coordinator_public_mojom|libsandbox_services|libsandbox|libseccomp_bpf|libservice_manager_cpp|libservice_manager_cpp_types|libservice_ma
nager_mojom_blink|libservice_manager_mojom_constants_blink|libservice_manager_mojom_constants_shared|libservice_manager_mojom_constants|libservice_manager_mojom_shared|libservice_manager_mojom|libservice|libsessions|libshared_memory_support|libshell_dialogs|libskia|libsnapshot|libsql|libstartup_tracing|libstorage_browser|libstorage_common|libstub_window|libsuid_sandbox_client|libsurface|libtracing_cpp|libtracing_mojom_shared|libtracing_mojom|libtracing|libui_base_ime|libui_base|libui_base_x|libui_data_pack|libui_devtools|libui_message_center_cpp|libui_touch_selection|libui_views_mus_lib|liburl_ipc|liburl_matcher|liburl|libuser_manager|libuser_prefs|libv8_libbase|libv8_libplatform|libv8|libviews|libviz_common|libviz_resource_format|libVkLayer_core_validation|libVkLayer_object_tracker|libVkLayer_parameter_validation|libVkLayer_threading|libVkLayer_unique_objects|libwebdata_common|libweb_dialogs|libwebview|libwm_public|libwm|libwtf|libx11_events_platform|libx11_window|libbase|libEGL|li
bGLESv2|libfontconfig
%else
-%global privlibs libaccessibility|libanimation|libaura_extra|libaura|libbase_i18n|libbase|libbindings_base|libbindings|libblink_android_mojo_bindings_shared|libblink_common|libblink_controller|libblink_core_mojo_bindings_shared|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|libcbor|libcc_animation|libcc_base|libcc_blink|libcc_debug|libcc_ipc|libcc_paint|libcc|libcdm_manager|libchromium_sqlite3|libclearkeycdm|libclient|libcloud_policy_proto_generated_compile|libcodec|libcolor_space|libcommon|libcompositor|libcontent_common_mojo_bindings_shared|libcontent_public_common_mojo_bindings_shared|libcontent|libcrash_key|libcrcrypto|libdbus|libdevice_base|libdevice_event_log|libdevice_features|libdevice_gamepad|libdevices|libdevice_vr_mojo_bindings_blink|libdevice_vr_mojo_bindings_shared|libdevice_vr_mojo_bindings|libdevi
ce_vr|libdiscardable_memory_client|libdiscardable_memory_common|libdiscardable_memory_service|libdisplay|libdisplay_types|libdisplay_util|libdomain_reliability|libEGL|libembedder|libembedder_switches|libevents_base|libevents_devices_x11|libevents_ozone_layout|libevents|libevents_x|libffmpeg|libfingerprint|libfreetype_harfbuzz|libgcm|libgeolocation|libgeometry_skia|libgeometry|libgesture_detection|libgfx_ipc_buffer_types|libgfx_ipc_color|libgfx_ipc_geometry|libgfx_ipc_skia|libgfx_ipc|libgfx|libgfx_switches|libgfx_x11|libgin|libgles2_implementation|libgles2|libgles2_utils|libGLESv2|libgl_init|libgl_in_process_context|libgl_wrapper|libgpu_ipc_service|libgpu|libgpu_util|libgtk3ui|libheadless|libhost|libicui18n|libicuuc|libinterfaces_shared|libipc_mojom_shared|libipc_mojom|libipc|libkeyboard|libkeyboard_with_content|libkeycodes_x11|libkeyed_service_content|libkeyed_service_core|libleveldatabase|libmanager|libmedia_blink|libmedia_devices_mojo_bindings_shared|libmedia_gpu|libmedia_mojo_ser
vices|libmedia|libmessage_center|libmessage_support|libmetrics_cpp|libmidi|libmojo_base_lib|libmojo_base_mojom_blink|libmojo_base_mojom_shared|libmojo_base_mojom|libmojo_base_shared_typemap_traits|libmojo_common_lib|libmojo_ime_lib|libmojo_mojom_bindings_shared|libmojo_mojom_bindings|libmojom_platform_shared|libmojom_shared|libmojo_public_system_cpp|libmojo_public_system|libmojo_system_impl|libnative_theme|libnet|libnet_with_v8|libnetwork_cpp_base|libnetwork_cpp|libnetwork_service|libnetwork_session_configurator|libonc|libplatform|libpolicy_component|libpolicy_proto|libppapi_host|libppapi_proxy|libppapi_shared|libprefs|libprinting|libprotobuf_lite|libproxy_config|libpublic|librange|libraster|libresource_coordinator_cpp_base|libresource_coordinator_cpp|libresource_coordinator_public_mojom_blink|libresource_coordinator_public_mojom_shared|libresource_coordinator_public_mojom|libsandbox_services|libsandbox|libseccomp_bpf|libservice_manager_cpp|libservice_manager_cpp_types|libservice_ma
nager_mojom_blink|libservice_manager_mojom_constants_blink|libservice_manager_mojom_constants_shared|libservice_manager_mojom_constants|libservice_manager_mojom_shared|libservice_manager_mojom|libservice|libsessions|libshared_memory_support|libshell_dialogs|libskia|libsnapshot|libsql|libstartup_tracing|libstorage_browser|libstorage_common|libstub_window|libsuid_sandbox_client|libsurface|libtracing_cpp|libtracing_mojom_shared|libtracing_mojom|libtracing|libui_base_ime|libui_base|libui_base_x|libui_data_pack|libui_devtools|libui_message_center_cpp|libui_touch_selection|libui_views_mus_lib|liburl_ipc|liburl_matcher|liburl|libuser_manager|libuser_prefs|libv8_libbase|libv8_libplatform|libv8|libviews|libviz_common|libviz_resource_format|libVkLayer_core_validation|libVkLayer_object_tracker|libVkLayer_parameter_validation|libVkLayer_threading|libVkLayer_unique_objects|libwebdata_common|libweb_dialogs|libwebview|libwidevinecdmadapter|libwidevinecdm|libwm_public|libwm|libwtf|libx11_events_pla
tform|libx11_window
+%global privlibs libaccessibility|libanimation|libapdu|libaura_extra|libaura|libbase_i18n|libbase|libbindings_base|libbindings|libblink_android_mojo_bindings_shared|libblink_common|libblink_controller|libblink_core_mojo_bindings_shared|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|libcbor|libcc_animation|libcc_base|libcc_blink|libcc_debug|libcc_ipc|libcc_paint|libcc|libcdm_manager|libchromium_sqlite3|libclearkeycdm|libclient|libcloud_policy_proto_generated_compile|libcodec|libcolor_space|libcommon|libcompositor|libcontent_common_mojo_bindings_shared|libcontent_public_common_mojo_bindings_shared|libcontent|libcrash_key|libcrcrypto|libdbus|libdevice_base|libdevice_event_log|libdevice_features|libdevice_gamepad|libdevices|libdevice_vr_mojo_bindings_blink|libdevice_vr_mojo_bindings_shared|libdevice_vr_mojo_bindings
|libdevice_vr|libdiscardable_memory_client|libdiscardable_memory_common|libdiscardable_memory_service|libdisplay|libdisplay_types|libdisplay_util|libdomain_reliability|libEGL|libembedder|libembedder_switches|libevents_base|libevents_devices_x11|libevents_ozone_layout|libevents|libevents_x|libffmpeg|libfido|libfingerprint|libfreetype_harfbuzz|libgcm|libgeolocation|libgeometry_skia|libgeometry|libgesture_detection|libgfx_ipc_buffer_types|libgfx_ipc_color|libgfx_ipc_geometry|libgfx_ipc_skia|libgfx_ipc|libgfx|libgfx_switches|libgfx_x11|libgin|libgles2_implementation|libgles2|libgles2_utils|libGLESv2|libgl_init|libgl_in_process_context|libgl_wrapper|libgpu_ipc_service|libgpu|libgpu_util|libgtk3ui|libheadless|libhost|libicui18n|libicuuc|libinterfaces_shared|libipc_mojom_shared|libipc_mojom|libipc|libkeyboard|libkeycodes_x11|libkeyed_service_content|libkeyed_service_core|libleveldatabase|libmanager|libmedia_blink|libmedia_devices_mojo_bindings_shared|libmedia_gpu|libmedia_mojo_services|lib
media|libmessage_center|libmessage_support|libmetrics_cpp|libmidi|libmirclient|libmojo_base_lib|libmojo_base_mojom_blink|libmojo_base_mojom_shared|libmojo_base_mojom|libmojo_base_shared_typemap_traits|libmojo_edk_ports|libmojo_edk|libmojo_ime_lib|libmojom_core_shared|libmojo_mojom_bindings_shared|libmojo_mojom_bindings|libmojom_platform_shared|libmojo_public_system_cpp|libmojo_public_system|libnative_theme|libnet|libnet_with_v8|libnetwork_cpp_base|libnetwork_cpp|libnetwork_service|libnetwork_session_configurator|libonc|libplatform|libpolicy_component|libpolicy_proto|libppapi_host|libppapi_proxy|libppapi_shared|libprefs|libprinting|libprotobuf_lite|libproxy_config|libpublic|librange|libraster|libresource_coordinator_cpp_base|libresource_coordinator_cpp|libresource_coordinator_public_mojom_blink|libresource_coordinator_public_mojom_shared|libresource_coordinator_public_mojom|libsandbox_services|libsandbox|libseccomp_bpf|libservice_manager_cpp|libservice_manager_cpp_types|libservice_ma
nager_mojom_blink|libservice_manager_mojom_constants_blink|libservice_manager_mojom_constants_shared|libservice_manager_mojom_constants|libservice_manager_mojom_shared|libservice_manager_mojom|libservice|libsessions|libshared_memory_support|libshell_dialogs|libskia|libsnapshot|libsql|libstartup_tracing|libstorage_browser|libstorage_common|libstub_window|libsuid_sandbox_client|libsurface|libtracing_cpp|libtracing_mojom_shared|libtracing_mojom|libtracing|libui_base_ime|libui_base|libui_base_x|libui_data_pack|libui_devtools|libui_message_center_cpp|libui_touch_selection|libui_views_mus_lib|liburl_ipc|liburl_matcher|liburl|libuser_manager|libuser_prefs|libv8_libbase|libv8_libplatform|libv8|libviews|libviz_common|libviz_resource_format|libVkLayer_core_validation|libVkLayer_object_tracker|libVkLayer_parameter_validation|libVkLayer_threading|libVkLayer_unique_objects|libwebdata_common|libweb_dialogs|libwebview|libwm_public|libwm|libwtf|libx11_events_platform|libx11_window|libbase|libEGL|li
bGLESv2
%endif
-%global __requires_exclude ^(%{privlibs})\\.so
+%global __requires_exclude ^(%{privlibs})\\.so*
# If we build with shared on, then chrome-remote-desktop depends on chromium libs.
# If we build with shared off, then users cannot swap out libffmpeg (and i686 gets a lot harder to build)
@@ -279,6 +279,9 @@ Source8: get_linux_tests_names.py
Source9: chromium-browser.xml
Source11: chrome-remote-desktop@.service
Source13: master_preferences
+# Unpackaged fonts
+Source14: https://fontlibrary.org/assets/downloads/gelasio/4d610887ff4d445cbc639aae...
+Source15: http://download.savannah.nongnu.org/releases/freebangfont/MuktiNarrow-0.9...
# We can assume gcc and binutils.
BuildRequires: gcc-c++
@@ -438,6 +441,16 @@ BuildRequires: pkgconfig(gnome-keyring-1)
# remote desktop needs this
BuildRequires: pam-devel
BuildRequires: systemd
+BuildRequires: google-croscore-arimo-fonts
+BuildRequires: google-croscore-cousine-fonts
+BuildRequires: dejavu-sans-fonts
+BuildRequires: thai-scalable-garuda-fonts
+BuildRequires: lohit-devanagari-fonts
+BuildRequires: lohit-gurmukhi-fonts
+BuildRequires: lohit-tamil-fonts
+BuildRequires: google-noto-sans-cjk-jp-fonts
+BuildRequires: google-noto-sans-khmer-fonts
+BuildRequires: google-croscore-tinos-fonts
# using the built from source version on aarch64
BuildRequires: ninja-build
@@ -848,6 +861,23 @@ ln -s /usr/bin/clang clang
popd
%endif
+# Unpack fonts
+pushd third_party/test_fonts
+mkdir test_fonts
+cd test_fonts
+unzip %{SOURCE14}
+tar xf %{SOURCE15}
+mv MuktiNarrow0.94/MuktiNarrow.ttf .
+rm -rf MuktiNarrow0.94
+cp -a /usr/share/fonts/google-croscore/Arimo-*.ttf .
+cp -a /usr/share/fonts/google-croscore/Cousine-*.ttf .
+cp -a /usr/share/fonts/dejavu/DejaVuSans.ttf /usr/share/fonts/dejavu/DejaVuSans-Bold.ttf .
+cp -a /usr/share/fonts/thai-scalable/Garuda.ttf .
+cp -a /usr/share/fonts/lohit-devanagari/Lohit-Devanagari.ttf /usr/share/fonts/lohit-gurmukhi/Lohit-Gurmukhi.ttf /usr/share/fonts/lohit-tamil/Lohit-Tamil.ttf .
+cp -a /usr/share/fonts/google-noto-cjk/NotoSansCJKjp-Regular.otf /usr/share/fonts/google-noto/NotoSansKhmer-Regular.ttf .
+cp -a /usr/share/fonts/google-croscore/Tinos-*.ttf .
+popd
+
# Core defines are flags that are true for both the browser and headless.
CHROMIUM_CORE_GN_DEFINES=""
CHROMIUM_CORE_GN_DEFINES+=' is_debug=false'
@@ -880,7 +910,7 @@ CHROMIUM_BROWSER_GN_DEFINES+=' is_component_ffmpeg=false is_component_build=fals
%endif
CHROMIUM_BROWSER_GN_DEFINES+=' remove_webcore_debug_symbols=true enable_hangout_services_extension=true'
CHROMIUM_BROWSER_GN_DEFINES+=' use_aura=true'
-CHROMIUM_BROWSER_GN_DEFINES+=' enable_webrtc=true enable_widevine=true'
+CHROMIUM_BROWSER_GN_DEFINES+=' enable_webrtc=true'
%if 0%{gtk3}
CHROMIUM_BROWSER_GN_DEFINES+=' use_gtk3=true'
%else
@@ -931,6 +961,7 @@ build/linux/unbundle/remove_bundled_libraries.py \
'third_party/angle/third_party/spirv-headers' \
'third_party/angle/third_party/spirv-tools' \
'third_party/angle/third_party/vulkan-validation-layers' \
+ 'third_party/apple_apsl' \
'third_party/blanketjs' \
'third_party/blink' \
'third_party/boringssl' \
@@ -951,6 +982,8 @@ build/linux/unbundle/remove_bundled_libraries.py \
'third_party/catapult/tracing/third_party/pako' \
'third_party/ced' \
'third_party/cld_3' \
+ 'third_party/crashpad' \
+ 'third_party/crashpad/crashpad/third_party/zlib/' \
'third_party/crc32c' \
'third_party/cros_system_api' \
'third_party/devscripts' \
@@ -1053,6 +1086,7 @@ build/linux/unbundle/remove_bundled_libraries.py \
'third_party/swiftshader/third_party/LLVM' \
'third_party/swiftshader/third_party/llvm-subzero' \
'third_party/tcmalloc' \
+ 'third_party/test_fonts' \
'third_party/usb_ids' \
'third_party/usrsctp' \
'third_party/vulkan' \
@@ -1196,7 +1230,7 @@ sed -i.orig -e 's/getenv("CHROME_VERSION_EXTRA")/"Fedora Project"/' $FILE
# Do headless first.
../depot_tools/ninja -C %{headlesstarget} -vvv headless_shell
-../depot_tools/ninja -C %{target} -vvv chrome chrome_sandbox chromedriver widevinecdmadapter clear_key_cdm policy_templates
+../depot_tools/ninja -C %{target} -vvv chrome chrome_sandbox chromedriver clear_key_cdm policy_templates
# remote client
pushd remoting
@@ -1273,9 +1307,10 @@ cp -a natives_blob.bin %{buildroot}%{chromium_path}
cp -a snapshot_blob.bin %{buildroot}%{chromium_path}
cp -a v8_context_snapshot.bin %{buildroot}%{chromium_path}
cp -a xdg-mime xdg-settings %{buildroot}%{chromium_path}
+cp -a MEIPreload %{buildroot}%{chromium_path}
%if 0%{?shared}
cp -a lib*.so* %{buildroot}%{chromium_path}
-cp -p %{buildroot}%{chromium_path}/libwidevinecdm.so{,.fedora}
+# cp -p %%{buildroot}%{chromium_path}/libwidevinecdm.so{,.fedora}
cp -p %{buildroot}%{chromium_path}/libffmpeg.so{,.%{lsuffix}}
cp -p %{buildroot}%{chromium_path}/libffmpeg.so.TOC{,.%{lsuffix}}
cp -p %{buildroot}%{chromium_path}/libmedia.so{,.%{lsuffix}}
@@ -1416,17 +1451,6 @@ if st and st.type == "link" then
os.remove(path)
end
-%posttrans libs
-%{_sbindir}/update-alternatives --install \
- %{_libdir}/chromium-browser/libwidevinecdm.so libwidevinecdm.so \
- %{_libdir}/chromium-browser/libwidevinecdm.so.fedora 10
-
-%preun libs
-if [ $1 = 0 ]; then
- %{_sbindir}/alternatives --remove libwidevinecdm.so \
- %{_libdir}/chromium-browser/libwidevinecdm.so.fedora
-fi
-
%if %{freeworld}
%posttrans -n chromium-libs-media-freeworld
%{_sbindir}/update-alternatives --install \
@@ -1497,6 +1521,7 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
%{chromium_path}/icudtl.dat
%{chromium_path}/%{chromium_browser_channel}
%{chromium_path}/%{chromium_browser_channel}.sh
+%{chromium_path}/MEIPreload/
%ifarch x86_64 i686
%{chromium_path}/swiftshader/
%endif
@@ -1587,7 +1612,6 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
%files libs
%exclude %{chromium_path}/libffmpeg.so*
%exclude %{chromium_path}/libmedia.so*
-%exclude %{chromium_path}/libwidevinecdm.so
%{chromium_path}/lib*.so*
%endif
diff --git a/sources b/sources
index 75b07a7..042c8b0 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,5 @@
SHA512 (depot_tools.git-master.tar.gz) = d3d6a1873b2b0296a8cd99e0d8d2e629a17b1808934b4972556168f8b4ccea60577ebaeab4445baf15afb1b04080808db59a832a5b61d247bd48da14fa6acf03
SHA512 (chromium-66.0.3359.181-clean.tar.xz) = 713e0488dc6443e29a0914d801159d25200388ec4e9912afd2be3b54f5b64af4a6c8560423209c00d9ee4ad1802ce4e76db2a952a1f8643f3247469ffecf0ec4
+SHA512 (chromium-67.0.3396.62-clean.tar.xz) = 5c7784a70eca7e5cfc9442190c7addc2f14b6038431135062eed9e5bf0df684b37eb691316b889f801be69cf3837810de7bf8330cf1411b5c22b0722c806f7da
+SHA512 (gelasio.zip) = 0a22def3eca8848161ee72453dc5f97cc52ed09ffe21834152f2535d3a71f404cdf1f6e1809564bacb86aae75278cbcb96cae52b537d3ccdc299b60d6d0bc53e
+SHA512 (MuktiNarrow-0.94.tar.bz2) = f7abd429e2591eaa047d1ac982d97fa67dc1480c42e55b2a97861abd90918704dce90b6bb27dec7b6d696f188017a74de54a7b7f45281f0515923b90300959d1
5 years, 11 months
[chromium-freeworld: 2/5] 67 patches
by Miro Hrončok
commit 169992d5d82be4342a14cf6eacf730eb72138a80
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Wed May 30 13:42:00 2018 -0400
67 patches
chromium-67.0.3396.62-boolfix.patch | 36 ++++
chromium-67.0.3396.62-gcc5.patch | 12 ++
chromium-67.0.3396.62-gn-system.patch | 208 ++++++++++++++++++++++
chromium-67.0.3396.62-skia-aarch64-buildfix.patch | 21 +++
4 files changed, 277 insertions(+)
---
diff --git a/chromium-67.0.3396.62-boolfix.patch b/chromium-67.0.3396.62-boolfix.patch
new file mode 100644
index 0000000..d0ed189
--- /dev/null
+++ b/chromium-67.0.3396.62-boolfix.patch
@@ -0,0 +1,36 @@
+diff -up chromium-67.0.3396.62/mojo/public/cpp/bindings/associated_interface_ptr_info.h.boolfix chromium-67.0.3396.62/mojo/public/cpp/bindings/associated_interface_ptr_info.h
+--- chromium-67.0.3396.62/mojo/public/cpp/bindings/associated_interface_ptr_info.h.boolfix 2018-05-30 04:43:17.000000000 -0400
++++ chromium-67.0.3396.62/mojo/public/cpp/bindings/associated_interface_ptr_info.h 2018-05-30 12:33:03.268912315 -0400
+@@ -45,7 +45,7 @@ class AssociatedInterfacePtrInfo {
+
+ bool is_valid() const { return handle_.is_valid(); }
+
+- explicit operator bool() const { return handle_; }
++ explicit operator bool() const { return (bool) handle_; }
+
+ ScopedInterfaceEndpointHandle PassHandle() {
+ return std::move(handle_);
+diff -up chromium-67.0.3396.62/mojo/public/cpp/bindings/associated_interface_request.h.boolfix chromium-67.0.3396.62/mojo/public/cpp/bindings/associated_interface_request.h
+--- chromium-67.0.3396.62/mojo/public/cpp/bindings/associated_interface_request.h.boolfix 2018-05-30 04:43:17.000000000 -0400
++++ chromium-67.0.3396.62/mojo/public/cpp/bindings/associated_interface_request.h 2018-05-30 12:33:03.269912294 -0400
+@@ -50,7 +50,7 @@ class AssociatedInterfaceRequest {
+ // handle.
+ bool is_pending() const { return handle_.is_valid(); }
+
+- explicit operator bool() const { return handle_; }
++ explicit operator bool() const { return (bool) handle_; }
+
+ ScopedInterfaceEndpointHandle PassHandle() { return std::move(handle_); }
+
+diff -up chromium-67.0.3396.62/mojo/public/cpp/bindings/interface_request.h.boolfix chromium-67.0.3396.62/mojo/public/cpp/bindings/interface_request.h
+--- chromium-67.0.3396.62/mojo/public/cpp/bindings/interface_request.h.boolfix 2018-05-30 12:33:03.270912274 -0400
++++ chromium-67.0.3396.62/mojo/public/cpp/bindings/interface_request.h 2018-05-30 12:34:05.156637922 -0400
+@@ -54,7 +54,7 @@ class InterfaceRequest {
+ // Indicates whether the request currently contains a valid message pipe.
+ bool is_pending() const { return handle_.is_valid(); }
+
+- explicit operator bool() const { return handle_.is_valid(); }
++ explicit operator bool() const { return (bool) handle_.is_valid(); }
+
+ // Removes the message pipe from the request and returns it.
+ ScopedMessagePipeHandle PassMessagePipe() { return std::move(handle_); }
diff --git a/chromium-67.0.3396.62-gcc5.patch b/chromium-67.0.3396.62-gcc5.patch
new file mode 100644
index 0000000..ceef85d
--- /dev/null
+++ b/chromium-67.0.3396.62-gcc5.patch
@@ -0,0 +1,12 @@
+diff -up chromium-67.0.3396.62/third_party/webgl/src/specs/latest/2.0/webgl2.idl.gcc5 chromium-67.0.3396.62/third_party/webgl/src/specs/latest/2.0/webgl2.idl
+--- chromium-67.0.3396.62/third_party/webgl/src/specs/latest/2.0/webgl2.idl.gcc5 2018-05-30 04:44:33.000000000 -0400
++++ chromium-67.0.3396.62/third_party/webgl/src/specs/latest/2.0/webgl2.idl 2018-05-30 11:59:26.218625660 -0400
+@@ -262,7 +262,7 @@ interface mixin WebGL2RenderingContextBa
+ const GLenum UNIFORM_BLOCK_ACTIVE_UNIFORM_INDICES = 0x8A43;
+ const GLenum UNIFORM_BLOCK_REFERENCED_BY_VERTEX_SHADER = 0x8A44;
+ const GLenum UNIFORM_BLOCK_REFERENCED_BY_FRAGMENT_SHADER = 0x8A46;
+- const GLenum INVALID_INDEX = 0xFFFFFFFF;
++ const GLenum INVALID_INDEX = 256;
+ const GLenum MAX_VERTEX_OUTPUT_COMPONENTS = 0x9122;
+ const GLenum MAX_FRAGMENT_INPUT_COMPONENTS = 0x9125;
+ const GLenum MAX_SERVER_WAIT_TIMEOUT = 0x9111;
diff --git a/chromium-67.0.3396.62-gn-system.patch b/chromium-67.0.3396.62-gn-system.patch
new file mode 100644
index 0000000..4a08e94
--- /dev/null
+++ b/chromium-67.0.3396.62-gn-system.patch
@@ -0,0 +1,208 @@
+diff -up chromium-67.0.3396.62/build/linux/unbundle/libjpeg.gn.gnsystem chromium-67.0.3396.62/build/linux/unbundle/libjpeg.gn
+diff -up chromium-67.0.3396.62/build/linux/unbundle/libusb.gn.gnsystem chromium-67.0.3396.62/build/linux/unbundle/libusb.gn
+--- chromium-67.0.3396.62/build/linux/unbundle/libusb.gn.gnsystem 2018-05-30 12:18:36.949488683 -0400
++++ chromium-67.0.3396.62/build/linux/unbundle/libusb.gn 2018-05-30 12:18:36.949488683 -0400
+@@ -0,0 +1,24 @@
++# Copyright 2016 The Chromium Authors. All rights reserved.
++# Use of this source code is governed by a BSD-style license that can be
++# found in the LICENSE file.
++
++import("//build/config/linux/pkg_config.gni")
++import("//build/shim_headers.gni")
++
++pkg_config("system_libusb") {
++ packages = [ "libusb-1.0" ]
++}
++
++shim_headers("libusb_shim") {
++ root_path = "src/libusb"
++ headers = [
++ "libusb.h",
++ ]
++}
++
++source_set("libusb") {
++ deps = [
++ ":libusb_shim",
++ ]
++ public_configs = [ ":system_libusb" ]
++}
+diff -up chromium-67.0.3396.62/build/linux/unbundle/opus.gn.gnsystem chromium-67.0.3396.62/build/linux/unbundle/opus.gn
+--- chromium-67.0.3396.62/build/linux/unbundle/opus.gn.gnsystem 2018-05-30 04:43:03.000000000 -0400
++++ chromium-67.0.3396.62/build/linux/unbundle/opus.gn 2018-05-30 12:18:36.950488661 -0400
+@@ -1,3 +1,164 @@
++# Copyright 2016 The Chromium Authors. All rights reserved.
++# Use of this source code is governed by a BSD-style license that can be
++# found in the LICENSE file.
++
++import("//build/config/linux/pkg_config.gni")
++import("//build/shim_headers.gni")
++import("//testing/test.gni")
++
++pkg_config("system_opus") {
++ packages = [ "opus" ]
++}
++
++shim_headers("opus_shim") {
++ root_path = "src/include"
++ headers = [
++ "opus_custom.h",
++ "opus_defines.h",
++ "opus_multistream.h",
++ "opus_types.h",
++ "opus.h",
++ ]
++}
++
++source_set("opus") {
++ deps = [
++ ":opus_shim",
++ ]
++ public_configs = [ ":system_opus" ]
++}
++
++config("opus_test_config") {
++ include_dirs = [
++ "src/celt",
++ "src/silk",
++ ]
++
++ if (is_win) {
++ defines = [ "inline=__inline" ]
++ }
++ if (is_android) {
++ libs = [ "log" ]
++ }
++ if (is_clang) {
++ cflags = [ "-Wno-absolute-value" ]
++ }
++}
++
++executable("opus_compare") {
++ sources = [
++ "src/src/opus_compare.c",
++ ]
++
++ configs -= [ "//build/config/compiler:chromium_code" ]
++ configs += [
++ "//build/config/compiler:no_chromium_code",
++ ":opus_test_config",
++ ]
++
++ deps = [
++ ":opus",
++ "//build/config/sanitizers:deps",
++ "//build/win:default_exe_manifest",
++ ]
++}
++
++executable("opus_demo") {
++ sources = [
++ "src/src/opus_demo.c",
++ ]
++
++ configs -= [ "//build/config/compiler:chromium_code" ]
++ configs += [
++ "//build/config/compiler:no_chromium_code",
++ ":opus_test_config",
++ ]
++
++ deps = [
++ ":opus",
++ "//build/config/sanitizers:deps",
++ "//build/win:default_exe_manifest",
++ ]
++}
++
++test("test_opus_api") {
++ sources = [
++ "src/tests/test_opus_api.c",
++ ]
++
++ configs -= [ "//build/config/compiler:chromium_code" ]
++ configs += [
++ "//build/config/compiler:no_chromium_code",
++ ":opus_test_config",
++ ]
++
++ deps = [
++ ":opus",
++ ]
++}
++
++test("test_opus_encode") {
++ sources = [
++ "src/tests/test_opus_encode.c",
++ ]
++
++ configs -= [ "//build/config/compiler:chromium_code" ]
++ configs += [
++ "//build/config/compiler:no_chromium_code",
++ ":opus_test_config",
++ ]
++
++ deps = [
++ ":opus",
++ ]
++}
++
++# GN orders flags on a target before flags from configs. The default config
++# adds -Wall, and this flag have to be after -Wall -- so they need to
++# come from a config and can't be on the target directly.
++config("test_opus_decode_config") {
++ # test_opus_decode passes a null pointer to opus_decode() for an argument
++ # marked as requiring a non-null value by the nonnull function attribute,
++ # and expects opus_decode() to fail. Disable the -Wnonnull option to avoid
++ # a compilation error if -Werror is specified.
++ if (is_posix) {
++ cflags = [ "-Wno-nonnull" ]
++ }
++}
++
++test("test_opus_decode") {
++ sources = [
++ "src/tests/test_opus_decode.c",
++ ]
++
++ configs -= [ "//build/config/compiler:chromium_code" ]
++ configs += [
++ "//build/config/compiler:no_chromium_code",
++ ":opus_test_config",
++ ":test_opus_decode_config",
++ ]
++
++ deps = [
++ ":opus",
++ ]
++}
++
++test("test_opus_padding") {
++ sources = [
++ "src/tests/test_opus_padding.c",
++ ]
++
++ configs -= [ "//build/config/compiler:chromium_code" ]
++ configs += [
++ "//build/config/compiler:no_chromium_code",
++ ":opus_test_config",
++ ]
++
++ deps = [
++ ":opus",
++ ]
++}
++
+ # Copyright 2017 The Chromium Authors. All rights reserved.
+ # Use of this source code is governed by a BSD-style license that can be
+ # found in the LICENSE file.
+diff -up chromium-67.0.3396.62/build/linux/unbundle/replace_gn_files.py.gnsystem chromium-67.0.3396.62/build/linux/unbundle/replace_gn_files.py
+--- chromium-67.0.3396.62/build/linux/unbundle/replace_gn_files.py.gnsystem 2018-05-30 12:18:36.951488638 -0400
++++ chromium-67.0.3396.62/build/linux/unbundle/replace_gn_files.py 2018-05-30 12:20:02.542534270 -0400
+@@ -27,6 +27,7 @@ REPLACEMENTS = {
+ 'libevent': 'base/third_party/libevent/BUILD.gn',
+ 'libjpeg': 'third_party/libjpeg.gni',
+ 'libpng': 'third_party/libpng/BUILD.gn',
++ 'libusb': 'third_party/libusb/BUILD.gn',
+ 'libvpx': 'third_party/libvpx/BUILD.gn',
+ 'libwebp': 'third_party/libwebp/BUILD.gn',
+ 'libxml': 'third_party/libxml/BUILD.gn',
diff --git a/chromium-67.0.3396.62-skia-aarch64-buildfix.patch b/chromium-67.0.3396.62-skia-aarch64-buildfix.patch
new file mode 100644
index 0000000..6b37b08
--- /dev/null
+++ b/chromium-67.0.3396.62-skia-aarch64-buildfix.patch
@@ -0,0 +1,21 @@
+diff -up chromium-67.0.3396.62/third_party/skia/src/opts/SkRasterPipeline_opts.h.aarch64fix chromium-67.0.3396.62/third_party/skia/src/opts/SkRasterPipeline_opts.h
+--- chromium-67.0.3396.62/third_party/skia/src/opts/SkRasterPipeline_opts.h.aarch64fix 2018-05-30 12:38:06.131467092 -0400
++++ chromium-67.0.3396.62/third_party/skia/src/opts/SkRasterPipeline_opts.h 2018-05-30 12:38:39.861734819 -0400
+@@ -653,7 +653,7 @@ SI F approx_powf(F x, F y) {
+ }
+
+ SI F from_half(U16 h) {
+-#if defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds.
++#if defined(JUMPER_IS_NEON) && defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds.
+ return vcvt_f32_f16(h);
+
+ #elif defined(JUMPER_IS_HSW) || defined(JUMPER_IS_AVX512)
+@@ -673,7 +673,7 @@ SI F from_half(U16 h) {
+ }
+
+ SI U16 to_half(F f) {
+-#if defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds.
++#if defined(JUMPER_IS_NEON) && defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds.
+ return vcvt_f16_f32(f);
+
+ #elif defined(JUMPER_IS_HSW) || defined(JUMPER_IS_AVX512)
5 years, 11 months
[chromium-freeworld: 1/5] 67
by Miro Hrončok
commit afb86c1562c3a056e1d4a67e5a219cbb31890815
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Wed May 30 13:41:28 2018 -0400
67
chromium.spec | 55 +++++++++++++++++++++++++++++--------------------------
1 file changed, 29 insertions(+), 26 deletions(-)
---
diff --git a/chromium.spec b/chromium.spec
index ab27f9b..b34dbd1 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -132,21 +132,21 @@ BuildRequires: libicu-devel >= 5.4
%global chromoting_client_id %nil
%endif
-%global majorversion 66
+%global majorversion 67
%if %{freeworld}
Name: chromium%{chromium_channel}%{?freeworld:-freeworld}
%else
Name: chromium%{chromium_channel}
%endif
-Version: %{majorversion}.0.3359.181
-Release: 3%{?dist}
+Version: %{majorversion}.0.3396.62
+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)
### Chromium Fedora Patches ###
-Patch0: chromium-64.0.3282.119-gcc5.patch
+Patch0: chromium-67.0.3396.62-gcc5.patch
Patch1: chromium-45.0.2454.101-linux-path-max.patch
Patch2: chromium-55.0.2883.75-addrfix.patch
Patch4: chromium-46.0.2490.71-notest.patch
@@ -172,7 +172,7 @@ Patch18: chromium-52.0.2743.82-master-prefs-path.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=1361157
Patch19: chromium-52.0.2743.116-unset-madv_free.patch
# Use gn system files
-Patch20: chromium-60.0.3112.78-gn-system.patch
+Patch20: chromium-67.0.3396.62-gn-system.patch
# Fix last commit position issue
# https://groups.google.com/a/chromium.org/forum/#!topic/gn-dev/7nlJv486bD4
Patch21: chromium-60.0.3112.78-last-commit-position.patch
@@ -188,10 +188,10 @@ Patch26: chromium-59.0.3071.86-i686-ld-memory-tricks.patch
# /builddir/build/BUILD/chromium-54.0.2840.90/out/Release/../../content/renderer/child_frame_compositing_helper.cc:214: undefined reference to `cc_blink::WebLayerImpl::setOpaque(bool)'
Patch27: chromium-63.0.3289.84-setopaque.patch
# Use -fpermissive to build WebKit
-Patch31: chromium-56.0.2924.87-fpermissive.patch
+# Patch31: chromium-56.0.2924.87-fpermissive.patch
# Fix issue with compilation on gcc7
# Thanks to Ben Noordhuis
-Patch33: chromium-65.0.3325.146-gcc7.patch
+# Patch33: chromium-65.0.3325.146-gcc7.patch
# Revert https://chromium.googlesource.com/chromium/src/+/b794998819088f76b4cf44c8...
# https://bugs.chromium.org/p/chromium/issues/detail?id=712737
# https://bugzilla.redhat.com/show_bug.cgi?id=1446851
@@ -219,35 +219,35 @@ Patch57: chromium-63.0.3289.84-aarch64-glibc-2.26.90.patch
# From gentoo
Patch62: chromium-66.0.3359.117-gcc5-r3.patch
# Do not try to use libc++ in the remoting stack
-Patch63: chromium-63.0.3289.84-nolibc++.patch
+# Patch63: chromium-63.0.3289.84-nolibc++.patch
# To use round with gcc, you need to #include <cmath>
Patch65: chromium-65.0.3325.146-gcc-round-fix.patch
# Include proper headers to invoke memcpy()
Patch67: chromium-65.0.3325.146-memcpy-fix.patch
# ../../mojo/public/cpp/bindings/associated_interface_ptr_info.h:48:43: error: cannot convert 'const mojo::ScopedInterfaceEndpointHandle' to 'bool' in return
-Patch85: chromium-65.0.3325.162-boolfix.patch
+Patch85: chromium-67.0.3396.62-boolfix.patch
# From Debian
-Patch86: chromium-65.0.3325.162-skia-aarch64-buildfix.patch
+Patch86: chromium-67.0.3396.62-skia-aarch64-buildfix.patch
# Use lstdc++ on EPEL7 only
Patch87: chromium-65.0.3325.162-epel7-stdc++.patch
# Missing files in tarball
Patch88: chromium-66.0.3359.117-missing-files.patch
# https://chromium.googlesource.com/chromium/src/+/ba4141e451f4e0b1b19410b1...
-Patch89: chromium-66.0.3359.117-gcc-optional-move-fixes.patch
+# Patch89: chromium-66.0.3359.117-gcc-optional-move-fixes.patch
# https://chromium.googlesource.com/chromium/src/+/4f2b52281ce1649ea8347489...
-Patch90: chromium-66.0.3359.117-gcc-copy-constructor-fix.patch
+# Patch90: chromium-66.0.3359.117-gcc-copy-constructor-fix.patch
# https://bugs.chromium.org/p/chromium/issues/detail?id=816952
-Patch91: chromium-66.0.3359.117-gcc-vector-copy-constructor-fix.patch
+# Patch91: chromium-66.0.3359.117-gcc-vector-copy-constructor-fix.patch
# Do not use unrar code, it is non-free
Patch92: chromium-66.0.3359.117-nounrar.patch
# Upstream GCC fixes
Patch93: chromium-66.0.3359.117-GCC-build-fix-base-Optional-T-requires-the-full-decl.patch
Patch94: chromium-66.0.3359.117-GCC-fully-declare-ConfigurationPolicyProvider.patch
-Patch95: chromium-65.0.3325.146-GCC-IDB-methods-String-renamed-to-GetString.patch
+# Patch95: chromium-65.0.3325.146-GCC-IDB-methods-String-renamed-to-GetString.patch
# https://github.com/archlinuxarm/PKGBUILDs/blob/master/extra/chromium/0006...
-Patch96: chromium-66.0.3359.117-GCC-do-not-use-initializer-list-for-NoDestructor-of-.patch
+# Patch96: chromium-66.0.3359.117-GCC-do-not-use-initializer-list-for-NoDestructor-of-.patch
# https://chromium.googlesource.com/chromium/src/+/b84682f31dc99b9c90f5a049...
-Patch97: chromium-66.0.3359.139-arm-init-fix.patch
+# Patch97: chromium-66.0.3359.139-arm-init-fix.patch
# GCC8 has changed the alignof operator to return the minimal alignment required by the target ABI
# instead of the preferred alignment. This means int64_t is now 4 on i686 (instead of 8).
# Use __alignof__ to get the value we expect (and chromium checks for).
@@ -699,8 +699,8 @@ udev.
%patch25 -p1 -b .jpegfix
%patch26 -p1 -b .ldmemory
%patch27 -p1 -b .setopaque
-%patch31 -p1 -b .permissive
-%patch33 -p1 -b .gcc7
+# %%patch31 -p1 -b .permissive
+# %%patch33 -p1 -b .gcc7
%patch36 -p1 -b .revert
%patch37 -p1 -b .ffmpeg-stdatomic
%patch39 -p1 -b .system-clang
@@ -717,7 +717,7 @@ udev.
# %%patch57 -p1 -b .aarch64glibc
# %%endif
%patch62 -p1 -b .gcc5-r3
-%patch63 -p1 -b .nolibc++
+# %%patch63 -p1 -b .nolibc++
%patch65 -p1 -b .gcc-round-fix
%patch67 -p1 -b .memcpyfix
%patch85 -p1 -b .boolfix
@@ -726,15 +726,15 @@ udev.
%patch87 -p1 -b .epel7
%endif
%patch88 -p1 -b .missing
-%patch89 -p1 -b .gccomove
-%patch90 -p1 -b .copycon
-%patch91 -p1 -b .944404
+# %%patch89 -p1 -b .gccomove
+# %%patch90 -p1 -b .copycon
+# %%patch91 -p1 -b .944404
%patch92 -p1 -b .nounrar
-%patch93 -p1 -b .gcc-full-decl
+# %%patch93 -p1 -b .gcc-full-decl
%patch94 -p1 -b .gcc-cpolicyprovider
-%patch95 -p1 -b .gcc-getstring
-%patch96 -p1 -b .flatsetfix
-%patch97 -p1 -b .arm-init-fix
+# %%patch95 -p1 -b .gcc-getstring
+# %%patch96 -p1 -b .flatsetfix
+# %%patch97 -p1 -b .arm-init-fix
%patch98 -p1 -b .gcc8-alignof
# Change shebang in all relevant files in this directory and all subdirectories
@@ -1636,6 +1636,9 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
%changelog
+* Wed May 30 2018 Tom Callaway <spot(a)fedoraproject.org> 67.0.3396.62-1
+- 67 releases of chromium on the wall...
+
* Tue May 29 2018 Tom Callaway <spot(a)fedoraproject.org> 66.0.3359.181-3
- also filter out fontconfig on epel7
5 years, 11 months
[shotcut] Update to 18.06.02 Add shotcut-18.06.02-qt.patch for qt 5.11.0
by Martin Gansser
commit a146afce3e8b2ce08ff7e3e6c63cb1ed64097c29
Author: Martin Gansser <mgansser(a)online.de>
Date: Wed Jun 6 11:50:05 2018 +0200
Update to 18.06.02
Add shotcut-18.06.02-qt.patch for qt 5.11.0
shotcut-18.06.02-qt.patch | 20 ++++++++++++++++++++
shotcut.spec | 2 ++
2 files changed, 22 insertions(+)
---
diff --git a/shotcut-18.06.02-qt.patch b/shotcut-18.06.02-qt.patch
new file mode 100644
index 0000000..a65bb77
--- /dev/null
+++ b/shotcut-18.06.02-qt.patch
@@ -0,0 +1,20 @@
+--- src/docks/recentdock.cpp.orig 2018-06-06 10:44:58.408978835 +0200
++++ src/docks/recentdock.cpp 2018-06-06 10:45:26.838845183 +0200
+@@ -21,6 +21,7 @@
+ #include "ui_recentdock.h"
+ #include "util.h"
+
++#include <QAction>
+ #include <QDir>
+ #include <QKeyEvent>
+ #include <Logger.h>
+--- src/docks/timelinedock.cpp.orig 2018-06-06 11:16:54.831969562 +0200
++++ src/docks/timelinedock.cpp 2018-06-06 11:17:24.417830475 +0200
+@@ -28,6 +28,7 @@
+ #include "shotcut_mlt_properties.h"
+ #include "settings.h"
+
++#include <QAction>
+ #include <QtQml>
+ #include <QtQuick>
+ #include <Logger.h>
diff --git a/shotcut.spec b/shotcut.spec
index 1c5b9f7..835d4f5 100644
--- a/shotcut.spec
+++ b/shotcut.spec
@@ -16,6 +16,7 @@ Source1: %{name}.appdata.xml
Patch0: mlt_path.patch
# shotcut-noupdatecheck.patch -- Disable automatic update check
Patch1: shotcut-noupdatecheck.patch
+Patch2: shotcut-%{version}-qt.patch
BuildRequires: gcc-c++
BuildRequires: desktop-file-utils
@@ -189,6 +190,7 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/org.%{na
%changelog
* Tue Jun 05 2018 Martin Gansser <martinkg(a)fedoraproject.org> - 18.06.02-1
- Update to 18.06.02
+- Add shotcut-18.06.02-qt.patch for qt 5.11.0
* Sat May 12 2018 Martin Gansser <martinkg(a)fedoraproject.org> - 18.05.08-1
- Update to 18.05.08
5 years, 11 months
[qmmp-plugin-pack-freeworld] new version 1.2.1 see the upstream changelog at http://qmmp.ylsoftware.com/index.php includes only f
by Karel Volný
commit 69e74249152c94f2e244dbef64ceed7cedef36ba
Author: Karel Volny <kvolny(a)redhat.com>
Date: Mon Jun 4 14:52:50 2018 +0200
new version 1.2.1
see the upstream changelog at http://qmmp.ylsoftware.com/index.php
includes only ffvideo, the rest is in Fedora
.gitignore | 1 +
qmmp-plugin-pack-freeworld.spec | 25 +++++++++++++++++--------
sources | 2 +-
3 files changed, 19 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1409d52..0c205ec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
qmmp-plugin-pack-0.8.3.tar.bz2
qmmp-plugin-pack-0.9.3.tar.bz2
/qmmp-plugin-pack-1.1.1.tar.bz2
+/qmmp-plugin-pack-1.2.1.tar.bz2
diff --git a/qmmp-plugin-pack-freeworld.spec b/qmmp-plugin-pack-freeworld.spec
index 4d9d121..509c481 100644
--- a/qmmp-plugin-pack-freeworld.spec
+++ b/qmmp-plugin-pack-freeworld.spec
@@ -1,5 +1,5 @@
Name: qmmp-plugin-pack-freeworld
-Version: 1.1.1
+Version: 1.2.1
Release: 1%{?dist}
Summary: A set of extra plugins for Qmmp
@@ -13,14 +13,14 @@ Source1: qmmp-plugin-pack-filter-provides.sh
BuildRequires: qmmp-devel >= 1.1.0
BuildRequires: cmake
-BuildRequires: libmpg123-devel
+BuildRequires: ffmpeg-devel
BuildRequires: qt5-linguist
-BuildRequires: taglib-devel
+#BuildRequires: taglib-devel
%description
Plugins for Qmmp from Qmmp Plugin Pack that cannot be included in Fedora.
- * MPG123 - MPEG v1/2 layer1/2/3 decoder using of libmpg123 library
+ * FFVideo - video playback engine based on FFmpeg library
%prep
%setup -q -n qmmp-plugin-pack-%{version}
@@ -29,22 +29,31 @@ chmod +x qmmp-plugin-pack-filter-provides.sh
%build
%cmake \
+ -D USE_MPG123:BOOL=FALSE \
-D USE_FFAP:BOOL=FALSE \
- -D USE_QSUI:BOOL=FALSE \
+ -D USE_XMP:BOOL=FALSE \
+ -D USE_SRC:BOOL=FALSE \
+ -D USE_GOOM:BOOL=FALSE \
+ -D USE_HISTORY:BOOL=FALSE \
.
-make %{?_smp_mflags} -C src/Input/mpg123
+make %{?_smp_mflags} -C src/Engines/ffvideo
%install
-make DESTDIR=%{buildroot} install -C src/Input/mpg123
+make DESTDIR=%{buildroot} install -C src/Engines/ffvideo
%files
%doc AUTHORS COPYING ChangeLog.rus README README.RUS
-%{_libdir}/qmmp/Input/*.so
+%{_libdir}/qmmp/Engines/*.so
%changelog
+* Mon Jun 04 2018 Karel Volný <kvolny(a)redhat.com> 1.2.1-1
+- new version 1.2.1
+- see the upstream changelog at http://qmmp.ylsoftware.com/index.php
+- includes only ffvideo, the rest is in Fedora
+
* Mon Jul 11 2016 Karel Volný <kvolny(a)redhat.com> 1.1.1-1
- new version 1.1.1
- see the upstream changelog at http://qmmp.ylsoftware.com/index.php
diff --git a/sources b/sources
index 770d3b1..98ed380 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b254498c6b38816f9d1efbd663ef8773 qmmp-plugin-pack-1.1.1.tar.bz2
+d23ed598cbbe9c58541ffbed0484df6c qmmp-plugin-pack-1.2.1.tar.bz2
5 years, 11 months
[qmmp-plugin-pack-freeworld] reviving the package, there is new ffvideo plugin that cannot be in Fedora
by Karel Volný
commit 925e7c4136db7f0377ae743798153e2f445ddab7
Author: Karel Volny <kvolny(a)redhat.com>
Date: Mon Jun 4 14:25:47 2018 +0200
reviving the package, there is new ffvideo plugin that cannot be in Fedora
Revert "retire, mpg123 provided in Fedora"
This reverts commit 36729f4d2f7313815c2b0a5b5ba3862b832b200a.
.gitignore | 3 +
dead.package | 2 -
qmmp-plugin-pack-filter-provides.sh | 9 +++
qmmp-plugin-pack-freeworld.spec | 107 ++++++++++++++++++++++++++++++++++++
sources | 1 +
5 files changed, 120 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..1409d52
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+qmmp-plugin-pack-0.8.3.tar.bz2
+qmmp-plugin-pack-0.9.3.tar.bz2
+/qmmp-plugin-pack-1.1.1.tar.bz2
diff --git a/qmmp-plugin-pack-filter-provides.sh b/qmmp-plugin-pack-filter-provides.sh
new file mode 100644
index 0000000..817f855
--- /dev/null
+++ b/qmmp-plugin-pack-filter-provides.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+if [ -x /usr/lib/rpm/redhat/find-provides ]; then
+ FINDPROV=/usr/lib/rpm/redhat/find-provides
+else
+ FINDPROV=/usr/lib/rpm/find-provides
+fi
+
+$FINDPROV $* | sed -e '/libmpg123.so/d'
diff --git a/qmmp-plugin-pack-freeworld.spec b/qmmp-plugin-pack-freeworld.spec
new file mode 100644
index 0000000..4d9d121
--- /dev/null
+++ b/qmmp-plugin-pack-freeworld.spec
@@ -0,0 +1,107 @@
+Name: qmmp-plugin-pack-freeworld
+Version: 1.1.1
+Release: 1%{?dist}
+Summary: A set of extra plugins for Qmmp
+
+Group: Applications/Multimedia
+License: GPLv2+
+URL: http://qmmp.ylsoftware.com/plugins.php
+Source0: http://qmmp.ylsoftware.com/files/plugins/qmmp-plugin-pack-%{version}.tar.bz2
+Source1: qmmp-plugin-pack-filter-provides.sh
+%define _use_internal_dependency_generator 0
+%define __find_provides %{_builddir}/%{buildsubdir}/qmmp-plugin-pack-filter-provides.sh
+
+BuildRequires: qmmp-devel >= 1.1.0
+BuildRequires: cmake
+BuildRequires: libmpg123-devel
+BuildRequires: qt5-linguist
+BuildRequires: taglib-devel
+
+%description
+Plugins for Qmmp from Qmmp Plugin Pack that cannot be included in Fedora.
+
+ * MPG123 - MPEG v1/2 layer1/2/3 decoder using of libmpg123 library
+
+%prep
+%setup -q -n qmmp-plugin-pack-%{version}
+cp %{SOURCE1} .
+chmod +x qmmp-plugin-pack-filter-provides.sh
+
+%build
+%cmake \
+ -D USE_FFAP:BOOL=FALSE \
+ -D USE_QSUI:BOOL=FALSE \
+ .
+make %{?_smp_mflags} -C src/Input/mpg123
+
+
+%install
+make DESTDIR=%{buildroot} install -C src/Input/mpg123
+
+
+%files
+%doc AUTHORS COPYING ChangeLog.rus README README.RUS
+%{_libdir}/qmmp/Input/*.so
+
+
+%changelog
+* Mon Jul 11 2016 Karel Volný <kvolny(a)redhat.com> 1.1.1-1
+- new version 1.1.1
+- see the upstream changelog at http://qmmp.ylsoftware.com/index.php
+- uses Qt5
+
+* Mon Jan 04 2016 Karel Volný <kvolny(a)redhat.com> 0.9.3-1
+- new version 0.9.3
+- see the upstream changelog at http://qmmp.ylsoftware.com/index.php
+
+* Mon Jun 29 2015 Karel Volný <kvolny(a)redhat.com> 0.8.3-1
+- new version
+- see the upstream changelog at http://qmmp.ylsoftware.com/index.php
+
+* Mon Sep 01 2014 Sérgio Basto <sergio(a)serjux.com> - 0.7.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Fri Jan 24 2014 Karel Volný <kvolny(a)redhat.com> 0.7.4-1
+- new version
+- see the upstream changelog at http://qmmp.ylsoftware.com/index.php
+
+* Mon Sep 30 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 0.7.2-2
+- Rebuilt
+
+* Wed Aug 28 2013 Karel Volný <kvolny(a)redhat.com> 0.7.2-1
+- new version
+- see the upstream changelog at http://qmmp.ylsoftware.com/index.php
+
+* Fri Jun 21 2013 Karel Volný <kvolny(a)redhat.com> 0.7.1-1
+- new version
+
+* Thu May 02 2013 Karel Volný <kvolny(a)redhat.com> 0.7.0-1
+- new version
+- see upstream changelog at http://qmmp.ylsoftware.com/index.php
+- project URLs changed
+
+* Tue Apr 02 2013 Karel Volný <kvolny(a)redhat.com> 0.6.6-1
+- new version
+- see upstream changelog at http://qmmp.ylsoftware.com/index_en.php
+
+* Tue Jan 29 2013 Karel Volný <kvolny(a)redhat.com> 0.6.4-1
+- new version
+- see upstream changelog at http://qmmp.ylsoftware.com/index_en.php
+
+* Tue Dec 11 2012 Karel Volný <kvolny(a)redhat.com> 0.6.3-1
+- new version
+- see upstream changelog at http://qmmp.ylsoftware.com/index_en.php
+
+* Fri Aug 24 2012 Karel Volný <kvolny(a)redhat.com> 0.6.2-2
+- update spec to newer style as suggested in Fedora package review
+- removed %%buildroot actions
+- removed %%clean section which got empty
+- removed %%defattr
+
+* Fri Aug 17 2012 Karel Volný <kvolny(a)redhat.com> 0.6.2-1
+- new version
+- fixes FSF address issue found by rpmlint
+- see upstream changelog at http://qmmp.ylsoftware.com/index_en.php
+
+* Tue Jul 31 2012 Karel Volný <kvolny(a)redhat.com> 0.6.1-1
+- initial RPM Fusion release
diff --git a/sources b/sources
new file mode 100644
index 0000000..770d3b1
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+b254498c6b38816f9d1efbd663ef8773 qmmp-plugin-pack-1.1.1.tar.bz2
5 years, 11 months
[shotcut/f28] Update to 18.06.02
by Martin Gansser
Summary of changes:
88859d0... Update to 18.06.02 (*)
(*) This commit already existed in another branch; no separate mail sent
5 years, 11 months
[shotcut] Update to 18.06.02
by Martin Gansser
commit 88859d0fa9300ba2cd47fba5e76697bc2e57803f
Author: Martin Gansser <mgansser(a)online.de>
Date: Wed Jun 6 10:23:54 2018 +0200
Update to 18.06.02
.gitignore | 1 +
shotcut-desktopfile.patch | 17 -----------------
shotcut.spec | 25 ++++++++++++-------------
sources | 2 +-
4 files changed, 14 insertions(+), 31 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index dcb0754..a74b5da 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
/shotcut-18.03.tar.gz
/shotcut-18.03.06.tar.gz
/shotcut-18.05.08.tar.gz
+/shotcut-18.06.02.tar.gz
diff --git a/shotcut.spec b/shotcut.spec
index e6534ef..1c5b9f7 100644
--- a/shotcut.spec
+++ b/shotcut.spec
@@ -1,9 +1,9 @@
# This package creates a build time version from the current date and uses it to check
-# for updates. See patch2 and prep/build section.
+# for updates. See patch1 and prep/build section.
%define _vstring %(echo %{version} |tr -d ".")
Name: shotcut
-Version: 18.05.08
+Version: 18.06.02
Release: 1%{dist}
Summary: A free, open source, cross-platform video editor
# The entire source code is GPLv3+ except mvcp/ which is LGPLv2+
@@ -14,10 +14,8 @@ Source0: https://github.com/mltframework/shotcut/archive/v%{version}.tar.
Source1: %{name}.appdata.xml
# Melt patch /usr/bin/mlt-melt
Patch0: mlt_path.patch
-# shotcut-desktopfile.patch -- Fix icon path
-Patch1: shotcut-desktopfile.patch
# shotcut-noupdatecheck.patch -- Disable automatic update check
-Patch2: shotcut-noupdatecheck.patch
+Patch1: shotcut-noupdatecheck.patch
BuildRequires: gcc-c++
BuildRequires: desktop-file-utils
@@ -136,9 +134,6 @@ doxygen CuteLogger/Doxyfile
%install
%make_install
-install -D icons/%{name}-logo-64.png %{buildroot}/%{_datadir}/pixmaps/%{name}.png
-install -Dm644 %{name}.appdata.xml %{buildroot}/%{_datadir}/appdata/%{name}.appdata.xml
-install -Dm644 snap/gui/%{name}.desktop %{buildroot}%{_datadir}/applications/%{name}.desktop
chmod a+x %{buildroot}/%{_datadir}/shotcut/qml/export-edl/rebuild.sh
# Install language files
@@ -173,8 +168,8 @@ sed -i 's/\r$//' src/mvcp/{qconsole.h,qconsole.cpp}
chmod a-x src/mvcp/{qconsole.cpp,qconsole.h}
%check
-desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
-appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/%{name}.appdata.xml
+desktop-file-validate %{buildroot}%{_datadir}/applications/org.%{name}.Shotcut.desktop
+appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/org.%{name}.Shotcut.appdata.xml
%files
%doc README.md
@@ -182,15 +177,19 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/%{name}.a
%{_bindir}/%{name}
%{_datadir}/%{name}/
%exclude %{_datadir}/%{name}/translations
-%{_datadir}/pixmaps/%{name}.png
-%{_datadir}/applications/%{name}.desktop
-%{_datadir}/appdata/%{name}.appdata.xml
+%{_datadir}/applications/org.%{name}.Shotcut.desktop
+%{_datadir}/icons/hicolor/64x64/apps/org.%{name}.Shotcut.png
+%{_datadir}/metainfo/org.%{name}.Shotcut.appdata.xml
+%{_datadir}/mime/packages/org.%{name}.Shotcut.xml
%files doc
%license COPYING
%doc doc
%changelog
+* Tue Jun 05 2018 Martin Gansser <martinkg(a)fedoraproject.org> - 18.06.02-1
+- Update to 18.06.02
+
* Sat May 12 2018 Martin Gansser <martinkg(a)fedoraproject.org> - 18.05.08-1
- Update to 18.05.08
diff --git a/sources b/sources
index 9105357..2c5bc57 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-09c98e582aed81af29bfbfd656c2744a shotcut-18.05.08.tar.gz
+99b2a4d10b56f8120989205c2c664c95 shotcut-18.06.02.tar.gz
5 years, 11 months