Merge pull request #678 from lrusak/chromium

chromium: update to 53.0.2785.92

packages/addons/browser/chromium/changelog.txt

@@ -1,3 +1,6 @@
+8.0.104
+- Update to 53.0.2785.92
+
 8.0.103
 - add xdotool
 

packages/addons/browser/chromium/package.mk

@@ -19,8 +19,8 @@
 ################################################################################
 
 PKG_NAME="chromium"
-PKG_VERSION="50.0.2661.75"
-PKG_REV="103"
+PKG_VERSION="53.0.2785.92"
+PKG_REV="104"
 PKG_ARCH="x86_64"
 PKG_LICENSE="Mixed"
 PKG_SITE="http://www.chromium.org/Home"
@@ -29,7 +29,7 @@ PKG_DEPENDS_TARGET="toolchain pciutils dbus libXcomposite libXcursor libXtst als
 PKG_PRIORITY="optional"
 PKG_SECTION="browser"
 PKG_SHORTDESC="Chromium Browser: the open-source web browser from Google"
-PKG_LONGDESC="Chromium Browser: the open-source web browser from Google"
+PKG_LONGDESC="Chromium Browser ($PKG_VERSION): the open-source web browser from Google"
 PKG_AUTORECONF="no"
 
 PKG_IS_ADDON="yes"
@@ -45,6 +45,8 @@ pre_make_target() {
 
   # https://groups.google.com/a/chromium.org/d/topic/chromium-packagers/9JX1N2nf4PU/discussion
   touch chrome/test/data/webui/i18n_process_css_test.html
+
+  sed -i -e 's/@WIDEVINE_VERSION@/Pinkie Pie/' third_party/widevine/cdm/stub/widevine_cdm_version.h
 }
 
 make_target() {

packages/addons/browser/chromium/patches/chromium-0001_widevine.patch

@@ -1,46 +1,3 @@
-diff -upr chromium-48.0.2564.82.orig/chrome/common/chrome_content_client.cc chromium-48.0.2564.82/chrome/common/chrome_content_client.cc
---- chromium-48.0.2564.82.orig/chrome/common/chrome_content_client.cc	2016-01-20 22:01:20.000000000 +0200
-+++ chromium-48.0.2564.82/chrome/common/chrome_content_client.cc	2016-01-21 20:02:02.788936626 +0200
-@@ -158,7 +158,12 @@ void ComputeBuiltInPlugins(std::vector<c
- #if defined(WIDEVINE_CDM_AVAILABLE) && defined(ENABLE_PEPPER_CDMS) && \
-     !defined(WIDEVINE_CDM_IS_COMPONENT)
-   static bool skip_widevine_cdm_file_check = false;
--  if (PathService::Get(chrome::FILE_WIDEVINE_CDM_ADAPTER, &path)) {
-+  bool widevine_cdm_present =
-+      skip_widevine_cdm_file_check ||
-+      (PathService::Get(chrome::FILE_WIDEVINE_CDM, &path) &&
-+       base::PathExists(path));
-+  if (widevine_cdm_present &&
-+      PathService::Get(chrome::FILE_WIDEVINE_CDM_ADAPTER, &path)) {
-     if (skip_widevine_cdm_file_check || base::PathExists(path)) {
-       content::PepperPluginInfo widevine_cdm;
-       widevine_cdm.is_out_of_process = true;
-diff -upr chromium-48.0.2564.82.orig/chrome/common/chrome_paths.cc chromium-48.0.2564.82/chrome/common/chrome_paths.cc
---- chromium-48.0.2564.82.orig/chrome/common/chrome_paths.cc	2016-01-20 22:01:20.000000000 +0200
-+++ chromium-48.0.2564.82/chrome/common/chrome_paths.cc	2016-01-21 19:18:51.287978456 +0200
-@@ -375,6 +375,11 @@ bool PathProvider(int key, base::FilePat
-         return false;
-       cur = cur.AppendASCII(kWidevineCdmAdapterFileName);
-       break;
-+    case chrome::FILE_WIDEVINE_CDM:
-+      if (!GetInternalPluginsDirectory(&cur))
-+        return false;
-+      cur = cur.AppendASCII(kWidevineCdmFileName);
-+      break;
- #endif  // defined(WIDEVINE_CDM_AVAILABLE) && defined(ENABLE_PEPPER_CDMS)
-     case chrome::FILE_RESOURCES_PACK:
- #if defined(OS_MACOSX) && !defined(OS_IOS)
-diff -upr chromium-48.0.2564.82.orig/chrome/common/chrome_paths.h chromium-48.0.2564.82/chrome/common/chrome_paths.h
---- chromium-48.0.2564.82.orig/chrome/common/chrome_paths.h	2016-01-14 03:49:22.000000000 +0200
-+++ chromium-48.0.2564.82/chrome/common/chrome_paths.h	2016-01-21 19:18:51.287978456 +0200
-@@ -99,6 +99,7 @@ enum {
-   DIR_COMPONENT_WIDEVINE_CDM,   // Directory that contains component-updated
-                                 // Widevine CDM files.
-   FILE_WIDEVINE_CDM_ADAPTER,    // Full path to the Widevine CDM adapter file.
-+  FILE_WIDEVINE_CDM,            // Full path to the Widevine CDM file.
-   FILE_RESOURCES_PACK,          // Full path to the .pak file containing
-                                 // binary data (e.g., html files and images
-                                 // used by internal pages).
 diff -upr chromium-48.0.2564.82.orig/third_party/widevine/cdm/stub/widevine_cdm_version.h chromium-48.0.2564.82/third_party/widevine/cdm/stub/widevine_cdm_version.h
 --- chromium-48.0.2564.82.orig/third_party/widevine/cdm/stub/widevine_cdm_version.h	2016-01-14 01:05:17.000000000 +0200
 +++ chromium-48.0.2564.82/third_party/widevine/cdm/stub/widevine_cdm_version.h	2016-01-21 19:18:51.287978456 +0200
@@ -48,6 +5,6 @@ diff -upr chromium-48.0.2564.82.orig/third_party/widevine/cdm/stub/widevine_cdm_
  
  #define WIDEVINE_CDM_AVAILABLE
  
-+#define WIDEVINE_CDM_VERSION_STRING "Pinkie Pie"
++#define WIDEVINE_CDM_VERSION_STRING "@WIDEVINE_VERSION@"
 +
  #endif  // WIDEVINE_CDM_VERSION_H_

packages/addons/browser/chromium/patches/chromium-0002-unset-madv_free.patch

@@ -0,0 +1,15 @@
+diff -up chromium-52.0.2743.116/third_party/WebKit/Source/wtf/allocator/PageAllocator.cpp.madv_free chromium-52.0.2743.116/third_party/WebKit/Source/wtf/allocator/PageAllocator.cpp
+--- chromium-52.0.2743.116/third_party/WebKit/Source/wtf/allocator/PageAllocator.cpp.madv_free	2016-08-15 13:07:29.279655676 -0400
++++ chromium-52.0.2743.116/third_party/WebKit/Source/wtf/allocator/PageAllocator.cpp	2016-08-15 13:08:38.447317416 -0400
+@@ -41,6 +41,11 @@
+ #include <errno.h>
+ #include <sys/mman.h>
+ 
++#if OS(LINUX) && defined(MADV_FREE)
++// Added in Linux 4.5, but it breaks the sandbox.
++#undef MADV_FREE
++#endif
++
+ #ifndef MADV_FREE
+ #define MADV_FREE MADV_DONTNEED
+ #endif