[Pkg-chromium-commit] [SCM] Git repository for pkg-chromium branch, experimental, updated. debian/16.0.912.75_r116452-1-3-g625083e
Giuseppe Iuculano
iuculano at debian.org
Thu Jan 26 09:51:46 UTC 2012
The following commit has been merged in the experimental branch:
commit 625083eadeed86fec274e02a3274a03c57d9b44d
Merge: 70fc5ec4d6067981bfeb7947bf100cda74657019 b9c1859681ac731db1d9ee1926d0ff4af6684193
Author: Giuseppe Iuculano <iuculano at debian.org>
Date: Thu Jan 26 10:51:23 2012 +0100
Merge branch 'experimental' of ssh://git.debian.org/git/pkg-chromium/pkg-chromium into experimental
Conflicts:
debian/patches/armv4.patch
debian/patches/glew.patch
debian/patches/prefs.patch
diff --combined debian/patches/expat.patch
index da8d2fd,cd85f73..ddd53a9
--- a/debian/patches/expat.patch
+++ b/debian/patches/expat.patch
@@@ -1,16 -1,4 +1,16 @@@
-Include system copy of expat.h
+From: Giuseppe Iuculano <iuculano at debian.org>
+Date: Sat, 8 May 2010 19:29:40 +0200
+Subject: Include system copy of expat.h
+---
+ src/chrome/browser/autofill/autofill_xml_parser.h | 2 +-
+ .../libjingle/source/talk/xmllite/xmlparser.h | 4 ++--
+ .../libjingle/source/talk/xmpp/xmppstanzaparser.cc | 4 ++--
+ .../skia/src/ports/SkXMLParser_expat.cpp | 2 +-
+ .../skia/src/ports/SkXMLPullParser_expat.cpp | 2 +-
+ 5 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/src/chrome/browser/autofill/autofill_xml_parser.h b/src/chrome/browser/autofill/autofill_xml_parser.h
+index f25e31a9..95cf059c 100644
--- a/src/chrome/browser/autofill/autofill_xml_parser.h
+++ b/src/chrome/browser/autofill/autofill_xml_parser.h
@@ -12,7 +12,7 @@
@@@ -22,8 -10,6 +22,8 @@@
#include "third_party/libjingle/source/talk/xmllite/xmlparser.h"
// The base class that contains common functionality between
+diff --git a/src/third_party/libjingle/source/talk/xmllite/xmlparser.h b/src/third_party/libjingle/source/talk/xmllite/xmlparser.h
+index b461e7e4..935896c6 100644
--- a/src/third_party/libjingle/source/talk/xmllite/xmlparser.h
+++ b/src/third_party/libjingle/source/talk/xmllite/xmlparser.h
@@ -32,9 +32,9 @@
@@@ -38,8 -24,6 +38,8 @@@
#endif // EXPAT_RELATIVE_PATH
struct XML_ParserStruct;
+diff --git a/src/third_party/libjingle/source/talk/xmpp/xmppstanzaparser.cc b/src/third_party/libjingle/source/talk/xmpp/xmppstanzaparser.cc
+index 6c3ef5fe..766d26e0 100644
--- a/src/third_party/libjingle/source/talk/xmpp/xmppstanzaparser.cc
+++ b/src/third_party/libjingle/source/talk/xmpp/xmppstanzaparser.cc
@@ -31,9 +31,9 @@
@@@ -54,8 -38,6 +54,8 @@@
#endif
namespace buzz {
+diff --git a/src/third_party/skia/src/ports/SkXMLParser_expat.cpp b/src/third_party/skia/src/ports/SkXMLParser_expat.cpp
+index c78dc350..7a8147f3 100644
--- a/src/third_party/skia/src/ports/SkXMLParser_expat.cpp
+++ b/src/third_party/skia/src/ports/SkXMLParser_expat.cpp
@@ -11,7 +11,7 @@
@@@ -67,8 -49,6 +67,8 @@@
#ifdef SK_BUILD_FOR_PPI
#define CHAR_16_TO_9
+diff --git a/src/third_party/skia/src/ports/SkXMLPullParser_expat.cpp b/src/third_party/skia/src/ports/SkXMLPullParser_expat.cpp
+index 06cdc653..41051eb5 100644
--- a/src/third_party/skia/src/ports/SkXMLPullParser_expat.cpp
+++ b/src/third_party/skia/src/ports/SkXMLPullParser_expat.cpp
@@ -12,7 +12,7 @@
@@@ -80,3 -60,18 +80,18 @@@
static inline char* dupstr(SkChunkAlloc& chunk, const char src[], size_t len)
{
+ --- a/src/third_party/libjingle/source/talk/xmllite/xmlbuilder.h
+ +++ b/src/third_party/libjingle/source/talk/xmllite/xmlbuilder.h
+ @@ -33,11 +33,7 @@
+ #include "talk/base/scoped_ptr.h"
+ #include "talk/xmllite/xmlparser.h"
+
+ -#ifdef EXPAT_RELATIVE_PATH
+ -#include "expat.h"
+ -#else
+ -#include "third_party/expat/v2_0_1/Source/lib/expat.h"
+ -#endif // EXPAT_RELATIVE_PATH
+ +#include <expat.h>
+
+ namespace buzz {
+
diff --combined debian/patches/nspr.patch
index 0820557,2c5624d..a4c313e
--- a/debian/patches/nspr.patch
+++ b/debian/patches/nspr.patch
@@@ -1,15 -1,4 +1,15 @@@
-Include system copy of prtime.h
+From: Giuseppe Iuculano <iuculano at debian.org>
+Date: Sat, 8 May 2010 11:30:40 +0200
+Subject: Include system copy of prtime.h
+---
+ src/base/pr_time_unittest.cc | 2 +-
+ src/base/time.cc | 2 +-
+ src/chrome/browser/metrics/metrics_log.cc | 2 +-
+ src/chrome/common/metrics_helpers.cc | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/base/pr_time_unittest.cc b/src/base/pr_time_unittest.cc
+index 5c8bad1d..8a9697de 100644
--- a/src/base/pr_time_unittest.cc
+++ b/src/base/pr_time_unittest.cc
@@ -4,7 +4,7 @@
@@@ -21,8 -10,6 +21,8 @@@
#include "base/time.h"
#include "testing/gtest/include/gtest/gtest.h"
+diff --git a/src/base/time.cc b/src/base/time.cc
+index 859810e7..996c33dc 100644
--- a/src/base/time.cc
+++ b/src/base/time.cc
@@ -4,7 +4,7 @@
@@@ -34,8 -21,6 +34,8 @@@
#include "base/logging.h"
+diff --git a/src/chrome/browser/metrics/metrics_log.cc b/src/chrome/browser/metrics/metrics_log.cc
+index d0bffb0d..3702c326 100644
--- a/src/chrome/browser/metrics/metrics_log.cc
+++ b/src/chrome/browser/metrics/metrics_log.cc
@@ -13,7 +13,7 @@
@@@ -47,8 -32,6 +47,8 @@@
#include "base/time.h"
#include "base/utf_string_conversions.h"
#include "chrome/browser/autocomplete/autocomplete.h"
+diff --git a/src/chrome/common/metrics_helpers.cc b/src/chrome/common/metrics_helpers.cc
+index 599bf12a..ea993a0c 100644
--- a/src/chrome/common/metrics_helpers.cc
+++ b/src/chrome/common/metrics_helpers.cc
@@ -11,7 +11,7 @@
@@@ -60,3 -43,35 +60,35 @@@
#include "base/time.h"
#include "base/utf_string_conversions.h"
#include "chrome/common/logging_chrome.h"
+ --- a/src/base/base.gypi
+ +++ b/src/base/base.gypi
+ @@ -18,7 +18,6 @@
+ 'third_party/dynamic_annotations/dynamic_annotations.h',
+ 'third_party/icu/icu_utf.cc',
+ 'third_party/icu/icu_utf.h',
+ - 'third_party/nspr/prtime.cc',
+ 'third_party/nspr/prtime.h',
+ 'third_party/nspr/prcpucfg_linux.h',
+ 'third_party/xdg_mime/xdgmime.h',
+ --- a/src/crypto/nss_util.cc
+ +++ b/src/crypto/nss_util.cc
+ @@ -9,7 +9,7 @@
+ #include <plarena.h>
+ #include <prerror.h>
+ #include <prinit.h>
+ -#include <prtime.h>
+ +#include <nspr/prtime.h>
+ #include <pk11pub.h>
+ #include <secmod.h>
+
+ --- a/src/net/base/x509_certificate_nss.cc
+ +++ b/src/net/base/x509_certificate_nss.cc
+ @@ -9,7 +9,7 @@
+ #include <nss.h>
+ #include <pk11pub.h>
+ #include <prerror.h>
+ -#include <prtime.h>
+ +#include <nspr/prtime.h>
+ #include <secder.h>
+ #include <secerr.h>
+ #include <sechash.h>
--
Git repository for pkg-chromium
More information about the Pkg-chromium-commit
mailing list