[chromium-freeworld: 31/148] Merge branch 'master' into f24
by Miro Hrončok
commit 283dc97c82b0c79c221bc77f14f5f4919c10f94b
Merge: cd8e259 0df9641
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Wed Sep 7 15:16:16 2016 -0400
Merge branch 'master' into f24
.gitignore | 1 +
chrome-remote-desktop.service | 1 +
chromium-53.0.2785.92-boringssl-time-fix.patch | 11 +
chromium-53.0.2785.92-gn-system.patch | 252 +++++++++++++++++++++++
chromium-53.0.2785.92-last-commit-position.patch | 28 +++
chromium.spec | 128 ++++++++++--
sources | 4 +-
7 files changed, 403 insertions(+), 22 deletions(-)
---
7 years, 3 months
[chromium-freeworld: 30/148] 53.0.2785.92
by Miro Hrončok
commit 0df9641b97490bb416253df0f618ab620248a10a
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Wed Sep 7 15:13:21 2016 -0400
53.0.2785.92
.gitignore | 1 +
chrome-remote-desktop.service | 1 +
chromium-53.0.2785.92-boringssl-time-fix.patch | 11 +
chromium-53.0.2785.92-gn-system.patch | 252 +++++++++++++++++++++++
chromium-53.0.2785.92-last-commit-position.patch | 28 +++
chromium.spec | 113 ++++++++--
sources | 4 +-
7 files changed, 388 insertions(+), 22 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a553dc5..68c0030 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
/policy_templates.zip
/chromium-52.0.2743.82-clean.tar.xz
/chromium-52.0.2743.116-clean.tar.xz
+/chromium-53.0.2785.92-clean.tar.xz
diff --git a/chrome-remote-desktop.service b/chrome-remote-desktop.service
index 5889bc7..2713bf1 100644
--- a/chrome-remote-desktop.service
+++ b/chrome-remote-desktop.service
@@ -2,6 +2,7 @@
Description="Chrome Remote Desktop host daemon"
[Service]
+Environment=HOME=%h
ExecStart=@@CRD_PATH@@/chrome-remote-desktop --start --foreground
ExecStop=@@CRD_PATH@@/chrome-remote-desktop --stop
ExecReload=@@CRD_PATH@@/chrome-remote-desktop --reload
diff --git a/chromium-53.0.2785.92-boringssl-time-fix.patch b/chromium-53.0.2785.92-boringssl-time-fix.patch
new file mode 100644
index 0000000..8d67957
--- /dev/null
+++ b/chromium-53.0.2785.92-boringssl-time-fix.patch
@@ -0,0 +1,11 @@
+diff -up chromium-53.0.2785.92/third_party/boringssl/src/crypto/x509/by_dir.c.timefix chromium-53.0.2785.92/third_party/boringssl/src/crypto/x509/by_dir.c
+--- chromium-53.0.2785.92/third_party/boringssl/src/crypto/x509/by_dir.c.timefix 2016-09-06 15:20:06.094396255 -0400
++++ chromium-53.0.2785.92/third_party/boringssl/src/crypto/x509/by_dir.c 2016-09-06 15:20:16.893187930 -0400
+@@ -56,6 +56,7 @@
+ * [including the GNU Public Licence.] */
+
+ #include <string.h>
++#include <time.h>
+ #include <sys/stat.h>
+ #include <sys/types.h>
+
diff --git a/chromium-53.0.2785.92-gn-system.patch b/chromium-53.0.2785.92-gn-system.patch
new file mode 100644
index 0000000..8c4c664
--- /dev/null
+++ b/chromium-53.0.2785.92-gn-system.patch
@@ -0,0 +1,252 @@
+diff -up chromium-53.0.2785.92/build/linux/unbundle/libjpeg.gn.gnsystem chromium-53.0.2785.92/build/linux/unbundle/libjpeg.gn
+--- chromium-53.0.2785.92/build/linux/unbundle/libjpeg.gn.gnsystem 2016-09-06 13:27:56.018365168 -0400
++++ chromium-53.0.2785.92/build/linux/unbundle/libjpeg.gn 2016-09-06 13:27:56.018365168 -0400
+@@ -0,0 +1,9 @@
++# 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.
++
++source_set("libjpeg") {
++ libs = [
++ "jpeg",
++ ]
++}
+diff -up chromium-53.0.2785.92/build/linux/unbundle/libpng.gn.gnsystem chromium-53.0.2785.92/build/linux/unbundle/libpng.gn
+--- chromium-53.0.2785.92/build/linux/unbundle/libpng.gn.gnsystem 2016-09-06 13:27:56.018365168 -0400
++++ chromium-53.0.2785.92/build/linux/unbundle/libpng.gn 2016-09-06 13:27:56.018365168 -0400
+@@ -0,0 +1,25 @@
++# 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_libpng") {
++ packages = [ "libpng" ]
++}
++
++shim_headers("libpng_shim") {
++ root_path = "include"
++ headers = [
++ "png.h",
++ "pngconf.h",
++ ]
++}
++
++source_set("libpng") {
++ deps = [
++ ":libpng_shim",
++ ]
++ public_configs = [ ":system_libpng" ]
++}
+diff -up chromium-53.0.2785.92/build/linux/unbundle/libusb.gn.gnsystem chromium-53.0.2785.92/build/linux/unbundle/libusb.gn
+--- chromium-53.0.2785.92/build/linux/unbundle/libusb.gn.gnsystem 2016-09-06 13:27:56.019365149 -0400
++++ chromium-53.0.2785.92/build/linux/unbundle/libusb.gn 2016-09-06 13:27:56.018365168 -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-53.0.2785.92/build/linux/unbundle/opus.gn.gnsystem chromium-53.0.2785.92/build/linux/unbundle/opus.gn
+--- chromium-53.0.2785.92/build/linux/unbundle/opus.gn.gnsystem 2016-09-06 13:27:56.019365149 -0400
++++ chromium-53.0.2785.92/build/linux/unbundle/opus.gn 2016-09-06 13:31:11.546589545 -0400
+@@ -0,0 +1,161 @@
++# 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",
++ ]
++}
++
+diff -up chromium-53.0.2785.92/build/linux/unbundle/replace_gn_files.py.gnsystem chromium-53.0.2785.92/build/linux/unbundle/replace_gn_files.py
+--- chromium-53.0.2785.92/build/linux/unbundle/replace_gn_files.py.gnsystem 2016-09-02 15:02:02.000000000 -0400
++++ chromium-53.0.2785.92/build/linux/unbundle/replace_gn_files.py 2016-09-06 13:27:56.020365130 -0400
+@@ -21,9 +21,13 @@ REPLACEMENTS = {
+ 'flac': 'third_party/flac/BUILD.gn',
+ 'harfbuzz-ng': 'third_party/harfbuzz-ng/BUILD.gn',
+ 'libevent': 'base/third_party/libevent/BUILD.gn',
++ 'libjpeg': 'third_party/libjpeg/BUILD.gn',
++ 'libpng': 'third_party/libpng/BUILD.gn',
++ 'libusb': 'third_party/libusb/BUILD.gn',
+ 'libwebp': 'third_party/libwebp/BUILD.gn',
+ 'libxml': 'third_party/libxml/BUILD.gn',
+ 'libxslt': 'third_party/libxslt/BUILD.gn',
++ 'opus': 'third_party/opus/BUILD.gn',
+ 'snappy': 'third_party/snappy/BUILD.gn',
+ 'yasm': 'third_party/yasm/yasm_assemble.gni',
+ 'zlib': 'third_party/zlib/BUILD.gn',
diff --git a/chromium-53.0.2785.92-last-commit-position.patch b/chromium-53.0.2785.92-last-commit-position.patch
new file mode 100644
index 0000000..46806f7
--- /dev/null
+++ b/chromium-53.0.2785.92-last-commit-position.patch
@@ -0,0 +1,28 @@
+diff -up chromium-53.0.2785.92/tools/gn/BUILD.gn.lastcommitfix chromium-53.0.2785.92/tools/gn/BUILD.gn
+--- chromium-53.0.2785.92/tools/gn/BUILD.gn.lastcommitfix 2016-09-06 13:50:17.540459136 -0400
++++ chromium-53.0.2785.92/tools/gn/BUILD.gn 2016-09-06 13:50:27.380269110 -0400
+@@ -259,7 +259,6 @@ executable("gn") {
+
+ deps = [
+ ":gn_lib",
+- ":last_commit_position",
+ "//base",
+ "//build/config/sanitizers:deps",
+ "//build/win:default_exe_manifest",
+diff -up chromium-53.0.2785.92/tools/gn/gn_main.cc.lastcommitfix chromium-53.0.2785.92/tools/gn/gn_main.cc
+--- chromium-53.0.2785.92/tools/gn/gn_main.cc.lastcommitfix 2016-09-06 13:49:34.620288177 -0400
++++ chromium-53.0.2785.92/tools/gn/gn_main.cc 2016-09-06 13:49:47.316042652 -0400
+@@ -12,13 +12,7 @@
+ #include "tools/gn/standard_out.h"
+ #include "tools/gn/switches.h"
+
+-// Only the GN-generated build makes this header for now.
+-// TODO(brettw) consider adding this if we need it in GYP.
+-#if defined(GN_BUILD)
+-#include "tools/gn/last_commit_position.h"
+-#else
+ #define LAST_COMMIT_POSITION "UNKNOWN"
+-#endif
+
+ namespace {
+
diff --git a/chromium.spec b/chromium.spec
index 6355974..ae9d12b 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -1,6 +1,12 @@
# NEVER EVER EVER turn this on in official builds
%global freeworld 0
+# gn is the new new new buildtool. *sigh*
+%global use_gn 0
+
+# Leave this alone, please.
+%global target out/Release
+
# %%{nil} for Stable; -beta for Beta; -dev for Devel
# dash in -beta and -dev is intentional !
%global chromium_channel %{nil}
@@ -61,7 +67,7 @@ BuildRequires: libicu-devel >= 5.4
%global bundleicu 1
%endif
-%global bundlere2 0
+%global bundlere2 1
# Chromium breaks on wayland, hidpi, and colors with gtk3 enabled.
%global gtk3 0
@@ -86,8 +92,8 @@ BuildRequires: libicu-devel >= 5.4
%global chromoting_client_id 449907151817-8vnlfih032ni8c4jjps9int9t86k546t.apps.googleusercontent.com
Name: chromium%{chromium_channel}
-Version: 52.0.2743.116
-Release: 11%{?dist}
+Version: 53.0.2785.92
+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)
@@ -109,14 +115,10 @@ Patch4: chromium-46.0.2490.71-notest.patch
Patch6: chromium-47.0.2526.80-pnacl-fgnu-inline-asm.patch
# Ignore broken nacl open fd counter
Patch7: chromium-47.0.2526.80-nacl-ignore-broken-fd-counter.patch
-# Fixups for gcc6
-Patch8: chromium-48.0.2564.103-gcc6.patch
# Use libusb_interrupt_event_handler from current libusbx (1.0.21-0.1.git448584a)
Patch9: chromium-48.0.2564.116-libusb_interrupt_event_handler.patch
# Fix re2 unbundle gyp
Patch10: chromium-50.0.2661.94-unbundle-re2-fix.patch
-# Fix PNGImageDecoder code
-Patch11: chromium-52.0.2723.2-PNGImageDecoder-fix-cast.patch
# Ignore deprecations in cups 2.2
# https://bugs.chromium.org/p/chromium/issues/detail?id=622493
Patch12: chromium-52.0.2743.82-cups22.patch
@@ -133,6 +135,13 @@ Patch18: chromium-52.0.2743.82-master-prefs-path.patch
# Disable MADV_FREE (if set by glibc)
# https://bugzilla.redhat.com/show_bug.cgi?id=1361157
Patch19: chromium-52.0.2743.116-unset-madv_free.patch
+# Use gn system files
+Patch20: chromium-53.0.2785.92-gn-system.patch
+# Fix last commit position issue
+# https://groups.google.com/a/chromium.org/forum/#!topic/gn-dev/7nlJv486bD4
+Patch21: chromium-53.0.2785.92-last-commit-position.patch
+# Fix issue where timespec is not defined when sys/stat.h is included.
+Patch22: chromium-53.0.2785.92-boringssl-time-fix.patch
### Chromium Tests Patches ###
Patch100: chromium-46.0.2490.86-use_system_opus.patch
@@ -191,7 +200,6 @@ BuildRequires: gperf
BuildRequires: libatomic
BuildRequires: libcap-devel
BuildRequires: libdrm-devel
-BuildRequires: libexif-devel
BuildRequires: libgcrypt-devel
BuildRequires: libudev-devel
BuildRequires: libusb-devel
@@ -238,10 +246,8 @@ BuildRequires: dbus-glib-devel
BuildRequires: elfutils-libelf-devel
BuildRequires: flac-devel
BuildRequires: hwdata
-BuildRequires: jsoncpp-devel
BuildRequires: kernel-headers
BuildRequires: libevent-devel
-BuildRequires: libexif-devel
BuildRequires: libffi-devel
%if 0%{?bundleicu}
# If this is true, we're using the bundled icu.
@@ -270,8 +276,6 @@ BuildRequires: libusbx-devel >= 1.0.21-0.1.git448584a
BuildRequires: libxslt-devel
# Same here, it seems.
# BuildRequires: libyuv-devel
-BuildRequires: minizip-devel
-BuildRequires: nspr-devel
%if %{bundleopus}
# Do nothing
%else
@@ -296,7 +300,6 @@ Requires: re2 >= 20160401
BuildRequires: re2-devel >= 20160401
%endif
BuildRequires: speech-dispatcher-devel
-BuildRequires: speex-devel = 1.2
BuildRequires: yasm
BuildRequires: pkgconfig(gnome-keyring-1)
# remote desktop needs this
@@ -500,10 +503,8 @@ members of the Chromium and WebDriver teams.
%patch4 -p1 -b .notest
%patch6 -p1 -b .gnu-inline
%patch7 -p1 -b .ignore-fd-count
-# %%patch8 -p1 -b .gcc6
%patch9 -p1 -b .modern-libusbx
%patch10 -p1 -b .unbundle-fix
-%patch11 -p1 -b .fixcast
%patch12 -p1 -b .cups22
%patch14 -p1 -b .morealiases
%patch15 -p1 -b .sandboxpie
@@ -511,6 +512,9 @@ members of the Chromium and WebDriver teams.
%patch17 -p1 -b .armfix
%patch18 -p1 -b .etc
%patch19 -p1 -b .madv_free
+%patch20 -p1 -b .gnsystem
+%patch21 -p1 -b .lastcommit
+%patch22 -p1 -b .timefix
### Chromium Tests Patches ###
%patch100 -p1 -b .use_system_opus
@@ -613,6 +617,36 @@ ln -s ../../out/Release/gen/sdk/linux_x86 linux_x86
popd
%endif
+CHROMIUM_BROWSER_GN_DEFINES=""
+%ifarch x86_64
+CHROMIUM_BROWSER_GN_DEFINES+=' system_libdir="lib64"'
+%endif
+CHROMIUM_BROWSER_GN_DEFINES+=' google_api_key="%{api_key}" google_default_client_id="%{default_client_id}" google_default_client_secret="%{default_client_secret}"'
+CHROMIUM_BROWSER_GN_DEFINES+=' is_clang=false use_sysroot=false use_gio=true use_pulseaudio=true icu_use_data_file_flag=true'
+%if 0%{?nonacl}
+CHROMIUM_BROWSER_GN_DEFINES+=' enable_nacl=false'
+%endif
+%if %{freeworld}
+CHROMIUM_BROWSER_GN_DEFINES+=' ffmpeg_branding="ChromeOS" proprietary_codecs=true'
+%else
+CHROMIUM_BROWSER_GN_DEFINES+=' ffmpeg_branding="Chromium" proprietary_codecs=false'
+%endif
+%if 0%{?shared}
+CHROMIUM_BROWSER_GN_DEFINES+=' is_component_ffmpeg=true is_component_build=true'
+%else
+CHROMIUM_BROWSER_GN_DEFINES+=' is_component_ffmpeg=false is_component_build=false'
+%endif
+CHROMIUM_BROWSER_GN_DEFINES+=' remove_webcore_debug_symbols=true enable_hangout_services_extension=true'
+CHROMIUM_BROWSER_GN_DEFINES+=' enable_hotwording=false use_aura=true enable_hidpi=true'
+CHROMIUM_BROWSER_GN_DEFINES+=' enable_webrtc=true enable_widevine=true'
+%if 0%{gtk3}
+CHROMIUM_BROWSER_GN_DEFINES+=' use_gtk3=true'
+%else
+CHROMIUM_BROWSER_GN_DEFINES+=' use_gtk3=false'
+%endif
+CHROMIUM_BROWSER_GN_DEFINES+=' extra_cflags="-fno-delete-null-pointer-checks" treat_warnings_as_errors=false'
+export CHROMIUM_BROWSER_GN_DEFINES
+
export CHROMIUM_BROWSER_GYP_DEFINES="\
%ifarch x86_64
-Dtarget_arch=x64 \
@@ -661,9 +695,7 @@ export CHROMIUM_BROWSER_GYP_DEFINES="\
-Duse_system_icu=1 \
%endif
-Dicu_use_data_file_flag=1 \
- -Duse_system_jsoncpp=1 \
-Duse_system_libevent=1 \
- -Duse_system_libexif=1 \
-Duse_system_libjpeg=1 \
-Duse_system_libpng=1 \
%if %{bundlelibusbx}
@@ -673,8 +705,6 @@ export CHROMIUM_BROWSER_GYP_DEFINES="\
%endif
-Duse_system_libxml=1 \
-Duse_system_libxslt=1 \
- -Duse_system_minizip=1 \
- -Duse_system_nspr=1 \
%if %{bundleopus}
-Duse_system_opus=0 \
%else
@@ -685,7 +715,6 @@ export CHROMIUM_BROWSER_GYP_DEFINES="\
%else
-Duse_system_re2=1 \
%endif
- -Duse_system_speex=1 \
-Duse_system_libsrtp=0 \
-Duse_system_xdg_utils=1 \
-Duse_system_yasm=1 \
@@ -797,11 +826,13 @@ build/linux/unbundle/remove_bundled_libraries.py \
'chrome/third_party/mozilla_security_manager' \
'courgette/third_party' \
'native_client/src/third_party/dlmalloc' \
+ 'native_client/src/third_party/valgrind' \
'net/third_party/mozilla_security_manager' \
'net/third_party/nss' \
'third_party/WebKit' \
'third_party/analytics' \
'third_party/angle' \
+ 'third_party/angle/src/common/third_party/numerics' \
'third_party/angle/src/third_party/compiler' \
'third_party/angle/src/third_party/libXNVCtrl' \
'third_party/angle/src/third_party/murmurhash' \
@@ -814,6 +845,7 @@ build/linux/unbundle/remove_bundled_libraries.py \
'third_party/catapult/tracing/third_party/d3' \
'third_party/catapult/tracing/third_party/gl-matrix' \
'third_party/catapult/tracing/third_party/jszip' \
+ 'third_party/catapult/tracing/third_party/mannwhitneyu' \
'third_party/catapult/third_party/py_vulcanize' \
'third_party/catapult/third_party/py_vulcanize/third_party/rcssmin' \
'third_party/catapult/third_party/py_vulcanize/third_party/rjsmin' \
@@ -894,6 +926,41 @@ ln -s %{python_sitearch}/markupsafe third_party/markupsafe
# Fix hardcoded path in remoting code
sed -i 's|/opt/google/chrome-remote-desktop|%{crd_path}|g' remoting/host/setup/daemon_controller_delegate_linux.cc
+export PATH=$PATH:%{_builddir}/depot_tools
+
+%if %{use_gn}
+build/linux/unbundle/replace_gn_files.py --system-libraries \
+ flac \
+%if 0%{?bundleharfbuzz}
+%else
+ harfbuzz-ng \
+%endif
+%if 0%{?bundleicu}
+%else
+ icu \
+%endif
+ libevent \
+ libjpeg \
+ libpng \
+%if %{bundlelibusbx}
+%else
+ libusb \
+%endif
+ libxml \
+ libxslt \
+%if %{bundleopus}
+%else
+ opus \
+%endif
+%if 0%{?bundlere2}
+%else
+ re2 \
+%endif
+ yasm
+
+tools/gn/bootstrap/bootstrap.py -v --gn-gen-args "$CHROMIUM_BROWSER_GN_DEFINES"
+%{target}/gn gen --args="$CHROMIUM_BROWSER_GN_DEFINES" %{target}
+%else
# Update gyp files according to our configuration
# If you will change something in the configuration please update it
# for build/gyp_chromium as well (and vice versa).
@@ -905,6 +972,7 @@ build/gyp_chromium \
-Drelease_extra_cflags="-O1 -fno-inline-functions -fno-inline" \
%endif
$CHROMIUM_BROWSER_GYP_DEFINES
+%endif
%if %{bundlelibusbx}
# no hackity hack hack
@@ -1605,6 +1673,11 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
%{chromium_path}/chromedriver
%changelog
+* Wed Sep 7 2016 Tom Callaway <spot(a)fedoraproject.org> 53.0.2785.92-1
+- add basic framework for gn tooling (disabled because it doesn't work yet)
+- update to 53.0.2785.92
+- fix HOME environment issue in chrome-remote-desktop service file
+
* Mon Aug 29 2016 Tom Callaway <spot(a)fedoraproject.org> 52.0.2743.116-11
- conditionalize Requires: u2f-hidraw-policy so that it is only used on Fedora
- use bundled harfbuzz on EL7
diff --git a/sources b/sources
index 6df5f7a..16ae8c6 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
49a7f897775cce21d2b69968b8af1cea depot_tools.git-master.tar.gz
-5d68885e80dec938f68f033a51639e57 chromium-52.0.2743.116-clean.tar.xz
-c0a1a388c4fb32be8e4afb5ace9e801a policy_templates.zip
+8280c0644492bac9f59f4e25ed11d309 policy_templates.zip
+40aa0cc4407dc8a198aedc29532abeee chromium-53.0.2785.92-clean.tar.xz
7 years, 3 months
[chromium-freeworld: 29/148] use bundled harfbuzz on EL7
by Miro Hrončok
commit 2fd8ecc863e7d33adcc206975824e9d10acd5e45
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Mon Aug 29 13:07:46 2016 -0400
use bundled harfbuzz on EL7
chromium.spec | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
---
diff --git a/chromium.spec b/chromium.spec
index 9c914ee..6355974 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -69,7 +69,9 @@ BuildRequires: libicu-devel >= 5.4
%if 0%{?rhel} == 7
%global bundleopus 1
%global bundlelibusbx 1
+%global bundleharfbuzz 1
%else
+%global bundleharfbuzz 0
%global bundleopus 0
%global bundlelibusbx 0
%endif
@@ -361,6 +363,9 @@ Provides: bundled(fips181) = 2.2.3
Provides: bundled(fontconfig) = 2.11.0
Provides: bundled(gperftools) = svn144
Provides: bundled(gtk3) = 3.1.4
+%if 0%{?bundleharfbuzz}
+Provides: bundled(harfbuzz) = 1.2.7
+%endif
Provides: bundled(hunspell) = 1.3.2
Provides: bundled(iccjpeg)
%if 0%{?bundleicu}
@@ -645,7 +650,11 @@ export CHROMIUM_BROWSER_GYP_DEFINES="\
-Duse_pulseaudio=1 \
-Duse_system_bzip2=1 \
-Duse_system_flac=1 \
+%if 0%{?bundleharfbuzz}
+ -Duse_system_harfbuzz=0 \
+%else
-Duse_system_harfbuzz=1 \
+%endif
%if 0%{?bundleicu}
-Duse_system_icu=0 \
%else
@@ -1596,8 +1605,9 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
%{chromium_path}/chromedriver
%changelog
-* Thu Aug 18 2016 Tom Callaway <spot(a)fedoraproject.org> 52.0.2743.116-11
+* Mon Aug 29 2016 Tom Callaway <spot(a)fedoraproject.org> 52.0.2743.116-11
- conditionalize Requires: u2f-hidraw-policy so that it is only used on Fedora
+- use bundled harfbuzz on EL7
* Thu Aug 18 2016 Tom Callaway <spot(a)fedoraproject.org> 52.0.2743.116-10
- disable gtk3 because it breaks lots of things
7 years, 3 months
[chromium-freeworld: 28/148] disable unavailable Requires on epel7
by Miro Hrončok
commit d0d4125df53e5005d3847e335adbd7599642fc32
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Thu Aug 18 15:47:59 2016 -0400
disable unavailable Requires on epel7
chromium.spec | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
---
diff --git a/chromium.spec b/chromium.spec
index ead6778..9c914ee 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -85,7 +85,7 @@ BuildRequires: libicu-devel >= 5.4
Name: chromium%{chromium_channel}
Version: 52.0.2743.116
-Release: 10%{?dist}
+Release: 11%{?dist}
Summary: A WebKit (Blink) powered web browser
Url: http://www.chromium.org/Home
License: BSD and LGPLv2+ and ASL 2.0 and IJG and MIT and GPLv2+ and ISC and OpenSSL and (MPLv1.1 or GPLv2 or LGPLv2)
@@ -313,8 +313,10 @@ Requires: nss-mdns%{_isa}
# GTK modules it expects to find for some reason.
Requires: libcanberra-gtk2%{_isa}
+%if 0%{?fedora}
# This enables support for u2f tokens
Requires: u2f-hidraw-policy
+%endif
# Once upon a time, we tried to split these out... but that's not worth the effort anymore.
Provides: chromium-ffmpegsumo = %{version}-%{release}
@@ -1594,6 +1596,9 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
%{chromium_path}/chromedriver
%changelog
+* Thu Aug 18 2016 Tom Callaway <spot(a)fedoraproject.org> 52.0.2743.116-11
+- conditionalize Requires: u2f-hidraw-policy so that it is only used on Fedora
+
* Thu Aug 18 2016 Tom Callaway <spot(a)fedoraproject.org> 52.0.2743.116-10
- disable gtk3 because it breaks lots of things
- re-enable hidpi setting
7 years, 3 months
[chromium-freeworld: 27/148] Merge branch 'master' into f24
by Miro Hrončok
commit cd8e259fda11004437eaed8f47156357a56d5af6
Merge: c5612ae 496fc08
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Thu Aug 18 09:42:49 2016 -0400
Merge branch 'master' into f24
chromium.spec | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
---
7 years, 3 months
[chromium-freeworld: 26/148] disable gtk3 because it breaks lots of things
by Miro Hrončok
commit 496fc08b11ca8f65185bfeb211ac2c454fe17d2b
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Thu Aug 18 09:37:04 2016 -0400
disable gtk3 because it breaks lots of things
chromium.spec | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/chromium.spec b/chromium.spec
index afd0848..ead6778 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -63,7 +63,8 @@ BuildRequires: libicu-devel >= 5.4
%global bundlere2 0
-%global gtk3 1
+# Chromium breaks on wayland, hidpi, and colors with gtk3 enabled.
+%global gtk3 0
%if 0%{?rhel} == 7
%global bundleopus 1
@@ -84,7 +85,7 @@ BuildRequires: libicu-devel >= 5.4
Name: chromium%{chromium_channel}
Version: 52.0.2743.116
-Release: 9%{?dist}
+Release: 10%{?dist}
Summary: A WebKit (Blink) powered web browser
Url: http://www.chromium.org/Home
License: BSD and LGPLv2+ and ASL 2.0 and IJG and MIT and GPLv2+ and ISC and OpenSSL and (MPLv1.1 or GPLv2 or LGPLv2)
@@ -719,7 +720,7 @@ export CHROMIUM_BROWSER_GYP_DEFINES="\
-Dlogging_like_official_build=1 \
-Denable_hotwording=0 \
-Duse_aura=1 \
- -Denable_hidpi=0 \
+ -Denable_hidpi=1 \
-Denable_touch_ui=1 \
-Denable_pepper_cdms=1 \
-Denable_webrtc=1 \
@@ -1593,6 +1594,10 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
%{chromium_path}/chromedriver
%changelog
+* Thu Aug 18 2016 Tom Callaway <spot(a)fedoraproject.org> 52.0.2743.116-10
+- disable gtk3 because it breaks lots of things
+- re-enable hidpi setting
+
* Tue Aug 16 2016 Tom Callaway <spot(a)fedoraproject.org> 52.0.2743.116-9
- filter out Requires/Provides for chromium-only libs and plugins
7 years, 3 months
[chromium-freeworld: 25/148] Merge branch 'master' into f24
by Miro Hrončok
commit c5612ae49d606587125b7e60a8e170308de5af0a
Merge: a27e11b a05dc02
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Tue Aug 16 15:31:51 2016 -0400
Merge branch 'master' into f24
chromium.spec | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
---
7 years, 3 months
[chromium-freeworld: 24/148] filter out private requires/provides
by Miro Hrončok
commit a05dc02e80bed1923d168a96d024a766d770e691
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Tue Aug 16 15:30:37 2016 -0400
filter out private requires/provides
chromium.spec | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
---
diff --git a/chromium.spec b/chromium.spec
index af8c149..afd0848 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -8,6 +8,13 @@
%global chromium_path %{_libdir}/chromium-browser%{chromium_channel}
%global crd_path %{_libdir}/chrome-remote-desktop
%global tests 0
+
+# We don't want any libs in these directories to generate Provides
+# Requires is trickier.
+%global __provides_exclude_from %{chromium_path}/.*\\.so|%{chromium_path}/lib/.*\\.so
+%global privlibs libaccessibility|libaura_extra|libaura|libbase_i18n|libbase|libblink_common|libblink_platform|libblink_web|libboringssl|libbrowser_ui_views|libcaptive_portal|libcc_blink|libcc_ipc|libcc_proto|libcc|libcc_surfaces|libchromium_sqlite3|libcloud_policy_proto_generated_compile|libcloud_policy_proto|libcompositor|libcontent|libcrcrypto|libdbus|libdevice_battery|libdevice_bluetooth|libdevice_core|libdevice_event_log_component|libdevice_vibration|libdisplay_compositor|libdisplay|libdisplay_types|libdisplay_util|libdomain_reliability|libEGL|libevents_base|libevents_devices|libevents_devices_x11|libevents_ipc|libevents_ozone_layout|libevents_platform|libevents|libevents_x|libffmpeg|libgcm_driver_common|libgcm|libgesture_detection|libgfx_geometry|libgfx_ipc_geometry|libgfx_ipc_skia|libgfx_ipc|libgfx_range|libgfx|libgfx_vector_icons|libgfx_x11|libgin|libgles2_c_lib|libgles2_implementation|libgles2_utils|libGLESv2|libgl_init|libgl_wrapper|libgpu|libgtk2ui|libicui18n|libicuuc|lib
ipc_mojo|libipc|libkeyboard|libkeyboard_with_content|libkeycodes_x11|libkeyed_service_content|libkeyed_service_core|libmedia_blink|libmedia_gpu|libmedia|libmessage_center|libmidi|libmodules|libmojo_common_lib|libmojo_geometry_lib|libmojo_system_impl|libnative_theme|libnet|libnet_with_v8|libonc_component|libplatform_handle|libpolicy_component|libppapi_host|libppapi_proxy|libppapi_shared|libprefs|libprinting|libprotobuf_lite|libproxy_config|libsandbox_services|libscheduler|libseccomp_bpf_helpers|libseccomp_bpf|libsessions_content|libshared_memory_support|libshell_dialogs|libskia|libsnapshot|libsql|libstorage_common|libstorage|libsuid_sandbox_client|libsurface|libsync_core|libsync_proto|libtracing|libtranslator|libui_base_ime|libui_base|libui_base_x|libui_data_pack|libui_touch_selection|liburl_ipc|liburl_lib|liburl_matcher|libuser_prefs|libv8|libviews|libwallpaper|libwebcore_shared|libwebdata_common|libweb_dialogs|libwebview|libwm|libwtf|libx11_events_platform
+%global __requires_exclude ^(%{privlibs})\\.so
+
# Try to not use the Xvfb as it is slow..
%global tests_force_display 0
# If we build with shared on, then chrome-remote-desktop depends on chromium libs.
@@ -77,7 +84,7 @@ BuildRequires: libicu-devel >= 5.4
Name: chromium%{chromium_channel}
Version: 52.0.2743.116
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: A WebKit (Blink) powered web browser
Url: http://www.chromium.org/Home
License: BSD and LGPLv2+ and ASL 2.0 and IJG and MIT and GPLv2+ and ISC and OpenSSL and (MPLv1.1 or GPLv2 or LGPLv2)
@@ -430,6 +437,7 @@ can include.
%else
%package libs-media
Summary: Shared libraries used by the chromium media subsystem
+Requires: chromium-libs%{_isa} = %{version}
%description libs-media
Shared libraries used by the chromium media subsystem.
@@ -1585,6 +1593,9 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
%{chromium_path}/chromedriver
%changelog
+* Tue Aug 16 2016 Tom Callaway <spot(a)fedoraproject.org> 52.0.2743.116-9
+- filter out Requires/Provides for chromium-only libs and plugins
+
* Tue Aug 16 2016 Tom Callaway <spot(a)fedoraproject.org> 52.0.2743.116-8
- fix path on Requires(post) line for semanage
7 years, 3 months
[chromium-freeworld: 23/148] Merge branch 'master' into f24
by Miro Hrončok
commit a27e11b7994fa47dd8b224fec7c7195c066fb8f5
Merge: bdd1207 4644b6d
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Tue Aug 16 09:20:52 2016 -0400
Merge branch 'master' into f24
chromium.spec | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
---
7 years, 3 months
[chromium-freeworld: 22/148] fix path on semanage Requires(post) line
by Miro Hrončok
commit 4644b6d7e7e03f657fcd7b03baedeba8c228def8
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Tue Aug 16 09:19:02 2016 -0400
fix path on semanage Requires(post) line
chromium.spec | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/chromium.spec b/chromium.spec
index 37b107c..af8c149 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -77,7 +77,7 @@ BuildRequires: libicu-devel >= 5.4
Name: chromium%{chromium_channel}
Version: 52.0.2743.116
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: A WebKit (Blink) powered web browser
Url: http://www.chromium.org/Home
License: BSD and LGPLv2+ and ASL 2.0 and IJG and MIT and GPLv2+ and ISC and OpenSSL and (MPLv1.1 or GPLv2 or LGPLv2)
@@ -402,7 +402,7 @@ Provides: bundled(x86inc) = 0
Provides: bundled(zlib) = 1.2.5
# For selinux scriptlet
-Requires(post): /sbin/semanage
+Requires(post): /usr/sbin/semanage
Requires(post): /usr/sbin/restorecon
%description
@@ -1585,6 +1585,9 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
%{chromium_path}/chromedriver
%changelog
+* Tue Aug 16 2016 Tom Callaway <spot(a)fedoraproject.org> 52.0.2743.116-8
+- fix path on Requires(post) line for semanage
+
* Mon Aug 15 2016 Tom Callaway <spot(a)fedoraproject.org> 52.0.2743.116-7
- add Requires(post) items for selinux scriptlets
7 years, 3 months