[Pkg-chromium-commit] [SCM] Git repository for pkg-chromium branch, experimental, updated. debian/15.0.874.106_r107270-1-1-gf67eee0

[Giuseppe Iuculano]

The following commit has been merged in the experimental branch:
commit 301651c647badb1a525cc5e3b83655efe5b8f3e7
Author: Giuseppe Iuculano <iuculano at debian.org>
Date:   Sun Nov 6 13:58:06 2011 +0100

    Use icu and libv8 private copy and disable nacl

diff --git a/debian/rules b/debian/rules
index ca4599e..d72f2d3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -33,7 +33,7 @@ WANT_SYSTEM_LIBS ?= 1
 WANT_SHARED_LIBS ?= 0
 WANT_TESTS       ?= 0
 WANT_SANDBOXING  ?= 1
-USE_SYSTEM_V8    ?= 1
+USE_SYSTEM_V8    ?= 0
 VERBOSE          ?= 0
 
 export DEB_BUILD_HARDENING=1
@@ -64,6 +64,9 @@ GYP_DEFINES += proprietary_codecs=1
 # enable compile-time dependency on gnome-keyring
 GYP_DEFINES += use_gnome_keyring=1
 
+#Disable nacl
+GYP_DEFINES += disable_nacl=1
+
 # Only keep -Werror when building for the Debian or Ubuntu development branches
 ifeq (,$(filter unstable development,$(DEBIAN_DIST)))
 GYP_DEFINES += werror=$(NULL)
@@ -297,7 +300,7 @@ GYP_DEFINES += \
 	use_system_libxslt=1 \
 	use_system_zlib=1 \
 	use_system_libevent=1 \
-	use_system_icu=1 \
+	use_system_icu=0 \
 	use_system_yasm=1 \
 	use_system_ffmpeg=$(USE_SYSTEM_FFMPEG) \
 	use_system_vpx=1 \

-- 
Git repository for pkg-chromium