diff options
| -rw-r--r-- | network/google-chrome/README | 2 | ||||
| -rwxr-xr-x[-rw-r--r--] | network/google-chrome/google-chrome.SlackBuild | 20 | ||||
| -rw-r--r-- | network/google-chrome/google-chrome.info | 8 |
3 files changed, 16 insertions, 14 deletions
diff --git a/network/google-chrome/README b/network/google-chrome/README index 390c34eefd..fa8afec372 100644 --- a/network/google-chrome/README +++ b/network/google-chrome/README @@ -7,4 +7,4 @@ 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. +This requires GConf, and seamonkey-solibs from Slackware's patches. diff --git a/network/google-chrome/google-chrome.SlackBuild b/network/google-chrome/google-chrome.SlackBuild index ed6df72835..4457fffaaa 100644..100755 --- a/network/google-chrome/google-chrome.SlackBuild +++ b/network/google-chrome/google-chrome.SlackBuild @@ -2,7 +2,7 @@ # # Slackware build script for Google Chrome -# Copyright 2009 Erik Hanson, Minneapolis, MN, USA +# Copyright 2009-2010 Erik Hanson, Minneapolis, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=google-chrome -VERSION=5.0.307.5 # We set this later. +VERSION=5.0.342.1 # Ephemeral version ARCH=${ARCH:-i386} # i386 or x86_64 BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -45,7 +45,7 @@ esac set -eu # Get the real version, thanks to Fred Richards. -VERSION=$(ar p google-chrome-unstable_current_${DEBARCH}.deb control.tar.gz | tar zxO ./control | grep Version | awk '{print $2}' | cut -d- -f1) +REAL_VER=$(ar p google-chrome-unstable_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 @@ -55,7 +55,7 @@ chown -R root:root . chmod -R u+w,go+r-w,a-s . chmod 0755 $PKG # Put this back. -rm opt/google/chrome/chrome-sandbox # Remove the sandbox. +chmod 4755 opt/google/chrome/chrome-sandbox # This needs to be SUID. rm -rf etc/ # The cron job is debian/ubuntu only. # We need bits of Moz, do this as dynamically as possible: @@ -71,15 +71,17 @@ fi mv $PKG/usr/share/man $PKG/usr/man gzip -9 $PKG/usr/man/man?/*.? +sed -i -e "s#Icon=google-chrome#Icon=/opt/google/chrome/product_logo_256.png#" \ + $PKG/opt/google/chrome/google-chrome.desktop mkdir -p $PKG/usr/share/applications -install -m 0644 opt/google/chrome/google-chrome.desktop \ - $PKG/usr/share/applications/google-chrome.desktop +ln -s /opt/google/chrome/google-chrome.desktop \ + $PKG/usr/share/applications/google-chrome.desktop -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +mkdir -p $PKG/usr/doc/$PRGNAM-$REAL_VER +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$REAL_VER/$PRGNAM.SlackBuild mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$REAL_VER-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/network/google-chrome/google-chrome.info b/network/google-chrome/google-chrome.info index b253e2255f..93f3edd2a7 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.307.5" +VERSION="5.0.342.1" HOMEPAGE="http://www.google.com/chrome/" DOWNLOAD="http://dl.google.com/linux/direct/google-chrome-unstable_current_i386.deb" -MD5SUM="cc4c3a524e9573cc464c6e786a9b3bfc" +MD5SUM="944a3e52451d938dbecabad0e5833a8a" DOWNLOAD_x86_64="http://dl.google.com/linux/direct/google-chrome-unstable_current_amd64.deb" -MD5SUM_x86_64="4859228f18abf7c660c5d60c9ec29f40" +MD5SUM_x86_64="982941d28aa3221956628d8b23bd8dd5" MAINTAINER="Erik Hanson" EMAIL="erik@slackbuilds.org" -APPROVED="dsomero" +APPROVED="rworkman" |