[Pkg-chromium-commit] [SCM] Git repository for pkg-chromium branch, master, updated. debian/25.0.1364.152-1-7-g2d34329

Giuseppe Iuculano iuculano at debian.org
Wed Apr 3 11:20:26 UTC 2013


The following commit has been merged in the master branch:
commit c6aabe6761f4e0a4ef1a3ed35982ad382c57bce0
Author: Giuseppe Iuculano <iuculano at debian.org>
Date:   Sat Mar 30 19:32:36 2013 +0100

    Refreshed patches

diff --git a/debian/patches/arm-neon.patch b/debian/patches/arm-neon.patch
index f0069d6..1d5fbf2 100644
--- a/debian/patches/arm-neon.patch
+++ b/debian/patches/arm-neon.patch
@@ -6,8 +6,8 @@ Bug-Ubuntu: 1084852
 
 Index: sid/src/third_party/webrtc/modules/audio_coding/codecs/isac/fix/source/isacfix.gypi
 ===================================================================
---- sid.orig/src/third_party/webrtc/modules/audio_coding/codecs/isac/fix/source/isacfix.gypi	2013-02-22 11:25:20.000000000 +0100
-+++ sid/src/third_party/webrtc/modules/audio_coding/codecs/isac/fix/source/isacfix.gypi	2013-02-23 11:41:42.274235012 +0100
+--- sid.orig/src/third_party/webrtc/modules/audio_coding/codecs/isac/fix/source/isacfix.gypi	2013-03-16 09:38:40.000000000 +0100
++++ sid/src/third_party/webrtc/modules/audio_coding/codecs/isac/fix/source/isacfix.gypi	2013-03-30 17:42:05.571734731 +0100
 @@ -72,7 +72,7 @@
              'WEBRTC_LINUX',
            ],
@@ -19,8 +19,8 @@ Index: sid/src/third_party/webrtc/modules/audio_coding/codecs/isac/fix/source/is
              'lattice_armv7.S',
 Index: sid/src/third_party/webrtc/system_wrappers/source/cpu_features.cc
 ===================================================================
---- sid.orig/src/third_party/webrtc/system_wrappers/source/cpu_features.cc	2013-02-22 11:25:19.000000000 +0100
-+++ sid/src/third_party/webrtc/system_wrappers/source/cpu_features.cc	2013-02-23 11:41:42.282235012 +0100
+--- sid.orig/src/third_party/webrtc/system_wrappers/source/cpu_features.cc	2013-03-16 09:38:39.000000000 +0100
++++ sid/src/third_party/webrtc/system_wrappers/source/cpu_features.cc	2013-03-30 17:42:05.575734731 +0100
 @@ -18,6 +18,47 @@
  
  #include "typedefs.h"
diff --git a/debian/patches/arm-no-float-abi.patch b/debian/patches/arm-no-float-abi.patch
index 6daf741..882d4ff 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	2013-02-22 13:16:14.915093970 +0100
-+++ sid/src/build/common.gypi	2013-02-22 13:16:37.555093429 +0100
-@@ -868,7 +868,7 @@
+--- sid.orig/src/build/common.gypi	2013-03-30 17:36:33.403742676 +0100
++++ sid/src/build/common.gypi	2013-03-30 17:41:56.039734959 +0100
+@@ -911,7 +911,7 @@
      'arm_fpu%': 'vfpv3',
  
      # Set ARM float abi compilation flag.
diff --git a/debian/patches/arm.patch b/debian/patches/arm.patch
index 0f2c584..08f2d9d 100644
--- a/debian/patches/arm.patch
+++ b/debian/patches/arm.patch
@@ -1,7 +1,7 @@
 Index: sid/src/ui/base/resource/data_pack.cc
 ===================================================================
