[Pkg-chromium-commit] [SCM] Git repository for pkg-chromium branch, master, updated. debian/25.0.1364.152-1-9-g5daf756
Michael Gilbert
mgilbert at debian.org
Wed May 22 21:54:55 UTC 2013
The following commit has been merged in the master branch:
commit 20895943e1d32e3d855cf9f9fc5746ccb1f02b78
Author: Michael Gilbert <mgilbert at debian.org>
Date: Wed May 22 17:54:51 2013 -0400
refresh patches
diff --git a/debian/patches/arm-no-float-abi.patch b/debian/patches/arm-no-float-abi.patch
index d636a4d..53df892 100644
--- a/debian/patches/arm-no-float-abi.patch
+++ b/debian/patches/arm-no-float-abi.patch
@@ -1,13 +1,13 @@
-Index: chromium-browser/src/build/common.gypi
+Index: chromium/src/build/common.gypi
===================================================================
---- chromium-browser.orig/src/build/common.gypi 2013-03-30 15:06:48.084381472 +0000
-+++ chromium-browser/src/build/common.gypi 2013-03-30 15:06:48.080381472 +0000
-@@ -911,7 +911,7 @@
+--- 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 new NPDevice API.
- 'enable_new_npdevice_api%': 0,
+ # Enable use of OpenMAX DL FFT routines.
+ 'use_openmax_dl_fft%': '<(use_openmax_dl_fft)',
diff --git a/debian/patches/arm.patch b/debian/patches/arm.patch
index 08f2d9d..5c6889c 100644
--- a/debian/patches/arm.patch
+++ b/debian/patches/arm.patch
@@ -1,8 +1,8 @@
-Index: sid/src/ui/base/resource/data_pack.cc
+Index: chromium/src/ui/base/resource/data_pack.cc
===================================================================
---- 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 @@
+--- chromium.orig/src/ui/base/resource/data_pack.cc 2013-05-22 03:15:53.209475098 +0000
++++ chromium/src/ui/base/resource/data_pack.cc 2013-05-22 03:15:53.185475099 +0000
+@@ -147,9 +147,11 @@
// 2) Verify the entries are within the appropriate bounds. There's an extra
// entry after the last item which gives us the length of the last item.
for (size_t i = 0; i < resource_count_ + 1; ++i) {
@@ -15,10 +15,10 @@ Index: sid/src/ui/base/resource/data_pack.cc
LOG(ERROR) << "Entry #" << i << " in data pack points off end of file. "
<< "Was the file corrupted?";
UMA_HISTOGRAM_ENUMERATION("DataPack.Load", ENTRY_NOT_FOUND,
-Index: sid/src/v8/src/arm/macro-assembler-arm.cc
+Index: chromium/src/v8/src/arm/macro-assembler-arm.cc
===================================================================
---- 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
+--- chromium.orig/src/v8/src/arm/macro-assembler-arm.cc 2013-05-22 03:15:53.209475098 +0000
++++ chromium/src/v8/src/arm/macro-assembler-arm.cc 2013-05-22 03:15:53.205475100 +0000
@@ -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 1f61fe9..21578fb 100644
--- a/debian/patches/armv4.patch
+++ b/debian/patches/armv4.patch
@@ -1,26 +1,13 @@
Do not use armv4 incopatible code
-Index: sid/src/build/common.gypi
+Index: chromium/src/build/common.gypi
===================================================================
---- chromium-browser.orig/src/build/common.gypi 2013-03-30 15:01:40.836384122 +0000
-+++ chromium-browser/src/build/common.gypi 2013-03-30 15:01:40.828384122 +0000
-@@ -2662,6 +2662,7 @@
+--- chromium.orig/src/build/common.gypi 2013-05-22 03:14:34.821477965 +0000
++++ chromium/src/build/common.gypi 2013-05-22 03:14:34.817477965 +0000
+@@ -2745,6 +2745,7 @@
# silences those warnings, as they are not helpful and
# clutter legitimate warnings.
'-Wno-abi',
+ '-fno-tree-sink',
],
'conditions': [
- ['arm_thumb==1', {
-Index: sid/src/base/debug/debugger_posix.cc
-===================================================================
---- chromium-browser.orig/src/base/debug/debugger_posix.cc 2013-03-30 15:01:40.836384122 +0000
-+++ chromium-browser/src/base/debug/debugger_posix.cc 2013-03-30 15:01:40.832384122 +0000
-@@ -230,7 +230,7 @@
- } while (0)
- #else
- // ARM && !ANDROID
--#define DEBUG_BREAK() asm("bkpt 0")
-+#define DEBUG_BREAK() asm("nop")
- #endif
- #elif defined(ARCH_CPU_MIPS_FAMILY)
- #define DEBUG_BREAK() asm("break 2")
+ ['arm_thumb==1 and android_webview_build==0', {
diff --git a/debian/patches/icon.patch b/debian/patches/icon.patch
index 7e49621..4631698 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
+Index: chromium/src/chrome/browser/ui/gtk/gtk_util.cc
===================================================================
---- 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 @@
+--- chromium.orig/src/chrome/browser/ui/gtk/gtk_util.cc 2013-05-22 03:15:59.425474873 +0000
++++ chromium/src/chrome/browser/ui/gtk/gtk_util.cc 2013-05-22 03:15:59.421474874 +0000
+@@ -54,7 +54,7 @@
#if defined(GOOGLE_CHROME_BUILD)
static const char* kIconName = "google-chrome";
#else
diff --git a/debian/patches/nss.patch b/debian/patches/nss.patch
index ea3eb81..d2b3d27 100644
--- a/debian/patches/nss.patch
+++ b/debian/patches/nss.patch
@@ -1,11 +1,11 @@
webkit needs to call nss to pull in nspr headers
-Index: sid/src/chrome/chrome_common.gypi
+Index: chromium/src/chrome/chrome_common.gypi
===================================================================
---- chromium-browser.orig/src/chrome/chrome_common.gypi 2013-03-30 14:57:14.356386421 +0000
-+++ chromium-browser/src/chrome/chrome_common.gypi 2013-03-30 14:57:14.348386420 +0000
-@@ -438,6 +438,11 @@
- '<(DEPTH)/third_party/wtl/include',
- ]
+--- chromium.orig/src/chrome/chrome_common.gypi 2013-05-22 03:08:57.793490276 +0000
++++ chromium/src/chrome/chrome_common.gypi 2013-05-22 03:08:57.793490276 +0000
+@@ -490,6 +490,11 @@
+ 'common/crash_keys.h',
+ ],
}],
+ ['OS=="linux"', {
+ 'include_dirs': [
diff --git a/debian/patches/prefs.patch b/debian/patches/prefs.patch
index 10a5479..b8da675 100644
--- a/debian/patches/prefs.patch
+++ b/debian/patches/prefs.patch
@@ -1,16 +1,17 @@
Author: Raymond Wooninck (tittiatcoke)
Source: OpenSUSE (chromium-master-prefs-path.patch)
-Index: chromium-browser/src/chrome/browser/first_run/first_run_linux.cc
+Index: chromium/src/chrome/browser/first_run/first_run_linux.cc
===================================================================
---- chromium-browser.orig/src/chrome/browser/first_run/first_run_linux.cc 2013-03-30 14:57:40.680386194 +0000
-+++ chromium-browser/src/chrome/browser/first_run/first_run_linux.cc 2013-03-30 15:00:41.448384646 +0000
-@@ -71,8 +71,7 @@
+--- chromium.orig/src/chrome/browser/first_run/first_run_linux.cc 2013-05-22 05:50:57.197135151 +0000
++++ chromium/src/chrome/browser/first_run/first_run_linux.cc 2013-05-22 05:51:58.833132898 +0000
+@@ -70,9 +70,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();
-+ master_prefs = FilePath("/etc/chromium");
+- return base::FilePath();
++ base::FilePath master_prefs = base::FilePath("/etc/chromium");
return master_prefs.AppendASCII(installer::kDefaultMasterPrefs);
}
diff --git a/debian/patches/system-speech.patch b/debian/patches/system-speech.patch
index fa4540f..00022b7 100644
--- a/debian/patches/system-speech.patch
+++ b/debian/patches/system-speech.patch
@@ -1,8 +1,8 @@
Use system speex
-Index: chromium-browser/src/build/linux/system.gyp
+Index: chromium/src/build/linux/system.gyp
===================================================================
---- chromium-browser.orig/src/build/linux/system.gyp 2013-03-30 15:03:35.028383135 +0000
-+++ chromium-browser/src/build/linux/system.gyp 2013-03-30 15:03:35.024383136 +0000
+--- chromium.orig/src/build/linux/system.gyp 2013-05-22 03:14:40.493477755 +0000
++++ chromium/src/build/linux/system.gyp 2013-05-22 03:14:40.473477755 +0000
@@ -619,6 +619,26 @@
],
},
@@ -30,24 +30,24 @@ Index: chromium-browser/src/build/linux/system.gyp
'target_name': 'gnome_keyring',
'type': 'none',
'conditions': [
-Index: chromium-browser/src/content/browser/speech/audio_encoder.cc
+Index: chromium/src/content/browser/speech/audio_encoder.cc
===================================================================
---- chromium-browser.orig/src/content/browser/speech/audio_encoder.cc 2013-03-30 15:03:35.028383135 +0000
-+++ chromium-browser/src/content/browser/speech/audio_encoder.cc 2013-03-30 15:06:23.812381682 +0000
+--- chromium.orig/src/content/browser/speech/audio_encoder.cc 2013-05-22 03:14:40.493477755 +0000
++++ chromium/src/content/browser/speech/audio_encoder.cc 2013-05-22 03:15:28.897475986 +0000
@@ -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: chromium-browser/src/content/content_browser.gypi
+Index: chromium/src/content/content_browser.gypi
===================================================================
---- chromium-browser.orig/src/content/content_browser.gypi 2013-03-30 15:03:35.028383135 +0000
-+++ chromium-browser/src/content/content_browser.gypi 2013-03-30 15:03:35.028383135 +0000
-@@ -1097,7 +1097,7 @@
+--- chromium.orig/src/content/content_browser.gypi 2013-05-22 03:14:40.493477755 +0000
++++ chromium/src/content/content_browser.gypi 2013-05-22 03:14:40.493477755 +0000
+@@ -1172,7 +1172,7 @@
}, { # OS!="android"
'dependencies': [
'../third_party/flac/flac.gyp:libflac',
--
Git repository for pkg-chromium
More information about the Pkg-chromium-commit
mailing list