Update to 6.0.1.2032 (which is the current version again, looks like the

crashes are fixed...)

Submitted by:	pointyhat via erwin

4 files changed, 105 insertions, 491 deletions

diff --git a/astro/google-earth/Makefile b/astro/google-earth/Makefile
index 849e397edbf8..0119e8df978c 100644
--- a/astro/google-earth/Makefile
+++ b/astro/google-earth/Makefile
@@ -6,13 +6,12 @@
 #
 
 PORTNAME=	google-earth
-PORTVERSION=	5.1.3535.3218
-PORTEPOCH=	1
+PORTVERSION=	6.0.1.2032
 CATEGORIES=	astro deskutils geography
-MASTER_SITES=	http://dl.google.com/earth/client/advanced/previous/
-DISTNAME=	GoogleEarthLinux
-EXTRACT_SUFX=	.bin
-DIST_SUBDIR=    ${PORTNAME}/${PORTVERSION}
+MASTER_SITES=	http://dl.google.com/earth/client/advanced/previous/:previous \
+		http://dl.google.com/earth/client/current/:current
+DISTFILES=	GoogleEarthLinux.bin:current
+DIST_SUBDIR=	${PORTNAME}/${PORTVERSION}
 EXTRACT_ONLY=	# none
 
 MAINTAINER=	nox@FreeBSD.org
@@ -28,6 +27,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:C/\..*//g}/
 USE_LINUX=	yes
 USE_LINUX_APPS=	xorglibs
 USE_GNOME=	desktopfileutils
+USE_PERL5_BUILD=	yes
 
 .include <bsd.port.pre.mk>
 
@@ -40,7 +40,7 @@ USE_LINUX_APPS+=	dri
 .endif
 
 .if ${OSVERSION}<700055
-IGNORE=	FreeBSD>=7.X is needed with Linux emulation 2.6.x.
+IGNORE=	FreeBSD>=7.X is needed with Linux emulation 2.6.x
 .elif ${OSVERSION}<800076 && \
 	(! defined (OVERRIDE_LINUX_NONBASE_PORTS) || \
 	 ! (${OVERRIDE_LINUX_NONBASE_PORTS} == f10))
@@ -49,8 +49,8 @@ IGNORE=	needs non-default linux ports (define OVERRIDE_LINUX_BASE_PORT=f10 and O
 
 do-extract:
 	@${MKDIR} ${WRKSRC}
-	@${CP} ${DISTDIR}/${DIST_SUBDIR}/${DISTFILES} ${WRKSRC}
-	@cd ${WRKSRC} && ${UNMAKESELF} ${DISTFILES} && ${RM} -f ${DISTFILES}
+	@${CP} ${DISTDIR}/${DIST_SUBDIR}/${_DISTFILES} ${WRKSRC}
+	@cd ${WRKSRC} && ${UNMAKESELF} ${_DISTFILES} && ${RM} -f ${_DISTFILES}
 	@cd ${WRKSRC} && ${TAR} xf googleearth-data.tar && ${RM} -f googleearth-data.tar
 	@cd ${WRKSRC} && ${TAR} xf googleearth-linux-x86.tar && ${RM} -f googleearth-linux-x86.tar
 
@@ -60,6 +60,7 @@ post-patch:
 	@${REINPLACE_CMD} -i "" -e 's/^TMPPATH.*/exit 0/' ${WRKSRC}/postinstall.sh
 	@${REINPLACE_CMD} -i "" -e 's|\"\$$SETUP_INSTALLPATH/|\"${WRKSRC}/|' ${WRKSRC}/postinstall.sh
 	@${REINPLACE_CMD} -i "" -e 's|\$$SETUP_INSTALLPATH/googleearth |${PREFIX}/bin/googleearth |' ${WRKSRC}/postinstall.sh
+	${PERL} -i -pe 's|/lib/ld-lsb.so.3\0\0\0|/lib/ld-linux.so.2\0|' ${WRKSRC}/googleearth-bin
 
 do-build:
 	@${SETENV} SETUP_INSTALLPATH=${DATADIR} ${WRKSRC}/postinstall.sh
diff --git a/astro/google-earth/distinfo b/astro/google-earth/distinfo
index 15b2eb313483..375430ae2744 100644
--- a/astro/google-earth/distinfo
+++ b/astro/google-earth/distinfo
@@ -1,3 +1,2 @@
-MD5 (google-earth/5.1.3535.3218/GoogleEarthLinux.bin) = 69a52b92691f725b15e28b9fa2a123b2
-SHA256 (google-earth/5.1.3535.3218/GoogleEarthLinux.bin) = f721e4e8db3a7351c77a8aea425ec334ff01e163481cbcf6cdda9dbb0ad422ac
-SIZE (google-earth/5.1.3535.3218/GoogleEarthLinux.bin) = 25932414
+SHA256 (google-earth/6.0.1.2032/GoogleEarthLinux.bin) = d52d39ee33957b0300bd63a78f8822eb80ce98f451bdbca903afe995cec86c95
+SIZE (google-earth/6.0.1.2032/GoogleEarthLinux.bin) = 33589497
diff --git a/astro/google-earth/files/patch-bin-googleearth b/astro/google-earth/files/patch-bin-googleearth
index a7d9d2a51f52..1d14941af2b5 100644
--- a/astro/google-earth/files/patch-bin-googleearth
+++ b/astro/google-earth/files/patch-bin-googleearth
@@ -1,15 +1,10 @@
 Index: bin/googleearth
-@@ -34,11 +34,21 @@ FindPath()
-     dirname $fullpath
- }
- 
-+ulimit -s 32768 2>/dev/null
-+
- # Set the home if not already set.
- if [ "${GOOGLEEARTH_DATA_PATH}" = "" ]; then
-     GOOGLEEARTH_DATA_PATH="`FindPath $0`"
+@@ -8,6 +8,16 @@ if [ "${GOOGLEEARTH_DATA_PATH}" = "" ]; 
+   GOOGLEEARTH_DATA_PATH="$(dirname "$(readlink -f "$0")")"
  fi
  
++ulimit -s 32768 2>/dev/null
++ 
 +# For browser wrapper script (to use original LD_LIBRARY_PATH)
 +if [ -n "${BROWSER}" ]
 +then
diff --git a/astro/google-earth/pkg-plist b/astro/google-earth/pkg-plist
index 9db5b86f1ab6..ac2aab0967e9 100644
--- a/astro/google-earth/pkg-plist
+++ b/astro/google-earth/pkg-plist
@@ -6,6 +6,33 @@ bin/googleearth
 %%DATADIR%%/README.linux
 %%DATADIR%%/bin/googleearth
 %%DATADIR%%/bin/browserwrapper
+%%DATADIR%%/desktop_icons/consumer/product_logo_128.png
+%%DATADIR%%/desktop_icons/consumer/product_logo_16.png
+%%DATADIR%%/desktop_icons/consumer/product_logo_22.png
+%%DATADIR%%/desktop_icons/consumer/product_logo_24.png
+%%DATADIR%%/desktop_icons/consumer/product_logo_256.png
+%%DATADIR%%/desktop_icons/consumer/product_logo_32.png
+%%DATADIR%%/desktop_icons/consumer/product_logo_32.xpm
+%%DATADIR%%/desktop_icons/consumer/product_logo_48.png
+%%DATADIR%%/desktop_icons/consumer/product_logo_64.png
+%%DATADIR%%/desktop_icons/ec/product_logo_128.png
+%%DATADIR%%/desktop_icons/ec/product_logo_16.png
+%%DATADIR%%/desktop_icons/ec/product_logo_22.png
+%%DATADIR%%/desktop_icons/ec/product_logo_24.png
+%%DATADIR%%/desktop_icons/ec/product_logo_256.png
+%%DATADIR%%/desktop_icons/ec/product_logo_32.png
+%%DATADIR%%/desktop_icons/ec/product_logo_32.xpm
+%%DATADIR%%/desktop_icons/ec/product_logo_48.png
+%%DATADIR%%/desktop_icons/ec/product_logo_64.png
+%%DATADIR%%/desktop_icons/pro/product_logo_128.png
+%%DATADIR%%/desktop_icons/pro/product_logo_16.png
+%%DATADIR%%/desktop_icons/pro/product_logo_22.png
+%%DATADIR%%/desktop_icons/pro/product_logo_24.png
+%%DATADIR%%/desktop_icons/pro/product_logo_256.png
+%%DATADIR%%/desktop_icons/pro/product_logo_32.png
+%%DATADIR%%/desktop_icons/pro/product_logo_32.xpm
+%%DATADIR%%/desktop_icons/pro/product_logo_48.png
+%%DATADIR%%/desktop_icons/pro/product_logo_64.png
 %%DATADIR%%/drivers.ini
 %%DATADIR%%/googleearth-bin
 %%DATADIR%%/googleearth-icon.png
