[Pkg-chromium-commit] [pkg-chromium] 01/03: Refreshed patches
Michael Gilbert
mgilbert at moszumanska.debian.org
Sun Feb 16 18:47:18 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 2ba5f87a6adbb9f1a8d757c012213e858dbe13d0
Author: Giuseppe Iuculano <iuculano at debian.org>
Date: Sun Feb 2 19:31:15 2014 +0100
Refreshed patches
Conflicts:
debian/patches/gold-linker.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 | 32 ++++++++++++++++----------------
debian/patches/nss.patch | 8 ++++----
debian/patches/prefs.patch | 4 ++--
debian/patches/system-speech.patch | 22 +++++++++++-----------
7 files changed, 47 insertions(+), 47 deletions(-)
diff --git a/debian/patches/expat.patch b/debian/patches/expat.patch
index a34b47d..e785ef5 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 2013-10-12 16:30:51.162607105 +0200
-+++ sid/src/third_party/libjingle/source/talk/xmllite/xmlparser.h 2013-10-12 16:30:51.154611105 +0200
+--- sid.orig/src/third_party/libjingle/source/talk/xmllite/xmlparser.h 2014-02-02 19:27:53.356401802 +0100
++++ sid/src/third_party/libjingle/source/talk/xmllite/xmlparser.h 2014-02-02 19:27:53.348401802 +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 2013-10-12 16:30:51.162607105 +0200
-+++ sid/src/third_party/libjingle/source/talk/xmpp/xmppstanzaparser.cc 2013-10-12 16:30:51.154611105 +0200
+--- sid.orig/src/third_party/libjingle/source/talk/xmpp/xmppstanzaparser.cc 2014-02-02 19:27:53.356401802 +0100
++++ sid/src/third_party/libjingle/source/talk/xmpp/xmppstanzaparser.cc 2014-02-02 19:27:53.348401802 +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 2013-10-12 16:30:51.162607105 +0200
-+++ sid/src/third_party/skia/src/ports/SkXMLParser_expat.cpp 2013-10-12 16:30:51.154611105 +0200
+--- sid.orig/src/third_party/skia/src/ports/SkXMLParser_expat.cpp 2014-02-02 19:27:53.356401802 +0100
++++ sid/src/third_party/skia/src/ports/SkXMLParser_expat.cpp 2014-02-02 19:27:53.348401802 +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 2013-10-12 16:30:51.162607105 +0200
-+++ sid/src/third_party/skia/src/ports/SkXMLPullParser_expat.cpp 2013-10-12 16:30:51.154611105 +0200
+--- sid.orig/src/third_party/skia/src/ports/SkXMLPullParser_expat.cpp 2014-02-02 19:27:53.356401802 +0100
++++ sid/src/third_party/skia/src/ports/SkXMLPullParser_expat.cpp 2014-02-02 19:27:53.348401802 +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 2013-10-12 16:30:51.162607105 +0200
-+++ sid/src/third_party/libjingle/source/talk/xmllite/xmlbuilder.h 2013-10-12 16:30:51.154611105 +0200
+--- sid.orig/src/third_party/libjingle/source/talk/xmllite/xmlbuilder.h 2014-02-02 19:27:53.356401802 +0100
++++ sid/src/third_party/libjingle/source/talk/xmllite/xmlbuilder.h 2014-02-02 19:27:53.352401802 +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 634108a..7c7dc59 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 2013-10-12 16:35:02.358312823 +0200
-+++ sid/src/chrome/app/resources/manpage.1.in 2013-10-12 16:35:02.350312823 +0200
+--- sid.orig/src/chrome/app/resources/manpage.1.in 2014-02-02 19:28:01.768401826 +0100
++++ sid/src/chrome/app/resources/manpage.1.in 2014-02-02 19:28:01.760401826 +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 4fb1737..2b571a3 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 2013-10-12 16:35:07.302312837 +0200
-+++ sid/src/chrome/browser/ui/gtk/gtk_util.cc 2013-10-12 16:35:07.298312837 +0200
+--- sid.orig/src/chrome/browser/ui/gtk/gtk_util.cc 2014-02-02 19:28:04.388401833 +0100
++++ sid/src/chrome/browser/ui/gtk/gtk_util.cc 2014-02-02 19:28:04.384401833 +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 e3a33fc..293a146 100644
--- a/debian/patches/nspr.patch
+++ b/debian/patches/nspr.patch
@@ -1,21 +1,21 @@
Include system copy of prtime.h
-Index: chromium/src/chrome/browser/metrics/metrics_log.cc
+Index: sid/src/chrome/browser/metrics/metrics_log.cc
===================================================================
---- 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 @@
+--- sid.orig/src/chrome/browser/metrics/metrics_log.cc 2014-02-02 19:27:05.936401666 +0100
++++ sid/src/chrome/browser/metrics/metrics_log.cc 2014-02-02 19:27:38.964401761 +0100
+@@ -20,7 +20,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: chromium/src/base/base.gypi
+Index: sid/src/base/base.gypi
===================================================================
---- 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
+--- sid.orig/src/base/base.gypi 2014-02-02 19:27:05.936401666 +0100
++++ sid/src/base/base.gypi 2014-02-02 19:27:05.932401666 +0100
@@ -25,7 +25,6 @@
'third_party/nspr/prcpucfg_openbsd.h',
'third_party/nspr/prcpucfg_solaris.h',
@@ -24,10 +24,10 @@ Index: chromium/src/base/base.gypi
'third_party/nspr/prtime.h',
'third_party/nspr/prtypes.h',
'third_party/xdg_mime/xdgmime.h',
-Index: chromium/src/base/time/pr_time_unittest.cc
+Index: sid/src/base/time/pr_time_unittest.cc
===================================================================
---- 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
+--- sid.orig/src/base/time/pr_time_unittest.cc 2014-02-02 19:27:05.936401666 +0100
++++ sid/src/base/time/pr_time_unittest.cc 2014-02-02 19:27:05.932401666 +0100
@@ -5,7 +5,7 @@
#include <time.h>
@@ -37,13 +37,13 @@ Index: chromium/src/base/time/pr_time_unittest.cc
#include "base/time/time.h"
#include "testing/gtest/include/gtest/gtest.h"
-Index: chromium/src/base/time/time.cc
+Index: sid/src/base/time/time.cc
===================================================================
---- 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 @@
-
+--- sid.orig/src/base/time/time.cc 2014-02-02 19:27:05.936401666 +0100
++++ sid/src/base/time/time.cc 2014-02-02 19:27:05.932401666 +0100
+@@ -10,8 +10,8 @@
#include "base/float_util.h"
+ #include "base/lazy_instance.h"
#include "base/logging.h"
-#include "base/third_party/nspr/prtime.h"
-#include "base/third_party/nspr/prtypes.h"
diff --git a/debian/patches/nss.patch b/debian/patches/nss.patch
index 795be34..5a924c1 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: chromium/src/chrome/chrome_common.gypi
+Index: sid/src/chrome/chrome_common.gypi
===================================================================
---- 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 @@
+--- sid.orig/src/chrome/chrome_common.gypi 2014-02-02 19:27:49.660401791 +0100
++++ sid/src/chrome/chrome_common.gypi 2014-02-02 19:27:49.660401791 +0100
+@@ -540,6 +540,11 @@
'common/local_discovery/local_discovery_messages.h',
]
}],
diff --git a/debian/patches/prefs.patch b/debian/patches/prefs.patch
index 93d0c4b..ba69dc5 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 2013-10-12 10:34:48.000000000 +0200
-+++ sid/src/chrome/browser/first_run/first_run_internal_linux.cc 2013-10-12 16:34:34.294312743 +0200
+--- sid.orig/src/chrome/browser/first_run/first_run_internal_linux.cc 2014-02-02 19:27:56.240401810 +0100
++++ sid/src/chrome/browser/first_run/first_run_internal_linux.cc 2014-02-02 19:27:56.236401810 +0100
@@ -19,9 +19,7 @@
base::FilePath MasterPrefsPath() {
diff --git a/debian/patches/system-speech.patch b/debian/patches/system-speech.patch
index d819cc7..3c0ca3f 100644
--- a/debian/patches/system-speech.patch
+++ b/debian/patches/system-speech.patch
@@ -1,9 +1,9 @@
Use system speex
-Index: chromium/src/build/linux/system.gyp
+Index: sid/src/build/linux/system.gyp
===================================================================
---- 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 @@
+--- sid.orig/src/build/linux/system.gyp 2014-02-02 19:27:59.064401818 +0100
++++ sid/src/build/linux/system.gyp 2014-02-02 19:27:59.060401818 +0100
+@@ -337,6 +337,26 @@
],
},
{
@@ -30,10 +30,10 @@ Index: chromium/src/build/linux/system.gyp
'target_name': 'gnome_keyring',
'type': 'none',
'conditions': [
-Index: chromium/src/content/browser/speech/audio_encoder.cc
+Index: sid/src/content/browser/speech/audio_encoder.cc
===================================================================
---- 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
+--- sid.orig/src/content/browser/speech/audio_encoder.cc 2014-02-02 19:27:59.064401818 +0100
++++ sid/src/content/browser/speech/audio_encoder.cc 2014-02-02 19:27:59.060401818 +0100
@@ -11,7 +11,7 @@
#include "base/strings/string_number_conversions.h"
#include "content/browser/speech/audio_buffer.h"
@@ -43,10 +43,10 @@ Index: chromium/src/content/browser/speech/audio_encoder.cc
namespace content {
namespace {
-Index: chromium/src/content/content_browser.gypi
+Index: sid/src/content/content_browser.gypi
===================================================================
---- 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
+--- sid.orig/src/content/content_browser.gypi 2014-02-02 19:27:59.064401818 +0100
++++ sid/src/content/content_browser.gypi 2014-02-02 19:27:59.060401818 +0100
@@ -1555,7 +1555,7 @@
}, { # input_speech==1
'dependencies': [
@@ -55,4 +55,4 @@ Index: chromium/src/content/content_browser.gypi
+ '../build/linux/system.gyp:speex',
],
}],
- ['linux_use_libgps==1', {
+ ],
--
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