---- sid.orig/src/ui/base/resource/data_pack.cc	2013-02-22 11:24:12.000000000 +0100
-+++ sid/src/ui/base/resource/data_pack.cc	2013-02-22 13:16:57.311092957 +0100
+--- sid.orig/src/ui/base/resource/data_pack.cc	2013-03-16 09:37:22.000000000 +0100
++++ sid/src/ui/base/resource/data_pack.cc	2013-03-30 17:42:01.131734837 +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.
@@ -17,8 +17,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-02-22 11:25:35.000000000 +0100
-+++ sid/src/v8/src/arm/macro-assembler-arm.cc	2013-02-22 13:16:57.315092957 +0100
+--- sid.orig/src/v8/src/arm/macro-assembler-arm.cc	2013-03-16 09:39:00.000000000 +0100
++++ sid/src/v8/src/arm/macro-assembler-arm.cc	2013-03-30 17:42:01.131734837 +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 6f53bf7..f327be3 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	2013-02-22 11:22:56.000000000 +0100
-+++ sid/src/build/common.gypi	2013-02-22 13:16:14.915093970 +0100
-@@ -2558,6 +2558,7 @@
+--- sid.orig/src/build/common.gypi	2013-03-16 09:36:04.000000000 +0100
++++ sid/src/build/common.gypi	2013-03-30 17:36:33.403742676 +0100
+@@ -2662,6 +2662,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	2013-02-22 11:22:57.000000000 +0100
-+++ sid/src/base/debug/debugger_posix.cc	2013-02-22 13:16:14.919093970 +0100
+--- sid.orig/src/base/debug/debugger_posix.cc	2013-03-16 09:36:05.000000000 +0100
++++ sid/src/base/debug/debugger_posix.cc	2013-03-30 17:36:33.407742677 +0100
 @@ -230,7 +230,7 @@
  } while (0)
  #else
diff --git a/debian/patches/cups1.5.patch b/debian/patches/cups1.5.patch
index c7f0b9d..dd71946 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-02-22 11:22:15.000000000 +0100
-+++ sid/src/printing/backend/cups_helper.h	2013-02-22 13:16:34.127093512 +0100
+--- sid.orig/src/printing/backend/cups_helper.h	2013-03-16 09:35:30.000000000 +0100
++++ sid/src/printing/backend/cups_helper.h	2013-03-30 17:41:53.611735017 +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-02-22 11:24:08.000000000 +0100
-+++ sid/src/chrome/service/cloud_print/print_system_cups.cc	2013-02-22 13:16:34.131093512 +0100
+--- sid.orig/src/chrome/service/cloud_print/print_system_cups.cc	2013-03-16 09:37:20.000000000 +0100
++++ sid/src/chrome/service/cloud_print/print_system_cups.cc	2013-03-30 17:41:53.615735017 +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 0d6308d..6037c1b 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-02-22 11:24:55.000000000 +0100
-+++ sid/src/third_party/libjingle/source/talk/xmllite/xmlparser.h	2013-02-22 13:16:09.895094091 +0100
+--- sid.orig/src/third_party/libjingle/source/talk/xmllite/xmlparser.h	2013-03-16 09:38:14.000000000 +0100
++++ sid/src/third_party/libjingle/source/talk/xmllite/xmlparser.h	2013-03-30 17:34:46.651745229 +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-02-22 11:24:53.000000000 +0100
-+++ sid/src/third_party/libjingle/source/talk/xmpp/xmppstanzaparser.cc	2013-02-22 13:16:09.899094091 +0100
+--- sid.orig/src/third_party/libjingle/source/talk/xmpp/xmppstanzaparser.cc	2013-03-16 09:38:11.000000000 +0100
++++ sid/src/third_party/libjingle/source/talk/xmpp/xmppstanzaparser.cc	2013-03-30 17:34:46.655745229 +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-02-22 11:25:13.000000000 +0100
-+++ sid/src/third_party/skia/src/ports/SkXMLParser_expat.cpp	2013-02-22 13:16:09.899094091 +0100
+--- sid.orig/src/third_party/skia/src/ports/SkXMLParser_expat.cpp	2013-03-16 09:38:30.000000000 +0100
++++ sid/src/third_party/skia/src/ports/SkXMLParser_expat.cpp	2013-03-30 17:34:46.655745229 +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-02-22 11:25:13.000000000 +0100
-+++ sid/src/third_party/skia/src/ports/SkXMLPullParser_expat.cpp	2013-02-22 13:16:09.899094091 +0100
+--- sid.orig/src/third_party/skia/src/ports/SkXMLPullParser_expat.cpp	2013-03-16 09:38:30.000000000 +0100
++++ sid/src/third_party/skia/src/ports/SkXMLPullParser_expat.cpp	2013-03-30 17:34:46.655745229 +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-02-22 11:24:55.000000000 +0100
-+++ sid/src/third_party/libjingle/source/talk/xmllite/xmlbuilder.h	2013-02-22 13:16:09.899094091 +0100
+--- sid.orig/src/third_party/libjingle/source/talk/xmllite/xmlbuilder.h	2013-03-16 09:38:14.000000000 +0100
++++ sid/src/third_party/libjingle/source/talk/xmllite/xmlbuilder.h	2013-03-30 17:34:46.655745229 +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 a67f6e7..9712046 100644
--- a/debian/patches/ffmpeg_arm.patch
+++ b/debian/patches/ffmpeg_arm.patch
@@ -1,9 +1,29 @@
 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-02-22 11:25:04.000000000 +0100