@@ -23,6 +50,7 @@ bin/googleearth
 %%DATADIR%%/lang/en.qm
 %%DATADIR%%/lang/es-419.qm
 %%DATADIR%%/lang/es.qm
+%%DATADIR%%/lang/fa.qm
 %%DATADIR%%/lang/fi.qm
 %%DATADIR%%/lang/fil.qm
 %%DATADIR%%/lang/fr.qm
@@ -52,6 +80,7 @@ bin/googleearth
 %%DATADIR%%/lang/uk.qm
 %%DATADIR%%/lang/vi.qm
 %%DATADIR%%/lang/zh-Hans.qm
+%%DATADIR%%/lang/zh-Hant-HK.qm
 %%DATADIR%%/lang/zh-Hant.qm
 %%DATADIR%%/libGLU.so.1
 %%DATADIR%%/libIGAttrs.so
@@ -73,6 +102,9 @@ bin/googleearth
 %%DATADIR%%/libbasicingest.so
 %%DATADIR%%/libcollada.so
 %%DATADIR%%/libcommon.so
+%%DATADIR%%/libcommon_gui.so
+%%DATADIR%%/libcommon_platform.so
+%%DATADIR%%/libcommon_webbrowser.so
 %%DATADIR%%/libcomponentframework.so
 %%DATADIR%%/libcurl.so.4
 %%DATADIR%%/libevll.so
@@ -82,7 +114,7 @@ bin/googleearth
 %%DATADIR%%/libge_net.so
 %%DATADIR%%/libgeobase.so
 %%DATADIR%%/libgeobaseutils.so
-%%DATADIR%%/libgoogleearth_lib.so
+%%DATADIR%%/libgoogleearth_free.so
 %%DATADIR%%/libgooglesearch.so
 %%DATADIR%%/libgps.so
 %%DATADIR%%/libicudata.so.38
@@ -92,7 +124,6 @@ bin/googleearth
 %%DATADIR%%/liblayout.so
 %%DATADIR%%/libmath.so
 %%DATADIR%%/libmeasure.so
-%%DATADIR%%/libminizip.so
 %%DATADIR%%/libmoduleframework.so
 %%DATADIR%%/libnavigate.so
 %%DATADIR%%/libnss_mdns4_minimal.so.2
@@ -100,16 +131,26 @@ bin/googleearth
 %%DATADIR%%/libproj.so.0
 %%DATADIR%%/librender.so
 %%DATADIR%%/libreporting.so
+%%DATADIR%%/libsgutil.so
+%%DATADIR%%/libspatial.so
+%%DATADIR%%/libviewsync.so
+%%DATADIR%%/libwebbrowser.so
 %%DATADIR%%/libwmsbase.so
 %%DATADIR%%/linux/xdg/xdg-desktop-icon
 %%DATADIR%%/linux/xdg/xdg-desktop-menu
 %%DATADIR%%/linux/xdg/xdg-mime
 %%DATADIR%%/plugins/imageformats/libqgif.so
 %%DATADIR%%/plugins/imageformats/libqjpeg.so
+%%DATADIR%%/product_logo_128.png
+%%DATADIR%%/product_logo_16.png
+%%DATADIR%%/product_logo_22.png
+%%DATADIR%%/product_logo_24.png
+%%DATADIR%%/product_logo_256.png
+%%DATADIR%%/product_logo_32.png
+%%DATADIR%%/product_logo_32.xpm
+%%DATADIR%%/product_logo_48.png
+%%DATADIR%%/product_logo_64.png
 %%DATADIR%%/qt.conf
-%%DATADIR%%/resources/16x16.png
-%%DATADIR%%/resources/32x32.png
-%%DATADIR%%/resources/aboutlogo.png
 %%DATADIR%%/resources/ad.country/startinglocation.kml
 %%DATADIR%%/resources/ae.country/startinglocation.kml
 %%DATADIR%%/resources/af.country/startinglocation.kml
@@ -117,46 +158,20 @@ bin/googleearth
 %%DATADIR%%/resources/ai.country/startinglocation.kml
 %%DATADIR%%/resources/al.country/startinglocation.kml
 %%DATADIR%%/resources/am.country/startinglocation.kml
-%%DATADIR%%/resources/american-flag.png
 %%DATADIR%%/resources/an.country/startinglocation.kml
 %%DATADIR%%/resources/ao.country/startinglocation.kml
+%%DATADIR%%/resources/application.rcc
 %%DATADIR%%/resources/aq.country/startinglocation.kml
 %%DATADIR%%/resources/ar.country/startinglocation.kml
 %%DATADIR%%/resources/ar.locale/default_myplaces.kml
-%%DATADIR%%/resources/arrow_e_active.png
-%%DATADIR%%/resources/arrow_e_hover.png
-%%DATADIR%%/resources/arrow_e_norm.png
-%%DATADIR%%/resources/arrow_n_active.png
-%%DATADIR%%/resources/arrow_n_hover.png
-%%DATADIR%%/resources/arrow_n_norm.png
-%%DATADIR%%/resources/arrow_s_active.png
-%%DATADIR%%/resources/arrow_s_hover.png
-%%DATADIR%%/resources/arrow_s_norm.png
-%%DATADIR%%/resources/arrow_w_active.png
-%%DATADIR%%/resources/arrow_w_hover.png
-%%DATADIR%%/resources/arrow_w_norm.png
-%%DATADIR%%/resources/arrows_e_active.png
-%%DATADIR%%/resources/arrows_e_hover.png
-%%DATADIR%%/resources/arrows_n_active.png
-%%DATADIR%%/resources/arrows_n_hover.png
-%%DATADIR%%/resources/arrows_norm.png
-%%DATADIR%%/resources/arrows_s_active.png
-%%DATADIR%%/resources/arrows_s_hover.png
-%%DATADIR%%/resources/arrows_w_active.png
-%%DATADIR%%/resources/arrows_w_hover.png
 %%DATADIR%%/resources/as.country/startinglocation.kml
-%%DATADIR%%/resources/asian-flag.png
 %%DATADIR%%/resources/at.country/startinglocation.kml
 %%DATADIR%%/resources/au.country/startinglocation.kml
-%%DATADIR%%/resources/auto-service.png
-%%DATADIR%%/resources/auto.png
 %%DATADIR%%/resources/aw.country/startinglocation.kml
 %%DATADIR%%/resources/ax.country/startinglocation.kml
 %%DATADIR%%/resources/az.country/startinglocation.kml
 %%DATADIR%%/resources/ba.country/startinglocation.kml
 %%DATADIR%%/resources/balloons.rcc
-%%DATADIR%%/resources/bang.png
-%%DATADIR%%/resources/bars.png
 %%DATADIR%%/resources/bb.country/startinglocation.kml
 %%DATADIR%%/resources/bd.country/startinglocation.kml
 %%DATADIR%%/resources/be.country/startinglocation.kml
@@ -172,44 +187,24 @@ bin/googleearth
 %%DATADIR%%/resources/br.country/startinglocation.kml
 %%DATADIR%%/resources/bs.country/startinglocation.kml
 %%DATADIR%%/resources/bt.country/startinglocation.kml
