up to 42.0.2311.135

Merged branch 'dev-42'

diff --git a/angle.patch b/angle.patch
index ab9b45f815ce828565783e4dfec3c1d8736fc47f..db5f4318f9b5d26092243ba5e74c035df4490059 100644 (file)
--- a/angle.patch
+++ b/angle.patch
@@ -1,9 +1,10 @@
---- a/third_party/angle/src/angle.gypi
-+++ b/third_party/angle/src/angle.gypi
-@@ -52,7 +52,7 @@
+--- chromium-browser-42.0.2311.82/third_party/angle/src/angle.gyp~     2015-04-09 00:14:43.000000000 +0300
++++ chromium-browser-42.0.2311.82/third_party/angle/src/angle.gyp      2015-04-21 22:02:35.668680845 +0300
+@@ -104,8 +104,7 @@
+                         {
                              'action_name': 'Generate ANGLE Commit ID Header',
                              'message': 'Generating ANGLE Commit ID',
-                             # reference the git index as an input, so we rebuild on changes to the index
+-                            # reference the git index as an input, so we rebuild on changes to the index
 -                            'inputs': [ '<(angle_id_script)', '<(angle_path)/.git/index' ],
 +                            'inputs': [ '<(angle_id_script)' ],
                              'outputs': [ '<(angle_id_header)' ],

diff --git a/chromium-browser.spec b/chromium-browser.spec
index 8ea7b211577a421284e741c24e02a92065fc72cc..6f7244a19901094c01e9644e290b58fb84fb4fbe 100644 (file)
--- a/chromium-browser.spec
+++ b/chromium-browser.spec
@@ -73,9 +73,9 @@
 # - http://code.google.com/p/chromium/wiki/LinuxBuildInstructionsPrerequisites
 # - to look for new tarball, use update-source.sh script
 
-%define                branch          41.0.2272
-%define                basever         101
-%define                patchver        118
+%define                branch          42.0.2311
+%define                basever         135
+#define                patchver        118
 %define                gyp_rev 1014
 Summary:       A WebKit powered web browser
 Name:          chromium-browser
@@ -88,7 +88,7 @@ Release:      1
 License:       BSD%{!?with_system_ffmpeg:, LGPL v2+ (ffmpeg)}
 Group:         X11/Applications/Networking
 Source0:       http://carme.pld-linux.org/~glen/chromium-browser/src/stable/%{name}-%{branch}.%{basever}.tar.xz
-# Source0-md5: a493cd513f2724eb63d6721707e11c4a
+# Source0-md5: 817a2db7a43928ed2d0c60460c13f4b1
 %if "%{?patchver}" != ""
 Patch0:                http://carme.pld-linux.org/~glen/chromium-browser/src/stable/%{name}-%{version}.patch.xz
 # Patch0-md5:  fc9cd6fd3392142db2ada6b98b89fa80
@@ -103,7 +103,6 @@ Source8:    get-source.sh
 Source9:       master_preferences.json
 # https://github.com/Kelvin-Ng/Kelvin-Gentoo-Overlay/tree/master/www-client/chromium/files
 Patch2:                enable-video-decode-accel.patch
-Patch4:                path-libpdf.patch
 Patch7:                dlopen_sonamed_gl.patch
 Patch8:                chromium_useragent.patch.in
 # https://bugs.gentoo.org/show_bug.cgi?id=393471
@@ -122,6 +121,7 @@ Patch35:    etc-dir.patch
 Patch36:       angle.patch
 Patch37:       %{name}-build.patch
 Patch38:       vaapi_include.patch
+Patch39:       libsecret.patch
 URL:           http://www.chromium.org/Home
 %{?with_gconf:BuildRequires:   GConf2-devel}
 %{?with_system_mesa:BuildRequires:     Mesa-libGL-devel >= 9.1}
@@ -161,6 +161,7 @@ BuildRequires:      libevent-devel
 %{?with_libjpegturbo:BuildRequires:    libjpeg-turbo-devel >= 1.2.0}
 %{?with_system_libmtp:BuildRequires:   libmtp-devel >= 1.1.3}
 BuildRequires: libpng-devel
+BuildRequires: libsecret-devel
 %{?with_selinux:BuildRequires: libselinux-devel}
 BuildRequires: libstdc++-devel
 %{?with_system_libusb:BuildRequires:   libusb-devel >= 1.0}
@@ -313,7 +314,6 @@ sed -e 's/@BUILD_DIST@/PLD %{pld_version}/g' \
 ln -s %{SOURCE7} .
 
 #%patch2 -p1 CHECK
-%patch4 -p3
 %patch7 -p1
 %patch15 -p2
 %{!?with_libjpegturbo:%patch11 -p0}
@@ -329,6 +329,7 @@ ln -s %{SOURCE7} .
 %patch36 -p1
 %patch37 -p1
 #%patch38 -p1 CHECK
+%patch39 -p1
 
 %{?with_dev:exit 0}
 
@@ -547,7 +548,6 @@ install -p chrome_sandbox $RPM_BUILD_ROOT%{_libdir}/%{name}/chrome-sandbox
 %if %{without system_ffmpeg}
 install -p libffmpegsumo.so $RPM_BUILD_ROOT%{_libdir}/%{name}
 %endif
-install -p libpdf.so $RPM_BUILD_ROOT%{_libdir}/%{name}
 cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_desktopdir}
 cp -p %{SOURCE9} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/master_preferences
 
