diff options
Diffstat (limited to 'gis/google-earth')
-rw-r--r-- | gis/google-earth/README | 6 | ||||
-rw-r--r-- | gis/google-earth/google-earth.SlackBuild | 17 | ||||
-rw-r--r-- | gis/google-earth/google-earth.info | 6 |
3 files changed, 17 insertions, 12 deletions
diff --git a/gis/google-earth/README b/gis/google-earth/README index 214834cbb0..f0d3ae93a4 100644 --- a/gis/google-earth/README +++ b/gis/google-earth/README @@ -21,3 +21,9 @@ NOTES: 2) This version of Google Earth Pro is only available for 64-bit systems. If you are still running 32-bit, you will need the google-earth-legacy SBo script. + +3) This version of Google Earth Pro is updated without bumping the + version number (only the embedded revision is bumped). For this + reason the md5sum may not match and the build will fail in sbopkg. + If this happens you will need to download the file and build the + package directly. diff --git a/gis/google-earth/google-earth.SlackBuild b/gis/google-earth/google-earth.SlackBuild index 82bc06cb7a..65011400a6 100644 --- a/gis/google-earth/google-earth.SlackBuild +++ b/gis/google-earth/google-earth.SlackBuild @@ -4,7 +4,7 @@ # Copyright 2007-2013 Michiel van Wessem, Manchester, United Kingdom # Copyright 2016-2018 Willy Sudiarto Raharjo <willysr@slackbuilds.org> -# Copyright 2021 Lenard Spencer, Orlando, Florida, USA +# Copyright 2021-2022 Lenard Spencer, Orlando, Florida, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -33,7 +33,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=google-earth -VERSION=${VERSION:-7.3.4} +VERSION=${VERSION:-7.3.6.9796} +SHORTVER=${SHORTVER:-7.3.6} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -67,16 +68,11 @@ fi # No flags/configure needed as it is just a binary repackaging. set -e -FULLVERSION=$(ar p google-earth-pro-stable_${VERSION}_${SRCARCH}.deb control.tar.xz 2> /dev/null | tar JxO ./control 2> /dev/null | grep Version | awk '{print $2}' | cut -d- -f1) -if [ -z "$FULLVERSION" ]; then # try to use control.tar.gz instead: - FULLVERSION=$(ar p google-earth-pro-stable_${VERSION}_${SRCARCH}.deb control.tar.gz 2> /dev/null | tar zxO ./control 2> /dev/null | grep Version | awk '{print $2}' | cut -d- -f1) -fi - rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $PKG -ar p $CWD/google-earth-pro-stable_${VERSION}_${SRCARCH}.deb data.tar.xz | tar xJv +ar p $CWD/google-earth-pro-stable_${SHORTVER}_${SRCARCH}.deb data.tar.xz | tar xJv cd $PKG chown -R root:root . # Fix Google braindeadness (and mine) @@ -93,10 +89,13 @@ find -L . \( -name "*.png" -o -name "*.kml" -o -name "*.xml" \) -exec chmod 0644 # Install a .desktop launcher: mv $PKG/opt/google/earth/pro/google-earth-pro.desktop $PKG/usr/share/applications/google-earth.desktop +# Clean up .desktop to satisfy sbopkglint: +sed -i '/MultipleArgs/d' $PKG/usr/share/applications/google-earth.desktop +sed -i "s|Application;||" $PKG/usr/share/applications/google-earth.desktop # Copy icons to /usr/share/icons for icon in 16 22 24 32 48 64 128 256; do - install -D $PKG/opt/google/earth/pro/product_logo_${icon}.png \ + install -m 644 -D $PKG/opt/google/earth/pro/product_logo_${icon}.png \ $PKG/usr/share/icons/hicolor/${icon}x${icon}/apps/${PRGNAM}-pro.png done diff --git a/gis/google-earth/google-earth.info b/gis/google-earth/google-earth.info index 3a38832c00..7223999e97 100644 --- a/gis/google-earth/google-earth.info +++ b/gis/google-earth/google-earth.info @@ -1,10 +1,10 @@ PRGNAM="google-earth" -VERSION="7.3.4" +VERSION="7.3.6.9796" HOMEPAGE="https://www.google.com/earth/index.html" DOWNLOAD="UNSUPPORTED" MD5SUM="" -DOWNLOAD_x86_64="https://dl.google.com/dl/linux/direct/google-earth-pro-stable_7.3.4_amd64.deb" -MD5SUM_x86_64="8ed1a3378282e0fdfd7f4a95e57fdadd" +DOWNLOAD_x86_64="https://dl.google.com/dl/linux/direct/google-earth-pro-stable_7.3.6_amd64.deb" +MD5SUM_x86_64="3e8fb2549222e87d4cbfe92bec068900" REQUIRES="" MAINTAINER="Lenard Spencer" EMAIL="lenardrspencer@gmail.com" |