Merge branch 'rosa2014.1' of abf.rosalinux.ru:import/chromium-browser-stable into rosa2014.1

chromium-browser-stable.spec

@@ -32,10 +32,16 @@ Patch8:		adjust-ldflags-no-keep-memory.patch
 # PATCH-FIX-OPENSUSE Compile the sandbox with -fPIE settings
 Patch15:	chromium-25.0.1364.172-sandbox-pie.patch
 
+Patch20:	chromium-gcc4.7.patch
+
 # archlinux arm enhancement patches
 Patch100:	arm-webrtc-fix.patch
 Patch101:	chromium-arm-r0.patch
 
+# New from Debian
+Patch500:	chromium-third-party-cookies-off-by-default.patch
+Patch501:	chromium-ps-print.patch
+
 Provides:	%{crname} = %{EVRD}
 Conflicts:	chromium-browser-unstable
 Conflicts:	chromium-browser-beta
@@ -190,10 +196,16 @@ members of the Chromium and WebDriver teams.
 #patch14 -p1
 %patch15 -p1
 
+%patch20 -p2
+
 # archlinux arm enhancements
 %patch100 -p0
 %patch101 -p0
 
+# new from debian
+%patch500 -p1
+%patch501 -p2
+
 ### build with widevine support
 
 # Patch from crbug (chromium bugtracker)

chromium-gcc4.7.patch

