[Lunar-commits] <moonbase-other> chromiun: A few refinements and getting rid of the sandbox script.

[Dennis Veatch]

commit e1394a590c0421872e5e4ad57d8bf664dabe5a0f
Author: Dennis Veatch <dennisveatch at bellsouth.net>
Date: Fri, 19 Sep 2014 08:31:47 -0400
URL: https://github.com/lunar-linux/moonbase-other/commit/e1394a590c0421872e5e4ad57d8bf664dabe5a0f

chromiun: A few refinements and getting rid of the sandbox script.
---
  web/chromium/BUILD      | +1/-3     
  web/chromium/DEPENDS    | +1/-0     
  web/chromium/POST_BUILD | +0/-6     
  web/chromium/PRE_BUILD  | +25/-9    
  4 files changed, 27 insertions(+), 18 deletions(-)

--- a/web/chromium/BUILD
+++ b/web/chromium/BUILD
@@ -41,6 +41,4 @@
 
   # theme installation
   mkdir -p /usr/share/themes/Chromium &&
-  cp -a $SOURCE_DIRECTORY/chrome/app/theme /usr/share/themes/Chromium/ &&
-
-  ln -sf ${CHROMIUM_HOME}/chromium-launcher.sh /usr/bin/chromium
+  cp -a $SOURCE_DIRECTORY/chrome/app/theme /usr/share/themes/Chromium/
--- a/web/chromium/DEPENDS
+++ b/web/chromium/DEPENDS
@@ -30,6 +30,7 @@ optional_depends "speex"      "-Duse_system_speex=1"     "-Duse_system_speex=0"
 optional_depends "pulseaudio" "-Denable_webrtc=1"        "-Denable_webrtc=0"        "To use system provided Realtime Web Communication"
 optional_depends "heimdal"    "-Duse_kerberos=1"         "-Duse_kerberos=0"         "To use system provided heimdal (kerberos) support"
 optional_depends "libvpx"     "-Duse_system_vpx=1"       "-Duse_system_vpx=0"       "To use system provided VP8 library"
+optional_depends "snappy"     "-Duse_system_snappy=1"    "-Duse_system_snappy=0"    "To use system provided snappy, fast decompression/compression support"
 
 optional_depends "icu4c" "-Duse_system_icu=1 -Dicu_use_data_file_flag=0"     \
                          "-Duse_system_icu=0"    "To use system provided icu library"
--- a/web/chromium/POST_BUILD
+++ /dev/null
@@ -1,6 +0,0 @@
-message ""
-message "Setting up sandbox"
-  BUILDTYPE=Release build/update-linux-sandbox.sh &&
-message ""
-message ""
-
--- a/web/chromium/PRE_BUILD
+++ b/web/chromium/PRE_BUILD
@@ -1,9 +1,4 @@
   default_pre_build &&
-
-  # To properly setup sandboxing need to run this script but it uses sudo, we don't,
-  # and getting rid of the echo saying it does.
-  sedit "s:sudo --::g" build/update-linux-sandbox.sh &&
-  sedit "27d" build/update-linux-sandbox.sh &&
   
   export CHROMIUM_HOME=/usr/lib/$MODULE &&
 
@@ -56,7 +51,28 @@ EOF
 # A little jiggle for adboe/flash
   echo > third_party/adobe/flash/flapper_version.h &&
 
-  OPTS+=" -Dproprietary_codecs=1 -Dwerror= -Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome-sandbox -Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome   \
-          -Dfastbuild=1 -Dlinux_strip_binary=1 -Dlinux_use_seccomp_sandbox=1 -Dlinux_use_gold_binary=0 -Dlinux_use_gold_flags=0 -Dlinux_use_bundled_binutils=0              \
-          -Dffmpeg_branding=Chrome -DENABLE_MEDIA_CAPTURE=1 -Duse_system_speex=1 -Duse_system_libevent=1 -Duse_system_libxml=1 -Duse_system_libxslt=1 -Dproprietary_codecs=1\
-          -Duse_system_ffmpeg=1 -Dpython_ver=${PYTHON_VER} -Duse_system_libjpeg=1 -Dremove_webcore_debug_symbols=1 -Dusb_ids_path=/usr/share/usb.ids"
+# chrome-sandbox is hardcoded so using anything but that won't work
+# Let chromium find the usb id paths on launch instead of compiling
+# in the path.
+  OPTS+=" -Dproprietary_codecs=1                                \
+          -Dwerror=                                             \
+          -Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome-sandbox  \
+          -Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome   \
+          -Dfastbuild=1                                         \
+          -Dlinux_strip_binary=1                                \
+          -Dlinux_use_seccomp_sandbox=1                         \
+          -Dlinux_use_gold_binary=0                             \
+          -Dlinux_use_gold_flags=0                              \
+          -Dlinux_use_bundled_binutils=0                        \
+          -Dffmpeg_branding=Chrome                              \
+          -DENABLE_MEDIA_CAPTURE=1                              \
+          -Duse_system_speex=1                                  \
+          -Duse_system_libevent=1                               \
+          -Duse_system_libxml=1                                 \
+          -Duse_system_libxslt=1                                \
+          -Dproprietary_codecs=1                                \
+          -Duse_system_ffmpeg=1                                 \
+          -Dpython_ver=${PYTHON_VER}                            \
+          -Duse_system_libjpeg=1                                \
+          -Dremove_webcore_debug_symbols=1                      \
+          -Dusb_ids_path=/usr/share/usb.ids"