gis/google-earth: Updated for version 7.3.4.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

3 files changed, 27 insertions, 66 deletions

diff --git a/gis/google-earth/README b/gis/google-earth/README
index a39cf206a7..214834cbb0 100644
--- a/gis/google-earth/README
+++ b/gis/google-earth/README
@@ -1,6 +1,6 @@
 google-earth (Google's famous virtual globe)
 
-Google Earth is a virtual globe program. It maps a version of the
+Google Earth Pro is a virtual globe program. It maps a version of the
 Earth by the superimposition of images obtained from satellite 
 imagery, aerial photography and GIS over a 3D globe. You point 
 and zoom to any place on the planet that you want to explore.
@@ -10,33 +10,14 @@ specific address to check out an apartment or hotel. View driving
 directions and even fly along your route.
 
 The degree of resolution available is based somewhat on the points 
-of interest, but most land (except for some islands) is covered in at 
+of interest, but most land (except for some islands) is covered in at
 least 15 meters of resolution. 
 
-When running GoogleEarth for the first time, you will see an error
-message stating that it is unable to find the Bitstream Vera fonts.
-This should be safe to ignore - it will use other fonts (and the
-DejaVu fonts included with Slackware are based on the Bitstream fonts).
-
 NOTES:
-1) Google Earth 7 is "LSB compliant" meaning it was built on a LSB
-   system.  Slackware however does not have that symlink which is part
-   of the LSB 3.0 specification.  Before, you had to add that symlink
-   manually; that is now handled in doinst.sh.
-
-2) Google Earth sometimes crashes when the 65-fonts-persian.conf is
-   available on the system. If you experience crashes, try removing
-   /etc/fonts/conf.d/65-fonts-persian.conf prior to launching this
-   application. The easiest way to do this is:
-
-            mv /etc/fonts/conf.d/65-fonts-persian.conf \
-               /etc/fonts/conf.d/65-fonts-persian.conf.old
-
-3) GoogleEarth requires that you have OpenGL drivers installed on your
-   system (and Xorg configured to use them). Not doing so will cause X
-   to crash.
+1) Google Earth Pro requires that you have OpenGL drivers installed on
+   your system (and Xorg configured to use them). Not doing so will
+   cause X to crash.
 
-4) This is the legacy version 7.3.0, which is confirmed to run on
-   Slackware 14.2.  The newer versions (7.3.1 and later) tend to hang
-   on 14.2.  On startup, a nag screen will pop up advising you that a
-   new version is availble, which you can safely ignore.
+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.
diff --git a/gis/google-earth/google-earth.SlackBuild b/gis/google-earth/google-earth.SlackBuild
index 6d0eb752bd..d1c288e5e5 100644
--- a/gis/google-earth/google-earth.SlackBuild
+++ b/gis/google-earth/google-earth.SlackBuild
@@ -4,8 +4,8 @@
 
 # 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
 # All rights reserved.
-# Maintained 2021 by Lenard Spencer <lenardrspencer@gmail.com>
 #
 # Redistribution and use of this script, with or without modification, is
 # permitted provided that the following conditions are met:
@@ -33,7 +33,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=google-earth
-VERSION=${VERSION:-7.3.0.3832}
+VERSION=${VERSION:-7.3.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -57,25 +57,28 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i586" ]; then
-  SRCARCH="i386"
-elif [ "$ARCH" = "x86_64" ]; then
+if [ "$ARCH" = "x86_64" ]; then
   SRCARCH="amd64"
 else
-  echo "This system is unsupported.  Aborting."
+  echo "This architecture is unsupported.  Aborting."
   exit 1
 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}-r0_${SRCARCH}.deb data.tar.xz | tar xJv
+ar p $CWD/google-earth-pro-stable_${VERSION}_${SRCARCH}.deb data.tar.xz | tar xJv
 cd $PKG
 chown -R root:root .
-
 # Fix Google braindeadness (and mine)
 find . -type d -exec chmod 0755 {} \;
 find -L . \
@@ -84,8 +87,8 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# Sadly (by lack of politer word), Google has some inconsistent permissions
-# for normal files; this should deal with them rather nicely.
+# Sadly (by lack of a more polite word), Google has some inconsistent
+# permissions for normal files; this should deal with them rather nicely.
 find -L . \( -name "*.png" -o -name "*.kml" -o -name "*.xml" \) -exec chmod 0644 {} \;
 
 # Install a .desktop launcher:
@@ -113,28 +116,5 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
-# Add ld-lsb.so symlink creation to doinst.sh
-if [ "$ARCH" = "x86_64" ]; then
-cat >> $PKG/install/doinst.sh << "EOF"
-# Create ld-lsb symlink
-( cd lib64
-  if [ ! -e ld-lsb-x86-64.so.3 ]; then
-    ln -sf ld-linux-x86-64.so.2 ld-lsb-x86-64.so.3
-  fi
-)
-
-EOF
-else
-cat >> $PKG/install/doinst.sh << "EOF"
-# Create ld-lsb symlink
-( cd lib
-  if [ ! -e ld-lsb.so.3 ]; then
-    ln -sf ld-linux.so.2 ld-lsb.so.3
-  fi
-)
-
-EOF
-fi
-
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$FULLVERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/gis/google-earth/google-earth.info b/gis/google-earth/google-earth.info
index 07621ca351..afad0c430c 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.0.3832"
+VERSION="7.3.4"
 HOMEPAGE="https://www.google.com/earth/index.html"
-DOWNLOAD="https://dl.google.com/dl/earth/client/GE7/release_7_3_0/google-earth-pro-stable_7.3.0.3832-r0_i386.deb"
-MD5SUM="5c298610ae4bd604fcfd54fdc32e53dd"
-DOWNLOAD_x86_64="https://dl.google.com/dl/earth/client/GE7/release_7_3_0/google-earth-pro-stable_7.3.0.3832-r0_amd64.deb"
-MD5SUM_x86_64="b9d8281257b7ebf0dfac1ab1d3578681"
+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="6b4475ecede3e8a30f5229695556a5e4"
 REQUIRES=""
 MAINTAINER="Lenard Spencer"
 EMAIL="lenardrspencer@gmail.com"