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