[Lunar-commits] <moonbase> chromium: version bumped to 6.0.472.53.

[Florin Braescu]

commit fc638bb29d3ffb3d9b234cd62166464375e7ad89
Author: Florin Braescu <florin at lunar-linux.org>
Date:   Sat Sep 4 19:24:50 2010 +0300

    chromium: version bumped to 6.0.472.53.
---
 web/chromium/BUILD   |   19 ++++++++++---------
 web/chromium/DEPENDS |    3 +--
 web/chromium/DETAILS |   15 ++++++++-------
 3 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/web/chromium/BUILD b/web/chromium/BUILD
index 44a1817..bf71f3e 100644
--- a/web/chromium/BUILD
+++ b/web/chromium/BUILD
@@ -1,18 +1,18 @@
 (
 
-  sedit "s/'-Werror'/''/" build/common.gypi &&
-  patch_it $SOURCE_CACHE/$SOURCE2 1 &&
+  sedit "s/'-Werror'/''/" build/common.gypi  &&
+  patch_it $SOURCE_CACHE/$SOURCE2 1  &&
 # sedit '/mozzconf.h/d' third_party/WebKit/WebCore/platform/image-decoders/zlib/zconf.h &&
 
   export CHROMIUM_HOME=/usr/lib/$MODULE
 
-  mkdir -p "${SOURCE_DIRECTORY}"/.gyp &&
+  mkdir -p "${SOURCE_DIRECTORY}"/.gyp  &&
   cat << EOF > "${SOURCE_DIRECTORY}"/.gyp/include.gypi
 {
-	'target_defaults': {
-		'cflags': [ '${CFLAGS// /','}' ],
-		'ldflags': [ '${LDFLAGS// /','}' ],
-	},
+        'target_defaults': {
+                 'cflags': [ '${CFLAGS// /','}' ],
+                'ldflags': [ '${LDFLAGS// /','}' ],
+        },
 }
 EOF
 
@@ -25,7 +25,7 @@ EOF
     OPTS="$OPTS -Dtarget_arch=x64"
   else
     OPTS="$OPTS -Dtarget_arch=ia32"
-  fi  
+  fi
 
   gcc_ver=`installed_version gcc | cut -d. -f1,2`
   if [[ $gcc_ver == "4.4" ]]; then
@@ -47,6 +47,7 @@ EOF
   cp -a out/Release/xdg-settings ${CHROMIUM_HOME} &&
   install -m 755 $SCRIPT_DIRECTORY/chromium-launcher.sh ${CHROMIUM_HOME} &&
   cp -a out/Release/chrome.pak ${CHROMIUM_HOME} &&
+  cp -a out/Release/resources.pak ${CHROMIUM_HOME} &&
   cp -a out/Release/locales ${CHROMIUM_HOME} &&
   cp -a out/Release/resources ${CHROMIUM_HOME} &&
   install -m 644 out/Release/chrome.1 /usr/share/man/man1/ &&
@@ -54,7 +55,7 @@ EOF
   if module_installed ffmpeg; then
     ln -sf /usr/lib/libavcodec.so.52 ${CHROMIUM_HOME}/libavcodec.so.52
     ln -sf /usr/lib/libavformat.so.52 ${CHROMIUM_HOME}/libavformat.so.52
-    ln -sf /usr/lib/libavutil.so.49 ${CHROMIUM_HOME}/libavutil.so.49
+    ln -sf /usr/lib/libavutil.so.50 ${CHROMIUM_HOME}/libavutil.so.50
   fi &&
 
   # symlink to lunar location for browser plugins, should be /opt/lunar/plugins
diff --git a/web/chromium/DEPENDS b/web/chromium/DEPENDS
index 2e7206f..09a2c25 100644
--- a/web/chromium/DEPENDS
+++ b/web/chromium/DEPENDS
@@ -1,8 +1,6 @@
 depends alsa-lib
 depends bzip2
-depends GConf
 depends gperf
-depends gtk+-2
 depends jpeg
 depends libpng
 depends libxml2
@@ -11,6 +9,7 @@ depends nss
 depends pango
 depends Python
 depends zlib
+depends libgnome-keyring
 
 optional_depends "ffmpeg"  "-Duse_system_Ffmpeg"  ""  \
                  "To enable system ffmpeg"
diff --git a/web/chromium/DETAILS b/web/chromium/DETAILS
index aa13a5d..f3f78f0 100644
--- a/web/chromium/DETAILS
+++ b/web/chromium/DETAILS
@@ -1,16 +1,17 @@
           MODULE=chromium
-         VERSION=4.0.249.43
-          SOURCE=${MODULE}-${VERSION}.tar.bz2
-         SOURCE2=${MODULE}-drop_sse2.patch
-      SOURCE_URL=http://download.lunar-linux.org/lunar/mirrors
+         VERSION=6.0.472.53
+          SOURCE=$MODULE-$VERSION.tar.bz2
+         SOURCE2=$MODULE-gyp-make.patch.bz2
+      SOURCE_URL=http://build.chromium.org/buildbot/official
      SOURCE2_URL=$PATCH_URL
-      SOURCE_VFY=sha1:d98cb7787433446946601ed4ff4577d0b1e5f46b
-     SOURCE2_VFY=sha1:1aa9701b329d970db00726ba883d7dd5448ba372
+      SOURCE_VFY=sha1:4fcd20f7f5b81bdb300a90bd4cd7bdbfe5e53af0
+     SOURCE2_VFY=sha1:d4b74dd254ecfcde86425d229cd65e1298194be5
         WEB_SITE=http://www.chromium.org/Home
          ENTERED=20100104
-         UPDATED=20100104
+         UPDATED=20100903
            PSAFE=no
            SHORT="Open-source version of Google Chrome web browser"
+
 cat << EOF
 Chromium is an open-source browser project that aims to build a safer, faster,
 and more stable way for all users to experience the web.