chromium: Chromium 54.0.2840.100 -> 55.0.2883.75

icu is still bundled by default. If icu is set to unbundled, it will
fail to build things related to nacl.

3 files changed, 21 insertions, 159 deletions

diff --git a/chromium/chromium/chromium-ffmpeg-clean.sh b/chromium/chromium/chromium-ffmpeg-clean.sh
index 9be158d..183f668 100755
--- a/chromium/chromium/chromium-ffmpeg-clean.sh
+++ b/chromium/chromium/chromium-ffmpeg-clean.sh
@@ -28,6 +28,7 @@
 # List of changes:
 #  * Rename: clean_ffmpeg.sh -> chromium-ffmpeg-clean.sh.
 #  * The shebang line no longer hardcodes the path to bash.
+#  * Delete gyp* from other_files because GYP support has been removed.
 
 # $1 files
 # $2 verbose
@@ -184,8 +185,6 @@ other_files="	BUILD.gn \
 		COPYING.LGPLv3 \
 		CREDITS \
 		CREDITS.chromium \
-		ffmpeg.gyp \
-		ffmpeg_generated.gypi \
 		ffmpeg_generated.gni \
 		ffmpeg_options.gni \
 		ffmpegsumo.ver \
diff --git a/chromium/chromium/chromium-fix-undefined-reference.patch b/chromium/chromium/chromium-fix-undefined-reference.patch
deleted file mode 100644
index c0edc4e..0000000
--- a/chromium/chromium/chromium-fix-undefined-reference.patch
+++ /dev/null
@@ -1,150 +0,0 @@
-Index: sandbox/linux/BUILD.gn
-diff --git a/sandbox/linux/BUILD.gn b/sandbox/linux/BUILD.gn
-index 3070b7347bcc115bb1fc145d2162d9db366a6618..1e6d7a1c813296ff9e7d35ffb60340407a54cec7 100644
---- a/sandbox/linux/BUILD.gn
-+++ b/sandbox/linux/BUILD.gn
-@@ -41,10 +41,7 @@ group("sandbox") {
-     public_deps += [ ":suid_sandbox_client" ]
-   }
-   if (use_seccomp_bpf || is_nacl_nonsfi) {
--    public_deps += [
--      ":seccomp_bpf",
--      ":seccomp_bpf_helpers",
--    ]
-+    public_deps += [ ":seccomp_bpf" ]
-   }
- }
- 
-@@ -221,6 +218,14 @@ component("seccomp_bpf") {
-     "bpf_dsl/syscall_set.cc",
-     "bpf_dsl/syscall_set.h",
-     "bpf_dsl/trap_registry.h",
-+    "seccomp-bpf-helpers/baseline_policy.cc",
-+    "seccomp-bpf-helpers/baseline_policy.h",
-+    "seccomp-bpf-helpers/sigsys_handlers.cc",
-+    "seccomp-bpf-helpers/sigsys_handlers.h",
-+    "seccomp-bpf-helpers/syscall_parameters_restrictions.cc",
-+    "seccomp-bpf-helpers/syscall_parameters_restrictions.h",
-+    "seccomp-bpf-helpers/syscall_sets.cc",
-+    "seccomp-bpf-helpers/syscall_sets.h",
-     "seccomp-bpf/die.cc",
-     "seccomp-bpf/die.h",
-     "seccomp-bpf/sandbox_bpf.cc",
-@@ -250,31 +255,6 @@ component("seccomp_bpf") {
-       "bpf_dsl/linux_syscall_ranges.h",
-       "bpf_dsl/seccomp_macros.h",
-       "bpf_dsl/trap_registry.h",
--    ]
--  }
--}
--
--component("seccomp_bpf_helpers") {
--  sources = [
--    "seccomp-bpf-helpers/baseline_policy.cc",
--    "seccomp-bpf-helpers/baseline_policy.h",
--    "seccomp-bpf-helpers/sigsys_handlers.cc",
--    "seccomp-bpf-helpers/sigsys_handlers.h",
--    "seccomp-bpf-helpers/syscall_parameters_restrictions.cc",
--    "seccomp-bpf-helpers/syscall_parameters_restrictions.h",
--    "seccomp-bpf-helpers/syscall_sets.cc",
--    "seccomp-bpf-helpers/syscall_sets.h",
--  ]
--  defines = [ "SANDBOX_IMPLEMENTATION" ]
--
--  deps = [
--    ":sandbox_services",
--    ":seccomp_bpf",
--    "//base",
--  ]
--
--  if (is_nacl_nonsfi) {
--    sources -= [
-       "seccomp-bpf-helpers/baseline_policy.cc",
-       "seccomp-bpf-helpers/baseline_policy.h",
-       "seccomp-bpf-helpers/syscall_sets.cc",
-Index: sandbox/linux/sandbox_linux.gypi
-diff --git a/sandbox/linux/sandbox_linux.gypi b/sandbox/linux/sandbox_linux.gypi
-index c19bdb1c5f67b1fcbebc0b772aae0d07b0ca0eb6..039e9b405174b708ad4fc36049f0f97c6b1ddcd3 100644
---- a/sandbox/linux/sandbox_linux.gypi
-+++ b/sandbox/linux/sandbox_linux.gypi
-@@ -54,7 +54,6 @@
-         [ 'use_seccomp_bpf==1', {
-           'dependencies': [
-             'seccomp_bpf',
--            'seccomp_bpf_helpers',
-           ],
-         }],
-       ],
-@@ -141,6 +140,14 @@
-         'bpf_dsl/syscall_set.cc',
-         'bpf_dsl/syscall_set.h',
-         'bpf_dsl/trap_registry.h',
-+        'seccomp-bpf-helpers/baseline_policy.cc',
-+        'seccomp-bpf-helpers/baseline_policy.h',
-+        'seccomp-bpf-helpers/sigsys_handlers.cc',
-+        'seccomp-bpf-helpers/sigsys_handlers.h',
-+        'seccomp-bpf-helpers/syscall_parameters_restrictions.cc',
-+        'seccomp-bpf-helpers/syscall_parameters_restrictions.h',
-+        'seccomp-bpf-helpers/syscall_sets.cc',
-+        'seccomp-bpf-helpers/syscall_sets.h',
-         'seccomp-bpf/die.cc',
-         'seccomp-bpf/die.h',
-         'seccomp-bpf/sandbox_bpf.cc',
-@@ -168,31 +175,6 @@
-       ],
-     },
-     {
--      'target_name': 'seccomp_bpf_helpers',
--      'type': '<(component)',
--      'sources': [
--        'seccomp-bpf-helpers/baseline_policy.cc',
--        'seccomp-bpf-helpers/baseline_policy.h',
--        'seccomp-bpf-helpers/sigsys_handlers.cc',
--        'seccomp-bpf-helpers/sigsys_handlers.h',
--        'seccomp-bpf-helpers/syscall_parameters_restrictions.cc',
--        'seccomp-bpf-helpers/syscall_parameters_restrictions.h',
--        'seccomp-bpf-helpers/syscall_sets.cc',
--        'seccomp-bpf-helpers/syscall_sets.h',
--      ],
--      'dependencies': [
--        '../base/base.gyp:base',
--        'sandbox_services',
--        'seccomp_bpf',
--      ],
--      'defines': [
--        'SANDBOX_IMPLEMENTATION',
--      ],
--      'include_dirs': [
--        '../..',
--      ],
--    },
--    {
-       # The setuid sandbox, for Linux
-       'target_name': 'chrome_sandbox',
-       'type': 'executable',
-Index: services/shell/runner/host/BUILD.gn
-diff --git a/services/shell/runner/host/BUILD.gn b/services/shell/runner/host/BUILD.gn
-index 813067dece21a83f1422b244939e22e35f64edf8..3b01c0ee162001f827fe1d7404e25ff8bd10aa68 100644
---- a/services/shell/runner/host/BUILD.gn
-+++ b/services/shell/runner/host/BUILD.gn
-@@ -61,7 +61,6 @@ source_set("child_process_base") {
-       "//sandbox/linux:sandbox",
-       "//sandbox/linux:sandbox_services",
-       "//sandbox/linux:seccomp_bpf",
--      "//sandbox/linux:seccomp_bpf_helpers",
-     ]
-   }
- 
-Index: services/shell/shell.gyp
-diff --git a/services/shell/shell.gyp b/services/shell/shell.gyp
-index eff0f628495388f034afd832a7bc8b8ffe8d9144..70349e2590d4e2a5d82198a79099c9eaf069926b 100644
---- a/services/shell/shell.gyp
-+++ b/services/shell/shell.gyp
-@@ -146,7 +146,6 @@
-           '<(DEPTH)/sandbox/sandbox.gyp:sandbox',
-           '<(DEPTH)/sandbox/sandbox.gyp:sandbox_services',
-           '<(DEPTH)/sandbox/sandbox.gyp:seccomp_bpf',
--          '<(DEPTH)/sandbox/sandbox.gyp:seccomp_bpf_helpers',
-         ],
-       }],
-       ['OS=="mac"', {
diff --git a/chromium/chromium/chromium.spec b/chromium/chromium/chromium.spec
index 9df0f2f..2c77faa 100644
--- a/chromium/chromium/chromium.spec
+++ b/chromium/chromium/chromium.spec
@@ -25,6 +25,9 @@
 %bcond_with system_ply
 %endif
 
+# Allow testing whether icu can be unbundled
+%bcond_with system_libicu
+
 # Allow building with symbols to ease debugging
 %bcond_without symbol
 
@@ -32,8 +35,8 @@
 %bcond_without require_clang
 
 Name:       chromium
-Version:    54.0.2840.100
-Release:    1%{?dist}
+Version:    55.0.2883.75
+Release:    100%{?dist}
 Summary:    An open-source project that aims to build a safer, faster, and more stable browser
 
 Group:      Applications/Internet
@@ -78,10 +81,6 @@ Patch0:     chromium-unset-madv_free.patch
 # http://pkgs.fedoraproject.org/cgit/rpms/chromium.git/commit/?id=0df9641
 Patch1:     chromium-last-commit-position.patch
 
-# Add a patch from upstream to fix undefined reference error
-# https://codereview.chromium.org/2291783002
-Patch2:     chromium-fix-undefined-reference.patch
-
 # Building with GCC 6 requires -fno-delete-null-pointer-checks to avoid crashes
 # Unfortunately, it is not possible to add additional compiler flags with
 # environment variables or command-line arguments when building with GN, so we
@@ -134,6 +133,9 @@ BuildRequires: python2-ply
 # replace_gn_files.py --system-libraries
 BuildRequires: flac-devel
 BuildRequires: harfbuzz-devel
+%if %{with system_libicu}
+BuildRequires: libicu-devel
+%endif
 BuildRequires: libjpeg-turbo-devel
 BuildRequires: libpng-devel
 # Chromium requires libvpx 1.5.0 and some non-default options
@@ -209,7 +211,6 @@ Provides:      chromium-libs, chromium-libs-media, chromedriver
     third_party/cld_2 \
     third_party/cld_3 \
     third_party/cros_system_api \
-    third_party/cython/python_flags.py \
     third_party/devscripts \
     third_party/dom_distiller_js \
     third_party/ffmpeg \
@@ -221,7 +222,9 @@ Provides:      chromium-libs, chromium-libs-media, chromedriver
     third_party/google_input_tools/third_party/closure_library/third_party/closure \
     third_party/hunspell \
     third_party/iccjpeg \
+%if !%{with system_libicu}
     third_party/icu \
+%endif
     third_party/jstemplate \
     third_party/khronos \
     third_party/leveldatabase \
@@ -294,6 +297,9 @@ Provides:      chromium-libs, chromium-libs-media, chromedriver
 ./build/linux/unbundle/replace_gn_files.py --system-libraries \
     flac \
     harfbuzz-ng \
+%if %{with system_libicu}
+    icu \
+%endif
     libjpeg \
     libpng \
 %if %{with system_libvpx}
@@ -459,7 +465,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{chromiumdir}/chromium-browser
 %{chromiumdir}/chrome-sandbox
 %{chromiumdir}/chromedriver
+%if !%{with system_libicu}
 %{chromiumdir}/icudtl.dat
+%endif
 %{chromiumdir}/nacl_helper
 %{chromiumdir}/nacl_helper_bootstrap
 %{chromiumdir}/nacl_irt_x86_64.nexe
@@ -474,6 +482,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Tue Dec 06 2016 - Ting-Wei Lan <lantw44@gmail.com> - 55.0.2883.75-100
+- Update to 55.0.2883.75
+- Re-add the option used to unbundle icu
+- Raise release number to 100 to avoid being replaced by official packages
+
 * Fri Nov 11 2016 - Ting-Wei Lan <lantw44@gmail.com> - 54.0.2840.100-1
 - Update to 54.0.2840.100