[Pkg-chromium-commit] [SCM] Git repository for pkg-chromium branch, master, updated. debian/22.0.1229.94_r161065-1-11-g9e76ec7
Giuseppe Iuculano
iuculano at debian.org
Wed Feb 6 10:44:46 UTC 2013
The following commit has been merged in the master branch:
commit 9e76ec7f910a2daef5224d31b91090798481c28b
Author: Giuseppe Iuculano <iuculano at debian.org>
Date: Wed Feb 6 11:44:33 2013 +0100
Refreshed patches
diff --git a/debian/patches/arm-no-float-abi.patch b/debian/patches/arm-no-float-abi.patch
index 2d356a4..5d9a3ab 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-09-26 11:06:40.322706593 +0200
-+++ sid/src/build/common.gypi 2012-09-26 11:06:54.338706295 +0200
-@@ -779,7 +779,7 @@
+--- sid.orig/src/build/common.gypi 2013-01-11 13:03:22.250737845 +0100
++++ sid/src/build/common.gypi 2013-01-11 13:03:57.050738219 +0100
+@@ -815,7 +815,7 @@
'arm_fpu%': 'vfpv3',
# Set ARM float abi compilation flag.
diff --git a/debian/patches/arm.patch b/debian/patches/arm.patch
index f98011e..0a40561 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-09-26 07:50:21.000000000 +0200
-+++ sid/src/skia/skia.gyp 2012-09-26 11:12:48.050698768 +0200
-@@ -1285,9 +1285,11 @@
+--- sid.orig/src/skia/skia.gyp 2013-01-11 11:03:21.000000000 +0100
++++ sid/src/skia/skia.gyp 2013-01-11 13:07:06.642740252 +0100
+@@ -747,9 +747,11 @@
[ 'target_arch == "arm" and armv7 != 1', {
'sources': [
'../third_party/skia/src/opts/SkBlitRow_opts_none.cpp',
@@ -16,8 +16,8 @@ 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-09-26 07:51:53.000000000 +0200
-+++ sid/src/ui/base/resource/data_pack.cc 2012-09-26 11:12:48.050698768 +0200
+--- sid.orig/src/ui/base/resource/data_pack.cc 2013-01-11 11:04:45.000000000 +0100
++++ sid/src/ui/base/resource/data_pack.cc 2013-01-11 13:07:06.642740252 +0100
@@ -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.
@@ -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-09-26 07:53:22.000000000 +0200
-+++ sid/src/v8/src/arm/macro-assembler-arm.cc 2012-09-26 11:12:48.054698770 +0200
+--- sid.orig/src/v8/src/arm/macro-assembler-arm.cc 2013-01-11 11:06:22.000000000 +0100
++++ sid/src/v8/src/arm/macro-assembler-arm.cc 2013-01-11 13:07:06.646740253 +0100
@@ -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 0c8d44f..f0eff41 100644
--- a/debian/patches/armv4.patch
+++ b/debian/patches/armv4.patch
@@ -1,9 +1,9 @@
Do not use armv4 incopatible code
Index: sid/src/build/common.gypi
===================================================================
---- 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 @@
+--- sid.orig/src/build/common.gypi 2013-01-11 11:03:36.000000000 +0100
++++ sid/src/build/common.gypi 2013-01-11 12:57:28.558734052 +0100
+@@ -2399,6 +2399,7 @@
# silences those warnings, as they are not helpful and
# clutter legitimate warnings.
'-Wno-abi',
@@ -13,8 +13,8 @@ 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-09-26 07:50:43.000000000 +0200
-+++ sid/src/base/debug/debugger_posix.cc 2012-09-26 11:00:38.606714290 +0200
+--- sid.orig/src/base/debug/debugger_posix.cc 2013-01-11 11:03:38.000000000 +0100
++++ sid/src/base/debug/debugger_posix.cc 2013-01-11 12:57:28.562734054 +0100
@@ -220,7 +220,7 @@
} while (0)
#else
@@ -22,5 +22,5 @@ Index: sid/src/base/debug/debugger_posix.cc
-#define DEBUG_BREAK() asm("bkpt 0")
+#define DEBUG_BREAK() asm("nop")
#endif
- #else
- #define DEBUG_BREAK() asm("int3")
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+ #define DEBUG_BREAK() asm("break 2")
diff --git a/debian/patches/cups1.5.patch b/debian/patches/cups1.5.patch
index ee90c44..c4bc917 100644
--- a/debian/patches/cups1.5.patch
+++ b/debian/patches/cups1.5.patch
@@ -2,20 +2,20 @@ 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-09-26 07:50:09.000000000 +0200
-+++ sid/src/printing/backend/cups_helper.h 2012-09-26 11:06:49.926706388 +0200
+--- sid.orig/src/printing/backend/cups_helper.h 2013-01-11 11:03:07.000000000 +0100
++++ sid/src/printing/backend/cups_helper.h 2013-01-11 13:03:54.350738189 +0100
@@ -6,6 +6,7 @@
#define PRINTING_BACKEND_CUPS_HELPER_H_
#include <cups/cups.h>
+#include <cups/ppd.h>
- #include "printing/printing_export.h"
+ #include <string>
Index: sid/src/chrome/service/cloud_print/print_system_cups.cc
===================================================================
---- 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
+--- sid.orig/src/chrome/service/cloud_print/print_system_cups.cc 2013-01-11 11:04:43.000000000 +0100
++++ sid/src/chrome/service/cloud_print/print_system_cups.cc 2013-01-11 13:03:54.354738190 +0100
@@ -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 c531774..795f7eb 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-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
+--- sid.orig/src/third_party/libjingle/source/talk/xmllite/xmlparser.h 2013-01-11 11:05:30.000000000 +0100
++++ sid/src/third_party/libjingle/source/talk/xmllite/xmlparser.h 2013-01-11 12:57:22.194733984 +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 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
+--- sid.orig/src/third_party/libjingle/source/talk/xmpp/xmppstanzaparser.cc 2013-01-11 11:05:26.000000000 +0100
++++ sid/src/third_party/libjingle/source/talk/xmpp/xmppstanzaparser.cc 2013-01-11 12:57:22.198733981 +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 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
+--- sid.orig/src/third_party/skia/src/ports/SkXMLParser_expat.cpp 2013-01-11 11:05:51.000000000 +0100
++++ sid/src/third_party/skia/src/ports/SkXMLParser_expat.cpp 2013-01-11 12:57:22.198733981 +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 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
+--- sid.orig/src/third_party/skia/src/ports/SkXMLPullParser_expat.cpp 2013-01-11 11:05:51.000000000 +0100
++++ sid/src/third_party/skia/src/ports/SkXMLPullParser_expat.cpp 2013-01-11 12:57:22.198733981 +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 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
+--- sid.orig/src/third_party/libjingle/source/talk/xmllite/xmlbuilder.h 2013-01-11 11:05:30.000000000 +0100
++++ sid/src/third_party/libjingle/source/talk/xmllite/xmlbuilder.h 2013-01-11 12:57:22.198733981 +0100
@@ -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 7e30b7e..9402e84 100644
--- a/debian/patches/ffmpeg_arm.patch
+++ b/debian/patches/ffmpeg_arm.patch
@@ -1,27 +1,59 @@
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-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',
-- 'libavcodec/arm/dsputil_init_armv5te.c',
- 'libavcodec/arm/dsputil_init_armv6.c',
-- 'libavcodec/arm/dsputil_init_vfp.c',
-- 'libavcodec/arm/dsputil_vfp.S',
- 'libavcodec/arm/fft_fixed_init_arm.c',
- 'libavcodec/arm/fft_init_arm.c',
- 'libavcodec/arm/fmtconvert_init_arm.c',
-- 'libavcodec/arm/fmtconvert_vfp.S',
- 'libavcodec/arm/h264pred_init_arm.c',
- 'libavcodec/arm/jrevdct_arm.S',
- 'libavcodec/arm/mpegvideo_arm.c',
-- 'libavcodec/arm/mpegvideo_armv5te.c',
-- 'libavcodec/arm/mpegvideo_armv5te_s.S',
- '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',
+--- sid.orig/src/third_party/ffmpeg/ffmpeg_generated.gypi 2013-01-11 11:05:31.000000000 +0100
++++ sid/src/third_party/ffmpeg/ffmpeg_generated.gypi 2013-01-11 13:00:47.726736191 +0100
+@@ -314,53 +314,41 @@
+ ['(target_arch == "arm" or (target_arch == "arm" and arm_neon == 1)) and (1) and (1)', {
+ 'c_sources': [
+ 'libavcodec/arm/dsputil_init_arm.c',
+- 'libavcodec/arm/dsputil_init_armv5te.c',
+ 'libavcodec/arm/dsputil_init_armv6.c',
+- 'libavcodec/arm/dsputil_init_vfp.c',
+ 'libavcodec/arm/fft_fixed_init_arm.c',
+ 'libavcodec/arm/fft_init_arm.c',
+ 'libavcodec/arm/fmtconvert_init_arm.c',
+ 'libavcodec/arm/h264pred_init_arm.c',
+ 'libavcodec/arm/mpegvideo_arm.c',
+- 'libavcodec/arm/mpegvideo_armv5te.c',
+ 'libavcodec/arm/vp3dsp_init_arm.c',
+ 'libavcodec/arm/vp8dsp_init_arm.c',
+ 'libavcodec/arm/vp8dsp_init_armv6.c',
+ 'libavutil/arm/cpu.c',
+ 'libavutil/arm/float_dsp_init_arm.c',
+- 'libavutil/arm/float_dsp_init_vfp.c',
+ ],
+ 'asm_sources': [
+ 'libavcodec/arm/dsputil_arm.S',
+ 'libavcodec/arm/dsputil_armv6.S',
+- 'libavcodec/arm/dsputil_vfp.S',
+ 'libavcodec/arm/fmtconvert_vfp.S',
+ 'libavcodec/arm/jrevdct_arm.S',
+- 'libavcodec/arm/mpegvideo_armv5te_s.S',
+ 'libavcodec/arm/simple_idct_arm.S',
+- 'libavcodec/arm/simple_idct_armv5te.S',
+ 'libavcodec/arm/simple_idct_armv6.S',
+ 'libavcodec/arm/vp8_armv6.S',
+ 'libavcodec/arm/vp8dsp_armv6.S',
+- 'libavutil/arm/float_dsp_vfp.S',
+ ],
+ 'converter_outputs': [
+ '<(shared_generated_dir)/libavcodec/arm/dsputil_init_arm.c',
+- '<(shared_generated_dir)/libavcodec/arm/dsputil_init_armv5te.c',
+ '<(shared_generated_dir)/libavcodec/arm/dsputil_init_armv6.c',
+- '<(shared_generated_dir)/libavcodec/arm/dsputil_init_vfp.c',
+ '<(shared_generated_dir)/libavcodec/arm/fft_fixed_init_arm.c',
+ '<(shared_generated_dir)/libavcodec/arm/fft_init_arm.c',
+ '<(shared_generated_dir)/libavcodec/arm/fmtconvert_init_arm.c',
+ '<(shared_generated_dir)/libavcodec/arm/h264pred_init_arm.c',
+ '<(shared_generated_dir)/libavcodec/arm/mpegvideo_arm.c',
+- '<(shared_generated_dir)/libavcodec/arm/mpegvideo_armv5te.c',
+ '<(shared_generated_dir)/libavcodec/arm/vp3dsp_init_arm.c',
+ '<(shared_generated_dir)/libavcodec/arm/vp8dsp_init_arm.c',
+ '<(shared_generated_dir)/libavcodec/arm/vp8dsp_init_armv6.c',
+ '<(shared_generated_dir)/libavutil/arm/cpu.c',
+ '<(shared_generated_dir)/libavutil/arm/float_dsp_init_arm.c',
+- '<(shared_generated_dir)/libavutil/arm/float_dsp_init_vfp.c',
+ ],
+ }], # (target_arch == "arm" or (target_arch == "arm" and arm_neon == 1)) and (1) and (1)
+ ['(1) and (1) and (1)', {
diff --git a/debian/patches/fix-manpage.patch b/debian/patches/fix-manpage.patch
index b8e6585..868ac58 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-09-26 07:50:55.000000000 +0200
-+++ sid/src/chrome/app/resources/manpage.1.in 2012-09-26 11:06:43.558706524 +0200
+--- sid.orig/src/chrome/app/resources/manpage.1.in 2013-01-11 11:03:49.000000000 +0100
++++ sid/src/chrome/app/resources/manpage.1.in 2013-01-11 13:03:43.246738072 +0100
@@ -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 f5fcfa4..214489a 100644
--- a/debian/patches/gcc4.7.patch
+++ b/debian/patches/gcc4.7.patch
@@ -1,7 +1,7 @@
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-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
+--- sid.orig/src/chrome/browser/search_engines/template_url_prepopulate_data.h 2013-01-11 11:04:05.000000000 +0100
++++ sid/src/chrome/browser/search_engines/template_url_prepopulate_data.h 2013-01-11 13:06:59.210740171 +0100
@@ -8,6 +8,7 @@
#include <stddef.h>
#include <string>
@@ -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-09-26 07:50:10.000000000 +0200
-+++ sid/src/gpu/command_buffer/common/types.h 2012-09-26 11:12:44.014698853 +0200
+--- sid.orig/src/gpu/command_buffer/common/types.h 2013-01-11 11:03:07.000000000 +0100
++++ sid/src/gpu/command_buffer/common/types.h 2013-01-11 13:06:59.214740170 +0100
@@ -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-09-26 07:50:43.000000000 +0200
-+++ sid/src/ipc/ipc_channel.h 2012-09-26 11:12:44.014698853 +0200
+--- sid.orig/src/ipc/ipc_channel.h 2013-01-11 11:03:38.000000000 +0100
++++ sid/src/ipc/ipc_channel.h 2013-01-11 13:06:59.214740170 +0100
@@ -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-09-26 07:52:42.000000000 +0200
-+++ sid/src/third_party/ots/src/os2.cc 2012-09-26 11:12:44.014698853 +0200
+--- sid.orig/src/third_party/ots/src/os2.cc 2013-01-11 11:05:36.000000000 +0100
++++ sid/src/third_party/ots/src/os2.cc 2013-01-11 13:06:59.214740170 +0100
@@ -5,6 +5,7 @@
#include "os2.h"
@@ -45,11 +45,11 @@ 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-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
+--- sid.orig/src/third_party/tcmalloc/chromium/src/base/stl_allocator.h 2013-01-11 11:03:24.000000000 +0100
++++ sid/src/third_party/tcmalloc/chromium/src/base/stl_allocator.h 2013-01-11 13:06:59.214740170 +0100
@@ -39,6 +39,7 @@
- #include <stddef.h> // for std::ptrdiff_t
+ #include <stddef.h> // for ptrdiff_t
#include <limits>
+#include <cstddef>
@@ -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-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
+--- sid.orig/src/third_party/tcmalloc/chromium/src/base/vdso_support.h 2013-01-11 11:03:24.000000000 +0100
++++ sid/src/third_party/tcmalloc/chromium/src/base/vdso_support.h 2013-01-11 13:06:59.214740170 +0100
@@ -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-09-26 07:50:24.000000000 +0200
-+++ sid/src/third_party/tcmalloc/chromium/src/common.cc 2012-09-26 11:12:44.014698853 +0200
+--- sid.orig/src/third_party/tcmalloc/chromium/src/common.cc 2013-01-11 11:03:24.000000000 +0100
++++ sid/src/third_party/tcmalloc/chromium/src/common.cc 2013-01-11 13:06:59.214740170 +0100
@@ -33,6 +33,7 @@
#include "config.h"
#include "common.h"
@@ -81,9 +81,9 @@ 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-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 @@
+--- sid.orig/src/third_party/tcmalloc/chromium/src/symbolize.h 2013-01-11 11:03:24.000000000 +0100
++++ sid/src/third_party/tcmalloc/chromium/src/symbolize.h 2013-01-11 13:06:59.214740170 +0100
+@@ -39,6 +39,7 @@
#endif
#include <stddef.h> // for NULL
#include <map>
@@ -93,8 +93,8 @@ 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-09-26 07:51:52.000000000 +0200
-+++ sid/src/ui/gfx/codec/jpeg_codec.h 2012-09-26 11:12:44.014698853 +0200
+--- sid.orig/src/ui/gfx/codec/jpeg_codec.h 2013-01-11 11:04:43.000000000 +0100
++++ sid/src/ui/gfx/codec/jpeg_codec.h 2013-01-11 13:06:59.218740174 +0100
@@ -7,6 +7,7 @@
#include <stddef.h>
diff --git a/debian/patches/glew.patch b/debian/patches/glew.patch
index 0c50d26..4157740 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-09-26 11:05:25.706708180 +0200
-+++ sid/src/build/linux/system.gyp 2012-09-26 11:06:40.318706593 +0200
+--- sid.orig/src/build/linux/system.gyp 2012-11-13 10:38:43.396406253 +0100
++++ sid/src/build/linux/system.gyp 2012-11-13 10:38:47.172406163 +0100
@@ -497,6 +497,23 @@
},
},
@@ -29,9 +29,9 @@ Index: sid/src/build/linux/system.gyp
'type': 'none',
Index: sid/src/chrome/chrome.gyp
===================================================================
---- 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 @@
+--- sid.orig/src/chrome/chrome.gyp 2012-11-08 08:57:58.000000000 +0100
++++ sid/src/chrome/chrome.gyp 2012-11-13 10:38:47.192406163 +0100
+@@ -250,6 +250,7 @@
'../base/base.gyp:base',
'../content/content.gyp:content_utility',
'../skia/skia.gyp:skia',
@@ -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-09-26 11:00:38.602714290 +0200
-+++ sid/src/build/common.gypi 2012-09-26 11:06:40.322706593 +0200
-@@ -1477,6 +1477,7 @@
+--- sid.orig/src/build/common.gypi 2012-11-13 10:38:38.452406372 +0100
++++ sid/src/build/common.gypi 2012-11-13 10:38:47.196406163 +0100
+@@ -1567,6 +1567,7 @@
['enable_gpu==1', {
'defines': [
'ENABLE_GPU=1',
diff --git a/debian/patches/icon.patch b/debian/patches/icon.patch
index 8256d3d..ba36601 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-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 @@
+--- sid.orig/src/chrome/browser/ui/gtk/gtk_util.cc 2013-01-11 11:04:00.000000000 +0100
++++ sid/src/chrome/browser/ui/gtk/gtk_util.cc 2013-01-11 13:07:09.458740282 +0100
+@@ -50,7 +50,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 8a547da..837e1a4 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-09-26 07:50:43.000000000 +0200
-+++ sid/src/base/pr_time_unittest.cc 2012-09-26 11:00:14.950714796 +0200
+--- sid.orig/src/base/pr_time_unittest.cc 2013-01-11 11:03:38.000000000 +0100
++++ sid/src/base/pr_time_unittest.cc 2013-01-11 12:57:06.590733818 +0100
@@ -5,7 +5,7 @@
#include <time.h>
@@ -14,10 +14,10 @@ Index: sid/src/base/pr_time_unittest.cc
Index: sid/src/base/time.cc
===================================================================
---- 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
+--- sid.orig/src/base/time.cc 2013-01-11 11:03:38.000000000 +0100
++++ sid/src/base/time.cc 2013-01-11 12:57:06.590733818 +0100
+@@ -12,7 +12,7 @@
+ #include <limits>
#include "base/sys_string_conversions.h"
-#include "base/third_party/nspr/prtime.h"
@@ -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-09-26 07:51:01.000000000 +0200
-+++ sid/src/chrome/browser/metrics/metrics_log.cc 2012-09-26 11:00:14.954714795 +0200
+--- sid.orig/src/chrome/browser/metrics/metrics_log.cc 2013-01-11 11:03:57.000000000 +0100
++++ sid/src/chrome/browser/metrics/metrics_log.cc 2013-01-11 12:57:06.590733818 +0100
@@ -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-09-26 07:50:43.000000000 +0200
-+++ sid/src/base/base.gypi 2012-09-26 11:00:14.954714795 +0200
+--- sid.orig/src/base/base.gypi 2013-01-11 11:03:38.000000000 +0100
++++ sid/src/base/base.gypi 2013-01-11 12:57:06.594733817 +0100
@@ -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-09-26 07:50:19.000000000 +0200
-+++ sid/src/crypto/nss_util.cc 2012-09-26 11:00:14.954714795 +0200
+--- sid.orig/src/crypto/nss_util.cc 2013-01-11 11:03:17.000000000 +0100
++++ sid/src/crypto/nss_util.cc 2013-01-11 12:57:06.594733817 +0100
@@ -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-09-26 07:50:21.000000000 +0200
-+++ sid/src/net/base/x509_certificate_nss.cc 2012-09-26 11:00:14.958714792 +0200
+--- sid.orig/src/net/base/x509_certificate_nss.cc 2013-01-11 11:03:21.000000000 +0100
++++ sid/src/net/base/x509_certificate_nss.cc 2013-01-11 12:57:06.594733817 +0100
@@ -9,7 +9,7 @@
#include <keyhi.h>
#include <nss.h>
diff --git a/debian/patches/nss.patch b/debian/patches/nss.patch
index eafd0c3..feaa559 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-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 @@
+--- sid.orig/src/chrome/chrome_common.gypi 2013-01-11 11:04:43.000000000 +0100
++++ sid/src/chrome/chrome_common.gypi 2013-01-11 12:57:18.346733943 +0100
+@@ -371,6 +371,11 @@
'<(DEPTH)/third_party/wtl/include',
]
}],
diff --git a/debian/patches/prefs.patch b/debian/patches/prefs.patch
index 1bb1b45..62307c0 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-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
+--- sid.orig/src/chrome/browser/first_run/first_run_linux.cc 2013-01-11 11:04:05.000000000 +0100
++++ sid/src/chrome/browser/first_run/first_run_linux.cc 2013-01-11 12:57:25.266734018 +0100
@@ -101,8 +101,7 @@
FilePath MasterPrefsPath() {
// The standard location of the master prefs is next to the chrome binary.
diff --git a/debian/patches/system-speech.patch b/debian/patches/system-speech.patch
index 858690b..b634e69 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-09-26 07:50:42.000000000 +0200
-+++ sid/src/build/linux/system.gyp 2012-09-26 11:05:25.706708180 +0200
+--- sid.orig/src/build/linux/system.gyp 2013-01-11 11:03:36.000000000 +0100
++++ sid/src/build/linux/system.gyp 2013-01-11 13:00:54.742736266 +0100
@@ -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-09-26 07:50:17.000000000 +0200
-+++ sid/src/content/browser/speech/audio_encoder.cc 2012-09-26 11:05:25.710708180 +0200
+--- sid.orig/src/content/browser/speech/audio_encoder.cc 2013-01-11 11:03:14.000000000 +0100
++++ sid/src/content/browser/speech/audio_encoder.cc 2013-01-11 13:00:54.742736266 +0100
@@ -11,7 +11,7 @@
#include "base/string_number_conversions.h"
#include "content/browser/speech/audio_buffer.h"
@@ -41,13 +41,13 @@ Index: sid/src/content/browser/speech/audio_encoder.cc
-#include "third_party/speex/speex.h"
+#include <speex/speex.h>
- using std::string;
- using speech::AudioChunk;
+ namespace content {
+ namespace {
Index: sid/src/content/content_browser.gypi
===================================================================
---- 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 @@
+--- sid.orig/src/content/content_browser.gypi 2013-01-11 11:03:16.000000000 +0100
++++ sid/src/content/content_browser.gypi 2013-01-11 13:00:54.746736265 +0100
+@@ -1026,7 +1026,7 @@
}, { # OS!="android"
'dependencies': [
'../third_party/flac/flac.gyp:libflac',
diff --git a/debian/patches/vpx.patch b/debian/patches/vpx.patch
index a56f4ca..e152e67 100644
--- a/debian/patches/vpx.patch
+++ b/debian/patches/vpx.patch
@@ -1,7 +1,7 @@
-Index: chromium-browser/src/third_party/libvpx/libvpx.gyp
+Index: sid/src/third_party/libvpx/libvpx.gyp
===================================================================
---- chromium-browser.orig/src/third_party/libvpx/libvpx.gyp 2012-10-28 00:39:46.934324915 -0400
-+++ chromium-browser/src/third_party/libvpx/libvpx.gyp 2012-10-28 00:53:45.566289134 -0400
+--- sid.orig/src/third_party/libvpx/libvpx.gyp 2012-11-08 08:58:51.000000000 +0100
++++ sid/src/third_party/libvpx/libvpx.gyp 2012-11-13 10:39:00.600405842 +0100
@@ -3,6 +3,11 @@
# found in the LICENSE file.
{
@@ -14,7 +14,7 @@ Index: chromium-browser/src/third_party/libvpx/libvpx.gyp
'conditions': [
['os_posix==1', {
'asm_obj_extension': 'o',
-@@ -458,6 +463,31 @@
+@@ -506,6 +511,31 @@
]
},
],
diff --git a/debian/patches/webkit-version.patch b/debian/patches/webkit-version.patch
index 6f6d8a8..457e011 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-09-26 07:50:09.000000000 +0200
-+++ sid/src/webkit/build/webkit_version.py 2012-09-26 11:06:47.454706441 +0200
+--- sid.orig/src/webkit/build/webkit_version.py 2013-01-11 11:03:06.000000000 +0100
++++ sid/src/webkit/build/webkit_version.py 2013-01-11 13:03:51.782738164 +0100
@@ -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