[Pkg-chromium-commit] [SCM] Git repository for pkg-chromium branch, master, updated. debian/21.0.1180.89_r154005-1-4-gf840af3
Giuseppe Iuculano
iuculano at debian.org
Mon Oct 1 14:00:26 UTC 2012
The following commit has been merged in the master branch:
commit 3b9811abe5e984b739f3949bc78097e30776a0b5
Author: Giuseppe Iuculano <iuculano at debian.org>
Date: Mon Oct 1 15:20:21 2012 +0200
Updated patches
diff --git a/debian/patches/arm-no-float-abi.patch b/debian/patches/arm-no-float-abi.patch
index 976c12f..2d356a4 100644
--- a/debian/patches/arm-no-float-abi.patch
+++ b/debian/patches/arm-no-float-abi.patch
@@ -1,8 +1,8 @@
Index: sid/src/build/common.gypi
===================================================================
---- sid.orig/src/build/common.gypi 2012-08-06 12:15:02.377549576 +0200
-+++ sid/src/build/common.gypi 2012-08-06 12:15:13.853549209 +0200
-@@ -732,7 +732,7 @@
+--- sid.orig/src/build/common.gypi 2012-09-26 11:06:40.322706593 +0200
++++ sid/src/build/common.gypi 2012-09-26 11:06:54.338706295 +0200
+@@ -779,7 +779,7 @@
'arm_fpu%': 'vfpv3',
# Set ARM float abi compilation flag.
diff --git a/debian/patches/arm.patch b/debian/patches/arm.patch
index f09defc..f98011e 100644
--- a/debian/patches/arm.patch
+++ b/debian/patches/arm.patch
@@ -1,8 +1,8 @@
Index: sid/src/skia/skia.gyp
===================================================================
---- sid.orig/src/skia/skia.gyp 2012-08-06 10:27:59.000000000 +0200
-+++ sid/src/skia/skia.gyp 2012-08-06 12:19:18.277541378 +0200
-@@ -1210,9 +1210,11 @@
+--- sid.orig/src/skia/skia.gyp 2012-09-26 07:50:21.000000000 +0200
++++ sid/src/skia/skia.gyp 2012-09-26 11:12:48.050698768 +0200
+@@ -1285,9 +1285,11 @@
[ 'target_arch == "arm" and armv7 != 1', {
'sources': [
'../third_party/skia/src/opts/SkBlitRow_opts_none.cpp',
@@ -16,9 +16,9 @@ Index: sid/src/skia/skia.gyp
],
Index: sid/src/ui/base/resource/data_pack.cc
===================================================================
---- sid.orig/src/ui/base/resource/data_pack.cc 2012-08-06 10:29:02.000000000 +0200
-+++ sid/src/ui/base/resource/data_pack.cc 2012-08-06 12:19:18.277541378 +0200
-@@ -130,9 +130,11 @@
+--- sid.orig/src/ui/base/resource/data_pack.cc 2012-09-26 07:51:53.000000000 +0200
++++ sid/src/ui/base/resource/data_pack.cc 2012-09-26 11:12:48.050698768 +0200
+@@ -146,9 +146,11 @@
// 2) Verify the entries are within the appropriate bounds. There's an extra
// entry after the last item which gives us the length of the last item.
for (size_t i = 0; i < resource_count_ + 1; ++i) {
@@ -33,8 +33,8 @@ Index: sid/src/ui/base/resource/data_pack.cc
UMA_HISTOGRAM_ENUMERATION("DataPack.Load", ENTRY_NOT_FOUND,
Index: sid/src/v8/src/arm/macro-assembler-arm.cc
===================================================================
---- sid.orig/src/v8/src/arm/macro-assembler-arm.cc 2012-08-06 10:30:43.000000000 +0200
-+++ sid/src/v8/src/arm/macro-assembler-arm.cc 2012-08-06 12:19:18.281541378 +0200
+--- sid.orig/src/v8/src/arm/macro-assembler-arm.cc 2012-09-26 07:53:22.000000000 +0200
++++ sid/src/v8/src/arm/macro-assembler-arm.cc 2012-09-26 11:12:48.054698770 +0200
@@ -61,9 +61,9 @@
// We do not support thumb inter-working with an arm architecture not supporting
// the blx instruction (below v5t). If you know what CPU you are compiling for
diff --git a/debian/patches/armv4.patch b/debian/patches/armv4.patch
index 4bdec8b..0c8d44f 100644
--- a/debian/patches/armv4.patch
+++ b/debian/patches/armv4.patch
@@ -1,22 +1,9 @@
Do not use armv4 incopatible code
-Index: sid/src/third_party/skia/include/core/SkMath.h
-===================================================================
---- sid.orig/src/third_party/skia/include/core/SkMath.h 2012-08-06 10:30:10.000000000 +0200
-+++ sid/src/third_party/skia/include/core/SkMath.h 2012-08-06 12:13:40.057552214 +0200
-@@ -156,7 +156,7 @@
- #if defined(__arm__) \
- && !defined(__thumb__) \
- && !defined(__ARM_ARCH_4T__) \
-- && !defined(__ARM_ARCH_5T__)
-+ && 0
- static inline int32_t SkMulS16(S16CPU x, S16CPU y) {
- SkASSERT((int16_t)x == x);
- SkASSERT((int16_t)y == y);
Index: sid/src/build/common.gypi
===================================================================
---- sid.orig/src/build/common.gypi 2012-08-06 10:28:13.000000000 +0200
-+++ sid/src/build/common.gypi 2012-08-06 12:13:40.057552214 +0200
-@@ -2123,6 +2123,7 @@
+--- sid.orig/src/build/common.gypi 2012-09-26 07:50:42.000000000 +0200
++++ sid/src/build/common.gypi 2012-09-26 11:00:38.602714290 +0200
+@@ -2207,6 +2207,7 @@
# silences those warnings, as they are not helpful and
# clutter legitimate warnings.
'-Wno-abi',
@@ -26,9 +13,9 @@ Index: sid/src/build/common.gypi
['arm_thumb==1', {
Index: sid/src/base/debug/debugger_posix.cc
===================================================================
---- sid.orig/src/base/debug/debugger_posix.cc 2012-08-06 10:28:13.000000000 +0200
-+++ sid/src/base/debug/debugger_posix.cc 2012-08-06 12:13:40.057552214 +0200
-@@ -215,7 +215,7 @@
+--- sid.orig/src/base/debug/debugger_posix.cc 2012-09-26 07:50:43.000000000 +0200
++++ sid/src/base/debug/debugger_posix.cc 2012-09-26 11:00:38.606714290 +0200
+@@ -220,7 +220,7 @@
} while (0)
#else
// ARM && !ANDROID
@@ -37,27 +24,3 @@ Index: sid/src/base/debug/debugger_posix.cc
#endif
#else
#define DEBUG_BREAK() asm("int3")
-Index: sid/src/third_party/skia/src/opts/SkBlitRow_opts_arm.cpp
-===================================================================
---- sid.orig/src/third_party/skia/src/opts/SkBlitRow_opts_arm.cpp 2012-08-06 10:30:09.000000000 +0200
-+++ sid/src/third_party/skia/src/opts/SkBlitRow_opts_arm.cpp 2012-08-06 12:13:40.057552214 +0200
-@@ -675,8 +675,8 @@
- /* dst1_scale and dst2_scale*/
- "lsr r9, r5, #24 \n\t" /* src >> 24 */
- "lsr r10, r6, #24 \n\t" /* src >> 24 */
-- "smulbb r9, r9, %[alpha] \n\t" /* r9 = SkMulS16 r9 with src_scale */
-- "smulbb r10, r10, %[alpha] \n\t" /* r10 = SkMulS16 r10 with src_scale */
-+ "mul r9, r9, %[alpha] \n\t" /* r9 = SkMulS16 r9 with src_scale */
-+ "mul r10, r10, %[alpha] \n\t" /* r10 = SkMulS16 r10 with src_scale */
- "lsr r9, r9, #8 \n\t" /* r9 >> 8 */
- "lsr r10, r10, #8 \n\t" /* r10 >> 8 */
- "rsb r9, r9, #256 \n\t" /* dst1_scale = r9 = 255 - r9 + 1 */
-@@ -745,7 +745,7 @@
-
- "lsr r6, r5, #24 \n\t" /* src >> 24 */
- "and r8, r12, r5, lsr #8 \n\t" /* ag = r8 = r5 masked by r12 lsr by #8 */
-- "smulbb r6, r6, %[alpha] \n\t" /* r6 = SkMulS16 with src_scale */
-+ "mul r6, r6, %[alpha] \n\t" /* r6 = SkMulS16 with src_scale */
- "and r9, r12, r5 \n\t" /* rb = r9 = r5 masked by r12 */
- "lsr r6, r6, #8 \n\t" /* r6 >> 8 */
- "mul r8, r8, %[alpha] \n\t" /* ag = r8 times scale */
diff --git a/debian/patches/cups1.5.patch b/debian/patches/cups1.5.patch
index 7138504..ee90c44 100644
--- a/debian/patches/cups1.5.patch
+++ b/debian/patches/cups1.5.patch
@@ -2,10 +2,10 @@ Description: Fix build failure due to cups 1.5 header changes
Author: Michael Gilbert <michael.s.gilbert at gmail.com>
Index: sid/src/printing/backend/cups_helper.h
===================================================================
---- sid.orig/src/printing/backend/cups_helper.h 2012-08-06 10:27:46.000000000 +0200
-+++ sid/src/printing/backend/cups_helper.h 2012-08-06 12:15:11.021549299 +0200
-@@ -7,6 +7,7 @@
- #pragma once
+--- sid.orig/src/printing/backend/cups_helper.h 2012-09-26 07:50:09.000000000 +0200
++++ sid/src/printing/backend/cups_helper.h 2012-09-26 11:06:49.926706388 +0200
+@@ -6,6 +6,7 @@
+ #define PRINTING_BACKEND_CUPS_HELPER_H_
#include <cups/cups.h>
+#include <cups/ppd.h>
@@ -14,8 +14,8 @@ Index: sid/src/printing/backend/cups_helper.h
Index: sid/src/chrome/service/cloud_print/print_system_cups.cc
===================================================================
---- sid.orig/src/chrome/service/cloud_print/print_system_cups.cc 2012-08-06 10:29:01.000000000 +0200
-+++ sid/src/chrome/service/cloud_print/print_system_cups.cc 2012-08-06 12:15:11.021549299 +0200
+--- sid.orig/src/chrome/service/cloud_print/print_system_cups.cc 2012-09-26 07:51:51.000000000 +0200
++++ sid/src/chrome/service/cloud_print/print_system_cups.cc 2012-09-26 11:06:49.930706388 +0200
@@ -5,6 +5,7 @@
#include "chrome/service/cloud_print/print_system.h"
diff --git a/debian/patches/expat.patch b/debian/patches/expat.patch
index e9332eb..c531774 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 2012-08-06 10:33:28.000000000 +0200
-+++ sid/src/third_party/libjingle/source/talk/xmllite/xmlparser.h 2012-08-06 12:12:46.665553924 +0200
+--- sid.orig/src/third_party/libjingle/source/talk/xmllite/xmlparser.h 2012-09-26 07:52:38.000000000 +0200
++++ sid/src/third_party/libjingle/source/talk/xmllite/xmlparser.h 2012-09-26 11:00:22.454714634 +0200
@@ -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 2012-08-06 10:33:25.000000000 +0200
-+++ sid/src/third_party/libjingle/source/talk/xmpp/xmppstanzaparser.cc 2012-08-06 12:12:46.665553924 +0200
+--- sid.orig/src/third_party/libjingle/source/talk/xmpp/xmppstanzaparser.cc 2012-09-26 07:52:35.000000000 +0200
++++ sid/src/third_party/libjingle/source/talk/xmpp/xmppstanzaparser.cc 2012-09-26 11:00:22.454714634 +0200
@@ -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 2012-08-06 10:30:16.000000000 +0200
-+++ sid/src/third_party/skia/src/ports/SkXMLParser_expat.cpp 2012-08-06 12:12:46.665553924 +0200
+--- sid.orig/src/third_party/skia/src/ports/SkXMLParser_expat.cpp 2012-09-26 07:52:51.000000000 +0200
++++ sid/src/third_party/skia/src/ports/SkXMLParser_expat.cpp 2012-09-26 11:00:22.454714634 +0200
@@ -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 2012-08-06 10:30:16.000000000 +0200
-+++ sid/src/third_party/skia/src/ports/SkXMLPullParser_expat.cpp 2012-08-06 12:12:46.665553924 +0200
+--- sid.orig/src/third_party/skia/src/ports/SkXMLPullParser_expat.cpp 2012-09-26 07:52:51.000000000 +0200
++++ sid/src/third_party/skia/src/ports/SkXMLPullParser_expat.cpp 2012-09-26 11:00:22.454714634 +0200
@@ -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 2012-08-06 10:33:28.000000000 +0200
-+++ sid/src/third_party/libjingle/source/talk/xmllite/xmlbuilder.h 2012-08-06 12:12:46.665553924 +0200
+--- sid.orig/src/third_party/libjingle/source/talk/xmllite/xmlbuilder.h 2012-09-26 07:52:38.000000000 +0200
++++ sid/src/third_party/libjingle/source/talk/xmllite/xmlbuilder.h 2012-09-26 11:00:22.454714634 +0200
@@ -33,11 +33,7 @@
#include "talk/base/scoped_ptr.h"
#include "talk/xmllite/xmlparser.h"
diff --git a/debian/patches/ffmpeg_arm.patch b/debian/patches/ffmpeg_arm.patch
index 4a43f45..7e30b7e 100644
--- a/debian/patches/ffmpeg_arm.patch
+++ b/debian/patches/ffmpeg_arm.patch
@@ -1,9 +1,9 @@
description: ffmpeg compatibility on the arm arch
Index: sid/src/third_party/ffmpeg/ffmpeg_generated.gypi
===================================================================
---- sid.orig/src/third_party/ffmpeg/ffmpeg_generated.gypi 2012-08-06 10:29:43.000000000 +0200
-+++ sid/src/third_party/ffmpeg/ffmpeg_generated.gypi 2012-08-06 12:13:43.805552095 +0200
-@@ -168,21 +168,14 @@
+--- sid.orig/src/third_party/ffmpeg/ffmpeg_generated.gypi 2012-09-26 07:52:28.000000000 +0200
++++ sid/src/third_party/ffmpeg/ffmpeg_generated.gypi 2012-09-26 11:04:55.566708822 +0200
+@@ -179,21 +179,14 @@
'libavcodec/arm/dsputil_arm.S',
'libavcodec/arm/dsputil_armv6.S',
'libavcodec/arm/dsputil_init_arm.c',
@@ -23,5 +23,5 @@ Index: sid/src/third_party/ffmpeg/ffmpeg_generated.gypi
'libavcodec/arm/simple_idct_arm.S',
- 'libavcodec/arm/simple_idct_armv5te.S',
'libavcodec/arm/simple_idct_armv6.S',
+ 'libavcodec/arm/vp3dsp_init_arm.c',
'libavcodec/arm/vp8_armv6.S',
- 'libavcodec/arm/vp8dsp_armv6.S',
diff --git a/debian/patches/fix-manpage.patch b/debian/patches/fix-manpage.patch
index 04e07b0..b8e6585 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 2012-08-06 10:28:20.000000000 +0200
-+++ sid/src/chrome/app/resources/manpage.1.in 2012-08-06 12:15:05.973549461 +0200
+--- sid.orig/src/chrome/app/resources/manpage.1.in 2012-09-26 07:50:55.000000000 +0200
++++ sid/src/chrome/app/resources/manpage.1.in 2012-09-26 11:06:43.558706524 +0200
@@ -1,5 +1,5 @@
-." This file is processed by chrome.gyp to generate manpages in the
-." build diretory.
diff --git a/debian/patches/gcc4.7.patch b/debian/patches/gcc4.7.patch
index 3572c9e..f5fcfa4 100644
--- a/debian/patches/gcc4.7.patch
+++ b/debian/patches/gcc4.7.patch
@@ -1,8 +1,8 @@
Index: sid/src/chrome/browser/search_engines/template_url_prepopulate_data.h
===================================================================
---- sid.orig/src/chrome/browser/search_engines/template_url_prepopulate_data.h 2012-08-06 10:28:37.000000000 +0200
-+++ sid/src/chrome/browser/search_engines/template_url_prepopulate_data.h 2012-08-06 12:15:50.369548039 +0200
-@@ -9,6 +9,7 @@
+--- sid.orig/src/chrome/browser/search_engines/template_url_prepopulate_data.h 2012-09-26 07:51:08.000000000 +0200
++++ sid/src/chrome/browser/search_engines/template_url_prepopulate_data.h 2012-09-26 11:12:44.010698853 +0200
+@@ -8,6 +8,7 @@
#include <stddef.h>
#include <string>
#include <vector>
@@ -12,8 +12,8 @@ Index: sid/src/chrome/browser/search_engines/template_url_prepopulate_data.h
#include "chrome/browser/search_engines/search_engine_type.h"
Index: sid/src/gpu/command_buffer/common/types.h
===================================================================
---- sid.orig/src/gpu/command_buffer/common/types.h 2012-08-06 10:27:47.000000000 +0200
-+++ sid/src/gpu/command_buffer/common/types.h 2012-08-06 12:15:50.369548039 +0200
+--- sid.orig/src/gpu/command_buffer/common/types.h 2012-09-26 07:50:10.000000000 +0200
++++ sid/src/gpu/command_buffer/common/types.h 2012-09-26 11:12:44.014698853 +0200
@@ -12,6 +12,7 @@
#endif
#include <cstddef>
@@ -24,8 +24,8 @@ Index: sid/src/gpu/command_buffer/common/types.h
typedef signed char int8;
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
+--- sid.orig/src/ipc/ipc_channel.h 2012-09-26 07:50:43.000000000 +0200
++++ sid/src/ipc/ipc_channel.h 2012-09-26 11:12:44.014698853 +0200
@@ -1,3 +1,4 @@
+#include <sys/types.h>
// Copyright (c) 2012 The Chromium Authors. All rights reserved.
@@ -33,8 +33,8 @@ Index: sid/src/ipc/ipc_channel.h
// 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
+--- sid.orig/src/third_party/ots/src/os2.cc 2012-09-26 07:52:42.000000000 +0200
++++ sid/src/third_party/ots/src/os2.cc 2012-09-26 11:12:44.014698853 +0200
@@ -5,6 +5,7 @@
#include "os2.h"
@@ -45,8 +45,8 @@ Index: sid/src/third_party/ots/src/os2.cc
// 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
+--- sid.orig/src/third_party/tcmalloc/chromium/src/base/stl_allocator.h 2012-09-26 07:50:24.000000000 +0200
++++ sid/src/third_party/tcmalloc/chromium/src/base/stl_allocator.h 2012-09-26 11:12:44.014698853 +0200
@@ -39,6 +39,7 @@
#include <stddef.h> // for std::ptrdiff_t
@@ -57,8 +57,8 @@ Index: sid/src/third_party/tcmalloc/chromium/src/base/stl_allocator.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
+--- sid.orig/src/third_party/tcmalloc/chromium/src/base/vdso_support.h 2012-09-26 07:50:24.000000000 +0200
++++ sid/src/third_party/tcmalloc/chromium/src/base/vdso_support.h 2012-09-26 11:12:44.014698853 +0200
@@ -63,6 +63,7 @@
#define HAVE_VDSO_SUPPORT 1
@@ -69,8 +69,8 @@ Index: sid/src/third_party/tcmalloc/chromium/src/base/vdso_support.h
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
+--- sid.orig/src/third_party/tcmalloc/chromium/src/common.cc 2012-09-26 07:50:24.000000000 +0200
++++ sid/src/third_party/tcmalloc/chromium/src/common.cc 2012-09-26 11:12:44.014698853 +0200
@@ -33,6 +33,7 @@
#include "config.h"
#include "common.h"
@@ -81,8 +81,8 @@ Index: sid/src/third_party/tcmalloc/chromium/src/common.cc
#include <unistd.h> // 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
+--- sid.orig/src/third_party/tcmalloc/chromium/src/symbolize.h 2012-09-26 07:50:24.000000000 +0200
++++ sid/src/third_party/tcmalloc/chromium/src/symbolize.h 2012-09-26 11:12:44.014698853 +0200
@@ -40,6 +40,7 @@
#endif
#include <stddef.h> // for NULL
@@ -93,9 +93,9 @@ Index: sid/src/third_party/tcmalloc/chromium/src/symbolize.h
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 @@
+--- sid.orig/src/ui/gfx/codec/jpeg_codec.h 2012-09-26 07:51:52.000000000 +0200
++++ sid/src/ui/gfx/codec/jpeg_codec.h 2012-09-26 11:12:44.014698853 +0200
+@@ -7,6 +7,7 @@
#include <stddef.h>
#include <vector>
diff --git a/debian/patches/glew.patch b/debian/patches/glew.patch
index 6651dda..0c50d26 100644
--- a/debian/patches/glew.patch
+++ b/debian/patches/glew.patch
@@ -1,8 +1,8 @@
description: use system glew library
Index: sid/src/build/linux/system.gyp
===================================================================
---- sid.orig/src/build/linux/system.gyp 2012-08-06 12:13:54.125551763 +0200
-+++ sid/src/build/linux/system.gyp 2012-08-06 12:15:02.377549576 +0200
+--- sid.orig/src/build/linux/system.gyp 2012-09-26 11:05:25.706708180 +0200
++++ sid/src/build/linux/system.gyp 2012-09-26 11:06:40.318706593 +0200
@@ -497,6 +497,23 @@
},
},
@@ -29,8 +29,8 @@ Index: sid/src/build/linux/system.gyp
'type': 'none',
Index: sid/src/chrome/chrome.gyp
===================================================================
---- sid.orig/src/chrome/chrome.gyp 2012-08-06 10:29:01.000000000 +0200
-+++ sid/src/chrome/chrome.gyp 2012-08-06 12:15:02.377549576 +0200
+--- sid.orig/src/chrome/chrome.gyp 2012-09-26 07:51:51.000000000 +0200
++++ sid/src/chrome/chrome.gyp 2012-09-26 11:06:40.322706593 +0200
@@ -247,6 +247,7 @@
'../base/base.gyp:base',
'../content/content.gyp:content_utility',
@@ -41,9 +41,9 @@ Index: sid/src/chrome/chrome.gyp
'utility/chrome_content_utility_client.cc',
Index: sid/src/build/common.gypi
===================================================================
---- sid.orig/src/build/common.gypi 2012-08-06 12:13:40.057552214 +0200
-+++ sid/src/build/common.gypi 2012-08-06 12:15:02.377549576 +0200
-@@ -1409,6 +1409,7 @@
+--- sid.orig/src/build/common.gypi 2012-09-26 11:00:38.602714290 +0200
++++ sid/src/build/common.gypi 2012-09-26 11:06:40.322706593 +0200
+@@ -1477,6 +1477,7 @@
['enable_gpu==1', {
'defines': [
'ENABLE_GPU=1',
diff --git a/debian/patches/icon.patch b/debian/patches/icon.patch
index 532c6bd..8256d3d 100644
--- a/debian/patches/icon.patch
+++ b/debian/patches/icon.patch
@@ -1,8 +1,8 @@
Index: sid/src/chrome/browser/ui/gtk/gtk_util.cc
===================================================================
---- sid.orig/src/chrome/browser/ui/gtk/gtk_util.cc 2012-08-06 10:28:32.000000000 +0200
-+++ sid/src/chrome/browser/ui/gtk/gtk_util.cc 2012-08-06 12:19:22.081541256 +0200
-@@ -57,7 +57,7 @@
+--- sid.orig/src/chrome/browser/ui/gtk/gtk_util.cc 2012-09-26 07:51:03.000000000 +0200
++++ sid/src/chrome/browser/ui/gtk/gtk_util.cc 2012-09-26 11:12:50.694698711 +0200
+@@ -56,7 +56,7 @@
#if defined(GOOGLE_CHROME_BUILD)
static const char* kIconName = "google-chrome";
#else
diff --git a/debian/patches/nspr.patch b/debian/patches/nspr.patch
index e33d2a0..8a547da 100644
--- a/debian/patches/nspr.patch
+++ b/debian/patches/nspr.patch
@@ -1,8 +1,8 @@
Include system copy of prtime.h
Index: sid/src/base/pr_time_unittest.cc
===================================================================
---- sid.orig/src/base/pr_time_unittest.cc 2012-08-06 10:28:14.000000000 +0200
-+++ sid/src/base/pr_time_unittest.cc 2012-08-06 12:12:18.157554839 +0200
+--- sid.orig/src/base/pr_time_unittest.cc 2012-09-26 07:50:43.000000000 +0200
++++ sid/src/base/pr_time_unittest.cc 2012-09-26 11:00:14.950714796 +0200
@@ -5,7 +5,7 @@
#include <time.h>
@@ -14,8 +14,8 @@ Index: sid/src/base/pr_time_unittest.cc
Index: sid/src/base/time.cc
===================================================================
---- sid.orig/src/base/time.cc 2012-08-06 10:28:14.000000000 +0200
-+++ sid/src/base/time.cc 2012-08-06 12:12:18.157554839 +0200
+--- sid.orig/src/base/time.cc 2012-09-26 07:50:43.000000000 +0200
++++ sid/src/base/time.cc 2012-09-26 11:00:14.950714796 +0200
@@ -10,7 +10,7 @@
#endif
@@ -27,8 +27,8 @@ Index: sid/src/base/time.cc
Index: sid/src/chrome/browser/metrics/metrics_log.cc
===================================================================
---- sid.orig/src/chrome/browser/metrics/metrics_log.cc 2012-08-06 10:28:30.000000000 +0200
-+++ sid/src/chrome/browser/metrics/metrics_log.cc 2012-08-06 12:12:18.161554837 +0200
+--- sid.orig/src/chrome/browser/metrics/metrics_log.cc 2012-09-26 07:51:01.000000000 +0200
++++ sid/src/chrome/browser/metrics/metrics_log.cc 2012-09-26 11:00:14.954714795 +0200
@@ -16,7 +16,7 @@
#include "base/string_number_conversions.h"
#include "base/string_util.h"
@@ -40,8 +40,8 @@ Index: sid/src/chrome/browser/metrics/metrics_log.cc
#include "base/utf_string_conversions.h"
Index: sid/src/base/base.gypi
===================================================================
---- sid.orig/src/base/base.gypi 2012-08-06 10:28:14.000000000 +0200
-+++ sid/src/base/base.gypi 2012-08-06 12:12:18.161554837 +0200
+--- sid.orig/src/base/base.gypi 2012-09-26 07:50:43.000000000 +0200
++++ sid/src/base/base.gypi 2012-09-26 11:00:14.954714795 +0200
@@ -17,7 +17,6 @@
'third_party/dmg_fp/dtoa_wrapper.cc',
'third_party/icu/icu_utf.cc',
@@ -52,8 +52,8 @@ Index: sid/src/base/base.gypi
'third_party/xdg_mime/xdgmime.h',
Index: sid/src/crypto/nss_util.cc
===================================================================
---- sid.orig/src/crypto/nss_util.cc 2012-08-06 10:27:56.000000000 +0200
-+++ sid/src/crypto/nss_util.cc 2012-08-06 12:12:18.161554837 +0200
+--- sid.orig/src/crypto/nss_util.cc 2012-09-26 07:50:19.000000000 +0200
++++ sid/src/crypto/nss_util.cc 2012-09-26 11:00:14.954714795 +0200
@@ -9,7 +9,7 @@
#include <plarena.h>
#include <prerror.h>
@@ -65,8 +65,8 @@ Index: sid/src/crypto/nss_util.cc
Index: sid/src/net/base/x509_certificate_nss.cc
===================================================================
---- sid.orig/src/net/base/x509_certificate_nss.cc 2012-08-06 10:27:59.000000000 +0200
-+++ sid/src/net/base/x509_certificate_nss.cc 2012-08-06 12:12:18.161554837 +0200
+--- sid.orig/src/net/base/x509_certificate_nss.cc 2012-09-26 07:50:21.000000000 +0200
++++ sid/src/net/base/x509_certificate_nss.cc 2012-09-26 11:00:14.958714792 +0200
@@ -9,7 +9,7 @@
#include <keyhi.h>
#include <nss.h>
diff --git a/debian/patches/nss.patch b/debian/patches/nss.patch
index 8374d6e..eafd0c3 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 2012-08-06 10:29:01.000000000 +0200
-+++ sid/src/chrome/chrome_common.gypi 2012-08-06 12:12:25.157554613 +0200
-@@ -299,6 +299,11 @@
+--- sid.orig/src/chrome/chrome_common.gypi 2012-09-26 07:51:51.000000000 +0200
++++ sid/src/chrome/chrome_common.gypi 2012-09-26 11:00:19.462714699 +0200
+@@ -309,6 +309,11 @@
'<(DEPTH)/third_party/wtl/include',
]
}],
diff --git a/debian/patches/prefs.patch b/debian/patches/prefs.patch
index a949f4e..1bb1b45 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_linux.cc
===================================================================
---- sid.orig/src/chrome/browser/first_run/first_run_linux.cc 2012-08-06 10:28:37.000000000 +0200
-+++ sid/src/chrome/browser/first_run/first_run_linux.cc 2012-08-06 12:13:35.981552344 +0200
+--- sid.orig/src/chrome/browser/first_run/first_run_linux.cc 2012-09-26 07:51:08.000000000 +0200
++++ sid/src/chrome/browser/first_run/first_run_linux.cc 2012-09-26 11:00:24.998714580 +0200
@@ -101,8 +101,7 @@
FilePath MasterPrefsPath() {
// The standard location of the master prefs is next to the chrome binary.
diff --git a/debian/patches/series b/debian/patches/series
index dd6f193..ef60839 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -19,7 +19,7 @@ cups1.5.patch
#system_v8.patch
#protobuf.patch
arm-no-float-abi.patch
-vpx.patch
+#vpx.patch
gcc4.7.patch
arm.patch
icon.patch
diff --git a/debian/patches/system-speech.patch b/debian/patches/system-speech.patch
index 2174a4f..858690b 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 2012-08-06 10:28:12.000000000 +0200
-+++ sid/src/build/linux/system.gyp 2012-08-06 12:13:54.125551763 +0200
+--- sid.orig/src/build/linux/system.gyp 2012-09-26 07:50:42.000000000 +0200
++++ sid/src/build/linux/system.gyp 2012-09-26 11:05:25.706708180 +0200
@@ -384,6 +384,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 2012-08-06 10:27:52.000000000 +0200
-+++ sid/src/content/browser/speech/audio_encoder.cc 2012-08-06 12:13:54.125551763 +0200
+--- sid.orig/src/content/browser/speech/audio_encoder.cc 2012-09-26 07:50:17.000000000 +0200
++++ sid/src/content/browser/speech/audio_encoder.cc 2012-09-26 11:05:25.710708180 +0200
@@ -11,7 +11,7 @@
#include "base/string_number_conversions.h"
#include "content/browser/speech/audio_buffer.h"
@@ -45,14 +45,14 @@ Index: sid/src/content/browser/speech/audio_encoder.cc
using speech::AudioChunk;
Index: sid/src/content/content_browser.gypi
===================================================================
---- sid.orig/src/content/content_browser.gypi 2012-08-06 10:27:54.000000000 +0200
-+++ sid/src/content/content_browser.gypi 2012-08-06 12:14:55.985549781 +0200
-@@ -13,7 +13,7 @@
- '../ppapi/ppapi_internal.gyp:ppapi_proxy',
- '../skia/skia.gyp:skia',
- '../third_party/flac/flac.gyp:libflac',
-- '../third_party/speex/speex.gyp:libspeex',
-+ '../build/linux/system.gyp:speex',
- '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit',
- '../third_party/zlib/zlib.gyp:zlib',
- '../ui/surface/surface.gyp:surface',
+--- sid.orig/src/content/content_browser.gypi 2012-09-26 07:50:18.000000000 +0200
++++ sid/src/content/content_browser.gypi 2012-09-26 11:06:31.998706772 +0200
+@@ -917,7 +917,7 @@
+ }, { # OS!="android"
+ 'dependencies': [
+ '../third_party/flac/flac.gyp:libflac',
+- '../third_party/speex/speex.gyp:libspeex',
++ '../build/linux/system.gyp:speex',
+ ],
+ }],
+ ['OS=="mac"', {
diff --git a/debian/patches/vpx.patch b/debian/patches/vpx.patch
index 602f38a..41cf28c 100644
--- a/debian/patches/vpx.patch
+++ b/debian/patches/vpx.patch
@@ -1,8 +1,8 @@
Index: sid/src/remoting/remoting.gyp
===================================================================
---- sid.orig/src/remoting/remoting.gyp 2012-08-06 10:27:44.000000000 +0200
-+++ sid/src/remoting/remoting.gyp 2012-08-06 12:15:16.629549120 +0200
-@@ -1031,7 +1031,7 @@
+--- sid.orig/src/remoting/remoting.gyp 2012-09-26 11:12:57.802698559 +0200
++++ sid/src/remoting/remoting.gyp 2012-09-26 16:58:35.194257270 +0200
+@@ -1139,7 +1139,7 @@
'../ui/ui.gyp:ui',
'../net/net.gyp:net',
'../skia/skia.gyp:skia',
@@ -11,30 +11,3 @@ Index: sid/src/remoting/remoting.gyp
'../third_party/protobuf/protobuf.gyp:protobuf_lite',
'../third_party/zlib/zlib.gyp:zlib',
'../media/media.gyp:yuv_convert',
-Index: sid/src/third_party/libvpx/libvpx.gyp
-===================================================================
---- sid.orig/src/third_party/libvpx/libvpx.gyp 2012-08-06 10:30:05.000000000 +0200
-+++ sid/src/third_party/libvpx/libvpx.gyp 2012-08-06 12:15:16.665549120 +0200
-@@ -281,11 +281,17 @@
- {
- 'target_name': 'libvpx_include',
- 'type': 'none',
-- 'direct_dependent_settings': {
-- 'include_dirs': [
-- 'source/libvpx',
-- ],
-- },
-+ 'conditions': [
-+ ['_toolset=="target"', {
-+ 'link_settings': {
-+ 'ldflags': [
-+ '<!@(pkg-config --libs-only-L --libs-only-other vpx)',
-+ ],
-+ 'libraries': [
-+ '<!@(pkg-config --libs-only-l vpx)',
-+ ],
-+ },
-+ }]]
- },
- {
- 'target_name': 'libvpx_lib',
diff --git a/debian/patches/webkit-version.patch b/debian/patches/webkit-version.patch
index acef7f5..6f6d8a8 100644
--- a/debian/patches/webkit-version.patch
+++ b/debian/patches/webkit-version.patch
@@ -1,8 +1,8 @@
description: debian-specific version parsing (for about dialog)
Index: sid/src/webkit/build/webkit_version.py
===================================================================
---- sid.orig/src/webkit/build/webkit_version.py 2012-08-06 10:27:46.000000000 +0200
-+++ sid/src/webkit/build/webkit_version.py 2012-08-06 12:15:08.557549378 +0200
+--- sid.orig/src/webkit/build/webkit_version.py 2012-09-26 07:50:09.000000000 +0200
++++ sid/src/webkit/build/webkit_version.py 2012-09-26 11:06:47.454706441 +0200
@@ -61,6 +61,15 @@
default_lastchange=None,
directory=os.path.join(webkit_dir, version_file_dir),
--
Git repository for pkg-chromium
More information about the Pkg-chromium-commit
mailing list