-+++ sid/src/third_party/ffmpeg/ffmpeg_generated.gypi	2013-02-22 13:16:24.671093738 +0100
-@@ -314,53 +314,41 @@
+--- sid.orig/src/third_party/ffmpeg/ffmpeg_generated.gypi	2013-03-16 09:38:07.000000000 +0100
++++ sid/src/third_party/ffmpeg/ffmpeg_generated.gypi	2013-03-30 17:40:15.887737358 +0100
+@@ -114,19 +114,16 @@
+           'libavcodec/arm/h264dsp_init_arm.c',
+           'libavcodec/arm/mpegaudiodsp_init_arm.c',
+           'libavcodec/arm/mpegvideo_arm.c',
+-          'libavcodec/arm/mpegvideo_armv5te.c',
+           'libavcodec/arm/sbrdsp_init_arm.c',
+         ],
+         'asm_sources': [
+           'libavcodec/arm/mpegaudiodsp_fixed_armv6.S',
+-          'libavcodec/arm/mpegvideo_armv5te_s.S',
+         ],
+         'converter_outputs': [
+           '<(shared_generated_dir)/libavcodec/arm/aacpsdsp_init_arm.c',
+           '<(shared_generated_dir)/libavcodec/arm/h264dsp_init_arm.c',
+           '<(shared_generated_dir)/libavcodec/arm/mpegaudiodsp_init_arm.c',
+           '<(shared_generated_dir)/libavcodec/arm/mpegvideo_arm.c',
+-          '<(shared_generated_dir)/libavcodec/arm/mpegvideo_armv5te.c',
+           '<(shared_generated_dir)/libavcodec/arm/sbrdsp_init_arm.c',
+         ],
+       }],  # (target_arch == "arm" or (target_arch == "arm" and arm_neon == 1)) and (ffmpeg_branding == "Chrome" or ffmpeg_branding == "ChromeOS") and (1)
+@@ -321,9 +318,7 @@
        ['(target_arch == "arm" or (target_arch == "arm" and arm_neon == 1)) and (1) and (1)', {
          'c_sources': [
            'libavcodec/arm/dsputil_init_arm.c',
@@ -13,11 +33,7 @@ Index: sid/src/third_party/ffmpeg/ffmpeg_generated.gypi
            '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',
+@@ -333,26 +328,19 @@
            'libavcodec/arm/vp8dsp_init_armv6.c',
            'libavutil/arm/cpu.c',
            'libavutil/arm/float_dsp_init_arm.c',
@@ -27,9 +43,8 @@ Index: sid/src/third_party/ffmpeg/ffmpeg_generated.gypi
            'libavcodec/arm/dsputil_arm.S',
            'libavcodec/arm/dsputil_armv6.S',
 -          'libavcodec/arm/dsputil_vfp.S',
-           'libavcodec/arm/fmtconvert_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',
@@ -45,11 +60,7 @@ Index: sid/src/third_party/ffmpeg/ffmpeg_generated.gypi
            '<(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',
+@@ -362,7 +350,6 @@
            '<(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',
diff --git a/debian/patches/fix-manpage.patch b/debian/patches/fix-manpage.patch
index d69cfb3..60c3dec 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-02-22 11:23:08.000000000 +0100
-+++ sid/src/chrome/app/resources/manpage.1.in	2013-02-22 13:16:29.767093616 +0100
+--- sid.orig/src/chrome/app/resources/manpage.1.in	2013-03-16 09:36:16.000000000 +0100
++++ sid/src/chrome/app/resources/manpage.1.in	2013-03-30 17:41:44.635735232 +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 1f0c9e6..6e144a8 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-02-22 11:23:22.000000000 +0100
-+++ sid/src/chrome/browser/search_engines/template_url_prepopulate_data.h	2013-02-22 13:16:41.591093333 +0100
+--- sid.orig/src/chrome/browser/search_engines/template_url_prepopulate_data.h	2013-03-16 09:36:26.000000000 +0100
++++ sid/src/chrome/browser/search_engines/template_url_prepopulate_data.h	2013-03-30 17:41:58.651734896 +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-02-22 11:22:16.000000000 +0100
-+++ sid/src/gpu/command_buffer/common/types.h	2013-02-22 13:16:41.591093333 +0100
+--- sid.orig/src/gpu/command_buffer/common/types.h	2013-03-16 09:35:31.000000000 +0100
++++ sid/src/gpu/command_buffer/common/types.h	2013-03-30 17:41:58.651734896 +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-02-22 11:22:57.000000000 +0100
-+++ sid/src/ipc/ipc_channel.h	2013-02-22 13:16:41.591093333 +0100
+--- sid.orig/src/ipc/ipc_channel.h	2013-03-16 09:36:05.000000000 +0100
++++ sid/src/ipc/ipc_channel.h	2013-03-30 17:41:58.655734896 +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-02-22 11:25:00.000000000 +0100
-+++ sid/src/third_party/ots/src/os2.cc	2013-02-22 13:16:41.595093333 +0100
+--- sid.orig/src/third_party/ots/src/os2.cc	2013-03-16 09:38:20.000000000 +0100
++++ sid/src/third_party/ots/src/os2.cc	2013-03-30 17:41:58.655734896 +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-02-22 11:22:37.000000000 +0100
-+++ sid/src/third_party/tcmalloc/chromium/src/base/stl_allocator.h	2013-02-22 13:16:41.595093333 +0100
+--- sid.orig/src/third_party/tcmalloc/chromium/src/base/stl_allocator.h	2013-03-16 09:35:52.000000000 +0100
++++ sid/src/third_party/tcmalloc/chromium/src/base/stl_allocator.h	2013-03-30 17:41:58.655734896 +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-02-22 11:22:37.000000000 +0100
-+++ sid/src/third_party/tcmalloc/chromium/src/base/vdso_support.h	2013-02-22 13:16:41.595093333 +0100
+--- sid.orig/src/third_party/tcmalloc/chromium/src/base/vdso_support.h	2013-03-16 09:35:52.000000000 +0100
++++ sid/src/third_party/tcmalloc/chromium/src/base/vdso_support.h	2013-03-30 17:41:58.655734896 +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-02-22 11:22:37.000000000 +0100
-+++ sid/src/third_party/tcmalloc/chromium/src/common.cc	2013-02-22 13:16:41.595093333 +0100
+--- sid.orig/src/third_party/tcmalloc/chromium/src/common.cc	2013-03-16 09:35:52.000000000 +0100
++++ sid/src/third_party/tcmalloc/chromium/src/common.cc	2013-03-30 17:41:58.655734896 +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-02-22 11:22:37.000000000 +0100
-+++ sid/src/third_party/tcmalloc/chromium/src/symbolize.h	2013-02-22 13:16:41.595093333 +0100
+--- sid.orig/src/third_party/tcmalloc/chromium/src/symbolize.h	2013-03-16 09:35:52.000000000 +0100
++++ sid/src/third_party/tcmalloc/chromium/src/symbolize.h	2013-03-30 17:41:58.655734896 +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-02-22 11:24:09.000000000 +0100
-+++ sid/src/ui/gfx/codec/jpeg_codec.h	2013-02-22 13:16:41.595093333 +0100
+--- sid.orig/src/ui/gfx/codec/jpeg_codec.h	2013-03-16 09:37:21.000000000 +0100
++++ sid/src/ui/gfx/codec/jpeg_codec.h	2013-03-30 17:41:58.655734896 +0100
 @@ -7,6 +7,7 @@
  
  #include <stddef.h>
diff --git a/debian/patches/icon.patch b/debian/patches/icon.patch
index 075f65b..7e49621 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-02-22 11:23:18.000000000 +0100
-+++ sid/src/chrome/browser/ui/gtk/gtk_util.cc	2013-02-22 13:23:03.155084207 +0100
+--- sid.orig/src/chrome/browser/ui/gtk/gtk_util.cc	2013-03-16 09:36:23.000000000 +0100
++++ sid/src/chrome/browser/ui/gtk/gtk_util.cc	2013-03-30 17:42:03.475734781 +0100
 @@ -51,7 +51,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 eabd123..3420b20 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-02-22 11:22:57.000000000 +0100
-+++ sid/src/base/pr_time_unittest.cc	2013-02-22 13:12:18.243099632 +0100
+--- sid.orig/src/base/pr_time_unittest.cc	2013-03-16 09:36:05.000000000 +0100
++++ sid/src/base/pr_time_unittest.cc	2013-03-30 17:31:00.279750643 +0100
 @@ -5,7 +5,7 @@
  #include <time.h>
  
@@ -14,12 +14,12 @@ Index: sid/src/base/pr_time_unittest.cc
  
 Index: sid/src/base/time.cc
 ===================================================================
---- sid.orig/src/base/time.cc	2013-02-22 11:22:57.000000000 +0100
-+++ sid/src/base/time.cc	2013-02-22 13:12:18.243099632 +0100
+--- sid.orig/src/base/time.cc	2013-03-16 09:36:05.000000000 +0100
++++ sid/src/base/time.cc	2013-03-30 17:34:24.303745766 +0100
 @@ -12,7 +12,7 @@
  #include <limits>
  
- #include "base/sys_string_conversions.h"
+ #include "base/strings/sys_string_conversions.h"
 -#include "base/third_party/nspr/prtime.h"
 +#include <nspr/prtime.h>
  
@@ -27,39 +27,27 @@ 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-02-22 11:23:17.000000000 +0100
-+++ sid/src/chrome/browser/metrics/metrics_log.cc	2013-02-22 13:12:18.247099632 +0100
-@@ -16,7 +16,7 @@
- #include "base/string_number_conversions.h"
+--- sid.orig/src/chrome/browser/metrics/metrics_log.cc	2013-03-16 09:36:22.000000000 +0100
++++ sid/src/chrome/browser/metrics/metrics_log.cc	2013-03-30 17:31:00.279750643 +0100
+@@ -19,7 +19,7 @@
  #include "base/string_util.h"
+ #include "base/strings/string_number_conversions.h"
  #include "base/sys_info.h"
 -#include "base/third_party/nspr/prtime.h"
 +#include <nspr/prtime.h>
  #include "base/time.h"
  #include "base/tracked_objects.h"
  #include "base/utf_string_conversions.h"
-Index: sid/src/base/base.gypi
+Index: sid/src/chrome/common/metrics/metrics_log_base.cc
 ===================================================================
---- sid.orig/src/base/base.gypi	2013-02-22 11:22:57.000000000 +0100
-+++ sid/src/base/base.gypi	2013-02-22 13:12:18.247099632 +0100
-@@ -17,7 +17,6 @@
-           'third_party/dmg_fp/dtoa_wrapper.cc',
-           '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',
-Index: sid/src/net/base/x509_certificate_nss.cc
-===================================================================
---- sid.orig/src/net/base/x509_certificate_nss.cc	2013-02-22 11:22:32.000000000 +0100
-+++ sid/src/net/base/x509_certificate_nss.cc	2013-02-22 13:12:18.247099632 +0100
-@@ -9,7 +9,7 @@
- #include <keyhi.h>
- #include <nss.h>
- #include <pk11pub.h>
--#include <prtime.h>
+--- sid.orig/src/chrome/common/metrics/metrics_log_base.cc	2013-03-16 09:37:14.000000000 +0100
++++ sid/src/chrome/common/metrics/metrics_log_base.cc	2013-03-30 17:33:36.375746910 +0100
+@@ -13,7 +13,7 @@
+ #include "base/strings/string_number_conversions.h"
+ #include "base/sys_byteorder.h"
+ #include "base/sys_info.h"
+-#include "base/third_party/nspr/prtime.h"
 +#include <nspr/prtime.h>
- #include <secder.h>
- #include <sechash.h>
- 
+ #include "base/utf_string_conversions.h"
+ #include "chrome/common/chrome_version_info.h"
+ #include "chrome/common/logging_chrome.h"
diff --git a/debian/patches/nss.patch b/debian/patches/nss.patch
index dd2061b..28c0027 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	2013-02-22 11:24:08.000000000 +0100
-+++ sid/src/chrome/chrome_common.gypi	2013-02-22 13:16:07.307094153 +0100
-@@ -400,6 +400,11 @@
+--- sid.orig/src/chrome/chrome_common.gypi	2013-03-16 09:37:20.000000000 +0100
++++ sid/src/chrome/chrome_common.gypi	2013-03-30 17:34:43.827745296 +0100
+@@ -438,6 +438,11 @@
              '<(DEPTH)/third_party/wtl/include',
            ]
          }],
