[Pkg-chromium-commit] [pkg-chromium] 01/02: Refreshed patches
Michael Gilbert
mgilbert at moszumanska.debian.org
Sun Apr 13 20:21:48 UTC 2014
This is an automated email from the git hooks/post-receive script.
mgilbert pushed a commit to branch wheezy
in repository pkg-chromium.
commit e13d191d11c71f1249c83cd74ac71c9231f2c049
Author: Giuseppe Iuculano <iuculano at debian.org>
Date: Fri Mar 21 17:07:46 2014 +0100
Refreshed patches
Conflicts:
debian/patches/chromedriver-revision.patch
debian/patches/file-5.17.patch
debian/patches/gold-linker.patch
debian/patches/no-polymer.patch
debian/patches/no-promo.patch
debian/patches/ps-print.patch
debian/patches/third-party-cookies-off-by-default.patch
debian/patches/window-placement.patch
---
debian/patches/expat.patch | 20 ++++++++++----------
debian/patches/fix-manpage.patch | 4 ++--
debian/patches/icon.patch | 4 ++--
debian/patches/nspr.patch | 18 +++++++++---------
debian/patches/nss.patch | 6 +++---
debian/patches/prefs.patch | 4 ++--
debian/patches/system-speech.patch | 16 ++++++++--------
7 files changed, 36 insertions(+), 36 deletions(-)
diff --git a/debian/patches/expat.patch b/debian/patches/expat.patch
index 575d841..dc1eae2 100644
--- a/debian/patches/expat.patch
+++ b/debian/patches/expat.patch
@@ -1,8 +1,8 @@
Include system copy of expat.h
Index: sid/src/third_party/libjingle/source/talk/xmllite/xmlparser.h
===================================================================
---- sid.orig/src/third_party/libjingle/source/talk/xmllite/xmlparser.h 2014-02-13 15:44:48.459431036 +0100
-+++ sid/src/third_party/libjingle/source/talk/xmllite/xmlparser.h 2014-02-13 15:44:48.451431037 +0100
+--- sid.orig/src/third_party/libjingle/source/talk/xmllite/xmlparser.h 2014-03-14 17:19:55.176905796 +0100
++++ sid/src/third_party/libjingle/source/talk/xmllite/xmlparser.h 2014-03-14 17:19:55.172905796 +0100
@@ -32,9 +32,9 @@
#include "talk/xmllite/xmlnsstack.h"
@@ -17,8 +17,8 @@ Index: sid/src/third_party/libjingle/source/talk/xmllite/xmlparser.h
struct XML_ParserStruct;
Index: sid/src/third_party/libjingle/source/talk/xmpp/xmppstanzaparser.cc
===================================================================
---- sid.orig/src/third_party/libjingle/source/talk/xmpp/xmppstanzaparser.cc 2014-02-13 15:44:48.459431036 +0100
-+++ sid/src/third_party/libjingle/source/talk/xmpp/xmppstanzaparser.cc 2014-02-13 15:44:48.451431037 +0100
+--- sid.orig/src/third_party/libjingle/source/talk/xmpp/xmppstanzaparser.cc 2014-03-14 17:19:55.176905796 +0100
++++ sid/src/third_party/libjingle/source/talk/xmpp/xmppstanzaparser.cc 2014-03-14 17:19:55.172905796 +0100
@@ -31,9 +31,9 @@
#include "talk/base/common.h"
#include "talk/xmpp/constants.h"
@@ -33,8 +33,8 @@ Index: sid/src/third_party/libjingle/source/talk/xmpp/xmppstanzaparser.cc
namespace buzz {
Index: sid/src/third_party/skia/src/ports/SkXMLParser_expat.cpp
===================================================================
---- sid.orig/src/third_party/skia/src/ports/SkXMLParser_expat.cpp 2014-02-13 15:44:48.459431036 +0100
-+++ sid/src/third_party/skia/src/ports/SkXMLParser_expat.cpp 2014-02-13 15:44:48.451431037 +0100
+--- sid.orig/src/third_party/skia/src/ports/SkXMLParser_expat.cpp 2014-03-14 17:19:55.176905796 +0100
++++ sid/src/third_party/skia/src/ports/SkXMLParser_expat.cpp 2014-03-14 17:19:55.172905796 +0100
@@ -11,7 +11,7 @@
#include "SkString.h"
#include "SkStream.h"
@@ -46,8 +46,8 @@ Index: sid/src/third_party/skia/src/ports/SkXMLParser_expat.cpp
#define CHAR_16_TO_9
Index: sid/src/third_party/skia/src/ports/SkXMLPullParser_expat.cpp
===================================================================
---- sid.orig/src/third_party/skia/src/ports/SkXMLPullParser_expat.cpp 2014-02-13 15:44:48.459431036 +0100
-+++ sid/src/third_party/skia/src/ports/SkXMLPullParser_expat.cpp 2014-02-13 15:44:48.451431037 +0100
+--- sid.orig/src/third_party/skia/src/ports/SkXMLPullParser_expat.cpp 2014-03-14 17:19:55.176905796 +0100
++++ sid/src/third_party/skia/src/ports/SkXMLPullParser_expat.cpp 2014-03-14 17:19:55.172905796 +0100
@@ -12,7 +12,7 @@
#include "SkString.h"
#include "SkStream.h"
@@ -59,8 +59,8 @@ Index: sid/src/third_party/skia/src/ports/SkXMLPullParser_expat.cpp
{
Index: sid/src/third_party/libjingle/source/talk/xmllite/xmlbuilder.h
===================================================================
---- sid.orig/src/third_party/libjingle/source/talk/xmllite/xmlbuilder.h 2014-02-13 15:44:48.459431036 +0100
-+++ sid/src/third_party/libjingle/source/talk/xmllite/xmlbuilder.h 2014-02-13 15:44:48.455431036 +0100
+--- sid.orig/src/third_party/libjingle/source/talk/xmllite/xmlbuilder.h 2014-03-14 17:19:55.176905796 +0100
++++ sid/src/third_party/libjingle/source/talk/xmllite/xmlbuilder.h 2014-03-14 17:19:55.172905796 +0100
@@ -33,11 +33,7 @@
#include "talk/base/scoped_ptr.h"
#include "talk/xmllite/xmlparser.h"
diff --git a/debian/patches/fix-manpage.patch b/debian/patches/fix-manpage.patch
index 23af626..4bc122d 100644
--- a/debian/patches/fix-manpage.patch
+++ b/debian/patches/fix-manpage.patch
@@ -6,8 +6,8 @@ Last-Update: 2011-02-20
Index: sid/src/chrome/app/resources/manpage.1.in
===================================================================
---- sid.orig/src/chrome/app/resources/manpage.1.in 2014-02-13 15:44:55.363430815 +0100
-+++ sid/src/chrome/app/resources/manpage.1.in 2014-02-13 15:44:55.359430815 +0100
+--- sid.orig/src/chrome/app/resources/manpage.1.in 2014-03-14 17:20:01.580905814 +0100
++++ sid/src/chrome/app/resources/manpage.1.in 2014-03-14 17:20:01.576905814 +0100
@@ -1,5 +1,5 @@
-." This file is processed by chrome.gyp to generate manpages in the
-." build diretory.
diff --git a/debian/patches/icon.patch b/debian/patches/icon.patch
index 9bab07d..719cfbc 100644
--- a/debian/patches/icon.patch
+++ b/debian/patches/icon.patch
@@ -1,7 +1,7 @@
Index: sid/src/chrome/browser/ui/gtk/gtk_util.cc
===================================================================
---- sid.orig/src/chrome/browser/ui/gtk/gtk_util.cc 2014-02-13 15:44:57.127430759 +0100
-+++ sid/src/chrome/browser/ui/gtk/gtk_util.cc 2014-02-13 15:44:57.119430759 +0100
+--- sid.orig/src/chrome/browser/ui/gtk/gtk_util.cc 2014-03-14 17:20:03.532905820 +0100
++++ sid/src/chrome/browser/ui/gtk/gtk_util.cc 2014-03-14 17:20:03.528905820 +0100
@@ -55,7 +55,7 @@
#if defined(GOOGLE_CHROME_BUILD)
static const char* kIconName = "google-chrome";
diff --git a/debian/patches/nspr.patch b/debian/patches/nspr.patch
index 3ad00df..4f327c3 100644
--- a/debian/patches/nspr.patch
+++ b/debian/patches/nspr.patch
@@ -1,9 +1,9 @@
Include system copy of prtime.h
Index: sid/src/chrome/browser/metrics/metrics_log.cc
===================================================================
---- sid.orig/src/chrome/browser/metrics/metrics_log.cc 2014-02-13 15:44:38.435431358 +0100
-+++ sid/src/chrome/browser/metrics/metrics_log.cc 2014-02-13 15:44:38.427431358 +0100
-@@ -20,7 +20,7 @@
+--- sid.orig/src/chrome/browser/metrics/metrics_log.cc 2014-03-14 17:19:44.940905767 +0100
++++ sid/src/chrome/browser/metrics/metrics_log.cc 2014-03-14 17:19:44.936905766 +0100
+@@ -22,7 +22,7 @@
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
#include "base/sys_info.h"
@@ -14,8 +14,8 @@ Index: sid/src/chrome/browser/metrics/metrics_log.cc
#include "chrome/browser/autocomplete/autocomplete_input.h"
Index: sid/src/base/base.gypi
===================================================================
---- sid.orig/src/base/base.gypi 2014-02-13 15:44:38.435431358 +0100
-+++ sid/src/base/base.gypi 2014-02-13 15:44:38.427431358 +0100
+--- sid.orig/src/base/base.gypi 2014-03-14 17:19:44.940905767 +0100
++++ sid/src/base/base.gypi 2014-03-14 17:19:44.936905766 +0100
@@ -25,7 +25,6 @@
'third_party/nspr/prcpucfg_openbsd.h',
'third_party/nspr/prcpucfg_solaris.h',
@@ -26,8 +26,8 @@ Index: sid/src/base/base.gypi
'third_party/xdg_mime/xdgmime.h',
Index: sid/src/base/time/pr_time_unittest.cc
===================================================================
---- sid.orig/src/base/time/pr_time_unittest.cc 2014-02-13 15:44:38.435431358 +0100
-+++ sid/src/base/time/pr_time_unittest.cc 2014-02-13 15:44:38.431431358 +0100
+--- sid.orig/src/base/time/pr_time_unittest.cc 2014-03-14 17:19:44.940905767 +0100
++++ sid/src/base/time/pr_time_unittest.cc 2014-03-14 17:19:44.936905766 +0100
@@ -5,7 +5,7 @@
#include <time.h>
@@ -39,8 +39,8 @@ Index: sid/src/base/time/pr_time_unittest.cc
Index: sid/src/base/time/time.cc
===================================================================
---- sid.orig/src/base/time/time.cc 2014-02-13 15:44:38.435431358 +0100
-+++ sid/src/base/time/time.cc 2014-02-13 15:44:38.431431358 +0100
+--- sid.orig/src/base/time/time.cc 2014-03-14 17:19:44.940905767 +0100
++++ sid/src/base/time/time.cc 2014-03-14 17:19:44.936905766 +0100
@@ -10,8 +10,8 @@
#include "base/float_util.h"
#include "base/lazy_instance.h"
diff --git a/debian/patches/nss.patch b/debian/patches/nss.patch
index 9cce954..7ebbf0c 100644
--- a/debian/patches/nss.patch
+++ b/debian/patches/nss.patch
@@ -1,9 +1,9 @@
webkit needs to call nss to pull in nspr headers
Index: sid/src/chrome/chrome_common.gypi
===================================================================
---- sid.orig/src/chrome/chrome_common.gypi 2014-02-13 15:44:46.043431114 +0100
-+++ sid/src/chrome/chrome_common.gypi 2014-02-13 15:44:46.035431114 +0100
-@@ -540,6 +540,11 @@
+--- sid.orig/src/chrome/chrome_common.gypi 2014-03-14 17:19:52.612905788 +0100
++++ sid/src/chrome/chrome_common.gypi 2014-03-14 17:19:52.608905788 +0100
+@@ -508,6 +508,11 @@
'common/local_discovery/local_discovery_messages.h',
]
}],
diff --git a/debian/patches/prefs.patch b/debian/patches/prefs.patch
index 442a131..d52fce4 100644
--- a/debian/patches/prefs.patch
+++ b/debian/patches/prefs.patch
@@ -2,8 +2,8 @@ Author: Raymond Wooninck (tittiatcoke)
Source: OpenSUSE (chromium-master-prefs-path.patch)
Index: sid/src/chrome/browser/first_run/first_run_internal_linux.cc
===================================================================
---- sid.orig/src/chrome/browser/first_run/first_run_internal_linux.cc 2014-02-13 15:44:51.439430941 +0100
-+++ sid/src/chrome/browser/first_run/first_run_internal_linux.cc 2014-02-13 15:44:51.435430941 +0100
+--- sid.orig/src/chrome/browser/first_run/first_run_internal_linux.cc 2014-03-14 17:19:57.308905802 +0100
++++ sid/src/chrome/browser/first_run/first_run_internal_linux.cc 2014-03-14 17:19:57.300905802 +0100
@@ -19,9 +19,7 @@
base::FilePath MasterPrefsPath() {
diff --git a/debian/patches/system-speech.patch b/debian/patches/system-speech.patch
index 300e044..9bdb9e9 100644
--- a/debian/patches/system-speech.patch
+++ b/debian/patches/system-speech.patch
@@ -1,8 +1,8 @@
Use system speex
Index: sid/src/build/linux/system.gyp
===================================================================
---- sid.orig/src/build/linux/system.gyp 2014-02-13 15:44:53.227430884 +0100
-+++ sid/src/build/linux/system.gyp 2014-02-13 15:44:53.223430884 +0100
+--- sid.orig/src/build/linux/system.gyp 2014-03-14 17:19:59.160905807 +0100
++++ sid/src/build/linux/system.gyp 2014-03-14 17:19:59.156905807 +0100
@@ -337,6 +337,26 @@
],
},
@@ -32,8 +32,8 @@ Index: sid/src/build/linux/system.gyp
'conditions': [
Index: sid/src/content/browser/speech/audio_encoder.cc
===================================================================
---- sid.orig/src/content/browser/speech/audio_encoder.cc 2014-02-13 15:44:53.227430884 +0100
-+++ sid/src/content/browser/speech/audio_encoder.cc 2014-02-13 15:44:53.223430884 +0100
+--- sid.orig/src/content/browser/speech/audio_encoder.cc 2014-03-14 17:19:59.160905807 +0100
++++ sid/src/content/browser/speech/audio_encoder.cc 2014-03-14 17:19:59.156905807 +0100
@@ -11,7 +11,7 @@
#include "base/strings/string_number_conversions.h"
#include "content/browser/speech/audio_buffer.h"
@@ -45,9 +45,9 @@ Index: sid/src/content/browser/speech/audio_encoder.cc
namespace {
Index: sid/src/content/content_browser.gypi
===================================================================
---- sid.orig/src/content/content_browser.gypi 2014-02-13 15:44:53.227430884 +0100
-+++ sid/src/content/content_browser.gypi 2014-02-13 15:44:53.223430884 +0100
-@@ -1555,7 +1555,7 @@
+--- sid.orig/src/content/content_browser.gypi 2014-03-14 17:19:59.160905807 +0100
++++ sid/src/content/content_browser.gypi 2014-03-14 17:19:59.156905807 +0100
+@@ -1627,7 +1627,7 @@
}, { # input_speech==1
'dependencies': [
'../third_party/flac/flac.gyp:libflac',
@@ -55,4 +55,4 @@ Index: sid/src/content/content_browser.gypi
+ '../build/linux/system.gyp:speex',
],
}],
- ],
+ ['OS == "win"', {
--
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