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

[Michael Gilbert]

The following commit has been merged in the master branch:
commit db01135ec294f5b94f12b9d7fcf7e6cf95f53729
Author: Michael Gilbert <mgilbert at debian.org>
Date:   Mon Apr 1 21:10:48 2013 -0400

    use system libspeechd, embedded libvpx, and disable breakpad

diff --git a/debian/control b/debian/control
index 85c28bc..d71ffdf 100644
--- a/debian/control
+++ b/debian/control
@@ -59,6 +59,7 @@ Build-Depends: cdbs,
 	libcups2-dev (>= 1.5.0),
 	libgnome-keyring-dev,
 	libspeex-dev,
+	libspeechd-dev,
 	hardening-wrapper,
 	libxt-dev,
 	libxtst-dev,
diff --git a/debian/rules b/debian/rules
index b64cc71..14c0da5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -88,6 +88,9 @@ GYP_DEFINES += linux_use_tcmalloc=0
 # 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)
 
@@ -356,11 +359,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