From f915161a3fd0c68f0a840de4f117f783b3b34b47 Mon Sep 17 00:00:00 2001 From: Knut Ahlers Date: Sun, 10 May 2020 22:01:34 +0200 Subject: [PATCH] Switch to versioned debs, apply shfmt Signed-off-by: Knut Ahlers --- PKGBUILD | 66 +++++++++++++++++++++++++++----------------------------- 1 file changed, 32 insertions(+), 34 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index f23e6d3..91b281b 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -13,50 +13,48 @@ arch=('x86_64') url="https://www.google.com/chrome" license=('custom:chrome') depends=('alsa-lib' 'gtk3' 'libcups' 'libxss' 'libxtst' 'nss') -optdepends=('libpipewire02: WebRTC desktop sharing under Wayland' - 'kdialog: for file dialogs in KDE' - 'gnome-keyring: for storing passwords in GNOME keyring' - 'kwallet: for storing passwords in KWallet' - 'gtk3-print-backends: for printing' - 'libunity: for download progress on KDE' - 'ttf-liberation: fix fonts for some PDFs (CRBug #369991)' - 'xdg-utils') +optdepends=( + 'libpipewire02: WebRTC desktop sharing under Wayland' + 'kdialog: for file dialogs in KDE' + 'gnome-keyring: for storing passwords in GNOME keyring' + 'kwallet: for storing passwords in KWallet' + 'gtk3-print-backends: for printing' + 'libunity: for download progress on KDE' + 'ttf-liberation: fix fonts for some PDFs - CRBug #369991' + 'xdg-utils' +) provides=('google-chrome') options=('!emptydirs' '!strip') install=$pkgname.install _channel=unstable -source=("google-chrome-${_channel}_${pkgver}_amd64.deb::https://dl.google.com/linux/direct/google-chrome-${_channel}_current_amd64.deb" - 'eula_text.html' - "google-chrome-$_channel.sh") +source=("http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-${_channel}/google-chrome-${_channel}_${pkgver}-1_amd64.deb" + 'eula_text.html' + "google-chrome-$_channel.sh") sha512sums=('010d92ae70d8adfcbaf406c0e683068616ddcd9d16d8958047d6363f0b69369f88f17083818512b22ba466e71149f66cb4fea82d569ff630f42460e3d9d6fc33' - 'a225555c06b7c32f9f2657004558e3f996c981481dbb0d3cd79b1d59fa3f05d591af88399422d3ab29d9446c103e98d567aeafe061d9550817ab6e7eb0498396' - '5f716219456ec8de9df4e7ee5f94bc35cdc1b079d9d1d5dab0df8d4b6e6d0fd8775bb64d0c8ce9339837d7277614c55aa05adced6e8ad49931989823ed97863b') - -## Previous build (also see: /var/cache/pacman/pkg/google-chrome-dev-*): -#source[0]="https://dl.google.com/linux/deb/pool/main/g/google-chrome-${_channel}/google-chrome-${_channel}_72.0.3608.4-1_amd64.deb" -#md5sums[0]='a3f6b505dda23519a7ad5ed0b6e929ac' + 'a225555c06b7c32f9f2657004558e3f996c981481dbb0d3cd79b1d59fa3f05d591af88399422d3ab29d9446c103e98d567aeafe061d9550817ab6e7eb0498396' + '5f716219456ec8de9df4e7ee5f94bc35cdc1b079d9d1d5dab0df8d4b6e6d0fd8775bb64d0c8ce9339837d7277614c55aa05adced6e8ad49931989823ed97863b') package() { - msg2 "Extracting the data.tar.xz..." - bsdtar -xf data.tar.xz -C "$pkgdir/" + msg2 "Extracting the data.tar.xz..." + bsdtar -xf data.tar.xz -C "$pkgdir/" - msg2 "Moving stuff in place..." - # Launcher - install -m755 google-chrome-$_channel.sh "$pkgdir"/usr/bin/google-chrome-$_channel + msg2 "Moving stuff in place..." + # Launcher + install -m755 google-chrome-$_channel.sh "$pkgdir"/usr/bin/google-chrome-$_channel - # Icons - for i in 16x16 24x24 32x32 48x48 64x64 128x128 256x256; do - install -Dm644 "$pkgdir"/opt/google/chrome-$_channel/product_logo_${i/x*}_${pkgname/*-}.png \ - "$pkgdir"/usr/share/icons/hicolor/$i/apps/google-chrome-$_channel.png - done + # Icons + for i in 16x16 24x24 32x32 48x48 64x64 128x128 256x256; do + install -Dm644 "$pkgdir"/opt/google/chrome-$_channel/product_logo_${i/x*/}_${pkgname/*-/}.png \ + "$pkgdir"/usr/share/icons/hicolor/$i/apps/google-chrome-$_channel.png + done - # License - install -Dm644 eula_text.html "$pkgdir"/usr/share/licenses/google-chrome-$_channel/eula_text.html + # License + install -Dm644 eula_text.html "$pkgdir"/usr/share/licenses/google-chrome-$_channel/eula_text.html - msg2 "Fixing Chrome icon resolution..." - sed -i "/Exec=/i\StartupWMClass=Google-chrome-$_channel" "$pkgdir"/usr/share/applications/google-chrome-$_channel.desktop + msg2 "Fixing Chrome icon resolution..." + sed -i "/Exec=/i\StartupWMClass=Google-chrome-$_channel" "$pkgdir"/usr/share/applications/google-chrome-$_channel.desktop - msg2 "Removing Debian Cron job and duplicate product logos..." - rm -r "$pkgdir"/etc/cron.daily/ "$pkgdir"/opt/google/chrome-$_channel/cron/ - rm "$pkgdir"/opt/google/chrome-$_channel/product_logo_*.png + msg2 "Removing Debian Cron job and duplicate product logos..." + rm -r "$pkgdir"/etc/cron.daily/ "$pkgdir"/opt/google/chrome-$_channel/cron/ + rm "$pkgdir"/opt/google/chrome-$_channel/product_logo_*.png }