gis/google-earth: Updated for version 7.3.0.3832. New maintainer.

Signed-off-by: Dave Woodfall <dave@slackbuilds.org>

4 files changed, 49 insertions, 31 deletions

diff --git a/gis/google-earth/README b/gis/google-earth/README
index 941e5bece5..a39cf206a7 100644
--- a/gis/google-earth/README
+++ b/gis/google-earth/README
@@ -19,32 +19,24 @@ 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 updates the GoogleEarth bin-file without changing the download
-   link location and they don't use version numbering in the filename 
-   (the version is more an internal numbering).  
-   
-   Therefore, this script is subject to failing (and a different MD5SUM) 
-   at any time due to the fact that you might get a newer version 
-   of GoogleEarth than what the script is designed to use. Please notify 
-   the maintainer if this is the case.
-
-2) 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. You'll need to create the symlink manually after installing 
-   the package:
-    
-   32-bit:    ln -sf /lib/ld-linux.so.2 /lib/ld-lsb.so.3
-   64-bit:    ln -sf /lib64/ld-linux-x86-64.so.2 /lib64/ld-lsb-x86-64.so.3
-
-3) Google Earth tends to crash when the 65-fonts-persian.conf is available on
-   the system. Please remove /etc/fonts/conf.d/65-fonts-persian.conf prior to
-   launching this application. The easiest way to do this is:
+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
 
-4) GoogleEarth now requires that you have OpenGL drivers installed on your
+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.
 
-5) On 32 bit, the VERSION is still at 7.3.0.3832.
+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.
diff --git a/gis/google-earth/doinst.sh b/gis/google-earth/doinst.sh
index cd40c461ab..76c4a738ca 100644
--- a/gis/google-earth/doinst.sh
+++ b/gis/google-earth/doinst.sh
@@ -11,3 +11,4 @@ if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
         /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1
     fi
 fi
+
diff --git a/gis/google-earth/google-earth.SlackBuild b/gis/google-earth/google-earth.SlackBuild
index c6c6b03fe4..1ca770d92f 100644
--- a/gis/google-earth/google-earth.SlackBuild
+++ b/gis/google-earth/google-earth.SlackBuild
@@ -3,8 +3,9 @@
 # Slackware build script for google-earth
 
 # Copyright 2007-2013  Michiel van Wessem, Manchester, United Kingdom
-# Copyright 2016-2019 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2016-2018 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
 # 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:
@@ -30,7 +31,7 @@
 # and to Daniel de Kok and Alan_Hicks for their comments.
 
 PRGNAM=google-earth
-VERSION=${VERSION:-7.3.3.7786}
+VERSION=${VERSION:-7.3.0.3832}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -61,9 +62,10 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $PKG
-ar p $CWD/google-earth-stable_current_${SRCARCH}.deb data.tar.xz | tar xJv
+ar p $CWD/google-earth-pro-stable_${VERSION}-r0_${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 . \
@@ -101,5 +103,28 @@ 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:-tgz}
diff --git a/gis/google-earth/google-earth.info b/gis/google-earth/google-earth.info
index 588bb62324..07621ca351 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.3.7786"
+VERSION="7.3.0.3832"
 HOMEPAGE="https://www.google.com/earth/index.html"
-DOWNLOAD="https://dl.google.com/dl/earth/client/current/google-earth-stable_current_i386.deb"
+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/current/google-earth-stable_current_amd64.deb"
-MD5SUM_x86_64="e26da562b45aa09d16210f97086eb358"
+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"
 REQUIRES=""
-MAINTAINER="Willy Sudiarto Raharjo"
-EMAIL="willysr@slackbuilds.org"
+MAINTAINER="Lenard Spencer"
+EMAIL="lenardrspencer@gmail.com"