[Lunar-commits] <moonbase> chromium: Uncommenting a few optional_depends. For now say no to icu4c.

[Dennis `stumbles` Veatch]

commit 4dec622e5e3adb5359d30c0c0a2b64621092ff99
Author: Dennis `stumbles` Veatch <stumbles at lunar-linux.org>
Date:   Tue Aug 23 15:57:24 2011 -0400

    chromium: Uncommenting a few optional_depends. For now say no to icu4c.
    
    Adding a sed to insert a missing include to the BUILD.
---
 web/chromium/BUILD   |    3 +++
 web/chromium/DEPENDS |   27 +++++++++------------------
 2 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/web/chromium/BUILD b/web/chromium/BUILD
index ba0bc2a..26ca231 100644
--- a/web/chromium/BUILD
+++ b/web/chromium/BUILD
@@ -1,5 +1,8 @@
 (
 
+# Inserting a missing cups include
+  sed -i "40i #include <cups/ppd.h>" chrome/browser/ui/webui/print_preview_handler.cc &&
+
   sedit "s/'-Werror'/''/" build/common.gypi  &&
 
   echo Fixing dumb CPU optimizations please wait in patience...
diff --git a/web/chromium/DEPENDS b/web/chromium/DEPENDS
index eec4c0f..90e07fe 100644
--- a/web/chromium/DEPENDS
+++ b/web/chromium/DEPENDS
@@ -14,35 +14,26 @@ depends libgnome-keyring
 depends libXScrnSaver
 depends Switch
 
-# Current ffmpeg does not have libavcore/samplefmt.h
-# Uncomment this when future Lunar's ffmpeg will have it
-#optional_depends "ffmpeg"  "-Duse_system_ffmpeg=1"  ""  \
-#                 "To enable system ffmpeg"
+optional_depends "yasm"   "-Duse_system_yasm=1"   "-Duse_system_yasm=0"   "To use system yasm to compile assembler parts"
+optional_depends "cups"   "-Duse_cups=1"          "-Duse_cups=0"          "To use cups printing"
+optional_depends "ffmpeg" "-Duse_system_ffmpeg=1" "-Duse_system_ffmpeg=0" "To enable system ffmpeg"
+optional_depends "icu4c"  "-Duse_system_icu=1"    "-Duse_system_icu=0"    "To use system icu library"
+optional_depends "GConf"  "-Duse_gconf=1"         "-Duse_gconf=0"         "To use cups printing"
+optional_depends "speex"  ""                      ""                      "To use system speex"
 
-optional_depends "yasm"  "-Duse_system_yasm=1"  ""  \
-                 "To use system yasm to compile assembler parts"
+optional_depends "libgnome-keyring"  "-Duse_gnome_keyring=1 -Dlinux_link_gnome_keyring=1" \
+                                     "-Duse_gnome_keyring=0 -Dlinux_link_gnome_keyring=0"  \
+                                     "To use gnome keyring"
 
 # in system libvpx 0.9.5 the vpx_codec_vp8_dx is missing
 #optional_depends "libvpx"  "-Duse_system_vpx=1"  ""  \
 #                 "To use system VP8 library"
 
-optional_depends "icu4c"  "-Duse_system_icu=1"  ""  \
-                 "To use system icu library"
 
 #Not supported in chromium 12.0
 #optional_depends "sqlite"  "-Duse_system_sqlite=1"  ""  \
 #                 "To use system sqlite"
 
-#Not supported in chromium 12.0
-#optional_depends "cups"  "-Duse_cups=1"  "-Duse_cups=0"  \
-#                 "To use cups printing"
-depends cups
 
-optional_depends "GConf"  "-Duse_gconf=1"  "-Duse_gconf=0"  \
-                 "To use cups printing"
 
-optional_depends "libgnome-keyring"  "-Duse_gnome_keyring=1 -Dlinux_link_gnome_keyring=1"  "-Duse_gnome_keyring=0 -Dlinux_link_gnome_keyring=0"  \
-                 "To use gnome keyring"
 
-optional_depends "speex"  ""  ""  \
-                 "To use system speex"