diff --git a/debian/patches/prefs.patch b/debian/patches/prefs.patch
index 33d5f0a..5f82f46 100644
--- a/debian/patches/prefs.patch
+++ b/debian/patches/prefs.patch
@@ -2,14 +2,14 @@ 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-02-22 11:23:22.000000000 +0100
-+++ sid/src/chrome/browser/first_run/first_run_linux.cc	2013-02-22 13:16:12.515094029 +0100
-@@ -101,8 +101,7 @@
- FilePath MasterPrefsPath() {
+--- sid.orig/src/chrome/browser/first_run/first_run_linux.cc	2013-03-16 09:36:26.000000000 +0100
++++ sid/src/chrome/browser/first_run/first_run_linux.cc	2013-03-30 17:36:23.679742907 +0100
+@@ -71,8 +71,7 @@
+ base::FilePath MasterPrefsPath() {
    // The standard location of the master prefs is next to the chrome binary.
-   FilePath master_prefs;
+   base::FilePath master_prefs;
 -  if (!PathService::Get(base::DIR_EXE, &master_prefs))
--    return FilePath();
+-    return base::FilePath();
 +  master_prefs = FilePath("/etc/chromium");
    return master_prefs.AppendASCII(installer::kDefaultMasterPrefs);
  }
diff --git a/debian/patches/system-speech.patch b/debian/patches/system-speech.patch
index 727a922..72cdbe7 100644
--- a/debian/patches/system-speech.patch
+++ b/debian/patches/system-speech.patch
@@ -1,9 +1,9 @@
 Use system speex
 Index: sid/src/build/linux/system.gyp
 ===================================================================
---- sid.orig/src/build/linux/system.gyp	2013-02-22 11:22:56.000000000 +0100
-+++ sid/src/build/linux/system.gyp	2013-02-22 13:16:27.135093679 +0100
-@@ -492,6 +492,26 @@
+--- sid.orig/src/build/linux/system.gyp	2013-03-16 09:36:04.000000000 +0100
++++ sid/src/build/linux/system.gyp	2013-03-30 17:40:30.135737015 +0100
+@@ -619,6 +619,26 @@
        ],
      },
      {
@@ -32,22 +32,22 @@ 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-02-22 11:22:20.000000000 +0100
-+++ sid/src/content/browser/speech/audio_encoder.cc	2013-02-22 13:16:27.139093679 +0100
+--- sid.orig/src/content/browser/speech/audio_encoder.cc	2013-03-16 09:35:35.000000000 +0100
++++ sid/src/content/browser/speech/audio_encoder.cc	2013-03-30 17:41:20.051735820 +0100
 @@ -11,7 +11,7 @@
  #include "base/string_number_conversions.h"
  #include "content/browser/speech/audio_buffer.h"
- #include "third_party/flac/flac.h"
--#include "third_party/speex/speex.h"
+ #include "third_party/flac/include/FLAC/stream_encoder.h"
+-#include "third_party/speex/include/speex/speex.h"
 +#include <speex/speex.h>
  
  namespace content {
  namespace {
 Index: sid/src/content/content_browser.gypi
 ===================================================================
---- sid.orig/src/content/content_browser.gypi	2013-02-22 11:22:27.000000000 +0100
-+++ sid/src/content/content_browser.gypi	2013-02-22 13:16:27.139093679 +0100
-@@ -1064,7 +1064,7 @@
+--- sid.orig/src/content/content_browser.gypi	2013-03-16 09:35:44.000000000 +0100
++++ sid/src/content/content_browser.gypi	2013-03-30 17:40:30.143737013 +0100
+@@ -1097,7 +1097,7 @@
      }, { # OS!="android"
        'dependencies': [
          '../third_party/flac/flac.gyp:libflac',
diff --git a/debian/patches/webkit-version.patch b/debian/patches/webkit-version.patch
index 78842d1..454d81a 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-02-22 11:22:14.000000000 +0100
-+++ sid/src/webkit/build/webkit_version.py	2013-02-22 13:16:31.875093568 +0100
+--- sid.orig/src/webkit/build/webkit_version.py	2013-03-16 09:35:29.000000000 +0100
++++ sid/src/webkit/build/webkit_version.py	2013-03-30 17:41:51.355735071 +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