From b7606663927a688f8f53f2db57af0c77438df826 Mon Sep 17 00:00:00 2001 From: Michiel van Wessem Date: Wed, 29 Dec 2010 00:08:47 -0600 Subject: multimedia/GoogleEarth: Updated for version 6.0.1.2032. Read the README. Seriously. Signed-off-by: Robby Workman --- multimedia/GoogleEarth/GoogleEarth.SlackBuild | 11 +++++------ multimedia/GoogleEarth/GoogleEarth.info | 4 ++-- multimedia/GoogleEarth/README | 20 ++++++++++++++------ multimedia/GoogleEarth/slack-desc | 8 ++++---- 4 files changed, 25 insertions(+), 18 deletions(-) diff --git a/multimedia/GoogleEarth/GoogleEarth.SlackBuild b/multimedia/GoogleEarth/GoogleEarth.SlackBuild index 11c9dac95a424..51c829bc3ea18 100644 --- a/multimedia/GoogleEarth/GoogleEarth.SlackBuild +++ b/multimedia/GoogleEarth/GoogleEarth.SlackBuild @@ -26,7 +26,7 @@ # and to Daniel de Kok and Alan_Hicks for their comments. PRGNAM=GoogleEarth -VERSION=${VERSION:-5.2.1.1588} +VERSION=${VERSION:-6.0.1.2032} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -35,7 +35,6 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} - # No flags/configure needed as it is just a binary repackaging. ARCH=i486 @@ -59,7 +58,7 @@ find . \ -exec chmod 755 {} \; -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# Sadly, Google has some rather inconsistent permissions for normal files; +# Sadly, Google has some inconsistent permissions for normal files; # this should deal with them rather nicely. find . \( -name "*.png" -o -name "*.kml" -o -name "*.xml" \) \ -exec chmod 0644 {} \; @@ -67,8 +66,8 @@ find . \( -name "*.png" -o -name "*.kml" -o -name "*.xml" \) \ mv $PKG/opt/$PRGNAM/bin/googleearth $PKG/opt/$PRGNAM rmdir $PKG/opt/$PRGNAM/bin -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +#find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ +# | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true # Let's use the information from the included postinstall.sh # script to create menu entry and mime stuff @@ -80,7 +79,7 @@ cat > $DESKTOPFILE << EOF [Desktop Entry] Name=Google Earth GenericName=3D planet viewer -Comment=Explore, search and discover the planet +Comment=Explore, search, and discover the planet Exec=googleearth %f Terminal=false MultipleArgs=false diff --git a/multimedia/GoogleEarth/GoogleEarth.info b/multimedia/GoogleEarth/GoogleEarth.info index e30812ee71835..5f75d3dad3c27 100644 --- a/multimedia/GoogleEarth/GoogleEarth.info +++ b/multimedia/GoogleEarth/GoogleEarth.info @@ -1,8 +1,8 @@ PRGNAM="GoogleEarth" -VERSION="5.2.1.1588" +VERSION="6.0.1.2032" HOMEPAGE="http://earth.google.com" DOWNLOAD="http://dl.google.com/earth/client/current/GoogleEarthLinux.bin" -MD5SUM="19ccb5dff2b1165c2a3644cbf6d680ee" +MD5SUM="737743e5ce9f464d555a2a829baebea4" DOWNLOAD_x86_64="UNSUPPORTED" MD5SUM_x86_64="" MAINTAINER="Michiel van Wessem" diff --git a/multimedia/GoogleEarth/README b/multimedia/GoogleEarth/README index 4b0c3f3817a4a..b87f14f6383d1 100644 --- a/multimedia/GoogleEarth/README +++ b/multimedia/GoogleEarth/README @@ -19,11 +19,7 @@ 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) GoogleEarth is a 32bit application only. You need to have the 32bit - compatibility packages installed to have this work on a 64bit system. - Otherwise you'll just see "no such file or directory" errors. - -2) Google updates the GoogleEarth bin-file without changing the download +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). @@ -32,6 +28,18 @@ NOTEs: of GoogleEarth than what the script is designed to use. Please notify the maintainer if this is the case. -3) GoogleEarth now requires that you have OpenGL drivers installed on your +2) Google Earth 6 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: + + ln -sf /lib/ld-linux.so.2 /lib/ld-lsb.so.3 + +3) GoogleEarth is a 32bit application only. You need to have the 32bit + compatibility packages installed to have this work on a 64bit system. + Otherwise you'll just see "no such file or directory" errors. + +4) GoogleEarth now requires that you have OpenGL drivers installed on your system (and Xorg configured to use them). Not doing so will cause X to crash. + diff --git a/multimedia/GoogleEarth/slack-desc b/multimedia/GoogleEarth/slack-desc index 9367fe0b4d6f0..839beddfae016 100644 --- a/multimedia/GoogleEarth/slack-desc +++ b/multimedia/GoogleEarth/slack-desc @@ -12,8 +12,8 @@ GoogleEarth: Google Earth is a virtual globe program. It maps a version of the GoogleEarth: Earth by the superimposition of images obtained from satellite GoogleEarth: imagery, aerial photography and GIS over a 3D globe. You point GoogleEarth: and zoom to any place on the planet that you want to explore. -GoogleEarth: Satellite images and local facts zoom into view. Tap into Google -GoogleEarth: search to show local points of interest and facts. Zoom to a -GoogleEarth: specific address to check out an apartment or hotel. View driving -GoogleEarth: directions and even fly along your route. +GoogleEarth: Satellite images and local facts zoom into view. GoogleEarth: +GoogleEarth: !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +GoogleEarth: If GoogleEarth fails to run, first consult the NOTES in the README. +GoogleEarth: !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- cgit v1.2.3