summaryrefslogtreecommitdiffstats
path: root/abs/extra
diff options
context:
space:
mode:
Diffstat (limited to 'abs/extra')
-rw-r--r--abs/extra/google-chrome/PKGBUILD12
-rw-r--r--abs/extra/google-chrome/google-chrome.install2
2 files changed, 8 insertions, 6 deletions
diff --git a/abs/extra/google-chrome/PKGBUILD b/abs/extra/google-chrome/PKGBUILD
index a6ea6b7..461a868 100644
--- a/abs/extra/google-chrome/PKGBUILD
+++ b/abs/extra/google-chrome/PKGBUILD
@@ -5,7 +5,7 @@
# or use: $ curl -s https://dl.google.com/linux/chrome/rpm/stable/x86_64/repodata/other.xml.gz | gzip -df | awk -F\" '/pkgid/{ sub(".*-","",$4); print $4": "$10 }'
pkgname=google-chrome
-pkgver=29.0.1547.65
+pkgver=30.0.1599.66
pkgrel=1
pkgdesc="An attempt at creating a safer, faster, and more stable browser (Stable Channel)"
arch=('i686' 'x86_64')
@@ -15,7 +15,7 @@ depends=('alsa-lib' 'gconf' 'gtk2' 'hicolor-icon-theme' 'libpng' 'libxslt' 'libx
optdepends=('kdebase-kdialog: needed for file dialogs in KDE'
'ttf-google-fonts-git')
provides=("google-chrome=$pkgver")
-conflicts=('google-chrome')
+conflicts=('google-chrome-beta')
replaces=('chromium')
options=('!emptydirs' '!strip')
install=$pkgname.install
@@ -24,9 +24,9 @@ _arch=i386
[ "$CARCH" = 'x86_64' ] && _arch=amd64
source=("google-chrome-${_channel}_${pkgver}_${_arch}.deb::https://dl.google.com/linux/direct/google-chrome-${_channel}_current_${_arch}.deb"
"$url/intl/en/eula_text.html")
-md5sums=('40109e81b3fa3e65e6d0b64c4631c75d'
+md5sums=('755827c51ad2896b76cf36fa1cba32ff'
'6d57da7476a4b1b7a81821d9c036425c')
-[ "$CARCH" = 'x86_64' ] && md5sums[0]='69b73f30c933972b04bcb5ce2da5ecef'
+[ "$CARCH" = 'x86_64' ] && md5sums[0]='7f055de3dc3a62cedb5156420c1bc99a'
#PKGEXT='.pkg.tar'
@@ -35,6 +35,7 @@ package() {
bsdtar -xf data.tar.lzma -C "$pkgdir/"
msg2 "Moving stuff in place"
+ # Desktop
mv "$pkgdir"/opt/google/chrome/google-chrome.desktop "$pkgdir"/usr/share/applications/
# Icons
@@ -52,5 +53,6 @@ package() {
ln -s /usr/lib/libudev.so.1 "$pkgdir"/opt/google/chrome/libudev.so.0
msg2 "Removing the Debian-intended cron job and duplicated images"
- rm "$pkgdir"/etc/cron.daily/google-chrome "$pkgdir"/opt/google/chrome/product_logo_*
+ rm -r "$pkgdir"/etc/cron.daily/ "$pkgdir"/opt/google/chrome/cron/
+ rm "$pkgdir"/opt/google/chrome/product_logo_*.png
}
diff --git a/abs/extra/google-chrome/google-chrome.install b/abs/extra/google-chrome/google-chrome.install
index c5c7d50..4b923b2 100644
--- a/abs/extra/google-chrome/google-chrome.install
+++ b/abs/extra/google-chrome/google-chrome.install
@@ -1,6 +1,6 @@
post_install() {
gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
- if [ ! -a /usr/bin/chromium ]; then
+ if [ ! -e /usr/bin/chromium ]; then
ln -s /usr/bin/google-chrome /usr/bin/chromium
fi
}