@@ -637,9 +637,6 @@ fi
 %{_libdir}/%{name}/locales
 %{_libdir}/%{name}/resources
 
-# conflicts with browser-plugin-chrome-pdf?
-%attr(755,root,root) %{_libdir}/%{name}/libpdf.so
-
 %dir %{_datadir}/%{name}
 %dir %{_datadir}/%{name}/locales
 %{_datadir}/%{name}/locales/en-US.pak

diff --git a/clean-source.sh b/clean-source.sh
index c6790740c9aab16ee586d036d36e9267527e677e..d426c37fa9e96e6f34c4ef127b09f78fb0f2caf9 100755 (executable)
--- a/clean-source.sh
+++ b/clean-source.sh
@@ -49,7 +49,7 @@ remove_nonessential_dirs() {
        ash/shell/cocoa \
        ash/system/chromeos_ \
        base/android \
-       base/chromeos \
+       base/chromeos_ \
        base/ios \
        breakpad/src/client/mac \
        breakpad/src/common/android \
@@ -596,10 +596,11 @@ clean_third_party() {
                '!' -iname '*.isolate' \
                '!' -path 'third_party/WebKit/*' \
                '!' -path 'third_party/adobe/flash/*' \
+               '!' -path 'third_party/analytics/*' \
                '!' -path 'third_party/angle/enumerate_files.py' \
+               '!' -path 'third_party/angle/include/*.h' \
                '!' -path 'third_party/angle/include/EGL/*' \
                '!' -path 'third_party/angle/include/GLSLANG/*' \
-               '!' -path 'third_party/angle/include/*.h' \
                '!' -path 'third_party/angle/src/*' \
                '!' -path 'third_party/angle/src/common/*' \
                '!' -path 'third_party/angle/src/compiler/*' \
@@ -644,6 +645,7 @@ clean_third_party() {
                '!' -path 'third_party/mesa/src/include/GL/glxext.h' \
                '!' -path 'third_party/mesa/src/include/GL/osmesa.h' \
                '!' -path 'third_party/modp_b64/*' \
+               '!' -path 'third_party/mojo/*' \
                '!' -path 'third_party/mt19937ar/*' \
                '!' -path 'third_party/npapi/*' \
                '!' -path 'third_party/openmax_dl/*' \
@@ -667,6 +669,7 @@ clean_third_party() {
                '!' -path 'third_party/trace-viewer/*' \
                '!' -path 'third_party/undoview/*' \
                '!' -path 'third_party/usrsctp/*' \
+               '!' -path 'third_party/web-animations-js/*' \
                '!' -path 'third_party/v8-i18n/*' \
                '!' -path 'third_party/v8/*' \
                '!' -path 'third_party/webrtc/*' \
@@ -739,7 +742,7 @@ remove_tests() {
        breakpad/src/client/windows/tests \
        breakpad/src/common/linux/tests \
        breakpad/src/common/tests \
-       cc/test \
+       cc/test_ \
        chrome/browser/chromeos/bluetooth/test \
        chrome/browser/component_updater/test \
        chrome/browser/extensions/api/test_ \
@@ -1039,6 +1042,7 @@ remove_tests() {
                -print -delete || :
 }
 # }}}
+
 # {{{ remove_bundled_libraries
 # Remove most bundled libraries. Some are still needed.
 # Sync this with gentoo/chromium-*.ebuild
@@ -1071,6 +1075,7 @@ remove_bundled_libraries() {
                'net/third_party/mozilla_security_manager' \
                'net/third_party/nss' \
                'third_party/WebKit' \
+               'third_party/analytics' \
                'third_party/angle' \
                'third_party/angle/src/third_party/compiler' \
                'third_party/brotli' \
@@ -1106,18 +1111,16 @@ remove_bundled_libraries() {
                'third_party/lzma_sdk' \
                'third_party/mesa' \
                'third_party/modp_b64' \
+               'third_party/mojo' \
                'third_party/mt19937ar' \
                'third_party/npapi' \
                'third_party/openmax_dl' \
                'third_party/opus' \
                'third_party/ots' \
                'third_party/pdfium' \
+               'third_party/pdfium/third_party/base' \
                'third_party/pdfium/third_party/bigint' \
                'third_party/pdfium/third_party/freetype' \
-               'third_party/pdfium/third_party/logging.h' \
-               'third_party/pdfium/third_party/macros.h' \
-               'third_party/pdfium/third_party/numerics' \
-               'third_party/pdfium/third_party/template_util.h' \
                'third_party/polymer' \
                'third_party/protobuf' \
                'third_party/qcms' \
@@ -1127,7 +1130,6 @@ remove_bundled_libraries() {
                'third_party/smhasher' \
                'third_party/sqlite' \
                'third_party/tcmalloc' \
-               'third_party/tlslite' \
                'third_party/trace-viewer' \
                'third_party/trace-viewer/third_party/components/polymer' \
                'third_party/trace-viewer/third_party/d3' \
@@ -1137,6 +1139,7 @@ remove_bundled_libraries() {
                'third_party/trace-viewer/third_party/tvcm/third_party/beautifulsoup/polymer_soup.py' \
                'third_party/undoview' \
                'third_party/usrsctp' \
+               'third_party/web-animations-js' \
                'third_party/webdriver' \
                'third_party/webrtc' \
                'third_party/widevine' \

diff --git a/libsecret.patch b/libsecret.patch
new file mode 100644 (file)
index 0000000..e55b0f7
--- /dev/null
+++ b/libsecret.patch
@@ -0,0 +1,14 @@
+diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
+index af7c775..e32fd13 100644
+--- a/chrome/chrome_browser.gypi
++++ b/chrome/chrome_browser.gypi
+@@ -3246,6 +3246,9 @@
+           'defines': [
+             'USE_LIBSECRET',
+           ],
++          'cflags': [
++            '<!@(pkg-config --cflags libsecret-1)',
++          ],
+         }],
+         ['use_aura==1', {
+           'sources': [ '<@(chrome_browser_aura_sources)' ],

diff --git a/path-libpdf.patch b/path-libpdf.patch
deleted file mode 100644 (file)
index e11e5bc..0000000
--- a/path-libpdf.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-In PLD Linux, browser-plugins framework symlinks enabled plugins to plugins/ dir
-access directly from there, instead of symlinking in google-chrome.spec
-
---- chromium-browser-20.0.1132.57/./src/chrome/common/chrome_paths.cc~ 2012-07-13 21:13:51.000000000 +0300
-+++ chromium-browser-20.0.1132.57/./src/chrome/common/chrome_paths.cc  2012-07-13 21:14:41.799431216 +0300
-@@ -255,9 +255,11 @@
-       cur = cur.Append(chrome::kPepperFlashPluginFilename);
-       break;
-     case chrome::FILE_PDF_PLUGIN:
--      if (!GetInternalPluginsDirectory(&cur))
-+      if (!PathService::Get(base::DIR_MODULE, &cur))
-         return false;
--      cur = cur.Append(kInternalPDFPluginFileName);
-+
-+      cur = cur.Append(FILE_PATH_LITERAL("plugins"))
-+               .Append(kInternalPDFPluginFileName);
-       break;
-     case chrome::FILE_NACL_PLUGIN:
-       if (!GetInternalPluginsDirectory(&cur))

diff --git a/system-mesa.patch b/system-mesa.patch
index a2f84845350b933374b281b4832d2b654732cae4..077fd8108ea25988ac68485cc5f93c6aeb3d11b2 100644 (file)
--- a/system-mesa.patch
+++ b/system-mesa.patch
@@ -1,14 +1,14 @@
 in PLD Linux, windows includes are not packaged
 http://lists.pld-linux.org/mailman/pipermail/pld-devel-en/2013-February/023459.html
 
---- chromium-browser-35.0.1916.114/ui/gl/generate_bindings.py~ 2014-05-14 22:23:31.000000000 +0300
-+++ chromium-browser-35.0.1916.114/ui/gl/generate_bindings.py  2014-05-25 23:32:33.414353814 +0300
-@@ -1284,7 +1284,7 @@
+--- chromium-browser-42.0.2311.82/ui/gl/generate_bindings.py~  2015-04-09 00:14:31.000000000 +0300
++++ chromium-browser-42.0.2311.82/ui/gl/generate_bindings.py   2015-04-19 23:32:27.601618454 +0300
+@@ -1616,7 +1616,7 @@
        'EGL_ANGLE_surface_d3d_texture_2d_share_handle',
      ],
    ],
--  [WGL_FUNCTIONS, 'wgl', ['GL/wglext.h'], []],
-+#  [WGL_FUNCTIONS, 'wgl', ['GL/wglext.h'], []],
-   [GLX_FUNCTIONS, 'glx', ['GL/glx.h', 'GL/glxext.h'], []],
+-  [WGL_FUNCTIONS, 'wgl', ['noninclude/GL/wglext.h'], []],
++#  [WGL_FUNCTIONS, 'wgl', ['noninclude/GL/wglext.h'], []],
+   [GLX_FUNCTIONS, 'glx', ['GL/glx.h', 'noninclude/GL/glxext.h'], []],
  ]