-%%DATADIR%%/resources/building.png
-%%DATADIR%%/resources/button-dis-leftendcap-flat.png
-%%DATADIR%%/resources/button-dis-repeating-flat.png
-%%DATADIR%%/resources/button-dis-rightendcap-flat.png
-%%DATADIR%%/resources/button-md-leftendcap-flat.png
-%%DATADIR%%/resources/button-md-repeating-flat.png
-%%DATADIR%%/resources/button-md-rightendcap-flat.png
 %%DATADIR%%/resources/bv.country/startinglocation.kml
 %%DATADIR%%/resources/bw.country/startinglocation.kml
 %%DATADIR%%/resources/by.country/startinglocation.kml
 %%DATADIR%%/resources/bz.country/startinglocation.kml
 %%DATADIR%%/resources/ca.country/startinglocation.kml
 %%DATADIR%%/resources/ca.locale/default_myplaces.kml
-%%DATADIR%%/resources/camera32.png
-%%DATADIR%%/resources/camera_mode.png
 %%DATADIR%%/resources/cc.country/startinglocation.kml
 %%DATADIR%%/resources/cd.country/startinglocation.kml
 %%DATADIR%%/resources/cf.country/startinglocation.kml
 %%DATADIR%%/resources/cg.country/startinglocation.kml
 %%DATADIR%%/resources/ch.country/startinglocation.kml
-%%DATADIR%%/resources/check-sel.png
-%%DATADIR%%/resources/check-somechildsel.png
-%%DATADIR%%/resources/check-unsel.png
 %%DATADIR%%/resources/ci.country/startinglocation.kml
 %%DATADIR%%/resources/ck.country/startinglocation.kml
 %%DATADIR%%/resources/cl.country/startinglocation.kml
-%%DATADIR%%/resources/close_circle_active.png
-%%DATADIR%%/resources/close_circle_hover.png
-%%DATADIR%%/resources/close_circle_norm.png
-%%DATADIR%%/resources/closedfolder.png
-%%DATADIR%%/resources/closednetworkfolder.png
 %%DATADIR%%/resources/cm.country/startinglocation.kml
 %%DATADIR%%/resources/cn.country/startinglocation.kml
 %%DATADIR%%/resources/co.country/startinglocation.kml
-%%DATADIR%%/resources/coffee_house_16.png
-%%DATADIR%%/resources/collapsedtree.png
 %%DATADIR%%/resources/cr.country/startinglocation.kml
-%%DATADIR%%/resources/crosshair.png
 %%DATADIR%%/resources/cs.country/startinglocation.kml
 %%DATADIR%%/resources/cs.locale/default_myplaces.kml
 %%DATADIR%%/resources/cu.country/startinglocation.kml
@@ -222,23 +217,15 @@ bin/googleearth
 %%DATADIR%%/resources/da.locale/default_myplaces.kml
 %%DATADIR%%/resources/de.country/startinglocation.kml
 %%DATADIR%%/resources/de.locale/default_myplaces.kml
-%%DATADIR%%/resources/decal.png
-%%DATADIR%%/resources/dining.png
-%%DATADIR%%/resources/dining_16.png
 %%DATADIR%%/resources/dj.country/startinglocation.kml
 %%DATADIR%%/resources/dk.country/startinglocation.kml
 %%DATADIR%%/resources/dm.country/startinglocation.kml
 %%DATADIR%%/resources/do.country/startinglocation.kml
 %%DATADIR%%/resources/doppler.txt
-%%DATADIR%%/resources/drawcircle.png
-%%DATADIR%%/resources/drawline.png
-%%DATADIR%%/resources/drawpolygon.png
-%%DATADIR%%/resources/drawpolyline.png
 %%DATADIR%%/resources/dz.country/startinglocation.kml
-%%DATADIR%%/resources/earthgroundrayleigh.png
-%%DATADIR%%/resources/earthskyrayleigh.png
 %%DATADIR%%/resources/ec.country/startinglocation.kml
 %%DATADIR%%/resources/ee.country/startinglocation.kml
+%%DATADIR%%/resources/effects.rcc
 %%DATADIR%%/resources/eg.country/startinglocation.kml
 %%DATADIR%%/resources/eh.country/startinglocation.kml
 %%DATADIR%%/resources/el.locale/default_myplaces.kml
@@ -248,12 +235,9 @@ bin/googleearth
 %%DATADIR%%/resources/es.country/startinglocation.kml
 %%DATADIR%%/resources/es.locale/default_myplaces.kml
 %%DATADIR%%/resources/et.country/startinglocation.kml
-%%DATADIR%%/resources/fast-food.png
 %%DATADIR%%/resources/fi.country/startinglocation.kml
 %%DATADIR%%/resources/fi.locale/default_myplaces.kml
 %%DATADIR%%/resources/fil.locale/default_myplaces.kml
-%%DATADIR%%/resources/find-next-dis.png
-%%DATADIR%%/resources/find-prev-dis.png
 %%DATADIR%%/resources/fj.country/startinglocation.kml
 %%DATADIR%%/resources/fk.country/startinglocation.kml
 %%DATADIR%%/resources/flightsim/aircraft/f16.acf
@@ -279,17 +263,12 @@ bin/googleearth
 %%DATADIR%%/resources/flightsim/planet/earth.ini
 %%DATADIR%%/resources/fm.country/startinglocation.kml
 %%DATADIR%%/resources/fo.country/startinglocation.kml
-%%DATADIR%%/resources/four-dollars.png
-%%DATADIR%%/resources/fr-layers.png
 %%DATADIR%%/resources/fr.country/startinglocation.kml
 %%DATADIR%%/resources/fr.locale/default_myplaces.kml
-%%DATADIR%%/resources/french-flag.png
 %%DATADIR%%/resources/ga.country/startinglocation.kml
 %%DATADIR%%/resources/gb.country/startinglocation.kml
 %%DATADIR%%/resources/gd.country/startinglocation.kml
 %%DATADIR%%/resources/ge.country/startinglocation.kml
-%%DATADIR%%/resources/geforce_cursor.png
-%%DATADIR%%/resources/geforce_cursor_32.png
 %%DATADIR%%/resources/gf.country/startinglocation.kml
 %%DATADIR%%/resources/gg.country/startinglocation.kml
 %%DATADIR%%/resources/gh.country/startinglocation.kml
@@ -297,7 +276,6 @@ bin/googleearth
 %%DATADIR%%/resources/gl.country/startinglocation.kml
 %%DATADIR%%/resources/gm.country/startinglocation.kml
 %%DATADIR%%/resources/gn.country/startinglocation.kml
-%%DATADIR%%/resources/google_earth_splash.png
 %%DATADIR%%/resources/gp.country/startinglocation.kml
 %%DATADIR%%/resources/gq.country/startinglocation.kml
 %%DATADIR%%/resources/gr.country/startinglocation.kml
@@ -306,11 +284,8 @@ bin/googleearth
 %%DATADIR%%/resources/gu.country/startinglocation.kml
 %%DATADIR%%/resources/gw.country/startinglocation.kml
 %%DATADIR%%/resources/gy.country/startinglocation.kml
-%%DATADIR%%/resources/hand.png
 %%DATADIR%%/resources/he.locale/default_myplaces.kml
 %%DATADIR%%/resources/hi.locale/default_myplaces.kml
-%%DATADIR%%/resources/high_res_places.png
-%%DATADIR%%/resources/highway_16.png
 %%DATADIR%%/resources/hk.country/startinglocation.kml
 %%DATADIR%%/resources/hm.country/startinglocation.kml
 %%DATADIR%%/resources/hn.country/startinglocation.kml
@@ -325,26 +300,16 @@ bin/googleearth
 %%DATADIR%%/resources/il.country/startinglocation.kml
 %%DATADIR%%/resources/im.country/startinglocation.kml
 %%DATADIR%%/resources/in.country/startinglocation.kml