@@ -0,0 +1,93 @@
+Index: sid/src/components/search_engines/template_url_prepopulate_data.h
+===================================================================
+--- sid.orig/src/components/search_engines/template_url_prepopulate_data.h	2012-08-06 10:28:37.000000000 +0200
++++ sid/src/components/search_engines/template_url_prepopulate_data.h	2012-08-06 12:15:50.369548039 +0200
+@@ -9,6 +9,7 @@
+ #include <stddef.h>
+ #include <string>
+ #include <vector>
++#include <cstddef>
+ 
+ #include "base/string16.h"
+ #include "chrome/browser/search_engines/search_engine_type.h"
+Index: sid/src/ipc/ipc_channel.h
+===================================================================
+--- sid.orig/src/ipc/ipc_channel.h	2012-08-06 10:28:14.000000000 +0200
++++ sid/src/ipc/ipc_channel.h	2012-08-06 12:15:50.369548039 +0200
+@@ -1,3 +1,4 @@
++#include <sys/types.h>
+ // Copyright (c) 2012 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.
+Index: sid/src/third_party/ots/src/os2.cc
+===================================================================
+--- sid.orig/src/third_party/ots/src/os2.cc	2012-08-06 10:29:56.000000000 +0200
++++ sid/src/third_party/ots/src/os2.cc	2012-08-06 12:15:50.369548039 +0200
+@@ -5,6 +5,7 @@
+ #include "os2.h"
+ 
+ #include "head.h"
++#include <cstddef>
+ 
+ // OS/2 - OS/2 and Windows Metrics
+ // http://www.microsoft.com/opentype/otspec/os2.htm
+Index: sid/src/third_party/tcmalloc/chromium/src/base/stl_allocator.h
+===================================================================
+--- sid.orig/src/third_party/tcmalloc/chromium/src/base/stl_allocator.h	2012-08-06 10:28:01.000000000 +0200
++++ sid/src/third_party/tcmalloc/chromium/src/base/stl_allocator.h	2012-08-06 12:15:50.373548039 +0200
+@@ -39,6 +39,7 @@
+ 
+ #include <stddef.h>   // for std::ptrdiff_t
+ #include <limits>
++#include <cstddef>
+ 
+ #include "base/logging.h"
+ 
+Index: sid/src/third_party/tcmalloc/chromium/src/base/vdso_support.h
+===================================================================
+--- sid.orig/src/third_party/tcmalloc/chromium/src/base/vdso_support.h	2012-08-06 10:28:01.000000000 +0200
++++ sid/src/third_party/tcmalloc/chromium/src/base/vdso_support.h	2012-08-06 12:15:50.373548039 +0200
+@@ -63,6 +63,7 @@
+ 
+ #define HAVE_VDSO_SUPPORT 1
+ 
++#include <cstddef>
+ #include <stdlib.h>     // for NULL
+ 
+ namespace base {
+Index: sid/src/third_party/tcmalloc/chromium/src/common.cc
+===================================================================
+--- sid.orig/src/third_party/tcmalloc/chromium/src/common.cc	2012-08-06 10:28:01.000000000 +0200
++++ sid/src/third_party/tcmalloc/chromium/src/common.cc	2012-08-06 12:15:50.373548039 +0200
+@@ -33,6 +33,7 @@
+ #include "config.h"
+ #include "common.h"
+ #include "system-alloc.h"
++#include <cstddef>
+ 
+ #if defined(HAVE_UNISTD_H) && defined(HAVE_GETPAGESIZE)
+ #include <unistd.h>                     // for getpagesize
+Index: sid/src/third_party/tcmalloc/chromium/src/symbolize.h
+===================================================================
+--- sid.orig/src/third_party/tcmalloc/chromium/src/symbolize.h	2012-08-06 10:28:01.000000000 +0200
++++ sid/src/third_party/tcmalloc/chromium/src/symbolize.h	2012-08-06 12:15:50.373548039 +0200
+@@ -40,6 +40,7 @@
+ #endif
+ #include <stddef.h>  // for NULL
+ #include <map>
++#include <cstddef>
+ 
+ using std::map;
+ 
+Index: sid/src/ui/gfx/codec/jpeg_codec.h
+===================================================================
+--- sid.orig/src/ui/gfx/codec/jpeg_codec.h	2012-08-06 10:29:01.000000000 +0200
++++ sid/src/ui/gfx/codec/jpeg_codec.h	2012-08-06 12:15:50.373548039 +0200
+@@ -8,6 +8,7 @@
+ 
+ #include <stddef.h>
+ #include <vector>
++#include <cstddef>
+ 
+ #include "ui/base/ui_export.h"
+ 

chromium-ps-print.patch

@@ -0,0 +1,14 @@
+description: add ps printing capability
+author: Salvatore Bonaccorso
+Index: sid/src/chrome/browser/printing/print_dialog_gtk.cc
+===================================================================
+--- sid.orig/src/chrome/browser/ui/libgtk2ui/print_dialog_gtk2.cc	2014-02-13 15:45:02.563430585 +0100
++++ sid/src/chrome/browser/ui/libgtk2ui/print_dialog_gtk2.cc	2014-02-13 15:45:02.559430585 +0100
+@@ -245,6 +245,7 @@
+   // Since we only generate PDF, only show printers that support PDF.
+   // TODO(thestig) Add more capabilities to support?
+   GtkPrintCapabilities cap = static_cast<GtkPrintCapabilities>(
++      GTK_PRINT_CAPABILITY_GENERATE_PS |
+       GTK_PRINT_CAPABILITY_GENERATE_PDF |
+       GTK_PRINT_CAPABILITY_PAGE_SET |
+       GTK_PRINT_CAPABILITY_COPIES |

chromium-third-party-cookies-off-by-default.patch

@@ -0,0 +1,11 @@
+--- src/components/content_settings/core/browser/cookie_settings.cc~	2015-09-02 11:00:33.000000000 +0000
++++ src/components/content_settings/core/browser/cookie_settings.cc	2015-09-03 09:30:37.497315300 +0000
+@@ -82,7 +82,7 @@
+ void CookieSettings::RegisterProfilePrefs(
+     user_prefs::PrefRegistrySyncable* registry) {
+   registry->RegisterBooleanPref(
+-      prefs::kBlockThirdPartyCookies, false,
++      prefs::kBlockThirdPartyCookies, true,
+       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
+ }
+