From 5db2ad1a1ce2ff7c724d61ec9baeb2daea6a855d Mon Sep 17 00:00:00 2001 From: Tigro Date: Mon, 7 Sep 2015 09:49:47 +0300 Subject: [PATCH 1/3] apply patches from debian --- chromium-browser-stable.spec | 8 ++++++++ chromium-ps-print.patch | 14 ++++++++++++++ chromium-third-party-cookies-off-by-default.patch | 11 +++++++++++ 3 files changed, 33 insertions(+) create mode 100644 chromium-ps-print.patch create mode 100644 chromium-third-party-cookies-off-by-default.patch diff --git a/chromium-browser-stable.spec b/chromium-browser-stable.spec index 6af31bb..743c0a2 100644 --- a/chromium-browser-stable.spec +++ b/chromium-browser-stable.spec @@ -36,6 +36,10 @@ Patch15: chromium-25.0.1364.172-sandbox-pie.patch 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 @@ -194,6 +198,10 @@ members of the Chromium and WebDriver teams. %patch100 -p0 %patch101 -p0 +# new from debian +%patch500 -p0 +%patch501 -p1 + ### build with widevine support # Patch from crbug (chromium bugtracker) diff --git a/chromium-ps-print.patch b/chromium-ps-print.patch new file mode 100644 index 0000000..025d9fb --- /dev/null +++ b/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( ++ GTK_PRINT_CAPABILITY_GENERATE_PS | + GTK_PRINT_CAPABILITY_GENERATE_PDF | + GTK_PRINT_CAPABILITY_PAGE_SET | + GTK_PRINT_CAPABILITY_COPIES | diff --git a/chromium-third-party-cookies-off-by-default.patch b/chromium-third-party-cookies-off-by-default.patch new file mode 100644 index 0000000..95726e8 --- /dev/null +++ b/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); + } + From 67c7416f81882ef160db54f161870b6bdb521595 Mon Sep 17 00:00:00 2001 From: Tigro Date: Mon, 7 Sep 2015 10:22:47 +0300 Subject: [PATCH 2/3] fix patch level --- chromium-browser-stable.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/chromium-browser-stable.spec b/chromium-browser-stable.spec index 743c0a2..bd1fd52 100644 --- a/chromium-browser-stable.spec +++ b/chromium-browser-stable.spec @@ -199,8 +199,8 @@ members of the Chromium and WebDriver teams. %patch101 -p0 # new from debian -%patch500 -p0 -%patch501 -p1 +%patch500 -p1 +%patch501 -p2 ### build with widevine support From b28eece910048f089e560044dc222f20416a4440 Mon Sep 17 00:00:00 2001 From: Tigro Date: Mon, 7 Sep 2015 11:03:24 +0300 Subject: [PATCH 3/3] apply gcc patch --- chromium-browser-stable.spec | 4 ++ chromium-gcc4.7.patch | 93 ++++++++++++++++++++++++++++++++++++ 2 files changed, 97 insertions(+) create mode 100644 chromium-gcc4.7.patch diff --git a/chromium-browser-stable.spec b/chromium-browser-stable.spec index bd1fd52..d4e7696 100644 --- a/chromium-browser-stable.spec +++ b/chromium-browser-stable.spec @@ -32,6 +32,8 @@ 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 @@ -194,6 +196,8 @@ members of the Chromium and WebDriver teams. #patch14 -p1 %patch15 -p1 +%patch20 -p2 + # archlinux arm enhancements %patch100 -p0 %patch101 -p0 diff --git a/chromium-gcc4.7.patch b/chromium-gcc4.7.patch new file mode 100644 index 0000000..c7c0bcf --- /dev/null +++ b/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 + #include + #include ++#include + + #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 + // 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 + + // 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 // for std::ptrdiff_t + #include ++#include + + #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 + #include // 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 + + #if defined(HAVE_UNISTD_H) && defined(HAVE_GETPAGESIZE) + #include // 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 // for NULL + #include ++#include + + 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 + #include ++#include + + #include "ui/base/ui_export.h" +