-%%DATADIR%%/resources/invisible.png
 %%DATADIR%%/resources/io.country/startinglocation.kml
 %%DATADIR%%/resources/iq.country/startinglocation.kml
 %%DATADIR%%/resources/ir.country/startinglocation.kml
 %%DATADIR%%/resources/is.country/startinglocation.kml
 %%DATADIR%%/resources/it.country/startinglocation.kml
 %%DATADIR%%/resources/it.locale/default_myplaces.kml
-%%DATADIR%%/resources/italian-flag.png
 %%DATADIR%%/resources/ja.locale/default_myplaces.kml
 %%DATADIR%%/resources/je.country/startinglocation.kml
 %%DATADIR%%/resources/jm.country/startinglocation.kml
 %%DATADIR%%/resources/jo.country/startinglocation.kml
-%%DATADIR%%/resources/joystick_look_active.png
-%%DATADIR%%/resources/joystick_look_background.png
-%%DATADIR%%/resources/joystick_look_hover.png
-%%DATADIR%%/resources/joystick_look_norm.png
-%%DATADIR%%/resources/joystick_move_active.png
-%%DATADIR%%/resources/joystick_move_background.png
-%%DATADIR%%/resources/joystick_move_hover.png
-%%DATADIR%%/resources/joystick_move_norm.png
 %%DATADIR%%/resources/jp.country/startinglocation.kml
 %%DATADIR%%/resources/ke.country/startinglocation.kml
 %%DATADIR%%/resources/kg.country/startinglocation.kml
@@ -353,23 +318,19 @@ bin/googleearth
 %%DATADIR%%/resources/km.country/startinglocation.kml
 %%DATADIR%%/resources/kn.country/startinglocation.kml
 %%DATADIR%%/resources/ko.locale/default_myplaces.kml
-%%DATADIR%%/resources/ko.locale/google_earth_splash.png
 %%DATADIR%%/resources/kp.country/startinglocation.kml
 %%DATADIR%%/resources/kr.country/startinglocation.kml
 %%DATADIR%%/resources/kw.country/startinglocation.kml
 %%DATADIR%%/resources/ky.country/startinglocation.kml
 %%DATADIR%%/resources/kz.country/startinglocation.kml
 %%DATADIR%%/resources/la.country/startinglocation.kml
-%%DATADIR%%/resources/large_traffic_count_16.png
-%%DATADIR%%/resources/layers_16.png
 %%DATADIR%%/resources/lb.country/startinglocation.kml
 %%DATADIR%%/resources/lc.country/startinglocation.kml
 %%DATADIR%%/resources/leftpanel-common.rcc
 %%DATADIR%%/resources/leftpanel-layer.rcc
 %%DATADIR%%/resources/li.country/startinglocation.kml
 %%DATADIR%%/resources/lk.country/startinglocation.kml
-%%DATADIR%%/resources/loading-image.png
-%%DATADIR%%/resources/loading.png
+%%DATADIR%%/resources/localshapes.rcc
 %%DATADIR%%/resources/lr.country/startinglocation.kml
 %%DATADIR%%/resources/ls.country/startinglocation.kml
 %%DATADIR%%/resources/lt.country/startinglocation.kml
@@ -379,15 +340,11 @@ bin/googleearth
 %%DATADIR%%/resources/lv.locale/default_myplaces.kml
 %%DATADIR%%/resources/ly.country/startinglocation.kml
 %%DATADIR%%/resources/ma.country/startinglocation.kml
-%%DATADIR%%/resources/marsgroundrayleigh.png
-%%DATADIR%%/resources/marsskyrayleigh.png
 %%DATADIR%%/resources/mc.country/startinglocation.kml
 %%DATADIR%%/resources/md.country/startinglocation.kml
 %%DATADIR%%/resources/me.country/startinglocation.kml
-%%DATADIR%%/resources/mexican-flag.png
 %%DATADIR%%/resources/mg.country/startinglocation.kml
 %%DATADIR%%/resources/mh.country/startinglocation.kml
-%%DATADIR%%/resources/misc-dining.png
 %%DATADIR%%/resources/mk.country/startinglocation.kml
 %%DATADIR%%/resources/ml.country/startinglocation.kml
 %%DATADIR%%/resources/mm.country/startinglocation.kml
@@ -403,8 +360,6 @@ bin/googleearth
 %%DATADIR%%/resources/mw.country/startinglocation.kml
 %%DATADIR%%/resources/mx.country/startinglocation.kml
 %%DATADIR%%/resources/my.country/startinglocation.kml
-%%DATADIR%%/resources/mysavedplaces_closed.png
-%%DATADIR%%/resources/mysavedplaces_open.png
 %%DATADIR%%/resources/mz.country/startinglocation.kml
 %%DATADIR%%/resources/na.country/startinglocation.kml
 %%DATADIR%%/resources/navcontrols.rcc
@@ -413,433 +368,89 @@ bin/googleearth
 %%DATADIR%%/resources/nf.country/startinglocation.kml
 %%DATADIR%%/resources/ng.country/startinglocation.kml
 %%DATADIR%%/resources/ni.country/startinglocation.kml
-%%DATADIR%%/resources/ni_closed_connected.png
-%%DATADIR%%/resources/ni_closed_disconnected.png
-%%DATADIR%%/resources/ni_closed_fetching_01.png
-%%DATADIR%%/resources/ni_closed_fetching_02.png
-%%DATADIR%%/resources/ni_closed_fetching_03.png
-%%DATADIR%%/resources/ni_open_connected.png
-%%DATADIR%%/resources/ni_open_disconnected.png
-%%DATADIR%%/resources/ni_open_fetching_01.png
-%%DATADIR%%/resources/ni_open_fetching_02.png
-%%DATADIR%%/resources/ni_open_fetching_03.png
 %%DATADIR%%/resources/nl.country/startinglocation.kml
 %%DATADIR%%/resources/nl.locale/default_myplaces.kml
 %%DATADIR%%/resources/no.country/startinglocation.kml
 %%DATADIR%%/resources/no.locale/default_myplaces.kml
-%%DATADIR%%/resources/node-closed.png
-%%DATADIR%%/resources/node-open.png
-%%DATADIR%%/resources/note.png
-%%DATADIR%%/resources/notfound.png
+%%DATADIR%%/resources/notifications.rcc
 %%DATADIR%%/resources/np.country/startinglocation.kml
 %%DATADIR%%/resources/nr.country/startinglocation.kml
 %%DATADIR%%/resources/nu.country/startinglocation.kml
 %%DATADIR%%/resources/nz.country/startinglocation.kml
 %%DATADIR%%/resources/om.country/startinglocation.kml
-%%DATADIR%%/resources/one-dollar.png
-%%DATADIR%%/resources/openfolder.png
-%%DATADIR%%/resources/opennetworkfolder.png
-%%DATADIR%%/resources/opentree.png
-%%DATADIR%%/resources/overlay.png
-%%DATADIR%%/resources/overviewframe.png
 %%DATADIR%%/resources/pa.country/startinglocation.kml
