summaryrefslogtreecommitdiffstats
path: root/extra
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2019-09-18 23:13:34 +0000
committer Eric Hameleers <alien@slackware.com>2019-09-19 08:59:48 +0200
commita580cc0d3e082bb499f39ba917b24149bdb68ac7 (patch)
tree7245d281771510a9e0c4024bf540e9d4b3c1995e /extra
parentba153cf4c6b9f6375a86058735337776cc361669 (diff)
downloadcurrent-a580cc0d3e082bb499f39ba917b24149bdb68ac7.tar.gz
current-a580cc0d3e082bb499f39ba917b24149bdb68ac7.tar.xz
Wed Sep 18 23:13:34 UTC 201920190918231334
d/python-2.7.16-x86_64-3.txz: Rebuilt. Rebuilt against glibc-2.30 to get rid of #define HAVE_STROPTS_H 1 in pyconfig.h. Thanks to ecd102. d/python3-3.7.4-x86_64-2.txz: Rebuilt. Rebuilt against glibc-2.30 to get rid of #define HAVE_STROPTS_H 1 in pyconfig.h. Thanks to ecd102. n/openobex-1.7.2-x86_64-3.txz: Rebuilt. Build/install extra openobex apps. Thanks to Dave Woodfall. x/xf86-video-intel-20190724_6f4972d5-x86_64-1.txz: Upgraded. extra/google-chrome/google-chrome.SlackBuild: Upgraded. Patched the packaging script to handle either control.tar.gz or control.tar.xz.
Diffstat (limited to 'extra')
-rwxr-xr-xextra/google-chrome/google-chrome.SlackBuild4
1 files changed, 3 insertions, 1 deletions
diff --git a/extra/google-chrome/google-chrome.SlackBuild b/extra/google-chrome/google-chrome.SlackBuild
index 6e166a800..894a0eec0 100755
--- a/extra/google-chrome/google-chrome.SlackBuild
+++ b/extra/google-chrome/google-chrome.SlackBuild
@@ -37,9 +37,11 @@ case "$ARCH" in
esac
# Get the version from the Debian/Ubuntu .deb (thanks to Fred Richards):
VERSION=$(ar p google-chrome-${RELEASE}_current_${DEBARCH}.deb control.tar.xz 2> /dev/null | tar JxO ./control 2> /dev/null | grep Version | awk '{print $2}' | cut -d- -f1)
+if [ -z "$VERSION" ]; then # try to use control.tar.gz instead:
+ VERSION=$(ar p google-chrome-${RELEASE}_current_${DEBARCH}.deb control.tar.gz 2> /dev/null | tar zxO ./control 2> /dev/null | grep Version | awk '{print $2}' | cut -d- -f1)
+fi
BUILD=${BUILD:-1}
-
if [ ! $UID = 0 ]; then
cat << EOF