[chromium-freeworld: 108/148] Merge branch 'master' into f24
by Miro Hrončok
commit b5aa03dc2da3ac8bcc34c4da70e2080087b0dbd6
Merge: 3739ffe 850545e
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Tue May 16 08:44:34 2017 -0400
Merge branch 'master' into f24
.gitignore | 2 +
...sktop.service => chrome-remote-desktop@.service | 1 +
chromium-52.0.2743.82-widevinefix.patch | 25 ---
chromium-56.0.2924.87-gcc-49.patch | 12 --
chromium-56.0.2924.87-unique-ptr-fix.patch | 12 --
chromium-57.0.2987.110-gtk_ui-gcc-fix.patch | 12 --
...patch => chromium-58.0.3029.81-enable-mp3.patch | 82 ++++++----
chromium-58.0.3029.81-ffmpeg-stdatomic.patch | 14 ++
chromium-58.0.3029.81-fix-gn.patch | 11 ++
chromium-58.0.3029.81-use_system_harfbuzz.patch | 12 ++
...-b794998819088f76b4cf44c8db6940240c563cf4.patch | 19 +++
chromium.spec | 71 +++++----
clean_ffmpeg.sh | 3 +-
sources | 5 +-
stdatomic.h | 173 ---------------------
15 files changed, 151 insertions(+), 303 deletions(-)
---
7 years, 3 months
[chromium-freeworld: 107/148] 58.0.3029.110
by Miro Hrončok
commit 850545ed64c0c3d70391eb98aecb5b06a7167297
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Mon May 15 16:04:38 2017 -0400
58.0.3029.110
.gitignore | 1 +
chromium-52.0.2743.82-widevinefix.patch | 25 ---
chromium-58.0.3029.81-ffmpeg-stdatomic.patch | 14 ++
...-b794998819088f76b4cf44c8db6940240c563cf4.patch | 19 +++
chromium.spec | 36 +++--
clean_ffmpeg.sh | 3 +-
sources | 1 +
stdatomic.h | 173 ---------------------
8 files changed, 56 insertions(+), 216 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 62f8e77..351b0e3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@
/chromium-57.0.2987.110-clean.tar.xz
/chromium-57.0.2987.133-clean.tar.xz
/chromium-58.0.3029.81-clean.tar.xz
+/chromium-58.0.3029.110-clean.tar.xz
diff --git a/chromium-58.0.3029.81-ffmpeg-stdatomic.patch b/chromium-58.0.3029.81-ffmpeg-stdatomic.patch
new file mode 100644
index 0000000..e08d5b2
--- /dev/null
+++ b/chromium-58.0.3029.81-ffmpeg-stdatomic.patch
@@ -0,0 +1,14 @@
+diff -up chromium-57.0.2987.21/third_party/ffmpeg/libavutil/cpu.c.ffmpeg_stdatomic chromium-57.0.2987.21/third_party/ffmpeg/libavutil/cpu.c
+--- chromium-57.0.2987.21/third_party/ffmpeg/libavutil/cpu.c.ffmpeg_stdatomic 2017-02-03 07:07:36.000000000 +0100
++++ chromium-57.0.2987.21/third_party/ffmpeg/libavutil/cpu.c 2017-02-09 11:54:34.083000442 +0100
+@@ -20,6 +20,10 @@
+ // Chromium: Windows doesn't provide stdatomic.h, so use the compat version.
+ #if defined(_MSC_VER)
+ #include <compat/atomics/win32/stdatomic.h>
++// GCC 4.8 didn't have stdatomic, but was advertising it.
++// https://gcc.gnu.org/bugzilla/show_bug.cgi?id=58016
++#elif !defined(__clang__) && defined(__GNUC__) && (__GNUC__ == 4 || (__GNUC__ == 4 && (__GNUC_MINOR__ == 8)))
++#include <compat/atomics/gcc/stdatomic.h>
+ #else
+ #include <stdatomic.h>
+ #endif
diff --git a/chromium-58.0.3029.96-revert-b794998819088f76b4cf44c8db6940240c563cf4.patch b/chromium-58.0.3029.96-revert-b794998819088f76b4cf44c8db6940240c563cf4.patch
new file mode 100644
index 0000000..ddb94a0
--- /dev/null
+++ b/chromium-58.0.3029.96-revert-b794998819088f76b4cf44c8db6940240c563cf4.patch
@@ -0,0 +1,19 @@
+diff -up chromium-58.0.3029.96/ui/events/devices/x11/device_data_manager_x11.cc.revert chromium-58.0.3029.96/ui/events/devices/x11/device_data_manager_x11.cc
+--- chromium-58.0.3029.96/ui/events/devices/x11/device_data_manager_x11.cc.revert 2017-05-08 14:58:11.767482431 -0400
++++ chromium-58.0.3029.96/ui/events/devices/x11/device_data_manager_x11.cc 2017-05-08 14:58:37.722960109 -0400
+@@ -790,15 +790,6 @@ void DeviceDataManagerX11::UpdateScrollC
+ DCHECK(deviceid >= 0 && deviceid < kMaxDeviceNum);
+ ScrollInfo& info = scroll_data_[deviceid];
+
+- bool legacy_scroll_available =
+- (scroll_class_info->flags & XIScrollFlagNoEmulation) == 0;
+- // If the device's highest resolution is lower than the resolution of xinput1
+- // then use xinput1's events instead (ie. don't configure smooth scrolling).
+- if (legacy_scroll_available &&
+- std::abs(scroll_class_info->increment) <= 1.0) {
+- return;
+- }
+-
+ switch (scroll_class_info->scroll_type) {
+ case XIScrollTypeVertical:
+ info.vertical.number = scroll_class_info->number;
diff --git a/chromium.spec b/chromium.spec
index f0b04a3..21fa094 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -20,7 +20,7 @@
# Requires is trickier.
%global __provides_exclude_from %{chromium_path}/.*\\.so|%{chromium_path}/lib/.*\\.so
-%global privlibs libaccessibility|libaura_extra|libaura|libbase_i18n|libbase|libbindings|libblink_common|libblink_core|libblink_modules|libblink_platform|libblink_web|libbluetooth|libboringssl|libbrowser_ui_views|libcaptive_portal|libcapture|libcc_animation|libcc_blink|libcc_ipc|libcc_proto|libcc|libcc_surfaces|libchromium_sqlite3|libclearkeycdm|libcloud_policy_proto_generated_compile|libcommon|libcompositor|libcontent|libcpp|libcrcrypto|libdbus|libdevice_base|libdevice_battery|libdevice_event_log|libdevice_gamepad|libdevices|libdevice_vibration|libdiscardable_memory_client|libdiscardable_memory_common|libdiscardable_memory_service|libdisplay_compositor|libdisplay|libdisplay_types|libdisplay_util|libdomain_reliability|libEGL|libevents_base|libevents_devices_x11|libevents_ipc|libevents_ozone_layout|libevents|libevents_x|libffmpeg|libfont_service_library|libgcm|libgeneric_sensor|libgeolocation|libgeometry|libgesture_detection|libgfx_ipc_color|libgfx_ipc_geometry|libgfx_ipc_skia|libgfx
_ipc|libgfx|libgfx_x11|libgin|libgles2_c_lib|libgles2_implementation|libgles2_utils|libGLESv2|libgl_in_process_context|libgl_init|libgl_wrapper|libgpu|libgtk2ui|libicui18n|libicuuc|libipc|libjs|libkeyboard|libkeyboard_with_content|libkeycodes_x11|libkeyed_service_content|libkeyed_service_core|libmedia_blink|libmedia_gpu|libmedia|libmessage_center|libmidi|libmojo_common_lib|libmojo_ime_lib|libmojo_public_system_cpp|libmojo_public_system|libmojo_system_impl|libnative_theme|libnet|libnet_with_v8|libonc|libplatform|libpolicy_component|libpolicy_proto|libpower_monitor|libpower_save_blocker|libppapi_host|libppapi_proxy|libppapi_shared|libprefs|libprinting|libprotobuf_lite|libproxy_config|librange|libsandbox_services|libseccomp_bpf|libsessions|libshared_memory_support|libshell_dialogs|libskia|libsnapshot|libsql|libstartup_tracing|libstorage_browser|libstorage_common|libstub_window|libsuid_sandbox_client|libsurface|libtest_ime_driver_library|libtime_zone_monitor|libtracing_library|libtracin
g|libui_base_ime|libui_base|libui_base_x|libui_data_pack|libui_library|libui_touch_selection|libui_views_mus_lib|liburl_ipc|liburl_matcher|liburl|libuser_manager|libuser_prefs|libv8_libbase|libv8_libplatform|libv8|libviews|libwebdata_common|libweb_dialogs|libwebview|libwidevinecdmadapter|libwidevinecdm|libwm|libwtf|libx11_events_platform|libx11_window
+%global privlibs libaccessibility|libaura_extra|libaura|libbase_i18n|libbase|libbindings|libblink_common|libblink_core|libblink_modules|libblink_platform|libblink_web|libbluetooth|libboringssl|libbrowser_ui_views|libcaptive_portal|libcapture|libcapture_base|libcapture_lib|libcc_animation|libcc_blink|libcc_ipc|libcc_paint|libcc_proto|libcc|libcc_surfaces|libchromium_sqlite3|libclearkeycdm|libcloud_policy_proto_generated_compile|libcommon|libcompositor|libcontent|libcpp|libcrcrypto|libdbus|libdevice_base|libdevice_battery|libdevice_event_log|libdevice_gamepad|libdevices|libdevice_vibration|libdevice_vr|libdiscardable_memory_client|libdiscardable_memory_common|libdiscardable_memory_service|libdisplay_compositor|libdisplay|libdisplay_types|libdisplay_util|libdomain_reliability|libEGL|libevents_base|libevents_devices_x11|libevents_ipc|libevents_ozone_layout|libevents|libevents_x|libfingerprint|libffmpeg|libfont_service_library|libgcm|libgeneric_sensor|libgeolocation|libgeometry|libgestur
e_detection|libgfx_ipc_color|libgfx_ipc_geometry|libgfx_ipc_skia|libgfx_ipc|libgfx|libgfx_x11|libgin|libgles2_c_lib|libgles2_implementation|libgles2_utils|libGLESv2|libgl_in_process_context|libgl_init|libgl_wrapper|libgpu|libgtk2ui|libicui18n|libicuuc|libipc|libjs|libkeyboard|libkeyboard_with_content|libkeycodes_x11|libkeyed_service_content|libkeyed_service_core|libmedia_blink|libmedia_gpu|libmedia|libmessage_center|libmidi|libmojo_common_lib|libmojo_ime_lib|libmojo_public_system_cpp|libmojo_public_system|libmojo_system_impl|libnative_theme|libnet|libnet_with_v8|libonc|libplatform|libpolicy_component|libpolicy_proto|libpower_monitor|libpower_save_blocker|libppapi_host|libppapi_proxy|libppapi_shared|libprefs|libprinting|libprotobuf_lite|libproxy_config|librange|libsandbox_services|libseccomp_bpf|libsessions|libshared_memory_support|libshell_dialogs|libskia|libsnapshot|libsql|libstartup_tracing|libstorage_browser|libstorage_common|libstub_window|libsuid_sandbox_client|libsurface|libte
st_ime_driver_library|libtime_zone_monitor|libtracing_library|libtracing|libui_base_ime|libui_base|libui_base_x|libui_data_pack|libui_library|libui_touch_selection|libui_views_mus_lib|liburl_ipc|liburl_matcher|liburl|libuser_manager|libuser_prefs|libv8_libbase|libv8_libplatform|libv8|libviews|libwebdata_common|libweb_dialogs|libwebview|libwidevinecdmadapter|libwidevinecdm|libwm|libwtf|libx11_events_platform|libx11_window
%global __requires_exclude ^(%{privlibs})\\.so
# Try to not use the Xvfb as it is slow..
@@ -96,7 +96,7 @@ BuildRequires: libicu-devel >= 5.4
%global majorversion 58
Name: chromium%{chromium_channel}
-Version: %{majorversion}.0.3029.81
+Version: %{majorversion}.0.3029.110
Release: 1%{?dist}
Summary: A WebKit (Blink) powered web browser
Url: http://www.chromium.org/Home
@@ -158,7 +158,12 @@ Patch34: chromium-58.0.3029.81-enable-mp3.patch
# Fix gn build
# https://chromium.googlesource.com/chromium/src.git/+/379e35f6f3eaa41a97f2...
Patch35: chromium-58.0.3029.81-fix-gn.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
+Patch36: chromium-58.0.3029.96-revert-b794998819088f76b4cf44c8db6940240c563cf4.patch
+# Correctly compile the stdatomic.h in ffmpeg with gcc 4.8
+Patch37: chromium-58.0.3029.81-ffmpeg-stdatomic.patch
### Chromium Tests Patches ###
Patch100: chromium-46.0.2490.86-use_system_opus.patch
@@ -194,11 +199,6 @@ 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
-# Only needed for platforms where gcc doesn't have stdatomic.h
-# RHEL 7 or older
-# Taken from https://raw.githubusercontent.com/FFmpeg/FFmpeg/master/compat/atomics/gcc...
-# on 2017-03-26
-Source14: stdatomic.h
# We can assume gcc and binutils.
BuildRequires: gcc-c++
@@ -543,17 +543,13 @@ members of the Chromium and WebDriver teams.
%patch33 -p1 -b .gcc7
%patch34 -p1 -b .mp3
%patch35 -p1 -b .fixgn
+%patch36 -p1 -b .revert
+%patch37 -p1 -b .ffmpeg-stdatomic
### Chromium Tests Patches ###
%patch100 -p1 -b .use_system_opus
%patch101 -p1 -b .use_system_harfbuzz
-%if 0%{?fedora} >= 24
-# Do nothing. We're modern enough to not need it.
-%else
-cp -a %{SOURCE14} third_party/ffmpeg/
-%endif
-
%if 0%{?asan}
export CC="clang"
export CXX="clang++"
@@ -1453,13 +1449,13 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-desktop
%post -n chrome-remote-desktop
-%systemd_post chrome-remote-desktop.service
+%systemd_post chrome-remote-desktop@.service
%preun -n chrome-remote-desktop
-%systemd_preun chrome-remote-desktop.service
+%systemd_preun chrome-remote-desktop@.service
%postun -n chrome-remote-desktop
-%systemd_postun_with_restart chrome-remote-desktop.service
+%systemd_postun_with_restart chrome-remote-desktop@.service
%files
%doc AUTHORS
@@ -1593,6 +1589,12 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
%{chromium_path}/chromedriver
%changelog
+* Mon May 15 2017 Tom Callaway <spot(a)fedoraproject.org> 58.0.3029.110-1
+- update to 58.0.3029.110
+
+* Mon May 8 2017 Tom Callaway <spot(a)fedoraproject.org> 58.0.3029.96-1
+- update to 58.0.3029.96
+
* Fri Apr 21 2017 Tom Callaway <spot(a)fedoraproject.org> 58.0.3029.81-1
- update to 58.0.3029.81
diff --git a/clean_ffmpeg.sh b/clean_ffmpeg.sh
index 39e68f7..01a89fc 100644
--- a/clean_ffmpeg.sh
+++ b/clean_ffmpeg.sh
@@ -182,7 +182,8 @@ header_files=" libavcodec/x86/inline_asm.h \
libavutil/version.h \
libswresample/swresample.h \
libswresample/version.h \
- compat/va_copy.h "
+ compat/va_copy.h \
+ compat/atomics/gcc/stdatomic.h "
manual_files=" libavcodec/x86/hpeldsp_rnd_template.c \
libavcodec/x86/rnd_template.c \
diff --git a/sources b/sources
index a80c737..5faaaee 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,4 @@
SHA512 (depot_tools.git-master.tar.gz) = d3d6a1873b2b0296a8cd99e0d8d2e629a17b1808934b4972556168f8b4ccea60577ebaeab4445baf15afb1b04080808db59a832a5b61d247bd48da14fa6acf03
SHA512 (policy_templates.zip) = 28f1f85eab1719dd1c6a70f7e4cd1c9bea46215adc327a32f2509098e70768a61dbb8b24c186279ec4e4e1299953c219e9eb71af6d5527fe9e422599ad0d785e
SHA512 (chromium-58.0.3029.81-clean.tar.xz) = b2ac41d6eccfd025d816b814354330fe4a9bb81c212fd7b98f79cc6f0c693d1b2ce5fbe0ce9397d43808ffcfa171585769c9db5d4b7d24e9bf548c450f8ad7f6
+SHA512 (chromium-58.0.3029.110-clean.tar.xz) = f26be2eaabe47d6294fd411bbb9abe07721c54fe06e6792a3ff0bd173571bb84ee673bc022f626883fc133e5285cf1386ba8539351d4eb82102feb3cab5f9852
7 years, 3 months
[chromium-freeworld/el7] (148 commits) ...Merge Fedora, chromium-60.0.3112.101-1
by Miro Hrončok
Summary of changes:
6618350... Initial setup of the repo (*)
f66ad85... HONK HONK! TRUCK FULL OF RADIOACTIVE WASTE AND ZOMBIE BITS (*)
c30bb16... 52.0.2743.82 (*)
67f9e82... 52.0.2743.82 (*)
098c7ea... try to fix cups22 again (hackishly) (*)
4bca8d3... actually fix compile against cups 2.2, add widevine compati (*)
7fe5f2b... compile with -fno-delete-null-pointer-checks (fixes v8 cras (*)
87abbbd... enable nacl/pnacl (chromium-native_client has landed in Fed (*)
a7e2324... Add an AppData file so that Chromium appears in the softwar (*)
fc6709f... fix post scriptlet so that selinux stuff only happens when (*)
98f362e... disable nacl/pnacl for Fedora 23 (and older) (*)
4839518... remember to bump release (*)
f5b63ce... fix conditional to disable verbose logging output unless be (*)
f96d8c8... trivial: Fix up the <translation> tag in the AppData file (*)
a5504ee... trivial: Fix up the <translation> tag in the AppData file (*)
8a15fdf... 52.0.2743.116 (*)
084ba54... Merge branch 'master' into f24 (*)
ed93147... fixup widevine handling, fix PepperFlash dir, add freeworld (*)
65d2fdc... Merge branch 'master' into f24 (*)
5c56e25... add Requires(post) for selinux scriplet (*)
bdd1207... Merge branch 'master' into f24 (*)
4644b6d... fix path on semanage Requires(post) line (*)
a27e11b... Merge branch 'master' into f24 (*)
a05dc02... filter out private requires/provides (*)
c5612ae... Merge branch 'master' into f24 (*)
496fc08... disable gtk3 because it breaks lots of things (*)
cd8e259... Merge branch 'master' into f24 (*)
d0d4125... disable unavailable Requires on epel7 (*)
2fd8ecc... use bundled harfbuzz on EL7 (*)
0df9641... 53.0.2785.92 (*)
283dc97... Merge branch 'master' into f24 (*)
1979550... 53.0.2785.101 (*)
77af42b... Merge branch 'master' into f24 (*)
1413d68... 53.0.2785.113 (*)
f0dc722... Merge branch 'master' into f24 (*)
c50f789... 53.0.2785.116 (*)
bbee19f... Merge branch 'master' into f24 (*)
c496d29... 53.0.2785.143 (*)
eb0653c... Merge branch 'master' into f24 (*)
6665291... 54.0.2840.59 (*)
bcb8929... conditionalize preservation of llvm-build dir for nacl (*)
c885574... fixup cups patch (*)
15eb147... fix memory issues with ld on i686 (*)
d4df8bc... fix ldflags (*)
be4198f... try using gold to get i686 to build in koji (*)
94b2a90... more haxs (*)
76530c5... typo (*)
27446e8... try different flags (*)
25d98a0... try different flags (*)
e40f047... try limiting debug (*)
2ec748f... fix deps (*)
cf9fdde... 54.0.2840.71 (*)
65b9550... Merge branch 'master' into f24 (*)
1b86e1c... fixup master_preferences, disable debugging in build (*)
95a4b60... 54.0.2840.90, debugging disabled (*)
840da84... Merge branch 'master' into f24 (*)
c324e58... fix build (*)
d63500b... Merge branch 'master' into f24 (*)
e456f1d... fix el7 build, snapshot needs to be in if aura is (*)
45c06de... Merge branch 'master' into f24 (*)
e05272a... 54.0.2840.100 (*)
71163f6... 55 changes (*)
0bdd4ee... Merge branch 'master' into f24 (*)
f81ff18... 55.0.2883.87 (*)
bfb9e2b... Merge branch 'master' into f24 (*)
ae406ea... use bundled jinja2 on RHEL (or Fedora older than 23) (*)
b4cff4b... preserve jinja2 dir (*)
96c125f... fix rvalue issue in remoting code (*)
53efa60... update ffmpeg clean scripts, thanks to Tomas Popela (*)
634b9db... - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass (*)
72f2502... 56.0.2924.87 (*)
cf4fe83... merge (*)
85686cc... fix chronal corruption caused by TARDIS (*)
407918e... add BR: gtk3-devel (*)
c24537e... Merge branch 'master' into f24 (*)
86f726d... fix compilation issues (*)
ff8c562... use bundled jinja everywhere (*)
f909a6c... disable debuginfo. will not fix rawhide, but should fix eve (*)
97d2e2b... Merge branch 'master' into f24 (*)
2076c5a... fix issue with unique ptr move on return with old gcc (*)
26fbfad... versioning sync build on rawhide (*)
54f615e... fix issue with gcc7 compile in v8 (thanks to Ben Noordhuis) (*)
ce69059... more gcc7 (*)
182a3dd... fix desktop file to have new window and new private window (*)
2a5a52f... enable mp3 support (*)
62bb085... fix sources (*)
f220743... new source (*)
4f30f8d... more new sources (*)
76c310d... more new sources (*)
2923a18... more new sources (*)
74ea286... 57.0.2987.110 (*)
6d6dc41... fix sources (*)
66f8a0a... Merge branch 'master' into f24 (*)
2270aa0... fix privlibs (*)
f46c327... Merge branch 'master' into f24 (*)
c7e1c43... fix mp3 enablement (*)
fb09fb1... Merge branch 'master' into f24 (*)
c02163c... add compat stdatomic.h (*)
acff0d6... add compat stdatomic.h (*)
3818e77... add compat stdatomic.h (*)
f381d74... move header to include path (*)
c18e243... Fix issue in gtk_ui.cc (*)
3b749ca... 57.0.2987.133 (*)
3739ffe... Merge branch 'master' into f24 (*)
f674d0a... 58.0.3029.81 (*)
94cfba9... use new service file name in %files (*)
850545e... 58.0.3029.110 (*)
b5aa03d... Merge branch 'master' into f24 (*)
8d1afda... strip provides/requires on libsensors (*)
eb56abd... Merge branch 'master' into f24 (*)
5180a1c... 59.0.3071.86 (*)
a9d450a... fix condit (*)
7fc3a99... Merge branch 'master' into f24 (*)
bc41d94... pnacl/nacl now needs llvm to build the bootstrap lib (*)
e1e1b51... Merge branch 'master' into f24 (*)
76f7bf9... fix hicolor file listing to be more inclusive (*)
356c8fb... fix filtering (*)
74ee244... actually fix mp3 playback support (*)
c68232b... actually fix mp3, update to .104 (*)
6e0d3b5... 59.0.3071.109 (*)
d0bdacb... fix path (*)
4b6e8a7... fix duplication between chrome-remote-desktop and chromium (*)
5efd1e8... use pretrans scriptlet to remove symlink on /etc/opt/chrome (*)
f88e197... moar chrome-remote-desktop fixes (*)
c23d66f... fix path in pretrans scriptlet (*)
aeacc87... fix path in pretrans scriptlet (*)
8c7674a... apply Rathann freeworld changes, update to 59.0.3071.115 (*)
d9e2499... Change struct ucontext to ucontext_t in breakpad (*)
03f0b9b... include copy of third_party/freetype from previous source t (*)
7c2fb50... fix scriptlets (*)
b7162c3... add missing \ in freeworld scriptlet (*)
d2fc3a1... use posttrans to ensure that old shared libs are gone befor (*)
2d02baa... BR: mesa-libGL-devel (*)
5a74290... - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass (*)
b5526c1... - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binu (*)
29aa9da... 60.0.3112.90 + headless + fixes for freeworld (*)
fae045b... merge (*)
7de0af7... fix typo from merge (*)
0d0973d... add minizip, conditionalize webp bundling for rhel7 (*)
bf4b08a... BR: mesa-libGL-devel (*)
bbbf61d... apply upstream commit to work around EPEL7 compiler issues (*)
682675b... try to trick old gcc (*)
97f9897... try different hack (*)
268e0a6... okay, do you like this? (*)
efb66ad... apply more workarounds to force code to compile with epel7 (*)
26f11a9... apply more workarounds to force code to compile with epel7 (*)
5922b5c... update to 60.0.3112.101, apply upstream fix for cameras whi (*)
f02ee82... Merge Fedora, chromium-60.0.3112.101-1 (*)
(*) This commit already existed in another branch; no separate mail sent
7 years, 3 months
[chromium-freeworld: 106/148] use new service file name in %files
by Miro Hrončok
commit 94cfba912645c02336889e3197758a89ff783c2b
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Sat Apr 22 12:00:10 2017 -0700
use new service file name in %files
chromium.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/chromium.spec b/chromium.spec
index c1c9b79..f0b04a3 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -1578,7 +1578,7 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
%{_sysconfdir}/opt/chrome/
%{crd_path}/remoting_locales/
%{crd_path}/start-host
-%{_unitdir}/chrome-remote-desktop.service
+%{_unitdir}/chrome-remote-desktop@.service
/var/lib/chrome-remote-desktop/
%if 0%{?build_remoting_app}
%if 0%{?nacl}
7 years, 3 months
[chromium-freeworld: 105/148] 58.0.3029.81
by Miro Hrončok
commit f674d0a3de4f987238662c754b7e8fe02518e26e
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Sat Apr 22 09:28:33 2017 -0700
58.0.3029.81
.gitignore | 1 +
...sktop.service => chrome-remote-desktop@.service | 1 +
chromium-56.0.2924.87-gcc-49.patch | 12 ----
chromium-56.0.2924.87-unique-ptr-fix.patch | 12 ----
chromium-57.0.2987.110-gtk_ui-gcc-fix.patch | 12 ----
...patch => chromium-58.0.3029.81-enable-mp3.patch | 82 +++++++++++++---------
chromium-58.0.3029.81-fix-gn.patch | 11 +++
chromium-58.0.3029.81-use_system_harfbuzz.patch | 12 ++++
chromium.spec | 37 +++++-----
sources | 4 +-
10 files changed, 96 insertions(+), 88 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0bc1f69..62f8e77 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@
/chromium-56.0.2924.87-clean.tar.xz
/chromium-57.0.2987.110-clean.tar.xz
/chromium-57.0.2987.133-clean.tar.xz
+/chromium-58.0.3029.81-clean.tar.xz
diff --git a/chrome-remote-desktop.service b/chrome-remote-desktop@.service
similarity index 97%
rename from chrome-remote-desktop.service
rename to chrome-remote-desktop@.service
index 2713bf1..4b5b1fc 100644
--- a/chrome-remote-desktop.service
+++ b/chrome-remote-desktop@.service
@@ -2,6 +2,7 @@
Description="Chrome Remote Desktop host daemon"
[Service]
+User=%i
Environment=HOME=%h
ExecStart=@@CRD_PATH@@/chrome-remote-desktop --start --foreground
ExecStop=@@CRD_PATH@@/chrome-remote-desktop --stop
diff --git a/chromium-57.0.2987.110-enable-mp3.patch b/chromium-58.0.3029.81-enable-mp3.patch
similarity index 83%
rename from chromium-57.0.2987.110-enable-mp3.patch
rename to chromium-58.0.3029.81-enable-mp3.patch
index a8b9ee6..7fbc0d0 100644
--- a/chromium-57.0.2987.110-enable-mp3.patch
+++ b/chromium-58.0.3029.81-enable-mp3.patch
@@ -1,6 +1,49 @@
-diff -up chromium-57.0.2987.110/third_party/ffmpeg/ffmpeg_generated.gni.mp3 chromium-57.0.2987.110/third_party/ffmpeg/ffmpeg_generated.gni
---- chromium-57.0.2987.110/third_party/ffmpeg/ffmpeg_generated.gni.mp3 2017-03-20 13:53:24.000000000 -0400
-+++ chromium-57.0.2987.110/third_party/ffmpeg/ffmpeg_generated.gni 2017-03-20 13:59:11.214419428 -0400
+diff -up chromium-58.0.3029.81/media/base/mime_util_internal.cc.mp3 chromium-58.0.3029.81/media/base/mime_util_internal.cc
+--- chromium-58.0.3029.81/media/base/mime_util_internal.cc.mp3 2017-04-21 14:46:15.817743487 -0400
++++ chromium-58.0.3029.81/media/base/mime_util_internal.cc 2017-04-21 14:52:58.544150880 -0400
+@@ -244,10 +244,10 @@ void MimeUtil::AddSupportedMediaFormats(
+ CodecSet webm_codecs(webm_audio_codecs);
+ webm_codecs.insert(webm_video_codecs.begin(), webm_video_codecs.end());
+
+-#if BUILDFLAG(USE_PROPRIETARY_CODECS)
+ CodecSet mp3_codecs;
+ mp3_codecs.insert(MP3);
+
++#if BUILDFLAG(USE_PROPRIETARY_CODECS)
+ CodecSet aac;
+ aac.insert(MPEG2_AAC);
+ aac.insert(MPEG4_AAC);
+@@ -291,10 +291,10 @@ void MimeUtil::AddSupportedMediaFormats(
+ AddContainerWithCodecs("application/ogg", ogg_codecs, false);
+ AddContainerWithCodecs("audio/flac", implicit_codec, false);
+
+-#if BUILDFLAG(USE_PROPRIETARY_CODECS)
+ AddContainerWithCodecs("audio/mpeg", mp3_codecs, true); // Allow "mp3".
+ AddContainerWithCodecs("audio/mp3", implicit_codec, true);
+ AddContainerWithCodecs("audio/x-mp3", implicit_codec, true);
++#if BUILDFLAG(USE_PROPRIETARY_CODECS)
+ AddContainerWithCodecs("audio/aac", implicit_codec, true); // AAC / ADTS.
+ AddContainerWithCodecs("audio/mp4", mp4_audio_codecs, true);
+ DCHECK(!mp4_video_codecs.empty());
+@@ -715,7 +715,6 @@ bool MimeUtil::IsCodecProprietary(Codec
+ case INVALID_CODEC:
+ case AC3:
+ case EAC3:
+- case MP3:
+ case MPEG2_AAC:
+ case MPEG4_AAC:
+ case H264:
+@@ -723,6 +722,7 @@ bool MimeUtil::IsCodecProprietary(Codec
+ case DOLBY_VISION:
+ return true;
+
++ case MP3:
+ case PCM:
+ case VORBIS:
+ case OPUS:
+diff -up chromium-58.0.3029.81/third_party/ffmpeg/ffmpeg_generated.gni.mp3 chromium-58.0.3029.81/third_party/ffmpeg/ffmpeg_generated.gni
+--- chromium-58.0.3029.81/third_party/ffmpeg/ffmpeg_generated.gni.mp3 2017-04-21 11:49:42.000000000 -0400
++++ chromium-58.0.3029.81/third_party/ffmpeg/ffmpeg_generated.gni 2017-04-21 14:46:15.816743506 -0400
@@ -176,19 +176,12 @@ if ((is_linux && current_cpu == "arm" &&
]
}
@@ -88,9 +131,9 @@ diff -up chromium-57.0.2987.110/third_party/ffmpeg/ffmpeg_generated.gni.mp3 chro
if ((is_linux && current_cpu == "arm" && arm_use_neon) || (is_linux && current_cpu == "arm")) {
ffmpeg_c_sources += [
"libavcodec/arm/h264pred_init_arm.c",
-diff -up chromium-57.0.2987.110/third_party/ffmpeg/libavcodec/sbrdsp.c.mp3 chromium-57.0.2987.110/third_party/ffmpeg/libavcodec/sbrdsp.c
---- chromium-57.0.2987.110/third_party/ffmpeg/libavcodec/sbrdsp.c.mp3 2017-03-20 14:15:22.068309439 -0400
-+++ chromium-57.0.2987.110/third_party/ffmpeg/libavcodec/sbrdsp.c 2017-03-20 14:15:47.826802603 -0400
+diff -up chromium-58.0.3029.81/third_party/ffmpeg/libavcodec/sbrdsp.c.mp3 chromium-58.0.3029.81/third_party/ffmpeg/libavcodec/sbrdsp.c
+--- chromium-58.0.3029.81/third_party/ffmpeg/libavcodec/sbrdsp.c.mp3 2017-04-21 11:49:43.000000000 -0400
++++ chromium-58.0.3029.81/third_party/ffmpeg/libavcodec/sbrdsp.c 2017-04-21 14:46:15.817743487 -0400
@@ -23,6 +23,7 @@
#define USE_FIXED 0
@@ -99,30 +142,3 @@ diff -up chromium-57.0.2987.110/third_party/ffmpeg/libavcodec/sbrdsp.c.mp3 chrom
#include "config.h"
#include "libavutil/attributes.h"
#include "libavutil/intfloat.h"
-diff -up chromium-57.0.2987.110/media/base/mime_util_internal.cc.mp3 chromium-57.0.2987.110/media/base/mime_util_internal.cc
---- chromium-57.0.2987.110/media/base/mime_util_internal.cc.mp3 2017-03-26 11:11:41.480377812 -0400
-+++ chromium-57.0.2987.110/media/base/mime_util_internal.cc 2017-03-26 11:13:19.289810708 -0400
-@@ -291,10 +291,10 @@ void MimeUtil::AddSupportedMediaFormats(
- CodecSet webm_codecs(webm_audio_codecs);
- webm_codecs.insert(webm_video_codecs.begin(), webm_video_codecs.end());
-
--#if defined(USE_PROPRIETARY_CODECS)
- CodecSet mp3_codecs;
- mp3_codecs.insert(MP3);
-
-+#if defined(USE_PROPRIETARY_CODECS)
- CodecSet aac;
- aac.insert(MPEG2_AAC);
- aac.insert(MPEG4_AAC);
-@@ -335,10 +335,10 @@ void MimeUtil::AddSupportedMediaFormats(
- AddContainerWithCodecs("application/ogg", ogg_codecs, false);
- AddContainerWithCodecs("audio/flac", implicit_codec, false);
-
--#if defined(USE_PROPRIETARY_CODECS)
- AddContainerWithCodecs("audio/mpeg", mp3_codecs, true); // Allow "mp3".
- AddContainerWithCodecs("audio/mp3", implicit_codec, true);
- AddContainerWithCodecs("audio/x-mp3", implicit_codec, true);
-+#if defined(USE_PROPRIETARY_CODECS)
- AddContainerWithCodecs("audio/aac", implicit_codec, true); // AAC / ADTS.
- AddContainerWithCodecs("audio/mp4", mp4_audio_codecs, true);
- DCHECK(!mp4_video_codecs.empty());
diff --git a/chromium-58.0.3029.81-fix-gn.patch b/chromium-58.0.3029.81-fix-gn.patch
new file mode 100644
index 0000000..d8b2207
--- /dev/null
+++ b/chromium-58.0.3029.81-fix-gn.patch
@@ -0,0 +1,11 @@
+diff -up chromium-58.0.3029.81/tools/gn/bootstrap/bootstrap.py.fixgn chromium-58.0.3029.81/tools/gn/bootstrap/bootstrap.py
+--- chromium-58.0.3029.81/tools/gn/bootstrap/bootstrap.py.fixgn 2017-04-21 15:39:59.704874747 -0400
++++ chromium-58.0.3029.81/tools/gn/bootstrap/bootstrap.py 2017-04-21 15:43:06.778809475 -0400
+@@ -384,6 +384,7 @@ def write_gn_ninja(path, root_gen_dir, o
+ 'base/base_paths.cc',
+ 'base/base_switches.cc',
+ 'base/build_time.cc',
++ 'base/callback_helpers.cc',
+ 'base/callback_internal.cc',
+ 'base/command_line.cc',
+ 'base/debug/activity_tracker.cc',
diff --git a/chromium-58.0.3029.81-use_system_harfbuzz.patch b/chromium-58.0.3029.81-use_system_harfbuzz.patch
new file mode 100644
index 0000000..df784fd
--- /dev/null
+++ b/chromium-58.0.3029.81-use_system_harfbuzz.patch
@@ -0,0 +1,12 @@
+diff -up chromium-58.0.3029.81/ui/gfx/render_text_harfbuzz.h.use_system_harfbuzz chromium-58.0.3029.81/ui/gfx/render_text_harfbuzz.h
+--- chromium-58.0.3029.81/ui/gfx/render_text_harfbuzz.h.use_system_harfbuzz 2017-04-21 14:58:23.182030756 -0400
++++ chromium-58.0.3029.81/ui/gfx/render_text_harfbuzz.h 2017-04-21 15:06:22.681991351 -0400
+@@ -12,7 +12,7 @@
+ #include <vector>
+
+ #include "base/macros.h"
+-#include "third_party/harfbuzz-ng/src/hb.h"
++#include <harfbuzz/hb.h>
+ #include "third_party/icu/source/common/unicode/ubidi.h"
+ #include "third_party/icu/source/common/unicode/uscript.h"
+ #include "ui/gfx/render_text.h"
diff --git a/chromium.spec b/chromium.spec
index 8c1c8af..c1c9b79 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -93,10 +93,10 @@ BuildRequires: libicu-devel >= 5.4
%global default_client_secret miEreAep8nuvTdvLums6qyLK
%global chromoting_client_id 449907151817-8vnlfih032ni8c4jjps9int9t86k546t.apps.googleusercontent.com
-%global majorversion 57
+%global majorversion 58
Name: chromium%{chromium_channel}
-Version: %{majorversion}.0.2987.133
+Version: %{majorversion}.0.3029.81
Release: 1%{?dist}
Summary: A WebKit (Blink) powered web browser
Url: http://www.chromium.org/Home
@@ -148,25 +148,21 @@ Patch26: chromium-54.0.2840.59-i686-ld-memory-tricks.patch
# obj/content/renderer/renderer/child_frame_compositing_helper.o: In function `content::ChildFrameCompositingHelper::OnSetSurface(cc::SurfaceId const&, gfx::Size const&, float, cc::SurfaceSequence const&)':
# /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-54.0.2840.90-setopaque.patch
-# Fix compiler issue with gcc 4.9
-# https://chromium.googlesource.com/external/webrtc/trunk/webrtc/+/69556b1c...
-Patch30: chromium-56.0.2924.87-gcc-49.patch
# Use -fpermissive to build WebKit
Patch31: chromium-56.0.2924.87-fpermissive.patch
-# Fix issue with unique_ptr move on return with older gcc
-Patch32: chromium-56.0.2924.87-unique-ptr-fix.patch
# Fix issue with compilation on gcc7
# Thanks to Ben Noordhuis
Patch33: chromium-56.0.2924.87-gcc7.patch
# Enable mp3 support
-Patch34: chromium-57.0.2987.110-enable-mp3.patch
-# Fix issue in gtk_ui.cc
-# https://chromium.googlesource.com/chromium/src.git/+/b95cf280873664a44297...
-Patch35: chromium-57.0.2987.110-gtk_ui-gcc-fix.patch
+Patch34: chromium-58.0.3029.81-enable-mp3.patch
+# Fix gn build
+# https://chromium.googlesource.com/chromium/src.git/+/379e35f6f3eaa41a97f2...
+Patch35: chromium-58.0.3029.81-fix-gn.patch
+
### Chromium Tests Patches ###
Patch100: chromium-46.0.2490.86-use_system_opus.patch
-Patch101: chromium-55.0.2883.75-use_system_harfbuzz.patch
+Patch101: chromium-58.0.3029.81-use_system_harfbuzz.patch
# Use chromium-latest.py to generate clean tarball from released build tarballs, found here:
# http://build.chromium.org/buildbot/official/
@@ -195,7 +191,7 @@ Source8: get_linux_tests_names.py
# GNOME stuff
Source9: chromium-browser.xml
Source10: https://dl.google.com/dl/edgedl/chrome/policy/policy_templates.zip
-Source11: chrome-remote-desktop.service
+Source11: chrome-remote-desktop@.service
Source12: chromium-browser.appdata.xml
Source13: master_preferences
# Only needed for platforms where gcc doesn't have stdatomic.h
@@ -232,6 +228,7 @@ BuildRequires: libusb-devel
BuildRequires: libXdamage-devel
BuildRequires: libXScrnSaver-devel
BuildRequires: libXtst-devel
+BuildRequires: nodejs
BuildRequires: nss-devel
BuildRequires: pciutils-devel
BuildRequires: pulseaudio-libs-devel
@@ -542,12 +539,10 @@ members of the Chromium and WebDriver teams.
%patch25 -p1 -b .jpegfix
%patch26 -p1 -b .ldmemory
%patch27 -p1 -b .setopaque
-%patch30 -p1 -b .gcc49
%patch31 -p1 -b .permissive
-%patch32 -p1 -b .unique-ptr-fix
%patch33 -p1 -b .gcc7
%patch34 -p1 -b .mp3
-%patch35 -p1 -b .gtkuifix
+%patch35 -p1 -b .fixgn
### Chromium Tests Patches ###
%patch100 -p1 -b .use_system_opus
@@ -697,6 +692,9 @@ CHROMIUM_BROWSER_GN_DEFINES+=' use_gtk3=false'
CHROMIUM_BROWSER_GN_DEFINES+=' treat_warnings_as_errors=false'
export CHROMIUM_BROWSER_GN_DEFINES
+mkdir -p third_party/node/linux/node-linux-x64/bin
+ln -s %{_bindir}/node third_party/node/linux/node-linux-x64/bin/node
+
# Remove most of the bundled libraries. Libraries specified below (taken from
# Gentoo's Chromium ebuild) are the libraries that needs to be preserved.
build/linux/unbundle/remove_bundled_libraries.py \
@@ -807,6 +805,8 @@ build/linux/unbundle/remove_bundled_libraries.py \
'third_party/mesa' \
'third_party/modp_b64' \
'third_party/mt19937ar' \
+ 'third_party/node' \
+ 'third_party/node/node_modules/vulcanize/third_party/UglifyJS2' \
'third_party/openmax_dl' \
'third_party/opus' \
'third_party/ots' \
@@ -1093,7 +1093,7 @@ cp -a remoting/host/installer/linux/is-remoting-session %{buildroot}%{crd_path}/
mkdir -p %{buildroot}%{_unitdir}
cp -a %{SOURCE11} %{buildroot}%{_unitdir}/
-sed -i 's|@@CRD_PATH@@|%{crd_path}|g' %{buildroot}%{_unitdir}/chrome-remote-desktop.service
+sed -i 's|@@CRD_PATH@@|%{crd_path}|g' %{buildroot}%{_unitdir}/chrome-remote-desktop@.service
# Add directories for policy management
mkdir -p %{buildroot}%{_sysconfdir}/chromium/policies/managed
@@ -1593,6 +1593,9 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
%{chromium_path}/chromedriver
%changelog
+* Fri Apr 21 2017 Tom Callaway <spot(a)fedoraproject.org> 58.0.3029.81-1
+- update to 58.0.3029.81
+
* Thu Mar 30 2017 Tom Callaway <spot(a)fedoraproject.org> 57.0.2987.133-1
- update to 57.0.2987.133
diff --git a/sources b/sources
index 44e8109..a80c737 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
SHA512 (depot_tools.git-master.tar.gz) = d3d6a1873b2b0296a8cd99e0d8d2e629a17b1808934b4972556168f8b4ccea60577ebaeab4445baf15afb1b04080808db59a832a5b61d247bd48da14fa6acf03
-SHA512 (policy_templates.zip) = 6a0564da805ee8d290453c9e46550fa8eed42d0fbd51a90eda566d888d9d7cf35ec9bb39f2340ec1ed98e7e813815eceb1f11cd202746815a7c8f8ecbef73a85
-SHA512 (chromium-57.0.2987.133-clean.tar.xz) = 5b5b3b9b8da008c04a8519eee1199e042bd1ee022e3eeb22eb10c075aeac64abe9312350cb867ab17854815d2aaf91fb6387b45f41f475fd854ee20e47d49ef8
+SHA512 (policy_templates.zip) = 28f1f85eab1719dd1c6a70f7e4cd1c9bea46215adc327a32f2509098e70768a61dbb8b24c186279ec4e4e1299953c219e9eb71af6d5527fe9e422599ad0d785e
+SHA512 (chromium-58.0.3029.81-clean.tar.xz) = b2ac41d6eccfd025d816b814354330fe4a9bb81c212fd7b98f79cc6f0c693d1b2ce5fbe0ce9397d43808ffcfa171585769c9db5d4b7d24e9bf548c450f8ad7f6
7 years, 3 months
[chromium-freeworld: 104/148] Merge branch 'master' into f24
by Miro Hrončok
commit 3739ffe4a2db23208a7ebb8e97fbccd94f72bd01
Merge: fb09fb1 3b749ca
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Thu Mar 30 14:21:58 2017 -0400
Merge branch 'master' into f24
.gitignore | 1 +
chromium-57.0.2987.110-gtk_ui-gcc-fix.patch | 12 ++
chromium.spec | 38 ++++--
sources | 2 +-
stdatomic.h | 173 ++++++++++++++++++++++++++++
5 files changed, 215 insertions(+), 11 deletions(-)
---
7 years, 3 months
[chromium-freeworld: 103/148] 57.0.2987.133
by Miro Hrončok
commit 3b749ca7b477337f9cb337bc117982626b18cc28
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Thu Mar 30 14:11:23 2017 -0400
57.0.2987.133
.gitignore | 1 +
chromium.spec | 11 +++++++++--
sources | 2 +-
3 files changed, 11 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 32bcb26..0bc1f69 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@
/chromium-55.0.2883.87-clean.tar.xz
/chromium-56.0.2924.87-clean.tar.xz
/chromium-57.0.2987.110-clean.tar.xz
+/chromium-57.0.2987.133-clean.tar.xz
diff --git a/chromium.spec b/chromium.spec
index db99530..8c1c8af 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -96,8 +96,8 @@ BuildRequires: libicu-devel >= 5.4
%global majorversion 57
Name: chromium%{chromium_channel}
-Version: %{majorversion}.0.2987.110
-Release: 4%{?dist}
+Version: %{majorversion}.0.2987.133
+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)
@@ -993,6 +993,10 @@ GOOGLE_CLIENT_ID_REMOTING_IDENTITY_API=%{chromoting_client_id} ../../depot_tools
%endif
popd
+# Nuke nacl/pnacl bits at the end of the build
+rm -rf out/Release/gen/sdk
+rm -rf native_client/toolchain
+rm -rf third_party/llvm-build/*
%install
rm -rf %{buildroot}
@@ -1589,6 +1593,9 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
%{chromium_path}/chromedriver
%changelog
+* Thu Mar 30 2017 Tom Callaway <spot(a)fedoraproject.org> 57.0.2987.133-1
+- update to 57.0.2987.133
+
* Sun Mar 26 2017 Tom Callaway <spot(a)fedoraproject.org> 57.0.2987.110-4
- copy compat stdatomic.h in for RHEL. Re-enable mp3 enablement.
- fix issue in gtk_ui.cc revealed by RHEL build
diff --git a/sources b/sources
index 920d0f1..44e8109 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
SHA512 (depot_tools.git-master.tar.gz) = d3d6a1873b2b0296a8cd99e0d8d2e629a17b1808934b4972556168f8b4ccea60577ebaeab4445baf15afb1b04080808db59a832a5b61d247bd48da14fa6acf03
SHA512 (policy_templates.zip) = 6a0564da805ee8d290453c9e46550fa8eed42d0fbd51a90eda566d888d9d7cf35ec9bb39f2340ec1ed98e7e813815eceb1f11cd202746815a7c8f8ecbef73a85
-SHA512 (chromium-57.0.2987.110-clean.tar.xz) = 9ea6a1ef5a553f9a51470248b8c0bb52ba8ff157aa6bc12515d8e589eff5e9dcaa55e37f5de4241bac96694c9b41ea260f827425ce1f07d5244369249373d4fc
+SHA512 (chromium-57.0.2987.133-clean.tar.xz) = 5b5b3b9b8da008c04a8519eee1199e042bd1ee022e3eeb22eb10c075aeac64abe9312350cb867ab17854815d2aaf91fb6387b45f41f475fd854ee20e47d49ef8
7 years, 3 months
[chromium-freeworld: 102/148] Fix issue in gtk_ui.cc
by Miro Hrončok
commit c18e243924af7fe83f77e2e776c26663b1e8ee93
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Tue Mar 28 11:44:47 2017 -0400
Fix issue in gtk_ui.cc
chromium-57.0.2987.110-gtk_ui-gcc-fix.patch | 12 ++++++++++++
chromium.spec | 5 +++++
2 files changed, 17 insertions(+)
---
diff --git a/chromium-57.0.2987.110-gtk_ui-gcc-fix.patch b/chromium-57.0.2987.110-gtk_ui-gcc-fix.patch
new file mode 100644
index 0000000..4e92fe4
--- /dev/null
+++ b/chromium-57.0.2987.110-gtk_ui-gcc-fix.patch
@@ -0,0 +1,12 @@
+diff -up chromium-57.0.2987.110/chrome/browser/ui/libgtkui/gtk_ui.cc.b95cf28 chromium-57.0.2987.110/chrome/browser/ui/libgtkui/gtk_ui.cc
+--- chromium-57.0.2987.110/chrome/browser/ui/libgtkui/gtk_ui.cc.b95cf28 2017-03-28 11:42:53.308857207 -0400
++++ chromium-57.0.2987.110/chrome/browser/ui/libgtkui/gtk_ui.cc 2017-03-28 11:43:04.172579015 -0400
+@@ -676,7 +676,7 @@ std::unique_ptr<views::Border> GtkUi::Cr
+ : nullptr);
+ }
+
+- return gtk_border;
++ return std::move(gtk_border);
+ }
+
+ void GtkUi::AddWindowButtonOrderObserver(
diff --git a/chromium.spec b/chromium.spec
index 54b380d..db99530 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -160,6 +160,9 @@ Patch32: chromium-56.0.2924.87-unique-ptr-fix.patch
Patch33: chromium-56.0.2924.87-gcc7.patch
# Enable mp3 support
Patch34: chromium-57.0.2987.110-enable-mp3.patch
+# Fix issue in gtk_ui.cc
+# https://chromium.googlesource.com/chromium/src.git/+/b95cf280873664a44297...
+Patch35: chromium-57.0.2987.110-gtk_ui-gcc-fix.patch
### Chromium Tests Patches ###
Patch100: chromium-46.0.2490.86-use_system_opus.patch
@@ -544,6 +547,7 @@ members of the Chromium and WebDriver teams.
%patch32 -p1 -b .unique-ptr-fix
%patch33 -p1 -b .gcc7
%patch34 -p1 -b .mp3
+%patch35 -p1 -b .gtkuifix
### Chromium Tests Patches ###
%patch100 -p1 -b .use_system_opus
@@ -1587,6 +1591,7 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
%changelog
* Sun Mar 26 2017 Tom Callaway <spot(a)fedoraproject.org> 57.0.2987.110-4
- copy compat stdatomic.h in for RHEL. Re-enable mp3 enablement.
+- fix issue in gtk_ui.cc revealed by RHEL build
* Sun Mar 26 2017 Tom Callaway <spot(a)fedoraproject.org> 57.0.2987.110-3
- fix mp3 enablement
7 years, 3 months
[chromium-freeworld: 101/148] move header to include path
by Miro Hrončok
commit f381d74a6c3b37d0bb9542e918595c30747daffc
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Tue Mar 28 10:20:45 2017 -0400
move header to include path
chromium.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/chromium.spec b/chromium.spec
index a93f242..54b380d 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -552,7 +552,7 @@ members of the Chromium and WebDriver teams.
%if 0%{?fedora} >= 24
# Do nothing. We're modern enough to not need it.
%else
-cp -a %{SOURCE14} third_party/ffmpeg/libavutil/
+cp -a %{SOURCE14} third_party/ffmpeg/
%endif
%if 0%{?asan}
7 years, 3 months
[chromium-freeworld: 100/148] add compat stdatomic.h
by Miro Hrončok
commit 3818e774a5f0be0a49ca39f38301bf864e90d7ad
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Sun Mar 26 17:09:48 2017 -0400
add compat stdatomic.h
chromium.spec | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
---
diff --git a/chromium.spec b/chromium.spec
index 563f3dc..a93f242 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -549,7 +549,9 @@ members of the Chromium and WebDriver teams.
%patch100 -p1 -b .use_system_opus
%patch101 -p1 -b .use_system_harfbuzz
-%if !%{?fedora}
+%if 0%{?fedora} >= 24
+# Do nothing. We're modern enough to not need it.
+%else
cp -a %{SOURCE14} third_party/ffmpeg/libavutil/
%endif
7 years, 3 months