-%%DATADIR%%/resources/paddle/1-lv.png
-%%DATADIR%%/resources/paddle/1.png
-%%DATADIR%%/resources/paddle/10-lv.png
-%%DATADIR%%/resources/paddle/10.png
-%%DATADIR%%/resources/paddle/2-lv.png
-%%DATADIR%%/resources/paddle/2.png
-%%DATADIR%%/resources/paddle/3-lv.png
-%%DATADIR%%/resources/paddle/3.png
-%%DATADIR%%/resources/paddle/4-lv.png
-%%DATADIR%%/resources/paddle/4.png
-%%DATADIR%%/resources/paddle/5-lv.png
-%%DATADIR%%/resources/paddle/5.png
-%%DATADIR%%/resources/paddle/6-lv.png
-%%DATADIR%%/resources/paddle/6.png
-%%DATADIR%%/resources/paddle/7-lv.png
-%%DATADIR%%/resources/paddle/7.png
-%%DATADIR%%/resources/paddle/8-lv.png
-%%DATADIR%%/resources/paddle/8.png
-%%DATADIR%%/resources/paddle/9-lv.png
-%%DATADIR%%/resources/paddle/9.png
-%%DATADIR%%/resources/paddle/a-lv.png
-%%DATADIR%%/resources/paddle/a.png
-%%DATADIR%%/resources/paddle/b-lv.png
-%%DATADIR%%/resources/paddle/b.png
-%%DATADIR%%/resources/paddle/blu-blank-lv.png
-%%DATADIR%%/resources/paddle/blu-blank.png
-%%DATADIR%%/resources/paddle/blu-circle-lv.png
-%%DATADIR%%/resources/paddle/blu-circle.png
-%%DATADIR%%/resources/paddle/blu-diamond-lv.png
-%%DATADIR%%/resources/paddle/blu-diamond.png
-%%DATADIR%%/resources/paddle/blu-square-lv.png
-%%DATADIR%%/resources/paddle/blu-square.png
-%%DATADIR%%/resources/paddle/blu-stars-lv.png
-%%DATADIR%%/resources/paddle/blu-stars.png
-%%DATADIR%%/resources/paddle/c-lv.png
-%%DATADIR%%/resources/paddle/c.png
-%%DATADIR%%/resources/paddle/d-lv.png
-%%DATADIR%%/resources/paddle/d.png
-%%DATADIR%%/resources/paddle/e-lv.png
-%%DATADIR%%/resources/paddle/e.png
-%%DATADIR%%/resources/paddle/f-lv.png
-%%DATADIR%%/resources/paddle/f.png
-%%DATADIR%%/resources/paddle/g-lv.png
-%%DATADIR%%/resources/paddle/g.png
-%%DATADIR%%/resources/paddle/go-lv.png
-%%DATADIR%%/resources/paddle/go.png
-%%DATADIR%%/resources/paddle/grn-blank-lv.png
-%%DATADIR%%/resources/paddle/grn-blank.png
-%%DATADIR%%/resources/paddle/grn-circle-lv.png
-%%DATADIR%%/resources/paddle/grn-circle.png
-%%DATADIR%%/resources/paddle/grn-diamond-lv.png
-%%DATADIR%%/resources/paddle/grn-diamond.png
-%%DATADIR%%/resources/paddle/grn-square-lv.png
-%%DATADIR%%/resources/paddle/grn-square.png
-%%DATADIR%%/resources/paddle/grn-stars-lv.png
-%%DATADIR%%/resources/paddle/grn-stars.png
-%%DATADIR%%/resources/paddle/h-lv.png
-%%DATADIR%%/resources/paddle/h.png
-%%DATADIR%%/resources/paddle/i-lv.png
-%%DATADIR%%/resources/paddle/i.png
-%%DATADIR%%/resources/paddle/j-lv.png
-%%DATADIR%%/resources/paddle/j.png
-%%DATADIR%%/resources/paddle/k-lv.png
-%%DATADIR%%/resources/paddle/k.png
-%%DATADIR%%/resources/paddle/l-lv.png
-%%DATADIR%%/resources/paddle/l.png
-%%DATADIR%%/resources/paddle/ltblu-blank-lv.png
-%%DATADIR%%/resources/paddle/ltblu-blank.png
-%%DATADIR%%/resources/paddle/ltblu-circle-lv.png
-%%DATADIR%%/resources/paddle/ltblu-circle.png
-%%DATADIR%%/resources/paddle/ltblu-diamond-lv.png
-%%DATADIR%%/resources/paddle/ltblu-diamond.png
-%%DATADIR%%/resources/paddle/ltblu-square-lv.png
-%%DATADIR%%/resources/paddle/ltblu-square.png
-%%DATADIR%%/resources/paddle/ltblu-stars-lv.png
-%%DATADIR%%/resources/paddle/ltblu-stars.png
-%%DATADIR%%/resources/paddle/m-lv.png
-%%DATADIR%%/resources/paddle/m.png
-%%DATADIR%%/resources/paddle/n-lv.png
-%%DATADIR%%/resources/paddle/n.png
-%%DATADIR%%/resources/paddle/o-lv.png
-%%DATADIR%%/resources/paddle/o.png
-%%DATADIR%%/resources/paddle/p-lv.png
-%%DATADIR%%/resources/paddle/p.png
-%%DATADIR%%/resources/paddle/pause-lv.png
-%%DATADIR%%/resources/paddle/pause.png
-%%DATADIR%%/resources/paddle/pink-blank-lv.png
-%%DATADIR%%/resources/paddle/pink-blank.png
-%%DATADIR%%/resources/paddle/pink-circle-lv.png
-%%DATADIR%%/resources/paddle/pink-circle.png
-%%DATADIR%%/resources/paddle/pink-diamond-lv.png
-%%DATADIR%%/resources/paddle/pink-diamond.png
-%%DATADIR%%/resources/paddle/pink-square-lv.png
-%%DATADIR%%/resources/paddle/pink-square.png
-%%DATADIR%%/resources/paddle/pink-stars-lv.png
-%%DATADIR%%/resources/paddle/pink-stars.png
-%%DATADIR%%/resources/paddle/purple-circle-lv.png
-%%DATADIR%%/resources/paddle/purple-circle.png
-%%DATADIR%%/resources/paddle/purple-diamond-lv.png
-%%DATADIR%%/resources/paddle/purple-diamond.png
-%%DATADIR%%/resources/paddle/purple-square-lv.png
-%%DATADIR%%/resources/paddle/purple-square.png
-%%DATADIR%%/resources/paddle/purple-stars-lv.png
-%%DATADIR%%/resources/paddle/purple-stars.png
-%%DATADIR%%/resources/paddle/q-lv.png
-%%DATADIR%%/resources/paddle/q.png
-%%DATADIR%%/resources/paddle/r-lv.png
-%%DATADIR%%/resources/paddle/r.png
-%%DATADIR%%/resources/paddle/red-circle-lv.png
-%%DATADIR%%/resources/paddle/red-circle.png
-%%DATADIR%%/resources/paddle/red-diamond-lv.png
-%%DATADIR%%/resources/paddle/red-diamond.png
-%%DATADIR%%/resources/paddle/red-square-lv.png
-%%DATADIR%%/resources/paddle/red-square.png
-%%DATADIR%%/resources/paddle/red-stars-lv.png
-%%DATADIR%%/resources/paddle/red-stars.png
-%%DATADIR%%/resources/paddle/route.png
-%%DATADIR%%/resources/paddle/s-lv.png
-%%DATADIR%%/resources/paddle/s.png
-%%DATADIR%%/resources/paddle/stop-lv.png
-%%DATADIR%%/resources/paddle/stop.png
-%%DATADIR%%/resources/paddle/t-lv.png
-%%DATADIR%%/resources/paddle/t.png
-%%DATADIR%%/resources/paddle/u-lv.png
-%%DATADIR%%/resources/paddle/u.png
-%%DATADIR%%/resources/paddle/v-lv.png
-%%DATADIR%%/resources/paddle/v.png
-%%DATADIR%%/resources/paddle/w-lv.png
-%%DATADIR%%/resources/paddle/w.png
-%%DATADIR%%/resources/paddle/wht-blank-lv.png
-%%DATADIR%%/resources/paddle/wht-blank.png
-%%DATADIR%%/resources/paddle/wht-circle-lv.png
-%%DATADIR%%/resources/paddle/wht-circle.png
-%%DATADIR%%/resources/paddle/wht-diamond-lv.png
-%%DATADIR%%/resources/paddle/wht-diamond.png
-%%DATADIR%%/resources/paddle/wht-square-lv.png
-%%DATADIR%%/resources/paddle/wht-square.png
-%%DATADIR%%/resources/paddle/wht-stars-lv.png
-%%DATADIR%%/resources/paddle/wht-stars.png
-%%DATADIR%%/resources/paddle/x-lv.png
-%%DATADIR%%/resources/paddle/x.png
-%%DATADIR%%/resources/paddle/y-lv.png
-%%DATADIR%%/resources/paddle/y.png
-%%DATADIR%%/resources/paddle/ylw-blank-lv.png
-%%DATADIR%%/resources/paddle/ylw-blank.png
-%%DATADIR%%/resources/paddle/ylw-circle-lv.png
-%%DATADIR%%/resources/paddle/ylw-circle.png
-%%DATADIR%%/resources/paddle/ylw-diamond-lv.png
-%%DATADIR%%/resources/paddle/ylw-diamond.png
-%%DATADIR%%/resources/paddle/ylw-square-lv.png
-%%DATADIR%%/resources/paddle/ylw-square.png
-%%DATADIR%%/resources/paddle/ylw-stars-lv.png
-%%DATADIR%%/resources/paddle/ylw-stars.png
-%%DATADIR%%/resources/paddle/z-lv.png
-%%DATADIR%%/resources/paddle/z.png
-%%DATADIR%%/resources/parks.png
 %%DATADIR%%/resources/pe.country/startinglocation.kml
 %%DATADIR%%/resources/pf.country/startinglocation.kml
 %%DATADIR%%/resources/pg.country/startinglocation.kml
 %%DATADIR%%/resources/ph.country/startinglocation.kml
