[Pkg-chromium-commit] [SCM] Git repository for pkg-chromium branch, master, updated. debian/22.0.1229.94_r161065-1-13-gcdf5c74
Giuseppe Iuculano
iuculano at debian.org
Wed Feb 6 12:39:09 UTC 2013
The following commit has been merged in the master branch:
commit cdf5c74dba0f52b1b591d491907e8cf6ad4e49dd
Author: Giuseppe Iuculano <iuculano at debian.org>
Date: Wed Feb 6 13:38:38 2013 +0100
Refreshed patches
diff --git a/debian/patches/arm-no-float-abi.patch b/debian/patches/arm-no-float-abi.patch
index 5d9a3ab..b8bfac8 100644
--- a/debian/patches/arm-no-float-abi.patch
+++ b/debian/patches/arm-no-float-abi.patch
@@ -1,7 +1,7 @@
Index: sid/src/build/common.gypi
===================================================================
---- 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
+--- sid.orig/src/build/common.gypi 2013-02-06 13:35:41.000000000 +0100
++++ sid/src/build/common.gypi 2013-02-06 13:36:33.665890308 +0100
@@ -815,7 +815,7 @@
'arm_fpu%': 'vfpv3',
diff --git a/debian/patches/arm.patch b/debian/patches/arm.patch
index 0a40561..25e65e2 100644
--- a/debian/patches/arm.patch
+++ b/debian/patches/arm.patch
@@ -1,7 +1,7 @@
Index: sid/src/skia/skia.gyp
===================================================================
---- 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
+--- sid.orig/src/skia/skia.gyp 2013-01-29 17:08:23.000000000 +0100
++++ sid/src/skia/skia.gyp 2013-02-06 13:38:06.857888078 +0100
@@ -747,9 +747,11 @@
[ 'target_arch == "arm" and armv7 != 1', {
'sources': [
@@ -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 2013-01-11 11:04:45.000000000 +0100
-+++ sid/src/ui/base/resource/data_pack.cc 2013-01-11 13:07:06.642740252 +0100
+--- sid.orig/src/ui/base/resource/data_pack.cc 2013-01-29 17:10:05.000000000 +0100
++++ sid/src/ui/base/resource/data_pack.cc 2013-02-06 13:38:06.857888078 +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 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
+--- sid.orig/src/v8/src/arm/macro-assembler-arm.cc 2013-01-29 17:11:48.000000000 +0100
++++ sid/src/v8/src/arm/macro-assembler-arm.cc 2013-02-06 13:38:06.857888078 +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 f0eff41..793672a 100644
--- a/debian/patches/armv4.patch
+++ b/debian/patches/armv4.patch
@@ -1,8 +1,8 @@
Do not use armv4 incopatible code
Index: sid/src/build/common.gypi
===================================================================
---- 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
+--- sid.orig/src/build/common.gypi 2013-01-29 17:08:52.000000000 +0100
++++ sid/src/build/common.gypi 2013-02-06 13:35:41.489891556 +0100
@@ -2399,6 +2399,7 @@
# silences those warnings, as they are not helpful and
# clutter legitimate warnings.
@@ -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 2013-01-11 11:03:38.000000000 +0100
-+++ sid/src/base/debug/debugger_posix.cc 2013-01-11 12:57:28.562734054 +0100
+--- sid.orig/src/base/debug/debugger_posix.cc 2013-01-29 17:08:54.000000000 +0100
++++ sid/src/base/debug/debugger_posix.cc 2013-02-06 13:35:41.493891554 +0100
@@ -220,7 +220,7 @@
} while (0)
#else
diff --git a/debian/patches/cups1.5.patch b/debian/patches/cups1.5.patch
index c4bc917..536b0a2 100644
--- a/debian/patches/cups1.5.patch
+++ b/debian/patches/cups1.5.patch
@@ -2,8 +2,8 @@ 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 2013-01-11 11:03:07.000000000 +0100
-+++ sid/src/printing/backend/cups_helper.h 2013-01-11 13:03:54.350738189 +0100
+--- sid.orig/src/printing/backend/cups_helper.h 2013-01-29 17:08:05.000000000 +0100
++++ sid/src/printing/backend/cups_helper.h 2013-02-06 13:36:30.601890380 +0100
@@ -6,6 +6,7 @@
#define PRINTING_BACKEND_CUPS_HELPER_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 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
+--- sid.orig/src/chrome/service/cloud_print/print_system_cups.cc 2013-01-29 17:10:04.000000000 +0100
++++ sid/src/chrome/service/cloud_print/print_system_cups.cc 2013-02-06 13:36:30.605890380 +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 795f7eb..bb0cc47 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-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
+--- sid.orig/src/third_party/libjingle/source/talk/xmllite/xmlparser.h 2013-01-29 17:10:56.000000000 +0100
++++ sid/src/third_party/libjingle/source/talk/xmllite/xmlparser.h 2013-02-06 13:35:34.605891719 +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-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
+--- sid.orig/src/third_party/libjingle/source/talk/xmpp/xmppstanzaparser.cc 2013-01-29 17:10:53.000000000 +0100
++++ sid/src/third_party/libjingle/source/talk/xmpp/xmppstanzaparser.cc 2013-02-06 13:35:34.605891719 +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-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
+--- sid.orig/src/third_party/skia/src/ports/SkXMLParser_expat.cpp 2013-01-29 17:11:11.000000000 +0100
++++ sid/src/third_party/skia/src/ports/SkXMLParser_expat.cpp 2013-02-06 13:35:34.605891719 +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-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
+--- sid.orig/src/third_party/skia/src/ports/SkXMLPullParser_expat.cpp 2013-01-29 17:11:11.000000000 +0100
++++ sid/src/third_party/skia/src/ports/SkXMLPullParser_expat.cpp 2013-02-06 13:35:34.605891719 +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-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
+--- sid.orig/src/third_party/libjingle/source/talk/xmllite/xmlbuilder.h 2013-01-29 17:10:56.000000000 +0100
++++ sid/src/third_party/libjingle/source/talk/xmllite/xmlbuilder.h 2013-02-06 13:35:34.609891719 +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 9402e84..d6af0ab 100644
--- a/debian/patches/ffmpeg_arm.patch
+++ b/debian/patches/ffmpeg_arm.patch
@@ -1,8 +1,8 @@
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 2013-01-11 11:05:31.000000000 +0100
-+++ sid/src/third_party/ffmpeg/ffmpeg_generated.gypi 2013-01-11 13:00:47.726736191 +0100
+--- sid.orig/src/third_party/ffmpeg/ffmpeg_generated.gypi 2013-01-29 17:10:53.000000000 +0100
++++ sid/src/third_party/ffmpeg/ffmpeg_generated.gypi 2013-02-06 13:35:44.513891482 +0100
@@ -314,53 +314,41 @@
['(target_arch == "arm" or (target_arch == "arm" and arm_neon == 1)) and (1) and (1)', {
'c_sources': [
diff --git a/debian/patches/fix-manpage.patch b/debian/patches/fix-manpage.patch
index 868ac58..3328d8d 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-01-11 11:03:49.000000000 +0100
-+++ sid/src/chrome/app/resources/manpage.1.in 2013-01-11 13:03:43.246738072 +0100
+--- sid.orig/src/chrome/app/resources/manpage.1.in 2013-01-29 17:09:06.000000000 +0100
++++ sid/src/chrome/app/resources/manpage.1.in 2013-02-06 13:36:22.265890579 +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 214489a..08a0986 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 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
+--- sid.orig/src/chrome/browser/search_engines/template_url_prepopulate_data.h 2013-01-29 17:09:21.000000000 +0100
++++ sid/src/chrome/browser/search_engines/template_url_prepopulate_data.h 2013-02-06 13:37:58.097888287 +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 2013-01-11 11:03:07.000000000 +0100
-+++ sid/src/gpu/command_buffer/common/types.h 2013-01-11 13:06:59.214740170 +0100
+--- sid.orig/src/gpu/command_buffer/common/types.h 2013-01-29 17:08:06.000000000 +0100
++++ sid/src/gpu/command_buffer/common/types.h 2013-02-06 13:37:58.097888287 +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 2013-01-11 11:03:38.000000000 +0100
-+++ sid/src/ipc/ipc_channel.h 2013-01-11 13:06:59.214740170 +0100
+--- sid.orig/src/ipc/ipc_channel.h 2013-01-29 17:08:55.000000000 +0100
++++ sid/src/ipc/ipc_channel.h 2013-02-06 13:37:58.101888287 +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 2013-01-11 11:05:36.000000000 +0100
-+++ sid/src/third_party/ots/src/os2.cc 2013-01-11 13:06:59.214740170 +0100
+--- sid.orig/src/third_party/ots/src/os2.cc 2013-01-29 17:11:00.000000000 +0100
++++ sid/src/third_party/ots/src/os2.cc 2013-02-06 13:37:58.101888287 +0100
@@ -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 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
+--- sid.orig/src/third_party/tcmalloc/chromium/src/base/stl_allocator.h 2013-01-29 17:08:30.000000000 +0100
++++ sid/src/third_party/tcmalloc/chromium/src/base/stl_allocator.h 2013-02-06 13:37:58.101888287 +0100
@@ -39,6 +39,7 @@
#include <stddef.h> // for 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 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
+--- sid.orig/src/third_party/tcmalloc/chromium/src/base/vdso_support.h 2013-01-29 17:08:30.000000000 +0100
++++ sid/src/third_party/tcmalloc/chromium/src/base/vdso_support.h 2013-02-06 13:37:58.101888287 +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 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
+--- sid.orig/src/third_party/tcmalloc/chromium/src/common.cc 2013-01-29 17:08:30.000000000 +0100
++++ sid/src/third_party/tcmalloc/chromium/src/common.cc 2013-02-06 13:37:58.101888287 +0100
@@ -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 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
+--- sid.orig/src/third_party/tcmalloc/chromium/src/symbolize.h 2013-01-29 17:08:30.000000000 +0100
++++ sid/src/third_party/tcmalloc/chromium/src/symbolize.h 2013-02-06 13:37:58.101888287 +0100
@@ -39,6 +39,7 @@
#endif
#include <stddef.h> // for NULL
@@ -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 2013-01-11 11:04:43.000000000 +0100
-+++ sid/src/ui/gfx/codec/jpeg_codec.h 2013-01-11 13:06:59.218740174 +0100
+--- sid.orig/src/ui/gfx/codec/jpeg_codec.h 2013-01-29 17:10:04.000000000 +0100
++++ sid/src/ui/gfx/codec/jpeg_codec.h 2013-02-06 13:37:58.101888287 +0100
@@ -7,6 +7,7 @@
#include <stddef.h>
diff --git a/debian/patches/icon.patch b/debian/patches/icon.patch
index ba36601..769caa5 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-01-11 11:04:00.000000000 +0100
-+++ sid/src/chrome/browser/ui/gtk/gtk_util.cc 2013-01-11 13:07:09.458740282 +0100
+--- sid.orig/src/chrome/browser/ui/gtk/gtk_util.cc 2013-01-29 17:09:17.000000000 +0100
++++ sid/src/chrome/browser/ui/gtk/gtk_util.cc 2013-02-06 13:38:11.389887969 +0100
@@ -50,7 +50,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 837e1a4..194962a 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 2013-01-11 11:03:38.000000000 +0100
-+++ sid/src/base/pr_time_unittest.cc 2013-01-11 12:57:06.590733818 +0100
+--- sid.orig/src/base/pr_time_unittest.cc 2013-01-29 17:08:55.000000000 +0100
++++ sid/src/base/pr_time_unittest.cc 2013-02-06 13:35:27.481891891 +0100
@@ -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 2013-01-11 11:03:38.000000000 +0100
-+++ sid/src/base/time.cc 2013-01-11 12:57:06.590733818 +0100
+--- sid.orig/src/base/time.cc 2013-01-29 17:08:55.000000000 +0100
++++ sid/src/base/time.cc 2013-02-06 13:35:27.485891889 +0100
@@ -12,7 +12,7 @@
#include <limits>
@@ -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 2013-01-11 11:03:57.000000000 +0100
-+++ sid/src/chrome/browser/metrics/metrics_log.cc 2013-01-11 12:57:06.590733818 +0100
+--- sid.orig/src/chrome/browser/metrics/metrics_log.cc 2013-01-29 17:09:15.000000000 +0100
++++ sid/src/chrome/browser/metrics/metrics_log.cc 2013-02-06 13:35:27.485891889 +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 2013-01-11 11:03:38.000000000 +0100
-+++ sid/src/base/base.gypi 2013-01-11 12:57:06.594733817 +0100
+--- sid.orig/src/base/base.gypi 2013-01-29 17:08:55.000000000 +0100
++++ sid/src/base/base.gypi 2013-02-06 13:35:27.485891889 +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 2013-01-11 11:03:17.000000000 +0100
-+++ sid/src/crypto/nss_util.cc 2013-01-11 12:57:06.594733817 +0100
+--- sid.orig/src/crypto/nss_util.cc 2013-01-29 17:08:19.000000000 +0100
++++ sid/src/crypto/nss_util.cc 2013-02-06 13:35:27.485891889 +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 2013-01-11 11:03:21.000000000 +0100
-+++ sid/src/net/base/x509_certificate_nss.cc 2013-01-11 12:57:06.594733817 +0100
+--- sid.orig/src/net/base/x509_certificate_nss.cc 2013-01-29 17:08:22.000000000 +0100
++++ sid/src/net/base/x509_certificate_nss.cc 2013-02-06 13:35:27.485891889 +0100
@@ -9,7 +9,7 @@
#include <keyhi.h>
#include <nss.h>
diff --git a/debian/patches/nss.patch b/debian/patches/nss.patch
index feaa559..48e126e 100644
--- a/debian/patches/nss.patch
+++ b/debian/patches/nss.patch
@@ -1,8 +1,8 @@
webkit needs to call nss to pull in nspr headers
Index: sid/src/chrome/chrome_common.gypi
===================================================================
---- 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
+--- sid.orig/src/chrome/chrome_common.gypi 2013-01-29 17:10:04.000000000 +0100
++++ sid/src/chrome/chrome_common.gypi 2013-02-06 13:35:31.985891782 +0100
@@ -371,6 +371,11 @@
'<(DEPTH)/third_party/wtl/include',
]
diff --git a/debian/patches/prefs.patch b/debian/patches/prefs.patch
index 62307c0..e75e3ee 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 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
+--- sid.orig/src/chrome/browser/first_run/first_run_linux.cc 2013-01-29 17:09:21.000000000 +0100
++++ sid/src/chrome/browser/first_run/first_run_linux.cc 2013-02-06 13:35:37.501891650 +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/pulse_ftbfs.patch b/debian/patches/pulse_ftbfs.patch
index 0f122cf..a3f29d9 100644
--- a/debian/patches/pulse_ftbfs.patch
+++ b/debian/patches/pulse_ftbfs.patch
@@ -1,7 +1,7 @@
Index: sid/src/media/audio/pulse/pulse_output.cc
===================================================================
---- sid.orig/src/media/audio/pulse/pulse_output.cc 2013-01-11 11:03:04.000000000 +0100
-+++ sid/src/media/audio/pulse/pulse_output.cc 2013-01-11 13:50:15.602768027 +0100
+--- sid.orig/src/media/audio/pulse/pulse_output.cc 2013-01-29 17:08:01.000000000 +0100
++++ sid/src/media/audio/pulse/pulse_output.cc 2013-02-06 13:38:14.129887904 +0100
@@ -86,7 +86,7 @@
// All channel maps have the same size array of channel positions.
diff --git a/debian/patches/series b/debian/patches/series
index c37e395..083b9bf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,7 +6,7 @@ prefs.patch
armv4.patch
ffmpeg_arm.patch
system-speech.patch
-glew.patch
+#glew.patch
fix-manpage.patch
webkit-version.patch
#ffmpeg.patch
@@ -19,7 +19,6 @@ cups1.5.patch
#system_v8.patch
#protobuf.patch
arm-no-float-abi.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 b634e69..3e202ed 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 2013-01-11 11:03:36.000000000 +0100
-+++ sid/src/build/linux/system.gyp 2013-01-11 13:00:54.742736266 +0100
+--- sid.orig/src/build/linux/system.gyp 2013-01-29 17:08:52.000000000 +0100
++++ sid/src/build/linux/system.gyp 2013-02-06 13:35:48.473891387 +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 2013-01-11 11:03:14.000000000 +0100
-+++ sid/src/content/browser/speech/audio_encoder.cc 2013-01-11 13:00:54.742736266 +0100
+--- sid.orig/src/content/browser/speech/audio_encoder.cc 2013-01-29 17:08:16.000000000 +0100
++++ sid/src/content/browser/speech/audio_encoder.cc 2013-02-06 13:35:48.473891387 +0100
@@ -11,7 +11,7 @@
#include "base/string_number_conversions.h"
#include "content/browser/speech/audio_buffer.h"
@@ -45,8 +45,8 @@ Index: sid/src/content/browser/speech/audio_encoder.cc
namespace {
Index: sid/src/content/content_browser.gypi
===================================================================
---- 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
+--- sid.orig/src/content/content_browser.gypi 2013-01-29 17:08:17.000000000 +0100
++++ sid/src/content/content_browser.gypi 2013-02-06 13:35:48.473891387 +0100
@@ -1026,7 +1026,7 @@
}, { # OS!="android"
'dependencies': [
diff --git a/debian/patches/webkit-version.patch b/debian/patches/webkit-version.patch
index 457e011..3d4fbc8 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 2013-01-11 11:03:06.000000000 +0100
-+++ sid/src/webkit/build/webkit_version.py 2013-01-11 13:03:51.782738164 +0100
+--- sid.orig/src/webkit/build/webkit_version.py 2013-01-29 17:08:05.000000000 +0100
++++ sid/src/webkit/build/webkit_version.py 2013-02-06 13:36:27.753890448 +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