[Pkg-chromium-commit] [pkg-chromium] 01/02: refresh patches for chromium 31
Michael Gilbert
mgilbert at moszumanska.debian.org
Sun Nov 24 01:08:45 UTC 2013
This is an automated email from the git hooks/post-receive script.
mgilbert pushed a commit to branch master
in repository pkg-chromium.
commit e77b4d2ac52dea67c6ea259bc0751150f96cc4c4
Author: Michael Gilbert <mgilbert at debian.org>
Date: Sat Nov 16 23:09:17 2013 +0000
refresh patches for chromium 31
---
debian/patches/gold-linker.patch | 10 +++++-----
debian/patches/nspr.patch | 32 +++++++++++++++++---------------
debian/patches/nss.patch | 10 +++++-----
debian/patches/ps-print.patch | 8 +++++---
debian/patches/system-speech.patch | 22 +++++++++++-----------
5 files changed, 43 insertions(+), 39 deletions(-)
diff --git a/debian/patches/gold-linker.patch b/debian/patches/gold-linker.patch
index 4ef7d5c..2b47bbf 100644
--- a/debian/patches/gold-linker.patch
+++ b/debian/patches/gold-linker.patch
@@ -1,8 +1,8 @@
-Index: sid/src/build/common.gypi
+Index: chromium/src/build/common.gypi
===================================================================
---- sid.orig/src/build/common.gypi 2013-10-12 16:35:12.094312851 +0200
-+++ sid/src/build/common.gypi 2013-10-12 16:35:12.086312851 +0200
-@@ -2341,6 +2341,7 @@
+--- chromium.orig/src/build/common.gypi 2013-11-13 07:52:27.196671230 +0000
++++ chromium/src/build/common.gypi 2013-11-13 07:52:27.196671230 +0000
+@@ -2371,6 +2371,7 @@
# Don't warn about printf format problems.
# This is off by default in gcc but on in Ubuntu's gcc(!).
'-Wno-format',
@@ -10,7 +10,7 @@ Index: sid/src/build/common.gypi
],
'cflags_cc!': [
# TODO(fischman): remove this.
-@@ -2730,6 +2731,7 @@
+@@ -2759,6 +2760,7 @@
'ldflags': [
'-Wl,-z,now',
'-Wl,-z,relro',
diff --git a/debian/patches/nspr.patch b/debian/patches/nspr.patch
index c148af7..e3a33fc 100644
--- a/debian/patches/nspr.patch
+++ b/debian/patches/nspr.patch
@@ -1,21 +1,21 @@
Include system copy of prtime.h
-Index: sid/src/chrome/browser/metrics/metrics_log.cc
+Index: chromium/src/chrome/browser/metrics/metrics_log.cc
===================================================================
---- sid.orig/src/chrome/browser/metrics/metrics_log.cc 2013-10-12 16:27:35.488492546 +0200
-+++ sid/src/chrome/browser/metrics/metrics_log.cc 2013-10-12 16:29:00.749840789 +0200
+--- chromium.orig/src/chrome/browser/metrics/metrics_log.cc 2013-11-13 07:50:26.980675623 +0000
++++ chromium/src/chrome/browser/metrics/metrics_log.cc 2013-11-13 07:52:01.556672167 +0000
@@ -21,7 +21,7 @@
- #include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
#include "base/sys_info.h"
+ #include "base/test/perftimer.h"
-#include "base/third_party/nspr/prtime.h"
+#include <nspr/prtime.h>
#include "base/time/time.h"
#include "base/tracked_objects.h"
#include "chrome/browser/autocomplete/autocomplete_input.h"
-Index: sid/src/base/base.gypi
+Index: chromium/src/base/base.gypi
===================================================================
---- sid.orig/src/base/base.gypi 2013-10-12 16:27:35.488492546 +0200
-+++ sid/src/base/base.gypi 2013-10-12 16:27:35.484494546 +0200
+--- chromium.orig/src/base/base.gypi 2013-11-13 07:50:26.980675623 +0000
++++ chromium/src/base/base.gypi 2013-11-13 07:50:26.928675625 +0000
@@ -25,7 +25,6 @@
'third_party/nspr/prcpucfg_openbsd.h',
'third_party/nspr/prcpucfg_solaris.h',
@@ -24,10 +24,10 @@ Index: sid/src/base/base.gypi
'third_party/nspr/prtime.h',
'third_party/nspr/prtypes.h',
'third_party/xdg_mime/xdgmime.h',
-Index: sid/src/base/time/pr_time_unittest.cc
+Index: chromium/src/base/time/pr_time_unittest.cc
===================================================================
---- sid.orig/src/base/time/pr_time_unittest.cc 2013-10-12 10:33:49.000000000 +0200
-+++ sid/src/base/time/pr_time_unittest.cc 2013-10-12 16:29:39.378516904 +0200
+--- chromium.orig/src/base/time/pr_time_unittest.cc 2013-11-13 07:50:26.980675623 +0000
++++ chromium/src/base/time/pr_time_unittest.cc 2013-11-13 07:50:26.928675625 +0000
@@ -5,7 +5,7 @@
#include <time.h>
@@ -37,16 +37,18 @@ Index: sid/src/base/time/pr_time_unittest.cc
#include "base/time/time.h"
#include "testing/gtest/include/gtest/gtest.h"
-Index: sid/src/base/time/time.cc
+Index: chromium/src/base/time/time.cc
===================================================================
---- sid.orig/src/base/time/time.cc 2013-10-12 10:33:49.000000000 +0200
-+++ sid/src/base/time/time.cc 2013-10-12 16:30:11.562416992 +0200
-@@ -10,7 +10,7 @@
+--- chromium.orig/src/base/time/time.cc 2013-11-13 07:50:26.980675623 +0000
++++ chromium/src/base/time/time.cc 2013-11-13 07:51:53.344672467 +0000
+@@ -9,8 +9,8 @@
+
#include "base/float_util.h"
#include "base/logging.h"
- #include "base/strings/sys_string_conversions.h"
-#include "base/third_party/nspr/prtime.h"
+-#include "base/third_party/nspr/prtypes.h"
+#include <nspr/prtime.h>
++#include <nspr/prtypes.h>
namespace base {
diff --git a/debian/patches/nss.patch b/debian/patches/nss.patch
index 74c69d0..795be34 100644
--- a/debian/patches/nss.patch
+++ b/debian/patches/nss.patch
@@ -1,10 +1,10 @@
webkit needs to call nss to pull in nspr headers
-Index: sid/src/chrome/chrome_common.gypi
+Index: chromium/src/chrome/chrome_common.gypi
===================================================================
---- sid.orig/src/chrome/chrome_common.gypi 2013-10-12 16:30:47.608385096 +0200
-+++ sid/src/chrome/chrome_common.gypi 2013-10-12 16:30:47.600389094 +0200
-@@ -607,6 +607,11 @@
- 'common/local_discovery/service_discovery_client.h',
+--- chromium.orig/src/chrome/chrome_common.gypi 2013-11-13 07:52:09.572671874 +0000
++++ chromium/src/chrome/chrome_common.gypi 2013-11-13 07:52:09.572671874 +0000
+@@ -606,6 +606,11 @@
+ 'common/local_discovery/local_discovery_messages.h',
]
}],
+ ['OS=="linux"', {
diff --git a/debian/patches/ps-print.patch b/debian/patches/ps-print.patch
index 583e80f..095f354 100644
--- a/debian/patches/ps-print.patch
+++ b/debian/patches/ps-print.patch
@@ -1,8 +1,10 @@
description: add ps printing capability
author: Salvatore Bonaccorso
---- a/src/chrome/browser/printing/print_dialog_gtk.cc
-+++ b/src/chrome/browser/printing/print_dialog_gtk.cc
-@@ -241,6 +241,7 @@
+Index: chromium/src/chrome/browser/printing/print_dialog_gtk.cc
+===================================================================
+--- chromium.orig/src/chrome/browser/printing/print_dialog_gtk.cc 2013-11-13 07:52:35.136670940 +0000
++++ chromium/src/chrome/browser/printing/print_dialog_gtk.cc 2013-11-13 07:52:35.136670940 +0000
+@@ -269,6 +269,7 @@
// Since we only generate PDF, only show printers that support PDF.
// TODO(thestig) Add more capabilities to support?
GtkPrintCapabilities cap = static_cast<GtkPrintCapabilities>(
diff --git a/debian/patches/system-speech.patch b/debian/patches/system-speech.patch
index e6577ef..d819cc7 100644
--- a/debian/patches/system-speech.patch
+++ b/debian/patches/system-speech.patch
@@ -1,9 +1,9 @@
Use system speex
-Index: sid/src/build/linux/system.gyp
+Index: chromium/src/build/linux/system.gyp
===================================================================
---- sid.orig/src/build/linux/system.gyp 2013-10-12 16:34:59.322312814 +0200
-+++ sid/src/build/linux/system.gyp 2013-10-12 16:34:59.314312814 +0200
-@@ -635,6 +635,26 @@
+--- chromium.orig/src/build/linux/system.gyp 2013-11-13 07:52:17.688671578 +0000
++++ chromium/src/build/linux/system.gyp 2013-11-13 07:52:17.676671578 +0000
+@@ -699,6 +699,26 @@
],
},
{
@@ -30,10 +30,10 @@ Index: sid/src/build/linux/system.gyp
'target_name': 'gnome_keyring',
'type': 'none',
'conditions': [
-Index: sid/src/content/browser/speech/audio_encoder.cc
+Index: chromium/src/content/browser/speech/audio_encoder.cc
===================================================================
---- sid.orig/src/content/browser/speech/audio_encoder.cc 2013-10-12 16:34:59.322312814 +0200
-+++ sid/src/content/browser/speech/audio_encoder.cc 2013-10-12 16:34:59.314312814 +0200
+--- chromium.orig/src/content/browser/speech/audio_encoder.cc 2013-11-13 07:52:17.688671578 +0000
++++ chromium/src/content/browser/speech/audio_encoder.cc 2013-11-13 07:52:17.676671578 +0000
@@ -11,7 +11,7 @@
#include "base/strings/string_number_conversions.h"
#include "content/browser/speech/audio_buffer.h"
@@ -43,11 +43,11 @@ Index: sid/src/content/browser/speech/audio_encoder.cc
namespace content {
namespace {
-Index: sid/src/content/content_browser.gypi
+Index: chromium/src/content/content_browser.gypi
===================================================================
---- sid.orig/src/content/content_browser.gypi 2013-10-12 16:34:59.322312814 +0200
-+++ sid/src/content/content_browser.gypi 2013-10-12 16:34:59.314312814 +0200
-@@ -1505,7 +1505,7 @@
+--- chromium.orig/src/content/content_browser.gypi 2013-11-13 07:52:17.688671578 +0000
++++ chromium/src/content/content_browser.gypi 2013-11-13 07:52:17.684671578 +0000
+@@ -1555,7 +1555,7 @@
}, { # input_speech==1
'dependencies': [
'../third_party/flac/flac.gyp:libflac',
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-chromium/pkg-chromium.git
More information about the Pkg-chromium-commit
mailing list