-%%DATADIR%%/resources/photo_icon_64.png
-%%DATADIR%%/resources/photo_listview.png
 %%DATADIR%%/resources/pk.country/startinglocation.kml
 %%DATADIR%%/resources/pl.country/startinglocation.kml
 %%DATADIR%%/resources/pl.locale/default_myplaces.kml
 %%DATADIR%%/resources/pm.country/startinglocation.kml
 %%DATADIR%%/resources/pn.country/startinglocation.kml
 %%DATADIR%%/resources/pr.country/startinglocation.kml
-%%DATADIR%%/resources/premium_lock.png
-%%DATADIR%%/resources/premium_locked.png
-%%DATADIR%%/resources/premium_star.png
-%%DATADIR%%/resources/printlogo.png
-%%DATADIR%%/resources/progress0.png
-%%DATADIR%%/resources/progress1.png
-%%DATADIR%%/resources/progress2.png
-%%DATADIR%%/resources/progress3.png
-%%DATADIR%%/resources/progress4.png
-%%DATADIR%%/resources/progress5.png
-%%DATADIR%%/resources/progress6.png
-%%DATADIR%%/resources/progress7.png
+%%DATADIR%%/resources/progress.rcc
 %%DATADIR%%/resources/ps.country/startinglocation.kml
 %%DATADIR%%/resources/pt-PT.locale/default_myplaces.kml
 %%DATADIR%%/resources/pt.country/startinglocation.kml
 %%DATADIR%%/resources/pt.locale/default_myplaces.kml
-%%DATADIR%%/resources/pushpin/blue-pushpin.png
-%%DATADIR%%/resources/pushpin/grn-pushpin.png
-%%DATADIR%%/resources/pushpin/ltblu-pushpin.png
-%%DATADIR%%/resources/pushpin/pink-pushpin.png
-%%DATADIR%%/resources/pushpin/purple-pushpin.png
-%%DATADIR%%/resources/pushpin/red-pushpin.png
-%%DATADIR%%/resources/pushpin/wht-pushpin.png
-%%DATADIR%%/resources/pushpin/ylw-pushpin.png
 %%DATADIR%%/resources/pw.country/startinglocation.kml
 %%DATADIR%%/resources/py.country/startinglocation.kml
 %%DATADIR%%/resources/qa.country/startinglocation.kml
-%%DATADIR%%/resources/query.png
-%%DATADIR%%/resources/raindrops0.png
-%%DATADIR%%/resources/raindrops1.png
-%%DATADIR%%/resources/raindrops2.png
-%%DATADIR%%/resources/raindrops3.png
 %%DATADIR%%/resources/re.country/startinglocation.kml
-%%DATADIR%%/resources/recreation.png
-%%DATADIR%%/resources/red_tile.png
-%%DATADIR%%/resources/resizeiconmac.png
-%%DATADIR%%/resources/ring_active.png
-%%DATADIR%%/resources/ring_hover.png
-%%DATADIR%%/resources/ring_n_active.png
-%%DATADIR%%/resources/ring_n_hover.png
-%%DATADIR%%/resources/ring_norm.png
+%%DATADIR%%/resources/renderui.rcc
 %%DATADIR%%/resources/ro.country/startinglocation.kml
 %%DATADIR%%/resources/ro.locale/default_myplaces.kml
-%%DATADIR%%/resources/roundrect_bottom.png
-%%DATADIR%%/resources/roundrect_bottomleft.png
-%%DATADIR%%/resources/roundrect_bottomright.png
-%%DATADIR%%/resources/roundrect_center.png
-%%DATADIR%%/resources/roundrect_left.png
-%%DATADIR%%/resources/roundrect_right.png
-%%DATADIR%%/resources/roundrect_top.png
-%%DATADIR%%/resources/roundrect_topleft.png
-%%DATADIR%%/resources/roundrect_topright.png
 %%DATADIR%%/resources/rs.country/startinglocation.kml
 %%DATADIR%%/resources/ru.country/startinglocation.kml
 %%DATADIR%%/resources/ru.locale/default_myplaces.kml
-%%DATADIR%%/resources/ru.locale/google_earth_splash.png
 %%DATADIR%%/resources/rw.country/startinglocation.kml
 %%DATADIR%%/resources/sa.country/startinglocation.kml
 %%DATADIR%%/resources/sb.country/startinglocation.kml
 %%DATADIR%%/resources/sc.country/startinglocation.kml
-%%DATADIR%%/resources/school_16.png
 %%DATADIR%%/resources/sd.country/startinglocation.kml
 %%DATADIR%%/resources/se.country/startinglocation.kml
 %%DATADIR%%/resources/sg.country/startinglocation.kml
 %%DATADIR%%/resources/sh.country/startinglocation.kml
