[Pkg-chromium-commit] [SCM] Git repository for pkg-chromium branch, master, updated. debian/27.0.1453.110-1-18-g3d518be
Michael Gilbert
mgilbert at debian.org
Tue Jul 16 12:07:11 UTC 2013
The following commit has been merged in the master branch:
commit 3b90da8e84d591acb35e1056aa995dbff4d2994e
Author: Michael Gilbert <mgilbert at debian.org>
Date: Tue Jul 16 08:11:08 2013 -0400
Remove unused patches
diff --git a/debian/patches/arm-no-float-abi.patch b/debian/patches/arm-no-float-abi.patch
deleted file mode 100644
index 53df892..0000000
--- a/debian/patches/arm-no-float-abi.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: chromium/src/build/common.gypi
-===================================================================
---- chromium.orig/src/build/common.gypi 2013-05-22 03:15:43.553475451 +0000
-+++ chromium/src/build/common.gypi 2013-05-22 03:15:43.549475453 +0000
-@@ -919,7 +919,7 @@
- 'arm_fpu%': 'vfpv3',
-
- # Set ARM float abi compilation flag.
-- 'arm_float_abi%': 'softfp',
-+ #'arm_float_abi%': 'softfp',
-
- # Enable use of OpenMAX DL FFT routines.
- 'use_openmax_dl_fft%': '<(use_openmax_dl_fft)',
diff --git a/debian/patches/chromium_useragent.patch b/debian/patches/chromium_useragent.patch
deleted file mode 100644
index 8af06f8..0000000
--- a/debian/patches/chromium_useragent.patch
+++ /dev/null
@@ -1,34 +0,0 @@
----
- webkit/glue/webkit_glue.cc | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-Index: src/webkit/glue/webkit_glue.cc
-===================================================================
---- src.orig/webkit/glue/webkit_glue.cc
-+++ src/webkit/glue/webkit_glue.cc
-@@ -366,18 +366,24 @@
- // Get the product name and version, and replace Safari's Version/X string
- // with it. This is done to expose our product name in a manner that is
- // maximally compatible with Safari, we hope!!
- std::string product;
-
- if (!mimic_safari) {
- scoped_ptr<FileVersionInfo> version_info(
- FileVersionInfo::CreateFileVersionInfoForCurrentModule());
-- if (version_info.get())
-+ if (version_info.get()) {
-+ std::string product_name;
-+
-+ product_name = WideToASCII(version_info->product_name());
- product = "Chrome/" + WideToASCII(version_info->product_version());
-+ if (LowerCaseEqualsASCII(product_name, "chromium"))
-+ product += " " + product_name + "/" + WideToASCII(version_info->product_version());
-+ }
- }
-
- if (product.empty())
- product = "Version/3.2.1";
-
- // Derived from Safari's UA string.
- StringAppendF(
- result,
diff --git a/debian/patches/cups1.5.patch b/debian/patches/cups1.5.patch
deleted file mode 100644
index 64e7745..0000000
--- a/debian/patches/cups1.5.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-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-06-24 11:48:42.972039352 +0200
-+++ sid/src/printing/backend/cups_helper.h 2013-06-24 11:48:42.964039352 +0200
-@@ -6,6 +6,7 @@
- #define PRINTING_BACKEND_CUPS_HELPER_H_
-
- #include <cups/cups.h>
-+#include <cups/ppd.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 2013-06-24 11:48:42.972039352 +0200
-+++ sid/src/chrome/service/cloud_print/print_system_cups.cc 2013-06-24 11:48:42.968039352 +0200
-@@ -5,6 +5,7 @@
- #include "chrome/service/cloud_print/print_system.h"
-
- #include <cups/cups.h>
-+#include <cups/ppd.h>
- #include <dlfcn.h>
- #include <errno.h>
- #include <pthread.h>
diff --git a/debian/patches/fix_null_conversion.patch b/debian/patches/fix_null_conversion.patch
deleted file mode 100644
index 49fbe82..0000000
--- a/debian/patches/fix_null_conversion.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- a/src/chrome/browser/gpu_process_host_ui_shim.cc
-+++ b/src/chrome/browser/gpu_process_host_ui_shim.cc
-@@ -102,7 +102,7 @@ RenderWidgetHostView* GpuProcessHostUISh
-
- GpuProcessHostUIShim::GpuProcessHostUIShim()
- : host_id_(++g_last_host_id),
-- gpu_process_(NULL) {
-+ gpu_process_(0) {
- g_hosts_by_id.AddWithID(this, host_id_);
- gpu_data_manager_ = GpuDataManager::GetInstance();
- DCHECK(gpu_data_manager_);
-@@ -236,7 +236,7 @@ void GpuProcessHostUIShim::SendOutstandi
- channel_requests_.pop();
- EstablishChannelError(callback.release(),
- IPC::ChannelHandle(),
-- NULL,
-+ 0,
- GPUInfo());
- }
-
-@@ -266,7 +266,7 @@ void GpuProcessHostUIShim::EstablishGpuC
- // If GPU features are already blacklisted, no need to establish the channel.
- if (gpu_data_manager_->GetGpuFeatureFlags().flags() != 0) {
- EstablishChannelError(
-- wrapped_callback.release(), IPC::ChannelHandle(), NULL, GPUInfo());
-+ wrapped_callback.release(), IPC::ChannelHandle(), 0, GPUInfo());
- return;
- }
-
-@@ -274,7 +274,7 @@ void GpuProcessHostUIShim::EstablishGpuC
- channel_requests_.push(wrapped_callback);
- } else {
- EstablishChannelError(
-- wrapped_callback.release(), IPC::ChannelHandle(), NULL, GPUInfo());
-+ wrapped_callback.release(), IPC::ChannelHandle(), 0, GPUInfo());
- }
- }
-
-@@ -419,7 +419,7 @@ void GpuProcessHostUIShim::OnChannelEsta
- Send(new GpuMsg_CloseChannel(channel_handle));
- EstablishChannelError(callback.release(),
- IPC::ChannelHandle(),
-- NULL,
-+ 0,
- gpu_info);
- AddCustomLogMessage(logging::LOG_WARNING, "WARNING",
- "Hardware acceleration is unavailable.");
---- a/src/chrome/gpu/gpu_channel.cc
-+++ b/src/chrome/gpu/gpu_channel.cc
-@@ -26,8 +26,8 @@ GpuChannel::GpuChannel(GpuThread* gpu_th
- int renderer_id)
- : gpu_thread_(gpu_thread),
- renderer_id_(renderer_id),
-- renderer_process_(NULL),
-- renderer_pid_(NULL) {
-+ renderer_process_(0),
-+ renderer_pid_(0) {
- DCHECK(gpu_thread);
- DCHECK(renderer_id);
- const CommandLine* command_line = CommandLine::ForCurrentProcess();
diff --git a/debian/patches/gcc4.7.patch b/debian/patches/gcc4.7.patch
deleted file mode 100644
index 518ae26..0000000
--- a/debian/patches/gcc4.7.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-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-06-24 11:50:52.948040747 +0200
-+++ sid/src/chrome/browser/search_engines/template_url_prepopulate_data.h 2013-06-24 11:50:52.936040746 +0200
-@@ -8,6 +8,7 @@
- #include <stddef.h>
- #include <string>
- #include <vector>
-+#include <cstddef>
-
- #include "base/string16.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-06-24 11:50:52.948040747 +0200
-+++ sid/src/gpu/command_buffer/common/types.h 2013-06-24 11:50:52.940040746 +0200
-@@ -12,6 +12,7 @@
- #endif
- #include <cstddef>
- #include <string>
-+#include <cstddef>
-
- typedef signed char schar;
- typedef signed char int8;
-Index: sid/src/ipc/ipc_channel.h
-===================================================================
---- sid.orig/src/ipc/ipc_channel.h 2013-06-24 11:50:52.948040747 +0200
-+++ sid/src/ipc/ipc_channel.h 2013-06-24 11:50:52.940040746 +0200
-@@ -1,3 +1,4 @@
-+#include <sys/types.h>
- // Copyright (c) 2012 The Chromium Authors. All rights reserved.
- // Use of this source code is governed by a BSD-style license that can be
- // found in the LICENSE file.
-Index: sid/src/third_party/ots/src/os2.cc
-===================================================================
---- sid.orig/src/third_party/ots/src/os2.cc 2013-06-24 11:50:52.948040747 +0200
-+++ sid/src/third_party/ots/src/os2.cc 2013-06-24 11:50:52.940040746 +0200
-@@ -5,6 +5,7 @@
- #include "os2.h"
-
- #include "head.h"
-+#include <cstddef>
-
- // OS/2 - OS/2 and Windows Metrics
- // 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-06-24 11:50:52.948040747 +0200
-+++ sid/src/third_party/tcmalloc/chromium/src/base/stl_allocator.h 2013-06-24 11:50:52.940040746 +0200
-@@ -39,6 +39,7 @@
-
- #include <stddef.h> // for ptrdiff_t
- #include <limits>
-+#include <cstddef>
-
- #include "base/logging.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-06-24 11:50:52.948040747 +0200
-+++ sid/src/third_party/tcmalloc/chromium/src/base/vdso_support.h 2013-06-24 11:50:52.940040746 +0200
-@@ -63,6 +63,7 @@
-
- #define HAVE_VDSO_SUPPORT 1
-
-+#include <cstddef>
- #include <stdlib.h> // for NULL
-
- namespace base {
-Index: sid/src/third_party/tcmalloc/chromium/src/common.cc
-===================================================================
---- sid.orig/src/third_party/tcmalloc/chromium/src/common.cc 2013-06-24 11:50:52.948040747 +0200
-+++ sid/src/third_party/tcmalloc/chromium/src/common.cc 2013-06-24 11:50:52.940040746 +0200
-@@ -33,6 +33,7 @@
- #include "config.h"
- #include "common.h"
- #include "system-alloc.h"
-+#include <cstddef>
-
- #if defined(HAVE_UNISTD_H) && defined(HAVE_GETPAGESIZE)
- #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-06-24 11:50:52.948040747 +0200
-+++ sid/src/third_party/tcmalloc/chromium/src/symbolize.h 2013-06-24 11:50:52.944040747 +0200
-@@ -39,6 +39,7 @@
- #endif
- #include <stddef.h> // for NULL
- #include <map>
-+#include <cstddef>
-
- using std::map;
-
-Index: sid/src/ui/gfx/codec/jpeg_codec.h
-===================================================================
---- sid.orig/src/ui/gfx/codec/jpeg_codec.h 2013-06-24 11:50:52.948040747 +0200
-+++ sid/src/ui/gfx/codec/jpeg_codec.h 2013-06-24 11:50:52.944040747 +0200
-@@ -7,6 +7,7 @@
-
- #include <stddef.h>
- #include <vector>
-+#include <cstddef>
-
- #include "ui/base/ui_export.h"
-
diff --git a/debian/patches/gcc4.8.patch b/debian/patches/gcc4.8.patch
deleted file mode 100644
index 93c2cb8..0000000
--- a/debian/patches/gcc4.8.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Index: chromium/src/build/common.gypi
-===================================================================
---- chromium.orig/src/build/common.gypi 2013-07-12 15:18:31.970094698 +0000
-+++ chromium/src/build/common.gypi 2013-07-12 15:18:31.966094698 +0000
-@@ -2832,6 +2832,14 @@
- },
- },
- 'conditions': [
-+ [ 'gcc_version>=48', {
-+ 'cflags': [
-+ '-Wno-unused-local-typedefs',
-+ ],
-+ 'cflags_cc': [
-+ '-fpermissive',
-+ ],
-+ }],
- ['target_arch=="ia32"', {
- 'target_conditions': [
- ['_toolset=="target"', {
diff --git a/debian/patches/gcc46.patch b/debian/patches/gcc46.patch
deleted file mode 100644
index e78932c..0000000
--- a/debian/patches/gcc46.patch
+++ /dev/null
@@ -1,122 +0,0 @@
---- a/src/gpu/command_buffer/common/cmd_buffer_common.h
-+++ b/src/gpu/command_buffer/common/cmd_buffer_common.h
-@@ -7,6 +7,8 @@
- #ifndef GPU_COMMAND_BUFFER_COMMON_CMD_BUFFER_COMMON_H_
- #define GPU_COMMAND_BUFFER_COMMON_CMD_BUFFER_COMMON_H_
-
-+
-+#include <cstddef>
- #include "../common/types.h"
- #include "../common/bitfield_helpers.h"
- #include "../common/logging.h"
---- a/src/gpu/command_buffer/common/gles2_cmd_format.h
-+++ b/src/gpu/command_buffer/common/gles2_cmd_format.h
-@@ -11,6 +11,7 @@
- #include <KHR/khrplatform.h>
-
- #include <string.h>
-+#include <cstddef>
-
- #include "../common/types.h"
- #include "../common/bitfield_helpers.h"
---- a/src/net/http/http_net_log_params.h
-+++ b/src/net/http/http_net_log_params.h
-@@ -12,6 +12,7 @@
- #include "base/memory/ref_counted.h"
- #include "net/base/net_log.h"
- #include "net/http/http_request_headers.h"
-+#include "net/http/http_response_headers.h"
-
- class Value;
-
---- a/src/net/spdy/spdy_http_stream.cc
-+++ b/src/net/spdy/spdy_http_stream.cc
-@@ -16,6 +16,7 @@
- #include "net/base/net_util.h"
- #include "net/http/http_request_headers.h"
- #include "net/http/http_request_info.h"
-+#include "net/http/http_response_headers.h"
- #include "net/http/http_response_info.h"
- #include "net/http/http_util.h"
- #include "net/spdy/spdy_http_utils.h"
---- a/src/third_party/ots/src/ots.h
-+++ b/src/third_party/ots/src/ots.h
-@@ -6,6 +6,7 @@
- #define OTS_H_
-
- #include <cstdarg>
-+#include <cstddef>
- #include <cstdio>
- #include <cstdlib>
- #include <cstring>
---- a/src/third_party/tcmalloc/chromium/src/base/stl_allocator.h
-+++ b/src/third_party/tcmalloc/chromium/src/base/stl_allocator.h
-@@ -37,6 +37,7 @@
-
- #include <config.h>
-
-+#include <cstddef>
- #include <limits>
-
- #include "base/basictypes.h"
---- a/src/third_party/tcmalloc/chromium/src/base/vdso_support.cc
-+++ b/src/third_party/tcmalloc/chromium/src/base/vdso_support.cc
-@@ -39,6 +39,7 @@
-
- #ifdef HAVE_VDSO_SUPPORT // defined in vdso_support.h
-
-+#include <cstddef>
- #include <fcntl.h>
-
- #include "base/atomicops.h" // for MemoryBarrier
---- a/src/third_party/tcmalloc/chromium/src/symbolize.h
-+++ b/src/third_party/tcmalloc/chromium/src/symbolize.h
-@@ -48,7 +48,7 @@ using std::map;
- class SymbolTable {
- public:
- SymbolTable()
-- : symbol_buffer_(NULL) {}
-+ : symbol_buffer_(0) {}
- ~SymbolTable() {
- delete[] symbol_buffer_;
- }
---- a/src/third_party/tcmalloc/chromium/src/system-alloc.cc
-+++ b/src/third_party/tcmalloc/chromium/src/system-alloc.cc
-@@ -31,6 +31,7 @@
- // Author: Sanjay Ghemawat
-
- #include <config.h>
-+#include <cstddef>
- #if defined HAVE_STDINT_H
- #include <stdint.h>
- #elif defined HAVE_INTTYPES_H
---- a/src/ui/gfx/codec/jpeg_codec.h
-+++ b/src/ui/gfx/codec/jpeg_codec.h
-@@ -8,6 +8,7 @@
-
- #include <stddef.h>
- #include <vector>
-+#include <cstdlib>
-
- class SkBitmap;
-
---- a/src/third_party/ots/src/os2.cc
-+++ b/src/third_party/ots/src/os2.cc
-@@ -5,6 +5,7 @@
- #include "os2.h"
-
- #include "head.h"
-+#include <cstddef>
-
- // OS/2 - OS/2 and Windows Metrics
- // http://www.microsoft.com/opentype/otspec/os2.htm
---- a/src/third_party/tcmalloc/chromium/src/common.cc
-+++ b/src/third_party/tcmalloc/chromium/src/common.cc
-@@ -30,6 +30,7 @@
- // ---
- // Author: Sanjay Ghemawat <opensource at google.com>
-
-+#include <cstddef>
- #include "config.h"
- #include "system-alloc.h"
- #include "config.h"
diff --git a/debian/patches/libav0.8.patch b/debian/patches/libav0.8.patch
deleted file mode 100644
index f4c836b..0000000
--- a/debian/patches/libav0.8.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/media/ffmpeg/ffmpeg_common.h
-+++ b/src/media/ffmpeg/ffmpeg_common.h
-@@ -23,6 +23,7 @@ MSVC_PUSH_DISABLE_WARNING(4244);
- #include <libavformat/avformat.h>
- #include <libavformat/avio.h>
- #include <libavutil/avutil.h>
-+#include <libavutil/mathematics.h>
- #include <libavutil/log.h>
- MSVC_POP_WARNING();
- } // extern "C"
diff --git a/debian/patches/no_tree_sink_v8.patch b/debian/patches/no_tree_sink_v8.patch
deleted file mode 100644
index 1e06025..0000000
--- a/debian/patches/no_tree_sink_v8.patch
+++ /dev/null
@@ -1,26 +0,0 @@
----
- v8/tools/gyp/v8.gyp | 1 +
- 1 file changed, 1 insertion(+)
-
-Index: src/v8/tools/gyp/v8.gyp
-===================================================================
---- src.orig/v8/tools/gyp/v8.gyp
-+++ src/v8/tools/gyp/v8.gyp
-@@ -86,16 +86,17 @@
- 'cflags': [
- '-fomit-frame-pointer',
- '-O3',
- ],
- 'conditions': [
- [ 'gcc_version==44', {
- 'cflags': [
- # Avoid gcc 4.4 strict aliasing issues in dtoa.c
-+ '-fno-tree-sink',
- '-fno-strict-aliasing',
- # Avoid crashes with gcc 4.4 in the v8 test suite.
- '-fno-tree-vrp',
- ],
- }],
- ],
- }],
- ['OS=="mac"', {
diff --git a/debian/patches/pulse_ftbfs.patch b/debian/patches/pulse_ftbfs.patch
deleted file mode 100644
index a3f29d9..0000000
--- a/debian/patches/pulse_ftbfs.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: sid/src/media/audio/pulse/pulse_output.cc
-===================================================================
---- 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.
- for (unsigned int channel = 0; channel != CHANNELS_MAX; ++channel) {
-- int channel_position = kChannelOrderings[channel_layout][channel];
-+ int channel_position = ChannelOrder(channel_layout, static_cast<Channels>(channel));
- if (channel_position > -1) {
- channel_map.map[channel_position] = ChromiumToPAChannelPosition(
- static_cast<Channels>(channel));
diff --git a/debian/patches/series b/debian/patches/series
index a6531e9..a5df548 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,16 +10,11 @@ system-speech.patch
fix-manpage.patch
webkit-version.patch
#ffmpeg.patch
-#gcc46.patch
#vpx.patch
#protobuf.patch
#javascript-i18n.patch
#icu.patch
-cups1.5.patch
#system_v8.patch
-#protobuf.patch
-gcc4.7.patch
arm.patch
icon.patch
arm-neon.patch
-gcc4.8.patch
--
Git repository for pkg-chromium
More information about the Pkg-chromium-commit
mailing list