[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:27 UTC 2013
The following commit has been merged in the master branch:
commit 2d34329fb259f44dc525a4f526a49a8a58a3925a
Merge: e48fddb22c704d03df88147406c73b54754873ff a2d8d342725eaefdb9bdc68c1de3244e9a986a6c
Author: Giuseppe Iuculano <iuculano at debian.org>
Date: Wed Apr 3 13:20:09 2013 +0200
Merge branch 'master' of ssh://git.debian.org/git/pkg-chromium/pkg-chromium
Conflicts:
debian/patches/arm-no-float-abi.patch
debian/patches/armv4.patch
debian/patches/nspr.patch
debian/patches/nss.patch
debian/patches/prefs.patch
debian/patches/system-speech.patch
diff --combined debian/patches/armv4.patch
index f327be3,969472d..1f61fe9
--- a/debian/patches/armv4.patch
+++ b/debian/patches/armv4.patch
@@@ -1,8 -1,8 +1,8 @@@
Do not use armv4 incopatible code
-Index: chromium-browser/src/build/common.gypi
+Index: sid/src/build/common.gypi
===================================================================
- --- 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
+ --- 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 @@
# silences those warnings, as they are not helpful and
# clutter legitimate warnings.
@@@ -11,10 -11,10 +11,10 @@@
],
'conditions': [
['arm_thumb==1', {
-Index: chromium-browser/src/base/debug/debugger_posix.cc
+Index: sid/src/base/debug/debugger_posix.cc
===================================================================
- --- 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
+ --- 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
diff --combined debian/patches/nss.patch
index 28c0027,205d94a..ea3eb81
--- a/debian/patches/nss.patch
+++ b/debian/patches/nss.patch
@@@ -1,8 -1,8 +1,8 @@@
webkit needs to call nss to pull in nspr headers
-Index: chromium-browser/src/chrome/chrome_common.gypi
+Index: sid/src/chrome/chrome_common.gypi
===================================================================
- --- 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
+ --- 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',
]
diff --combined debian/patches/prefs.patch
index 5f82f46,6497733..10a5479
--- a/debian/patches/prefs.patch
+++ b/debian/patches/prefs.patch
@@@ -1,15 -1,15 +1,15 @@@
Author: Raymond Wooninck (tittiatcoke)
Source: OpenSUSE (chromium-master-prefs-path.patch)
- Index: sid/src/chrome/browser/first_run/first_run_linux.cc
+ Index: chromium-browser/src/chrome/browser/first_run/first_run_linux.cc
===================================================================
- --- 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
+ --- 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 @@
base::FilePath MasterPrefsPath() {
// The standard location of the master prefs is next to the chrome binary.
-- base::FilePath master_prefs;
++ FilePath master_prefs;
- if (!PathService::Get(base::DIR_EXE, &master_prefs))
--- return base::FilePath();
++- return FilePath();
+ master_prefs = FilePath("/etc/chromium");
return master_prefs.AppendASCII(installer::kDefaultMasterPrefs);
}
diff --combined debian/patches/system-speech.patch
index 72cdbe7,a969339..fa4540f
--- a/debian/patches/system-speech.patch
+++ b/debian/patches/system-speech.patch
@@@ -1,8 -1,8 +1,8 @@@
Use system speex
- Index: sid/src/build/linux/system.gyp
+ Index: chromium-browser/src/build/linux/system.gyp
===================================================================
- --- 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
+ --- 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
@@ -619,6 +619,26 @@
],
},
@@@ -30,23 -30,23 +30,23 @@@
'target_name': 'gnome_keyring',
'type': 'none',
'conditions': [
- Index: sid/src/content/browser/speech/audio_encoder.cc
+ Index: chromium-browser/src/content/browser/speech/audio_encoder.cc
===================================================================
- --- 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
+ --- 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
@@ -11,7 +11,7 @@
#include "base/string_number_conversions.h"
#include "content/browser/speech/audio_buffer.h"
-- #include "third_party/flac/include/FLAC/stream_encoder.h"
---#include "third_party/speex/include/speex/speex.h"
++ #include "third_party/flac/flac.h"
++-#include "third_party/speex/speex.h"
+#include <speex/speex.h>
namespace content {
namespace {
- Index: sid/src/content/content_browser.gypi
+ Index: chromium-browser/src/content/content_browser.gypi
===================================================================
- --- 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
+ --- 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 @@
}, { # OS!="android"
'dependencies': [
diff --combined debian/rules
index 6340b5f,14c0da5..4f4f1f8
--- a/debian/rules
+++ b/debian/rules
@@@ -53,9 -53,6 +53,9 @@@ endi
# Disable SSE2
GYP_DEFINES = disable_sse2=1
+#Disable breakpad
+GYP_DEFINES += linux_breakpad=0
+
#Debian Chromium Api Key
GYP_DEFINES += google_api_key='AIzaSyCkfPOPZXDKNn8hhgu3JrA62wIgC93d44k'
GYP_DEFINES += google_default_client_id='811574891467.apps.googleusercontent.com'
@@@ -91,6 -88,9 +91,9 @@@ GYP_DEFINES += linux_use_tcmalloc=
# This makes breakages easier to detect by revdep-rebuild.
GYP_DEFINES += linux_link_gsettings=1
+ # Disable breakpad crash reporting
+ GYP_DEFINES += linux_breakpad=0
+
DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
@@@ -359,11 -359,12 +362,12 @@@ GYP_DEFINES +=
use_system_icu=0 \
use_system_yasm=1 \
use_system_ffmpeg=$(USE_SYSTEM_FFMPEG) \
- use_system_libvpx=1 \
+ use_system_libvpx=0 \
use_system_xdg_utils=1 \
use_system_flac=1 \
use_system_libwebp=0 \
use_system_speex=1 \
+ linux_link_libspeechd=1 \
$(NULL)
endif
--
Git repository for pkg-chromium
More information about the Pkg-chromium-commit
mailing list