-%%DATADIR%%/resources/shapes/airports.png
-%%DATADIR%%/resources/shapes/arrow-reverse.png
-%%DATADIR%%/resources/shapes/arrow.png
-%%DATADIR%%/resources/shapes/arts.png
-%%DATADIR%%/resources/shapes/bars.png
-%%DATADIR%%/resources/shapes/broken_link.png
-%%DATADIR%%/resources/shapes/bus.png
-%%DATADIR%%/resources/shapes/cabs.png
-%%DATADIR%%/resources/shapes/camera-lv.png
-%%DATADIR%%/resources/shapes/camera.png
-%%DATADIR%%/resources/shapes/campfire.png
-%%DATADIR%%/resources/shapes/campground.png
-%%DATADIR%%/resources/shapes/capital_big.png
-%%DATADIR%%/resources/shapes/capital_big_highlight.png
-%%DATADIR%%/resources/shapes/capital_small.png
-%%DATADIR%%/resources/shapes/capital_small_highlight.png
-%%DATADIR%%/resources/shapes/caution.png
-%%DATADIR%%/resources/shapes/church.png
-%%DATADIR%%/resources/shapes/coffee.png
-%%DATADIR%%/resources/shapes/convenience.png
-%%DATADIR%%/resources/shapes/cross-hairs.png
-%%DATADIR%%/resources/shapes/cross-hairs_highlight.png
-%%DATADIR%%/resources/shapes/cycling.png
-%%DATADIR%%/resources/shapes/dining.png
-%%DATADIR%%/resources/shapes/dollar.png
-%%DATADIR%%/resources/shapes/donut.png
-%%DATADIR%%/resources/shapes/earthquake.png
-%%DATADIR%%/resources/shapes/electronics.png
-%%DATADIR%%/resources/shapes/euro.png
-%%DATADIR%%/resources/shapes/falling_rocks.png
-%%DATADIR%%/resources/shapes/ferry.png
-%%DATADIR%%/resources/shapes/firedept.png
-%%DATADIR%%/resources/shapes/fishing.png
-%%DATADIR%%/resources/shapes/flag.png
-%%DATADIR%%/resources/shapes/forbidden.png
-%%DATADIR%%/resources/shapes/gas_stations.png
-%%DATADIR%%/resources/shapes/golf.png
-%%DATADIR%%/resources/shapes/grocery.png
-%%DATADIR%%/resources/shapes/heliport.png
-%%DATADIR%%/resources/shapes/highway.png
-%%DATADIR%%/resources/shapes/hiker.png
-%%DATADIR%%/resources/shapes/homegardenbusiness.png
-%%DATADIR%%/resources/shapes/horsebackriding.png
-%%DATADIR%%/resources/shapes/hospitals.png
-%%DATADIR%%/resources/shapes/info-i.png
-%%DATADIR%%/resources/shapes/info.png
-%%DATADIR%%/resources/shapes/info_circle.png
-%%DATADIR%%/resources/shapes/lodging.png
-%%DATADIR%%/resources/shapes/man.png
-%%DATADIR%%/resources/shapes/marina.png
-%%DATADIR%%/resources/shapes/mechanic.png
-%%DATADIR%%/resources/shapes/motorcycling.png
-%%DATADIR%%/resources/shapes/mountains.png
-%%DATADIR%%/resources/shapes/movies.png
-%%DATADIR%%/resources/shapes/open-diamond.png
-%%DATADIR%%/resources/shapes/parking_lot.png
-%%DATADIR%%/resources/shapes/parks.png
-%%DATADIR%%/resources/shapes/partly_cloudy.png
-%%DATADIR%%/resources/shapes/pharmacy_rx.png
-%%DATADIR%%/resources/shapes/phone.png
-%%DATADIR%%/resources/shapes/picnic.png
-%%DATADIR%%/resources/shapes/placemark_circle.png
-%%DATADIR%%/resources/shapes/placemark_circle_highlight.png
-%%DATADIR%%/resources/shapes/placemark_square.png
-%%DATADIR%%/resources/shapes/placemark_square_highlight.png
-%%DATADIR%%/resources/shapes/play.png
-%%DATADIR%%/resources/shapes/poi.png
-%%DATADIR%%/resources/shapes/police.png
-%%DATADIR%%/resources/shapes/polygon.png
-%%DATADIR%%/resources/shapes/post_office.png
-%%DATADIR%%/resources/shapes/rail.png
-%%DATADIR%%/resources/shapes/rainy.png
-%%DATADIR%%/resources/shapes/ranger_station.png
-%%DATADIR%%/resources/shapes/realestate.png
-%%DATADIR%%/resources/shapes/road_shield1.png
-%%DATADIR%%/resources/shapes/road_shield2.png
-%%DATADIR%%/resources/shapes/road_shield3.png
-%%DATADIR%%/resources/shapes/ruler.png
-%%DATADIR%%/resources/shapes/sailing.png
-%%DATADIR%%/resources/shapes/salon.png
-%%DATADIR%%/resources/shapes/schools.png
-%%DATADIR%%/resources/shapes/shaded_dot.png
-%%DATADIR%%/resources/shapes/shopping.png
-%%DATADIR%%/resources/shapes/ski.png
-%%DATADIR%%/resources/shapes/snack_bar.png
-%%DATADIR%%/resources/shapes/snowflake_simple.png
-%%DATADIR%%/resources/shapes/square.png
-%%DATADIR%%/resources/shapes/star.png
-%%DATADIR%%/resources/shapes/subway.png
-%%DATADIR%%/resources/shapes/sunny.png
-%%DATADIR%%/resources/shapes/swimming.png
-%%DATADIR%%/resources/shapes/target.png
-%%DATADIR%%/resources/shapes/terrain.png
-%%DATADIR%%/resources/shapes/thunderstorm.png
-%%DATADIR%%/resources/shapes/toilets.png
-%%DATADIR%%/resources/shapes/trail.png
-%%DATADIR%%/resources/shapes/tram.png
-%%DATADIR%%/resources/shapes/triangle.png
-%%DATADIR%%/resources/shapes/truck.png
-%%DATADIR%%/resources/shapes/volcano.png
-%%DATADIR%%/resources/shapes/water.png
-%%DATADIR%%/resources/shapes/webcam.png
-%%DATADIR%%/resources/shapes/wheel_chair_accessible.png
-%%DATADIR%%/resources/shapes/woman.png
-%%DATADIR%%/resources/shapes/yen.png
 %%DATADIR%%/resources/si.country/startinglocation.kml
 %%DATADIR%%/resources/sj.country/startinglocation.kml
 %%DATADIR%%/resources/sk.country/startinglocation.kml
 %%DATADIR%%/resources/sk.locale/default_myplaces.kml
-%%DATADIR%%/resources/skyreflectionabove.png
-%%DATADIR%%/resources/skyreflectionbelow.png
 %%DATADIR%%/resources/sl.country/startinglocation.kml
 %%DATADIR%%/resources/sl.locale/default_myplaces.kml
 %%DATADIR%%/resources/sm.country/startinglocation.kml
 %%DATADIR%%/resources/sn.country/startinglocation.kml
-%%DATADIR%%/resources/snowflakes0.png
-%%DATADIR%%/resources/snowflakes1.png
-%%DATADIR%%/resources/snowflakes2.png
-%%DATADIR%%/resources/snowflakes3.png
 %%DATADIR%%/resources/so.country/startinglocation.kml
 %%DATADIR%%/resources/spin_icon.png
 %%DATADIR%%/resources/sr.country/startinglocation.kml
 %%DATADIR%%/resources/sr.locale/default_myplaces.kml
 %%DATADIR%%/resources/st.country/startinglocation.kml
 %%DATADIR%%/resources/statusbar.rcc
-%%DATADIR%%/resources/steering_click_dot.png
-%%DATADIR%%/resources/steering_drag_dot.png
-%%DATADIR%%/resources/streamed_layer.png
-%%DATADIR%%/resources/streamed_layers.png
-%%DATADIR%%/resources/sun.png
 %%DATADIR%%/resources/sv.country/startinglocation.kml
 %%DATADIR%%/resources/sv.locale/default_myplaces.kml
-%%DATADIR%%/resources/swoop_target.png
 %%DATADIR%%/resources/sy.country/startinglocation.kml
 %%DATADIR%%/resources/sz.country/startinglocation.kml
 %%DATADIR%%/resources/tc.country/startinglocation.kml
 %%DATADIR%%/resources/td.country/startinglocation.kml
-%%DATADIR%%/resources/terrain_16.png
+%%DATADIR%%/resources/terrainmgr.rcc
 %%DATADIR%%/resources/tf.country/startinglocation.kml
 %%DATADIR%%/resources/tg.country/startinglocation.kml
 %%DATADIR%%/resources/th.country/startinglocation.kml
 %%DATADIR%%/resources/th.locale/default_myplaces.kml
-%%DATADIR%%/resources/three-dollars.png
-%%DATADIR%%/resources/tile.png
-%%DATADIR%%/resources/timedate_dashed.png
 %%DATADIR%%/resources/tj.country/startinglocation.kml
 %%DATADIR%%/resources/tk.country/startinglocation.kml
 %%DATADIR%%/resources/tl.country/startinglocation.kml
 %%DATADIR%%/resources/tm.country/startinglocation.kml
-%%DATADIR%%/resources/tm_ghost_bg.png
 %%DATADIR%%/resources/tmcontrols.rcc
 %%DATADIR%%/resources/tn.country/startinglocation.kml
 %%DATADIR%%/resources/to.country/startinglocation.kml
 %%DATADIR%%/resources/toolbar.rcc
-%%DATADIR%%/resources/tour16.png
 %%DATADIR%%/resources/tourcontrols.rcc
 %%DATADIR%%/resources/tr.country/startinglocation.kml
 %%DATADIR%%/resources/tr.locale/default_myplaces.kml
