diff --git a/network/google-chrome/README b/network/google-chrome/README index fa8afec372..0c9af625be 100644 --- a/network/google-chrome/README +++ b/network/google-chrome/README @@ -3,8 +3,4 @@ Google Chrome (Open Source Web Browser) This script will repackage the debian binary. The snapshot is updated daily, so the MD5SUM and VERSION numbers are not likely to match. -You can disable plugin (flash, etc) support by running the script: -PLUGINS=no ./google-chrome.SlackBuild -Default is yes (enabled). This is a simple change to the .desktop file. - -This requires GConf, and seamonkey-solibs from Slackware's patches. +This requires GConf. diff --git a/network/google-chrome/google-chrome.SlackBuild b/network/google-chrome/google-chrome.SlackBuild index 395d50d3c6..c9d14f75c3 100644 --- a/network/google-chrome/google-chrome.SlackBuild +++ b/network/google-chrome/google-chrome.SlackBuild @@ -1,5 +1,5 @@ #!/bin/sh - +# # Slackware build script for Google Chrome # Copyright 2009-2010 Erik Hanson, Minneapolis, MN, USA @@ -23,7 +23,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=google-chrome -VERSION=5.0.375.38 # Ephemeral version +VERSION=5.0.375.55 # Ephemeral version +RELEASE=stable # stable, beta, or unstable ARCH=${ARCH:-i386} # i386 or x86_64 BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -33,9 +34,6 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -# Enable (supposedly crashy) plugin support by default: -PLUGINS=${PLUGINS:-yes} - # Just in case: case "$ARCH" in i?86) DEBARCH="i386" ; LIBDIRSUFFIX="" ; ARCH=i386 ;; @@ -45,12 +43,12 @@ esac set -eu # Get the real version, thanks to Fred Richards. -REAL_VER=$(ar p google-chrome-beta_current_${DEBARCH}.deb control.tar.gz | tar zxO ./control | grep Version | awk '{print $2}' | cut -d- -f1) +REAL_VER=$(ar p google-chrome-${RELEASE}_current_${DEBARCH}.deb control.tar.gz | tar zxO ./control | grep Version | awk '{print $2}' | cut -d- -f1) rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $PKG -ar p $CWD/google-chrome-beta_current_${DEBARCH}.deb data.tar.lzma | lzma -d | tar xv +ar p $CWD/google-chrome-${RELEASE}_current_${DEBARCH}.deb data.tar.lzma | lzma -d | tar xv chown -R root:root . chmod -R u+w,go+r-w,a-s . @@ -64,10 +62,6 @@ for MLIB in $MISSING_LIBS ; do ln -s /usr/lib${LIBDIRSUFFIX}/seamonkey/${MLIB%.?d} opt/google/chrome/$MLIB done -if [ "$PLUGINS" == "yes" ] ; then - sed -i 's/%U/--enable-plugins %U/' opt/google/chrome/google-chrome.desktop -fi - mv $PKG/usr/share/man $PKG/usr/man gzip -9 $PKG/usr/man/man?/*.? diff --git a/network/google-chrome/google-chrome.info b/network/google-chrome/google-chrome.info index 0f3da1a2d6..3ec03a94dd 100644 --- a/network/google-chrome/google-chrome.info +++ b/network/google-chrome/google-chrome.info @@ -1,10 +1,10 @@ PRGNAM="google-chrome" -VERSION="5.0.375.38" +VERSION="5.0.375.55" HOMEPAGE="http://www.google.com/chrome/" -DOWNLOAD="http://dl.google.com/dl/linux/direct/google-chrome-beta_current_i386.deb" -MD5SUM="ac37d2c1766e6af8dccb06160a1bfbee" -DOWNLOAD_x86_64="http://dl.google.com/dl/linux/direct/google-chrome-beta_current_amd64.deb" -MD5SUM_x86_64="31a62a4cbb97913d0328c27ac93956d0" +DOWNLOAD="http://dl.google.com/dl/linux/direct/google-chrome-stable_current_i386.deb" +MD5SUM="d8718b7c35731393e3664fd61e820e25" +DOWNLOAD_x86_64="http://dl.google.com/dl/linux/direct/google-chrome-stable_current_amd64.deb" +MD5SUM_x86_64="c06d8981d32b542f9de1b943f5cf8146" MAINTAINER="Erik Hanson" EMAIL="erik@slackbuilds.org" -APPROVED="rworkman" +APPROVED=""