-%%DATADIR%%/resources/transp.png
-%%DATADIR%%/resources/transportation.png
 %%DATADIR%%/resources/tt.country/startinglocation.kml
 %%DATADIR%%/resources/tv.country/startinglocation.kml
 %%DATADIR%%/resources/tw.country/startinglocation.kml
-%%DATADIR%%/resources/two-dollars.png
 %%DATADIR%%/resources/tz.country/startinglocation.kml
 %%DATADIR%%/resources/ua.country/startinglocation.kml
 %%DATADIR%%/resources/ug.country/startinglocation.kml
@@ -858,39 +469,15 @@ bin/googleearth
 %%DATADIR%%/resources/vi.locale/default_myplaces.kml
 %%DATADIR%%/resources/vn.country/startinglocation.kml
 %%DATADIR%%/resources/vu.country/startinglocation.kml
-%%DATADIR%%/resources/waterbump0.png
-%%DATADIR%%/resources/waterbump1.png
-%%DATADIR%%/resources/waterbump2.png
-%%DATADIR%%/resources/waterbump3.png
-%%DATADIR%%/resources/waterbump4.png
-%%DATADIR%%/resources/waterbump5.png
-%%DATADIR%%/resources/waterbump6.png
-%%DATADIR%%/resources/waterbump7.png
-%%DATADIR%%/resources/waterbump8.png
-%%DATADIR%%/resources/watersurface.png
-%%DATADIR%%/resources/webcam_16.png
+%%DATADIR%%/resources/webbrowser.rcc
 %%DATADIR%%/resources/wf.country/startinglocation.kml
-%%DATADIR%%/resources/white_3d.png
-%%DATADIR%%/resources/white_linestring.png
-%%DATADIR%%/resources/white_polygon.png
 %%DATADIR%%/resources/ws.country/startinglocation.kml
 %%DATADIR%%/resources/ye.country/startinglocation.kml
 %%DATADIR%%/resources/yt.country/startinglocation.kml
 %%DATADIR%%/resources/za.country/startinglocation.kml
 %%DATADIR%%/resources/zh-Hans.locale/default_myplaces.kml
-%%DATADIR%%/resources/zh-Hans.locale/google_earth_splash.png
 %%DATADIR%%/resources/zh-Hant.locale/default_myplaces.kml
-%%DATADIR%%/resources/zh-Hant.locale/google_earth_splash.png
 %%DATADIR%%/resources/zm.country/startinglocation.kml
-%%DATADIR%%/resources/zoom_background.png
-%%DATADIR%%/resources/zoom_minus_active.png
-%%DATADIR%%/resources/zoom_minus_hover.png
-%%DATADIR%%/resources/zoom_norm.png
-%%DATADIR%%/resources/zoom_plus_active.png
-%%DATADIR%%/resources/zoom_plus_hover.png
-%%DATADIR%%/resources/zoombar_active.png
-%%DATADIR%%/resources/zoombar_hover.png
-%%DATADIR%%/resources/zoombar_norm.png
 %%DATADIR%%/resources/zw.country/startinglocation.kml
 %%DATADIR%%/shaders/atmosphere_common.ini
 %%DATADIR%%/shaders/atmosphere_ground_sun_off.arbfp1
@@ -935,6 +522,37 @@ bin/googleearth
 %%DATADIR%%/shaders/precipitation_double_cone.cfg
 %%DATADIR%%/shaders/precipitation_double_cone.ps_2_0
 %%DATADIR%%/shaders/precipitation_double_cone.vs_2_0
+%%DATADIR%%/shaders/stbillboard.arbfp1
+%%DATADIR%%/shaders/stbillboard.arbvp1
+%%DATADIR%%/shaders/stbillboard.asd
+%%DATADIR%%/shaders/stbillboard.cfg
+%%DATADIR%%/shaders/stbillboard.ps_2_0
+%%DATADIR%%/shaders/stbillboard.vs_2_0
+%%DATADIR%%/shaders/stbranch.arbfp1
+%%DATADIR%%/shaders/stbranch.arbvp1
+%%DATADIR%%/shaders/stbranch.asd
+%%DATADIR%%/shaders/stbranch.cfg
+%%DATADIR%%/shaders/stbranch.ps_2_0
+%%DATADIR%%/shaders/stbranch.vs_2_0
+%%DATADIR%%/shaders/stcommonobjects.ini
+%%DATADIR%%/shaders/stfrond.arbfp1
+%%DATADIR%%/shaders/stfrond.arbvp1
+%%DATADIR%%/shaders/stfrond.asd
+%%DATADIR%%/shaders/stfrond.cfg
+%%DATADIR%%/shaders/stfrond.ps_2_0
+%%DATADIR%%/shaders/stfrond.vs_2_0
+%%DATADIR%%/shaders/stleafcard.arbfp1
+%%DATADIR%%/shaders/stleafcard.arbvp1
+%%DATADIR%%/shaders/stleafcard.asd
+%%DATADIR%%/shaders/stleafcard.cfg
+%%DATADIR%%/shaders/stleafcard.ps_2_0
+%%DATADIR%%/shaders/stleafcard.vs_2_0
+%%DATADIR%%/shaders/stleafmesh.arbfp1
+%%DATADIR%%/shaders/stleafmesh.arbvp1
+%%DATADIR%%/shaders/stleafmesh.asd
+%%DATADIR%%/shaders/stleafmesh.cfg
+%%DATADIR%%/shaders/stleafmesh.ps_2_0
+%%DATADIR%%/shaders/stleafmesh.vs_2_0
 %%DATADIR%%/shaders/watersurface.arbfp1
 %%DATADIR%%/shaders/watersurface.arbvp1
 %%DATADIR%%/shaders/watersurface.asd
@@ -948,6 +566,10 @@ share/mime/application/vnd.google-earth.kml+xml.xml
 share/mime/application/vnd.google-earth.kmz.xml
 share/mime/packages/googleearth-mimetypes.xml
 @dirrm %%DATADIR%%/bin
+@dirrm %%DATADIR%%/desktop_icons/consumer
+@dirrm %%DATADIR%%/desktop_icons/ec
+@dirrm %%DATADIR%%/desktop_icons/pro
+@dirrm %%DATADIR%%/desktop_icons
 @dirrm %%DATADIR%%/lang
 @dirrm %%DATADIR%%/linux/xdg
 @dirrm %%DATADIR%%/linux
@@ -1155,7 +777,6 @@ share/mime/packages/googleearth-mimetypes.xml
 @dirrm %%DATADIR%%/resources/nz.country
 @dirrm %%DATADIR%%/resources/om.country
 @dirrm %%DATADIR%%/resources/pa.country
-@dirrm %%DATADIR%%/resources/paddle
 @dirrm %%DATADIR%%/resources/pe.country
 @dirrm %%DATADIR%%/resources/pf.country
 @dirrm %%DATADIR%%/resources/pg.country
@@ -1170,7 +791,6 @@ share/mime/packages/googleearth-mimetypes.xml
 @dirrm %%DATADIR%%/resources/pt-PT.locale
 @dirrm %%DATADIR%%/resources/pt.country
 @dirrm %%DATADIR%%/resources/pt.locale
-@dirrm %%DATADIR%%/resources/pushpin
 @dirrm %%DATADIR%%/resources/pw.country
 @dirrm %%DATADIR%%/resources/py.country
 @dirrm %%DATADIR%%/resources/qa.country
@@ -1188,7 +808,6 @@ share/mime/packages/googleearth-mimetypes.xml
 @dirrm %%DATADIR%%/resources/se.country
 @dirrm %%DATADIR%%/resources/sg.country
 @dirrm %%DATADIR%%/resources/sh.country
-@dirrm %%DATADIR%%/resources/shapes
 @dirrm %%DATADIR%%/resources/si.country
 @dirrm %%DATADIR%%/resources/sj.country
 @dirrm %%DATADIR%%/resources/sk.country