Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 8 Apr 2018 17:21:34 +0000 (UTC)
From:      "Tobias C. Berner" <tcberner@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r466809 - in head: . Mk/Uses astro astro/libkgeomap astro/marble astro/marble/files
Message-ID:  <201804081721.w38HLYhs021725@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tcberner
Date: Sun Apr  8 17:21:34 2018
New Revision: 466809
URL: https://svnweb.freebsd.org/changeset/ports/466809

Log:
  New ports: astro/libkgeomap, astro/marble
  
  This is the current version of KDE Applications <foo>.
  Note that users of KDE SC4 should stick with <foo>-kde4.
  
  Differential Revision:	https://reviews.freebsd.org/D14823

Added:
  head/astro/libkgeomap/
     - copied from r465449, head/astro/libkgeomap-kde4/
  head/astro/marble/
     - copied from r465449, head/astro/marble-kde4/
Deleted:
  head/astro/marble/files/
Modified:
  head/MOVED
  head/Mk/Uses/kde.mk
  head/astro/Makefile
  head/astro/libkgeomap/Makefile
  head/astro/libkgeomap/distinfo
  head/astro/libkgeomap/pkg-descr
  head/astro/libkgeomap/pkg-plist
  head/astro/marble/Makefile
  head/astro/marble/distinfo
  head/astro/marble/pkg-plist

Modified: head/MOVED
==============================================================================
--- head/MOVED	Sun Apr  8 17:21:02 2018	(r466808)
+++ head/MOVED	Sun Apr  8 17:21:34 2018	(r466809)
@@ -10082,7 +10082,6 @@ net/zeroconf-ioslave|net/zeroconf-ioslave-kde4|2018-02
 net/krfb|net/krfb-kde4|2018-02-22|Make room for KDE updates
 net/krdc|net/krdc-kde4|2018-02-22|Make room for KDE updates
 net/kget|net/kget-kde4|2018-02-22|Make room for KDE updates
-astro/marble|astro/marble-kde4|2018-02-22|Make room for KDE updates
 astro/kstars|astro/kstars-kde4|2018-02-22|Make room for KDE updates
 japanese/kiten|japanese/kiten-kde4|2018-02-22|Make room for KDE updates
 comms/kremotecontrol|comms/kremotecontrol-kde4|2018-02-22|Make room for KDE updates
@@ -10194,7 +10193,6 @@ multimedia/plexpy|multimedia/tautulli|2018-03-17|Proje
 net-im/ring-daemon||2018-03-18|Ring can't build because it depends on custom bundled versions of other packages
 net-im/ring-libclient||2018-03-18|Ring can't build because it depends on custom bundled versions of other packages
 net-im/ring-gnome||2018-03-18|Ring can't build because it depends on custom bundled versions of other packages
-astro/libkgeomap|astro/libkgeomap-kde4|2018-03-20|Make room for KDE updates
 databases/akonadi|databases/akonadi-kde4|2018-03-20|Make room for KDE updates
 graphics/code-eli||2018-03-20|Has expired: Broken for more than 6 months
 databases/pg_rman||2018-03-20|Has expired: Broken for more than 6 months

Modified: head/Mk/Uses/kde.mk
==============================================================================
--- head/Mk/Uses/kde.mk	Sun Apr  8 17:21:02 2018	(r466808)
+++ head/Mk/Uses/kde.mk	Sun Apr  8 17:21:34 2018	(r466809)
@@ -632,6 +632,8 @@ libksane5_LIB=		libKF5Sane.so
 
 marble4_PORT=		astro/marble-kde4
 marble4_LIB=		libmarblewidget.so
+marble5_PORT=		astro/marble
+marble5_LIB=		libmarblewidget-qt5.so
 
 okular4_PORT=		graphics/okular-kde4
 okular4_LIB=		libokularcore.so

Modified: head/astro/Makefile
==============================================================================
--- head/astro/Makefile	Sun Apr  8 17:21:02 2018	(r466808)
+++ head/astro/Makefile	Sun Apr  8 17:21:34 2018	(r466809)
@@ -31,11 +31,13 @@
     SUBDIR += josm
     SUBDIR += kstars-kde4
     SUBDIR += libgal
+    SUBDIR += libkgeomap
     SUBDIR += libkgeomap-kde4
     SUBDIR += libnova
     SUBDIR += libosmium
     SUBDIR += libosmpbf
     SUBDIR += luna
+    SUBDIR += marble
     SUBDIR += marble-kde4
     SUBDIR += match
     SUBDIR += merkaartor

Modified: head/astro/libkgeomap/Makefile
==============================================================================
--- head/astro/libkgeomap-kde4/Makefile	Sat Mar 24 11:18:05 2018	(r465449)
+++ head/astro/libkgeomap/Makefile	Sun Apr  8 17:21:34 2018	(r466809)
@@ -1,24 +1,23 @@
 # $FreeBSD$
 
 PORTNAME=	libkgeomap
-PORTVERSION=	${KDE4_APPLICATIONS_VERSION}
-PORTREVISION=	9
-CATEGORIES=	astro kde
-MASTER_SITES=	KDE/${KDE4_APPLICATIONS_BRANCH}/applications/${PORTVERSION}/src
-PKGNAMESUFFIX=	-kde4
-DIST_SUBDIR=	KDE/${PORTVERSION}
+DISTVERSION=	${KDE_APPLICATIONS_VERSION}
+CATEGORIES=	astro kde kde-applications
 
 MAINTAINER=	kde@FreeBSD.org
-COMMENT=	KDE4 library for browsing photos on a map
+COMMENT=	KDE library for browsing photos on a map
 
 LICENSE=	GPLv2+ LGPL20+
 LICENSE_COMB=	multi
 
 BUILD_DEPENDS=	${LOCALBASE}/include/boost/graph/buffer_concepts.hpp:devel/boost-libs
+LIB_DEPENDS=	libopencv_legacy.so:graphics/opencv
 
-USES=		cmake:outsource kde:4 pathfix tar:xz
-USE_KDE=	kdelibs automoc4 marble
+USES=		cmake:outsource gettext kde:5 pkgconfig tar:xz
+USE_KDE=	config coreaddons ecm i18n kio marble service textwidgets
+USE_QT5=	concurrent core gui network webkit widgets xml \
+		buildtools_build qmake_build
+
 USE_LDCONFIG=	yes
-USE_QT4=	network phonon xml moc_build qmake_build rcc_build uic_build
 
 .include <bsd.port.mk>

Modified: head/astro/libkgeomap/distinfo
==============================================================================
--- head/astro/libkgeomap-kde4/distinfo	Sat Mar 24 11:18:05 2018	(r465449)
+++ head/astro/libkgeomap/distinfo	Sun Apr  8 17:21:34 2018	(r466809)
@@ -1,2 +1,3 @@
-SHA256 (KDE/15.04.3/libkgeomap-15.04.3.tar.xz) = b305977b27ebb1da798facf35488beef848f750e70a743ee8a8fab6edb0e1cc0
-SIZE (KDE/15.04.3/libkgeomap-15.04.3.tar.xz) = 124160
+TIMESTAMP = 1520519252
+SHA256 (KDE/applications/17.12.3/libkgeomap-17.12.3.tar.xz) = b17176bb1cead681dd55744bea31a18a922f9edaffdd1c3d4e0f65c807f5c480
+SIZE (KDE/applications/17.12.3/libkgeomap-17.12.3.tar.xz) = 149616

Modified: head/astro/libkgeomap/pkg-descr
==============================================================================
--- head/astro/libkgeomap-kde4/pkg-descr	Sat Mar 24 11:18:05 2018	(r465449)
+++ head/astro/libkgeomap/pkg-descr	Sun Apr  8 17:21:34 2018	(r466809)
@@ -1,4 +1,4 @@
-Libkgeomap is a KDE4 C++ wrapper around world map components such as Marble,
+Libkgeomap is a KDE C++ wrapper around world map components such as Marble,
 OpenstreetMap, and GoogleMap, for browsing and arranging photos on such maps.
 
 WWW: http://www.digikam.org

Modified: head/astro/libkgeomap/pkg-plist
==============================================================================
--- head/astro/libkgeomap-kde4/pkg-plist	Sat Mar 24 11:18:05 2018	(r465449)
+++ head/astro/libkgeomap/pkg-plist	Sun Apr  8 17:21:34 2018	(r466809)
@@ -1,54 +1,116 @@
-include/kde4/libkgeomap/abstractmarkertiler.h
-include/kde4/libkgeomap/dragdrophandler.h
-include/kde4/libkgeomap/geocoordinates.h
-include/kde4/libkgeomap/itemmarkertiler.h
-include/kde4/libkgeomap/kgeomap_primitives.h
-include/kde4/libkgeomap/kgeomap_widget.h
-include/kde4/libkgeomap/libkgeomap_export.h
-include/kde4/libkgeomap/lookup_altitude.h
-include/kde4/libkgeomap/lookup_factory.h
-include/kde4/libkgeomap/modelhelper.h
-include/kde4/libkgeomap/tileindex.h
-include/kde4/libkgeomap/track_reader.h
-include/kde4/libkgeomap/tracks.h
-include/kde4/libkgeomap/version.h
-lib/libkgeomap.so
-lib/libkgeomap.so.2
-lib/libkgeomap.so.2.1.0
-libdata/pkgconfig/libkgeomap.pc
-share/apps/cmake/modules/FindKGeoMap.cmake
-share/apps/libkgeomap/backend-googlemaps-js.js
-share/apps/libkgeomap/backend-googlemaps.html
-share/apps/libkgeomap/backend-osm-js.js
-share/apps/libkgeomap/backend-osm.html
-share/apps/libkgeomap/cluster-circle-00ff00-selected.png
-share/apps/libkgeomap/cluster-circle-00ff00-someselected.png
-share/apps/libkgeomap/cluster-circle-00ff00.png
-share/apps/libkgeomap/cluster-circle-00ffff-selected.png
-share/apps/libkgeomap/cluster-circle-00ffff-someselected.png
-share/apps/libkgeomap/cluster-circle-00ffff.png
-share/apps/libkgeomap/cluster-circle-ff0000-selected.png
-share/apps/libkgeomap/cluster-circle-ff0000-someselected.png
-share/apps/libkgeomap/cluster-circle-ff0000.png
-share/apps/libkgeomap/cluster-circle-ff7f00-selected.png
-share/apps/libkgeomap/cluster-circle-ff7f00-someselected.png
-share/apps/libkgeomap/cluster-circle-ff7f00.png
-share/apps/libkgeomap/cluster-circle-ffff00-selected.png
-share/apps/libkgeomap/cluster-circle-ffff00-someselected.png
-share/apps/libkgeomap/cluster-circle-ffff00.png
-share/apps/libkgeomap/marker-00ff00-selected.png
-share/apps/libkgeomap/marker-00ff00-someselected.png
-share/apps/libkgeomap/marker-00ff00.png
-share/apps/libkgeomap/marker-00ffff-selected.png
-share/apps/libkgeomap/marker-00ffff-someselected.png
-share/apps/libkgeomap/marker-00ffff.png
-share/apps/libkgeomap/marker-ff0000-selected.png
-share/apps/libkgeomap/marker-ff0000-someselected.png
-share/apps/libkgeomap/marker-ff0000.png
-share/apps/libkgeomap/marker-ff7f00-selected.png
-share/apps/libkgeomap/marker-ff7f00-someselected.png
-share/apps/libkgeomap/marker-ff7f00.png
-share/apps/libkgeomap/marker-ffff00-selected.png
-share/apps/libkgeomap/marker-ffff00-someselected.png
-share/apps/libkgeomap/marker-ffff00.png
-share/apps/libkgeomap/marker-icon-16x16.png
+include/KF5/KGeoMap/KGeoMap/AbstractMarkerTiler
+include/KF5/KGeoMap/KGeoMap/DragDropHandler
+include/KF5/KGeoMap/KGeoMap/GeoCoordinates
+include/KF5/KGeoMap/KGeoMap/GroupState
+include/KF5/KGeoMap/KGeoMap/GroupStateComputer
+include/KF5/KGeoMap/KGeoMap/ItemMarkerTiler
+include/KF5/KGeoMap/KGeoMap/LookupAltitude
+include/KF5/KGeoMap/KGeoMap/LookupFactory
+include/KF5/KGeoMap/KGeoMap/MapWidget
+include/KF5/KGeoMap/KGeoMap/ModelHelper
+include/KF5/KGeoMap/KGeoMap/TileIndex
+include/KF5/KGeoMap/KGeoMap/TrackReader
+include/KF5/KGeoMap/KGeoMap/Tracks
+include/KF5/KGeoMap/KGeoMap/Types
+include/KF5/KGeoMap/kgeomap/abstractmarkertiler.h
+include/KF5/KGeoMap/kgeomap/dragdrophandler.h
+include/KF5/KGeoMap/kgeomap/geocoordinates.h
+include/KF5/KGeoMap/kgeomap/groupstate.h
+include/KF5/KGeoMap/kgeomap/groupstatecomputer.h
+include/KF5/KGeoMap/kgeomap/itemmarkertiler.h
+include/KF5/KGeoMap/kgeomap/libkgeomap_export.h
+include/KF5/KGeoMap/kgeomap/lookupaltitude.h
+include/KF5/KGeoMap/kgeomap/lookupfactory.h
+include/KF5/KGeoMap/kgeomap/mapwidget.h
+include/KF5/KGeoMap/kgeomap/modelhelper.h
+include/KF5/KGeoMap/kgeomap/tileindex.h
+include/KF5/KGeoMap/kgeomap/trackreader.h
+include/KF5/KGeoMap/kgeomap/tracks.h
+include/KF5/KGeoMap/kgeomap/types.h
+include/KF5/libkgeomap_version.h
+lib/cmake/KF5KGeoMap/KF5KGeoMapConfig.cmake
+lib/cmake/KF5KGeoMap/KF5KGeoMapConfigVersion.cmake
+lib/cmake/KF5KGeoMap/KF5KGeoMapTargets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/KF5KGeoMap/KF5KGeoMapTargets.cmake
+lib/libKF5KGeoMap.so
+lib/libKF5KGeoMap.so.10.0.0
+lib/libKF5KGeoMap.so.5.0.0
+%%DATADIR%%/backend-googlemaps-js.js
+%%DATADIR%%/backend-googlemaps.html
+%%DATADIR%%/backend-osm-js.js
+%%DATADIR%%/backend-osm.html
+%%DATADIR%%/cluster-circle-00ff00-selected.png
+%%DATADIR%%/cluster-circle-00ff00-someselected.png
+%%DATADIR%%/cluster-circle-00ff00.png
+%%DATADIR%%/cluster-circle-00ffff-selected.png
+%%DATADIR%%/cluster-circle-00ffff-someselected.png
+%%DATADIR%%/cluster-circle-00ffff.png
+%%DATADIR%%/cluster-circle-ff0000-selected.png
+%%DATADIR%%/cluster-circle-ff0000-someselected.png
+%%DATADIR%%/cluster-circle-ff0000.png
+%%DATADIR%%/cluster-circle-ff7f00-selected.png
+%%DATADIR%%/cluster-circle-ff7f00-someselected.png
+%%DATADIR%%/cluster-circle-ff7f00.png
+%%DATADIR%%/cluster-circle-ffff00-selected.png
+%%DATADIR%%/cluster-circle-ffff00-someselected.png
+%%DATADIR%%/cluster-circle-ffff00.png
+%%DATADIR%%/marker-00ff00-selected.png
+%%DATADIR%%/marker-00ff00-someselected.png
+%%DATADIR%%/marker-00ff00.png
+%%DATADIR%%/marker-00ffff-selected.png
+%%DATADIR%%/marker-00ffff-someselected.png
+%%DATADIR%%/marker-00ffff.png
+%%DATADIR%%/marker-ff0000-selected.png
+%%DATADIR%%/marker-ff0000-someselected.png
+%%DATADIR%%/marker-ff0000.png
+%%DATADIR%%/marker-ff7f00-selected.png
+%%DATADIR%%/marker-ff7f00-someselected.png
+%%DATADIR%%/marker-ff7f00.png
+%%DATADIR%%/marker-ffff00-selected.png
+%%DATADIR%%/marker-ffff00-someselected.png
+%%DATADIR%%/marker-ffff00.png
+%%DATADIR%%/marker-icon-16x16.png
+share/locale/ar/LC_MESSAGES/libkgeomap.mo
+share/locale/ast/LC_MESSAGES/libkgeomap.mo
+share/locale/bg/LC_MESSAGES/libkgeomap.mo
+share/locale/bs/LC_MESSAGES/libkgeomap.mo
+share/locale/ca/LC_MESSAGES/libkgeomap.mo
+share/locale/ca@valencia/LC_MESSAGES/libkgeomap.mo
+share/locale/cs/LC_MESSAGES/libkgeomap.mo
+share/locale/da/LC_MESSAGES/libkgeomap.mo
+share/locale/de/LC_MESSAGES/libkgeomap.mo
+share/locale/el/LC_MESSAGES/libkgeomap.mo
+share/locale/en_GB/LC_MESSAGES/libkgeomap.mo
+share/locale/es/LC_MESSAGES/libkgeomap.mo
+share/locale/et/LC_MESSAGES/libkgeomap.mo
+share/locale/fi/LC_MESSAGES/libkgeomap.mo
+share/locale/fr/LC_MESSAGES/libkgeomap.mo
+share/locale/ga/LC_MESSAGES/libkgeomap.mo
+share/locale/gl/LC_MESSAGES/libkgeomap.mo
+share/locale/hu/LC_MESSAGES/libkgeomap.mo
+share/locale/ia/LC_MESSAGES/libkgeomap.mo
+share/locale/it/LC_MESSAGES/libkgeomap.mo
+share/locale/ja/LC_MESSAGES/libkgeomap.mo
+share/locale/kk/LC_MESSAGES/libkgeomap.mo
+share/locale/km/LC_MESSAGES/libkgeomap.mo
+share/locale/ko/LC_MESSAGES/libkgeomap.mo
+share/locale/lt/LC_MESSAGES/libkgeomap.mo
+share/locale/mr/LC_MESSAGES/libkgeomap.mo
+share/locale/nb/LC_MESSAGES/libkgeomap.mo
+share/locale/nds/LC_MESSAGES/libkgeomap.mo
+share/locale/nl/LC_MESSAGES/libkgeomap.mo
+share/locale/nn/LC_MESSAGES/libkgeomap.mo
+share/locale/pa/LC_MESSAGES/libkgeomap.mo
+share/locale/pl/LC_MESSAGES/libkgeomap.mo
+share/locale/pt/LC_MESSAGES/libkgeomap.mo
+share/locale/pt_BR/LC_MESSAGES/libkgeomap.mo
+share/locale/ro/LC_MESSAGES/libkgeomap.mo
+share/locale/ru/LC_MESSAGES/libkgeomap.mo
+share/locale/sk/LC_MESSAGES/libkgeomap.mo
+share/locale/sl/LC_MESSAGES/libkgeomap.mo
+share/locale/sv/LC_MESSAGES/libkgeomap.mo
+share/locale/tr/LC_MESSAGES/libkgeomap.mo
+share/locale/ug/LC_MESSAGES/libkgeomap.mo
+share/locale/uk/LC_MESSAGES/libkgeomap.mo
+share/locale/zh_CN/LC_MESSAGES/libkgeomap.mo
+share/locale/zh_TW/LC_MESSAGES/libkgeomap.mo

Modified: head/astro/marble/Makefile
==============================================================================
--- head/astro/marble-kde4/Makefile	Sat Mar 24 11:18:05 2018	(r465449)
+++ head/astro/marble/Makefile	Sun Apr  8 17:21:34 2018	(r466809)
@@ -1,35 +1,38 @@
 # $FreeBSD$
 
 PORTNAME=	marble
-PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	4
-CATEGORIES=	astro kde kde-kde4
+DISTVERSION=	${KDE_APPLICATIONS_VERSION}
+CATEGORIES=	astro kde kde-applications
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Virtual globe and world atlas for KDE
 
-LIB_DEPENDS=	libquazip.so:archivers/quazip@qt4
+LICENSE=	GPLv2+
+LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-USES=		cmake:outsource kde:4 shared-mime-info tar:xz
-USE_KDE=	kdelibs automoc4
-USE_QT4=	corelib dbus declarative designer_build gui network phonon \
-		qtestlib script sql svg webkit xml \
-		qmake_build moc_build rcc_build uic_build
+LIB_DEPENDS=	libquazip5.so:archivers/quazip@qt5
+
+USES=		cmake:outsource desktop-file-utils gettext kde:5 tar:xz
+USE_KDE=	attica auth codecs completion config configwidgets coreaddons \
+		crash doctools ecm i18n jobwidgets kio newstuff package parts \
+		plasma-framework runner service sonnet textwidgets wallet \
+		widgetsaddons xmlgui
+USE_QT5=	concurrent core dbus designer gui location network opengl \
+		phonon4 printsupport qml quick script sql svg webkit widgets xml \
+		buildtools_build qmake_build
+
 USE_LDCONFIG=	yes
 MAKE_ENV=	XDG_CONFIG_HOME=/dev/null
-CMAKE_ARGS=	-DMOBILE:BOOL=FALSE
+# We have to set QT_IMPORTS_PATH, as it does not get picked up
+CMAKE_ARGS=	-DMOBILE:BOOL=FALSE \
+		-DQT_IMPORTS_DIR:PATH=${QT_IMPORTDIR}
 
 OPTIONS_DEFINE=	GPS
-OPTIONS_DEFAULT=	GPS
+OPTIONS_DEFAULT=GPS
 OPTIONS_SUB=	yes
 
-GPS_DESC=	Support for GPS position provider
+GPS_DESC=		Support for GPS position provider
 GPS_LIB_DEPENDS=	libgps.so:astro/gpsd
-GPS_CMAKE_OFF=	-DWITH_libgps:BOOL=FALSE
-
-# pre-configure:
-# # Prevent updating MIME during build.
-# 	${REINPLACE_CMD} -e '/update_xdg_mimetypes/ d' \
-# 		${PATCH_WRKSRC}/data/CMakeLists.txt
+GPS_CMAKE_OFF=		-DWITH_libgps:BOOL=FALSE
 
 .include <bsd.port.mk>

Modified: head/astro/marble/distinfo
==============================================================================
--- head/astro/marble-kde4/distinfo	Sat Mar 24 11:18:05 2018	(r465449)
+++ head/astro/marble/distinfo	Sun Apr  8 17:21:34 2018	(r466809)
@@ -1,2 +1,3 @@
-SHA256 (KDE/4.14.3/marble-4.14.3.tar.xz) = 4d6667cf67ae9976e4c1efc306be222d13f2ee5927483325411ae0e9631dc0f0
-SIZE (KDE/4.14.3/marble-4.14.3.tar.xz) = 19709200
+TIMESTAMP = 1520519256
+SHA256 (KDE/applications/17.12.3/marble-17.12.3.tar.xz) = f1004b0a63767cfba91865623598c309ca7529a7e37ccf451d439f5edbb6f8dd
+SIZE (KDE/applications/17.12.3/marble-17.12.3.tar.xz) = 52353704

Modified: head/astro/marble/pkg-plist
==============================================================================
--- head/astro/marble-kde4/pkg-plist	Sat Mar 24 11:18:05 2018	(r465449)
+++ head/astro/marble/pkg-plist	Sun Apr  8 17:21:34 2018	(r466809)
@@ -1,7 +1,6 @@
 bin/marble
-bin/marble-mobile
 bin/marble-qt
-bin/marble-touch
+etc/xdg/marble.knsrc
 include/astro/astr2lib.h
 include/astro/astrolib.h
 include/astro/astrolib_export.h
@@ -16,17 +15,22 @@ include/marble/AbstractFloatItem.h
 include/marble/AbstractMarbleGraphicsLayout.h
 include/marble/AbstractProjection.h
 include/marble/AbstractWorkerThread.h
+include/marble/AddLinkDialog.h
 include/marble/AlternativeRoutesModel.h
 include/marble/AutoNavigation.h
 include/marble/BillboardGraphicsItem.h
 include/marble/BookmarkManager.h
+include/marble/CelestialSortFilterProxyModel.h
 include/marble/ClipPainter.h
 include/marble/CurrentLocationWidget.h
 include/marble/DialogConfigurationInterface.h
 include/marble/DownloadRegion.h
 include/marble/DownloadRegionDialog.h
+include/marble/EditPlacemarkDialog.h
 include/marble/ElevationModel.h
 include/marble/FileViewWidget.h
+include/marble/FlyToEditWidget.h
+include/marble/FormattedTextWidget.h
 include/marble/FrameGraphicsItem.h
 include/marble/GeoDataAbstractView.h
 include/marble/GeoDataAccuracy.h
@@ -60,6 +64,7 @@ include/marble/GeoDataPoint.h
 include/marble/GeoDataPolyStyle.h
 include/marble/GeoDataPolygon.h
 include/marble/GeoDataRegion.h
+include/marble/GeoDataRelation.h
 include/marble/GeoDataSnippet.h
 include/marble/GeoDataStyle.h
 include/marble/GeoDataStyleMap.h
@@ -69,11 +74,13 @@ include/marble/GeoDataTimeSpan.h
 include/marble/GeoDataTimeStamp.h
 include/marble/GeoDataTrack.h
 include/marble/GeoDataTreeModel.h
+include/marble/GeoDataTypes.h
 include/marble/GeoDocument.h
 include/marble/GeoGraphicsItem.h
 include/marble/GeoGraphicsScene.h
 include/marble/GeoPainter.h
 include/marble/GeoWriter.h
+include/marble/HttpDownloadManager.h
 include/marble/LabelGraphicsItem.h
 include/marble/LatLonBoxWidget.h
 include/marble/LatLonEdit.h
@@ -82,11 +89,11 @@ include/marble/LegendWidget.h
 include/marble/Maneuver.h
 include/marble/MapThemeDownloadDialog.h
 include/marble/MapThemeManager.h
+include/marble/MapViewItemDelegate.h
 include/marble/MapViewWidget.h
 include/marble/MapWizard.h
 include/marble/MarbleAboutDialog.h
 include/marble/MarbleColors.h
-include/marble/MarbleControlBox.h
 include/marble/MarbleDebug.h
 include/marble/MarbleDirs.h
 include/marble/MarbleGlobal.h
@@ -95,17 +102,20 @@ include/marble/MarbleGraphicsItem.h
 include/marble/MarbleInputHandler.h
 include/marble/MarbleLocale.h
 include/marble/MarbleMap.h
+include/marble/MarbleMath.h
 include/marble/MarbleModel.h
 include/marble/MarbleNavigator.h
 include/marble/MarbleWebView.h
 include/marble/MarbleWidget.h
 include/marble/MarbleWidgetInputHandler.h
 include/marble/MarbleWidgetPopupMenu.h
-include/marble/NavigationWidget.h
+include/marble/OsmcSymbol.h
 include/marble/ParseRunnerPlugin.h
 include/marble/ParsingRunner.h
 include/marble/ParsingRunnerManager.h
+include/marble/PlacemarkEditHeader.h
 include/marble/Planet.h
+include/marble/PlanetFactory.h
 include/marble/PluginAboutDialog.h
 include/marble/PluginInterface.h
 include/marble/PluginManager.h
@@ -114,6 +124,7 @@ include/marble/PositionProviderPluginInterface.h
 include/marble/PositionTracking.h
 include/marble/QtMarbleConfigDialog.h
 include/marble/Quaternion.h
+include/marble/RemoveItemEditWidget.h
 include/marble/RenderPlugin.h
 include/marble/RenderPluginInterface.h
 include/marble/RenderState.h
@@ -135,6 +146,7 @@ include/marble/SearchRunner.h
 include/marble/SearchRunnerManager.h
 include/marble/SearchRunnerPlugin.h
 include/marble/Serializable.h
+include/marble/SoundCueEditWidget.h
 include/marble/SunLocator.h
 include/marble/TileCoordsPyramid.h
 include/marble/TileCreator.h
@@ -142,940 +154,1608 @@ include/marble/TileCreatorDialog.h
 include/marble/TileId.h
 include/marble/TileLevelRangeWidget.h
 include/marble/TinyWebBrowser.h
+include/marble/TourControlEditWidget.h
+include/marble/TourItemDelegate.h
 include/marble/TourPlayback.h
 include/marble/TourWidget.h
 include/marble/ViewportParams.h
+include/marble/WaitEditWidget.h
 include/marble/WidgetGraphicsItem.h
 include/marble/geodata_export.h
-include/marble/global.h
 include/marble/marble_export.h
-lib/kde4/libmarble_part.so
-lib/kde4/marblethumbnail.so
-lib/kde4/plasma_applet_worldclock.so
-lib/kde4/plasma_runner_marble.so
-lib/kde4/plugins/designer/LatLonEditPlugin.so
-lib/kde4/plugins/designer/MarbleNavigatorPlugin.so
-lib/kde4/plugins/designer/MarbleWidgetPlugin.so
-lib/kde4/plugins/marble/AnnotatePlugin.so
-lib/kde4/plugins/marble/AprsPlugin.so
-lib/kde4/plugins/marble/AtmospherePlugin.so
-lib/kde4/plugins/marble/CachePlugin.so
-lib/kde4/plugins/marble/CompassFloatItem.so
-lib/kde4/plugins/marble/CrosshairsPlugin.so
-lib/kde4/plugins/marble/CycleStreetsPlugin.so
-lib/kde4/plugins/marble/EarthquakePlugin.so
-lib/kde4/plugins/marble/EclipsesPlugin.so
-lib/kde4/plugins/marble/ElevationProfileFloatItem.so
-lib/kde4/plugins/marble/ElevationProfileMarker.so
-lib/kde4/plugins/marble/FlightGearPositionProviderPlugin.so
-lib/kde4/plugins/marble/FoursquarePlugin.so
-lib/kde4/plugins/marble/GosmoreReverseGeocodingPlugin.so
-lib/kde4/plugins/marble/GosmoreRoutingPlugin.so
-lib/kde4/plugins/marble/GpsInfo.so
-lib/kde4/plugins/marble/GpsbabelPlugin.so
-%%GPS%%lib/kde4/plugins/marble/GpsdPositionProviderPlugin.so
-lib/kde4/plugins/marble/GpxPlugin.so
-lib/kde4/plugins/marble/GraticulePlugin.so
-lib/kde4/plugins/marble/HostipPlugin.so
-lib/kde4/plugins/marble/JsonPlugin.so
-lib/kde4/plugins/marble/KmlPlugin.so
-lib/kde4/plugins/marble/LatLonPlugin.so
-lib/kde4/plugins/marble/License.so
-lib/kde4/plugins/marble/LocalDatabasePlugin.so
-lib/kde4/plugins/marble/LocalOsmSearchPlugin.so
-lib/kde4/plugins/marble/LogPlugin.so
-lib/kde4/plugins/marble/MapQuestPlugin.so
-lib/kde4/plugins/marble/MapScaleFloatItem.so
-lib/kde4/plugins/marble/MeasureTool.so
-lib/kde4/plugins/marble/MonavPlugin.so
-lib/kde4/plugins/marble/NavigationFloatItem.so
-lib/kde4/plugins/marble/NominatimReverseGeocodingPlugin.so
-lib/kde4/plugins/marble/NominatimSearchPlugin.so
-lib/kde4/plugins/marble/OSRMPlugin.so
-lib/kde4/plugins/marble/OpenCachingComPlugin.so
-lib/kde4/plugins/marble/OpenDesktopPlugin.so
-lib/kde4/plugins/marble/OpenRouteServicePlugin.so
-lib/kde4/plugins/marble/OsmPlugin.so
-lib/kde4/plugins/marble/OverviewMap.so
-lib/kde4/plugins/marble/Photo.so
-lib/kde4/plugins/marble/PlacemarkPositionProviderPlugin.so
-lib/kde4/plugins/marble/Pn2Plugin.so
-lib/kde4/plugins/marble/PntPlugin.so
-lib/kde4/plugins/marble/PositionMarker.so
-lib/kde4/plugins/marble/PostalCode.so
-lib/kde4/plugins/marble/ProgressFloatItem.so
-lib/kde4/plugins/marble/RouteSimulationPositionProviderPlugin.so
-lib/kde4/plugins/marble/RoutingPlugin.so
-lib/kde4/plugins/marble/RoutinoPlugin.so
-lib/kde4/plugins/marble/SatellitesPlugin.so
-lib/kde4/plugins/marble/Speedometer.so
-lib/kde4/plugins/marble/StarsPlugin.so
-lib/kde4/plugins/marble/SunPlugin.so
-lib/kde4/plugins/marble/Weather.so
-lib/kde4/plugins/marble/Wikipedia.so
-lib/kde4/plugins/marble/YoursPlugin.so
+lib/cmake/Astro/AstroConfig.cmake
+lib/cmake/Astro/AstroConfigVersion.cmake
+lib/cmake/Astro/AstroTargets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/Astro/AstroTargets.cmake
+lib/cmake/Marble/MarbleConfig.cmake
+lib/cmake/Marble/MarbleConfigVersion.cmake
+lib/cmake/Marble/MarbleTargets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/Marble/MarbleTargets.cmake
 lib/libastro.so
 lib/libastro.so.0.17.20
 lib/libastro.so.1
-lib/libmarblewidget.so
-lib/libmarblewidget.so.0.19.2
-lib/libmarblewidget.so.19
-%%QT_IMPORTDIR%%/org/kde/edu/marble/MarbleSettings.qml
-%%QT_IMPORTDIR%%/org/kde/edu/marble/libMarbleDeclarativePlugin.so
-%%QT_IMPORTDIR%%/org/kde/edu/marble/qmldir
-share/appdata/marble.appdata.xml
-share/applications/kde4/marble-mobile.desktop
-share/applications/kde4/marble-qt.desktop
-share/applications/kde4/marble-touch.desktop
-share/applications/kde4/marble.desktop
-share/applications/kde4/marble_geo.desktop
-share/applications/kde4/marble_gpx.desktop
-share/applications/kde4/marble_kml.desktop
-share/applications/kde4/marble_kmz.desktop
-share/applications/kde4/marble_osm.desktop
-share/applications/kde4/marble_worldwind.desktop
-share/apps/cmake/modules/FindMarble.cmake
-share/apps/marble/data/LICENSE.txt
-share/apps/marble/data/audio/KDE-Sys-App-Positive.ogg
-share/apps/marble/data/audio/KDE-Sys-List-End.ogg
-share/apps/marble/data/bitmaps/airport.png
-share/apps/marble/data/bitmaps/annotation.png
-share/apps/marble/data/bitmaps/antarctic_shelves.png
-share/apps/marble/data/bitmaps/audio-x-generic.png
-share/apps/marble/data/bitmaps/bookmark.png
-share/apps/marble/data/bitmaps/border_1.png
-share/apps/marble/data/bitmaps/border_2.png
-share/apps/marble/data/bitmaps/border_disputed.png
-share/apps/marble/data/bitmaps/border_maritime.png
-share/apps/marble/data/bitmaps/city_1_orange.png
-share/apps/marble/data/bitmaps/city_1_red.png
-share/apps/marble/data/bitmaps/city_1_white.png
-share/apps/marble/data/bitmaps/city_1_yellow.png
-share/apps/marble/data/bitmaps/city_2_orange.png
-share/apps/marble/data/bitmaps/city_2_red.png
-share/apps/marble/data/bitmaps/city_2_white.png
-share/apps/marble/data/bitmaps/city_2_yellow.png
-share/apps/marble/data/bitmaps/city_3_orange.png
-share/apps/marble/data/bitmaps/city_3_red.png
-share/apps/marble/data/bitmaps/city_3_white.png
-share/apps/marble/data/bitmaps/city_3_yellow.png
-share/apps/marble/data/bitmaps/city_4_orange.png
-share/apps/marble/data/bitmaps/city_4_red.png
-share/apps/marble/data/bitmaps/city_4_white.png
-share/apps/marble/data/bitmaps/city_4_yellow.png
-share/apps/marble/data/bitmaps/coordinate.png
-share/apps/marble/data/bitmaps/crater.png
-share/apps/marble/data/bitmaps/cursor_bc.png
-share/apps/marble/data/bitmaps/cursor_bl.png
-share/apps/marble/data/bitmaps/cursor_br.png
-share/apps/marble/data/bitmaps/cursor_cl.png
-share/apps/marble/data/bitmaps/cursor_cr.png
-share/apps/marble/data/bitmaps/cursor_tc.png
-share/apps/marble/data/bitmaps/cursor_tl.png
-share/apps/marble/data/bitmaps/cursor_tr.png
-share/apps/marble/data/bitmaps/default_location.png
-share/apps/marble/data/bitmaps/document-edit.png
-share/apps/marble/data/bitmaps/earth_apollo.jpg
-share/apps/marble/data/bitmaps/flag.png
-share/apps/marble/data/bitmaps/folder.png
-share/apps/marble/data/bitmaps/glacier.png
-share/apps/marble/data/bitmaps/highway_footway.png
-share/apps/marble/data/bitmaps/highway_motorway.png
-share/apps/marble/data/bitmaps/highway_path.png
-share/apps/marble/data/bitmaps/highway_primary.png
-share/apps/marble/data/bitmaps/highway_secondary.png
-share/apps/marble/data/bitmaps/highway_tertiary.png
-share/apps/marble/data/bitmaps/highway_track.png
-share/apps/marble/data/bitmaps/highway_trunk.png
-share/apps/marble/data/bitmaps/highway_unclassified.png
-share/apps/marble/data/bitmaps/lake.png
-share/apps/marble/data/bitmaps/lake_historic.png
-share/apps/marble/data/bitmaps/manned_landing.png
-share/apps/marble/data/bitmaps/media-playback-pause.png
-share/apps/marble/data/bitmaps/mountain_1.png
-share/apps/marble/data/bitmaps/nation.png
-share/apps/marble/data/bitmaps/observatory.png
-share/apps/marble/data/bitmaps/ocean.png
-share/apps/marble/data/bitmaps/osm.png
-share/apps/marble/data/bitmaps/other.png
-share/apps/marble/data/bitmaps/playa.png
-share/apps/marble/data/bitmaps/player-time.png
-share/apps/marble/data/bitmaps/poi/accommodation_camping.p.16.png
-share/apps/marble/data/bitmaps/poi/accommodation_hostel.p.16.png
-share/apps/marble/data/bitmaps/poi/accommodation_hotel2.p.16.png
-share/apps/marble/data/bitmaps/poi/accommodation_motel.p.16.png
-share/apps/marble/data/bitmaps/poi/accommodation_youth_hostel.p.16.png
-share/apps/marble/data/bitmaps/poi/amenity_library.p.16.png
-share/apps/marble/data/bitmaps/poi/education_college.p.16.png
-share/apps/marble/data/bitmaps/poi/education_school.p.16.png
-share/apps/marble/data/bitmaps/poi/education_university.p.16.png
-share/apps/marble/data/bitmaps/poi/food_bar.p.16.png
-share/apps/marble/data/bitmaps/poi/food_biergarten.p.16.png
-share/apps/marble/data/bitmaps/poi/food_cafe.p.16.png
-share/apps/marble/data/bitmaps/poi/food_fastfood2.p.16.png
-share/apps/marble/data/bitmaps/poi/food_pub.p.16.png
-share/apps/marble/data/bitmaps/poi/food_restaurant.p.16.png
-share/apps/marble/data/bitmaps/poi/health_doctors2.p.16.png
-share/apps/marble/data/bitmaps/poi/health_hospital.p.16.png
-share/apps/marble/data/bitmaps/poi/health_pharmacy.p.16.png
-share/apps/marble/data/bitmaps/poi/money_atm2.p.16.png
-share/apps/marble/data/bitmaps/poi/money_bank2.p.16.png
-share/apps/marble/data/bitmaps/poi/place_of_worship_bahai3.p.16.png
-share/apps/marble/data/bitmaps/poi/place_of_worship_buddhist3.p.16.png
-share/apps/marble/data/bitmaps/poi/place_of_worship_christian3.p.16.png
-share/apps/marble/data/bitmaps/poi/place_of_worship_hindu3.p.16.png
-share/apps/marble/data/bitmaps/poi/place_of_worship_islamic3.p.16.png
-share/apps/marble/data/bitmaps/poi/place_of_worship_jain3.p.16.png
-share/apps/marble/data/bitmaps/poi/place_of_worship_jewish3.p.16.png
-share/apps/marble/data/bitmaps/poi/place_of_worship_shinto3.p.16.png
-share/apps/marble/data/bitmaps/poi/place_of_worship_sikh3.p.16.png
-share/apps/marble/data/bitmaps/poi/place_of_worship_unknown3.p.16.png
-share/apps/marble/data/bitmaps/poi/shopping_alcohol.p.16.png
-share/apps/marble/data/bitmaps/poi/shopping_hifi.p.16.png
-share/apps/marble/data/bitmaps/poi/shopping_supermarket.p.16.png
-share/apps/marble/data/bitmaps/poi/tourist_attraction.p.16.png
-share/apps/marble/data/bitmaps/poi/tourist_castle2.p.16.png
-share/apps/marble/data/bitmaps/poi/tourist_cinema.p.16.png
-share/apps/marble/data/bitmaps/poi/tourist_monument.p.16.png
-share/apps/marble/data/bitmaps/poi/tourist_museum.p.16.png
-share/apps/marble/data/bitmaps/poi/tourist_ruin.p.16.png
-share/apps/marble/data/bitmaps/poi/tourist_theatre.p.16.png
-share/apps/marble/data/bitmaps/poi/tourist_theme_park.p.16.png
-share/apps/marble/data/bitmaps/poi/tourist_view_point.p.16.png
-share/apps/marble/data/bitmaps/poi/tourist_zoo.p.16.png
-share/apps/marble/data/bitmaps/poi/transport_aerodrome.p.16.png
-share/apps/marble/data/bitmaps/poi/transport_airport_terminal.p.16.png
-share/apps/marble/data/bitmaps/poi/transport_bus_station.p.16.png
-share/apps/marble/data/bitmaps/poi/transport_bus_stop.p.16.png
-share/apps/marble/data/bitmaps/poi/transport_car_share.p.16.png
-share/apps/marble/data/bitmaps/poi/transport_fuel.p.16.png
-share/apps/marble/data/bitmaps/poi/transport_parking.p.16.png
-share/apps/marble/data/bitmaps/poi/transport_rental_bicycle.p.16.png
-share/apps/marble/data/bitmaps/poi/transport_rental_car.p.16.png
-share/apps/marble/data/bitmaps/poi/transport_taxi_rank.p.16.png
-share/apps/marble/data/bitmaps/poi/transport_train_station.p.16.png
-share/apps/marble/data/bitmaps/poi/transport_tram_stop.p.16.png
-share/apps/marble/data/bitmaps/pole_1.png
-share/apps/marble/data/bitmaps/pole_2.png
-share/apps/marble/data/bitmaps/river.png
-share/apps/marble/data/bitmaps/robotic_rover.png
-share/apps/marble/data/bitmaps/routing_pick.png
-share/apps/marble/data/bitmaps/routing_remove.png
-share/apps/marble/data/bitmaps/routing_step.png
-share/apps/marble/data/bitmaps/satellite.png
-share/apps/marble/data/bitmaps/shadowframe.png
-share/apps/marble/data/bitmaps/shipwreck.png
-share/apps/marble/data/bitmaps/stars/star_0_blue.png
-share/apps/marble/data/bitmaps/stars/star_0_bluewhite.png
-share/apps/marble/data/bitmaps/stars/star_0_garnetred.png
-share/apps/marble/data/bitmaps/stars/star_0_orange.png
-share/apps/marble/data/bitmaps/stars/star_0_red.png
-share/apps/marble/data/bitmaps/stars/star_0_white.png
-share/apps/marble/data/bitmaps/stars/star_0_yellow.png
-share/apps/marble/data/bitmaps/stars/star_3_blue.png
-share/apps/marble/data/bitmaps/stars/star_3_bluewhite.png
-share/apps/marble/data/bitmaps/stars/star_3_garnetred.png
-share/apps/marble/data/bitmaps/stars/star_3_orange.png
-share/apps/marble/data/bitmaps/stars/star_3_red.png
-share/apps/marble/data/bitmaps/stars/star_3_white.png
-share/apps/marble/data/bitmaps/stars/star_3_yellow.png
-share/apps/marble/data/bitmaps/turn-around.png
-share/apps/marble/data/bitmaps/turn-continue.png
-share/apps/marble/data/bitmaps/turn-exit-left.png
-share/apps/marble/data/bitmaps/turn-exit-right.png
-share/apps/marble/data/bitmaps/turn-left.png
-share/apps/marble/data/bitmaps/turn-merge.png
-share/apps/marble/data/bitmaps/turn-right.png
-share/apps/marble/data/bitmaps/turn-roundabout-far.png
-share/apps/marble/data/bitmaps/turn-roundabout-first.png
-share/apps/marble/data/bitmaps/turn-roundabout-second.png
-share/apps/marble/data/bitmaps/turn-roundabout-third.png
-share/apps/marble/data/bitmaps/turn-sharp-left.png
-share/apps/marble/data/bitmaps/turn-sharp-right.png
-share/apps/marble/data/bitmaps/turn-slight-left.png
-share/apps/marble/data/bitmaps/turn-slight-right.png
-share/apps/marble/data/bitmaps/unmanned_hard_landing.png
-share/apps/marble/data/bitmaps/unmanned_soft_landing.png
-share/apps/marble/data/bitmaps/urban_area.png
-share/apps/marble/data/bitmaps/valley.png
-share/apps/marble/data/bitmaps/volcano_1.png
-share/apps/marble/data/bitmaps/waypoint.png
-share/apps/marble/data/bitmaps/wikipedia.png
-share/apps/marble/data/credits_authors.html
-share/apps/marble/data/credits_data.html
-share/apps/marble/data/flags/flag_ad.svg
-share/apps/marble/data/flags/flag_ae.svg
-share/apps/marble/data/flags/flag_af.svg
-share/apps/marble/data/flags/flag_ag.svg
-share/apps/marble/data/flags/flag_ai.svg
-share/apps/marble/data/flags/flag_al.svg
-share/apps/marble/data/flags/flag_am.svg
-share/apps/marble/data/flags/flag_an.svg
-share/apps/marble/data/flags/flag_ao.svg
-share/apps/marble/data/flags/flag_aq.svg
-share/apps/marble/data/flags/flag_ar.svg
-share/apps/marble/data/flags/flag_as.svg
-share/apps/marble/data/flags/flag_at.svg
-share/apps/marble/data/flags/flag_au.svg
-share/apps/marble/data/flags/flag_aw.svg
-share/apps/marble/data/flags/flag_ax.svg
-share/apps/marble/data/flags/flag_az.svg
-share/apps/marble/data/flags/flag_ba.svg
-share/apps/marble/data/flags/flag_bb.svg
-share/apps/marble/data/flags/flag_bd.svg
-share/apps/marble/data/flags/flag_be.svg
-share/apps/marble/data/flags/flag_bf.svg
-share/apps/marble/data/flags/flag_bg.svg
-share/apps/marble/data/flags/flag_bh.svg
-share/apps/marble/data/flags/flag_bi.svg
-share/apps/marble/data/flags/flag_bj.svg
-share/apps/marble/data/flags/flag_bm.svg
-share/apps/marble/data/flags/flag_bn.svg
-share/apps/marble/data/flags/flag_bo.svg
-share/apps/marble/data/flags/flag_br.svg
-share/apps/marble/data/flags/flag_bs.svg
-share/apps/marble/data/flags/flag_bt.svg
-share/apps/marble/data/flags/flag_bv.svg
-share/apps/marble/data/flags/flag_bw.svg
-share/apps/marble/data/flags/flag_by.svg
-share/apps/marble/data/flags/flag_bz.svg
-share/apps/marble/data/flags/flag_ca.svg
-share/apps/marble/data/flags/flag_cc.svg
-share/apps/marble/data/flags/flag_cd.svg
-share/apps/marble/data/flags/flag_cf.svg
-share/apps/marble/data/flags/flag_cg.svg
-share/apps/marble/data/flags/flag_ch.svg
-share/apps/marble/data/flags/flag_ci.svg
-share/apps/marble/data/flags/flag_ck.svg
-share/apps/marble/data/flags/flag_cl.svg
-share/apps/marble/data/flags/flag_cm.svg
-share/apps/marble/data/flags/flag_cn.svg
-share/apps/marble/data/flags/flag_co.svg
-share/apps/marble/data/flags/flag_cr.svg
-share/apps/marble/data/flags/flag_cu.svg
-share/apps/marble/data/flags/flag_cv.svg
-share/apps/marble/data/flags/flag_cx.svg
-share/apps/marble/data/flags/flag_cy.svg
-share/apps/marble/data/flags/flag_cz.svg
-share/apps/marble/data/flags/flag_de.svg
-share/apps/marble/data/flags/flag_dj.svg
-share/apps/marble/data/flags/flag_dk.svg
-share/apps/marble/data/flags/flag_dm.svg
-share/apps/marble/data/flags/flag_do.svg
-share/apps/marble/data/flags/flag_dz.svg
-share/apps/marble/data/flags/flag_ec.svg
-share/apps/marble/data/flags/flag_ee.svg
-share/apps/marble/data/flags/flag_eg.svg
-share/apps/marble/data/flags/flag_eh.svg
-share/apps/marble/data/flags/flag_er.svg
-share/apps/marble/data/flags/flag_es.svg
-share/apps/marble/data/flags/flag_et.svg
-share/apps/marble/data/flags/flag_fi.svg
-share/apps/marble/data/flags/flag_fj.svg
-share/apps/marble/data/flags/flag_fk.svg
-share/apps/marble/data/flags/flag_fm.svg
-share/apps/marble/data/flags/flag_fo.svg
-share/apps/marble/data/flags/flag_fr.svg
-share/apps/marble/data/flags/flag_ga.svg
-share/apps/marble/data/flags/flag_gb.svg
-share/apps/marble/data/flags/flag_gd.svg
-share/apps/marble/data/flags/flag_ge.svg
-share/apps/marble/data/flags/flag_gf.svg
-share/apps/marble/data/flags/flag_gg.svg
-share/apps/marble/data/flags/flag_gh.svg
-share/apps/marble/data/flags/flag_gi.svg
-share/apps/marble/data/flags/flag_gl.svg
-share/apps/marble/data/flags/flag_gm.svg
-share/apps/marble/data/flags/flag_gn.svg
-share/apps/marble/data/flags/flag_gp.svg
-share/apps/marble/data/flags/flag_gq.svg
-share/apps/marble/data/flags/flag_gr.svg
-share/apps/marble/data/flags/flag_gs.svg
-share/apps/marble/data/flags/flag_gt.svg
-share/apps/marble/data/flags/flag_gu.svg
-share/apps/marble/data/flags/flag_gw.svg
-share/apps/marble/data/flags/flag_gy.svg
-share/apps/marble/data/flags/flag_hk.svg
-share/apps/marble/data/flags/flag_hm.svg
-share/apps/marble/data/flags/flag_hn.svg
-share/apps/marble/data/flags/flag_hr.svg
-share/apps/marble/data/flags/flag_ht.svg
-share/apps/marble/data/flags/flag_hu.svg
-share/apps/marble/data/flags/flag_id.svg
-share/apps/marble/data/flags/flag_ie.svg
-share/apps/marble/data/flags/flag_il.svg
-share/apps/marble/data/flags/flag_im.svg
-share/apps/marble/data/flags/flag_in.svg
-share/apps/marble/data/flags/flag_io.svg
-share/apps/marble/data/flags/flag_iq.svg
-share/apps/marble/data/flags/flag_ir.svg
-share/apps/marble/data/flags/flag_is.svg
-share/apps/marble/data/flags/flag_it.svg
-share/apps/marble/data/flags/flag_je.svg
-share/apps/marble/data/flags/flag_jm.svg
-share/apps/marble/data/flags/flag_jo.svg
-share/apps/marble/data/flags/flag_jp.svg
-share/apps/marble/data/flags/flag_ke.svg
-share/apps/marble/data/flags/flag_kg.svg
-share/apps/marble/data/flags/flag_kh.svg
-share/apps/marble/data/flags/flag_ki.svg
-share/apps/marble/data/flags/flag_km.svg
-share/apps/marble/data/flags/flag_kn.svg
-share/apps/marble/data/flags/flag_kp.svg
-share/apps/marble/data/flags/flag_kr.svg
-share/apps/marble/data/flags/flag_kw.svg
-share/apps/marble/data/flags/flag_ky.svg
-share/apps/marble/data/flags/flag_kz.svg
-share/apps/marble/data/flags/flag_la.svg
-share/apps/marble/data/flags/flag_lb.svg
-share/apps/marble/data/flags/flag_lc.svg
-share/apps/marble/data/flags/flag_li.svg
-share/apps/marble/data/flags/flag_lk.svg
-share/apps/marble/data/flags/flag_lr.svg
-share/apps/marble/data/flags/flag_ls.svg
-share/apps/marble/data/flags/flag_lt.svg
-share/apps/marble/data/flags/flag_lu.svg
-share/apps/marble/data/flags/flag_lv.svg
-share/apps/marble/data/flags/flag_ly.svg
-share/apps/marble/data/flags/flag_ma.svg
-share/apps/marble/data/flags/flag_mc.svg
-share/apps/marble/data/flags/flag_md.svg
-share/apps/marble/data/flags/flag_me.svg
-share/apps/marble/data/flags/flag_mg.svg
-share/apps/marble/data/flags/flag_mh.svg
-share/apps/marble/data/flags/flag_mk.svg
-share/apps/marble/data/flags/flag_ml.svg
-share/apps/marble/data/flags/flag_mm.svg
-share/apps/marble/data/flags/flag_mn.svg
-share/apps/marble/data/flags/flag_mo.svg
-share/apps/marble/data/flags/flag_mp.svg
-share/apps/marble/data/flags/flag_mq.svg
-share/apps/marble/data/flags/flag_mr.svg
-share/apps/marble/data/flags/flag_ms.svg
-share/apps/marble/data/flags/flag_mt.svg
-share/apps/marble/data/flags/flag_mu.svg
-share/apps/marble/data/flags/flag_mv.svg
-share/apps/marble/data/flags/flag_mw.svg
-share/apps/marble/data/flags/flag_mx.svg
-share/apps/marble/data/flags/flag_my.svg
-share/apps/marble/data/flags/flag_mz.svg
-share/apps/marble/data/flags/flag_na.svg
-share/apps/marble/data/flags/flag_nc.svg
-share/apps/marble/data/flags/flag_ne.svg
-share/apps/marble/data/flags/flag_nf.svg
-share/apps/marble/data/flags/flag_ng.svg
-share/apps/marble/data/flags/flag_ni.svg
-share/apps/marble/data/flags/flag_nl.svg
-share/apps/marble/data/flags/flag_no.svg
-share/apps/marble/data/flags/flag_np.svg
-share/apps/marble/data/flags/flag_nr.svg
-share/apps/marble/data/flags/flag_nu.svg
-share/apps/marble/data/flags/flag_nz.svg
-share/apps/marble/data/flags/flag_om.svg
-share/apps/marble/data/flags/flag_pa.svg
-share/apps/marble/data/flags/flag_pe.svg
-share/apps/marble/data/flags/flag_pf.svg
-share/apps/marble/data/flags/flag_pg.svg
-share/apps/marble/data/flags/flag_ph.svg
-share/apps/marble/data/flags/flag_pk.svg
-share/apps/marble/data/flags/flag_pl.svg
-share/apps/marble/data/flags/flag_pm.svg
-share/apps/marble/data/flags/flag_pn.svg
-share/apps/marble/data/flags/flag_pr.svg
-share/apps/marble/data/flags/flag_ps.svg
-share/apps/marble/data/flags/flag_pt.svg
-share/apps/marble/data/flags/flag_pw.svg
-share/apps/marble/data/flags/flag_py.svg
-share/apps/marble/data/flags/flag_qa.svg
-share/apps/marble/data/flags/flag_re.svg
-share/apps/marble/data/flags/flag_ro.svg
-share/apps/marble/data/flags/flag_rs.svg
-share/apps/marble/data/flags/flag_ru.svg
-share/apps/marble/data/flags/flag_rw.svg
-share/apps/marble/data/flags/flag_sa.svg
-share/apps/marble/data/flags/flag_sb.svg
-share/apps/marble/data/flags/flag_sc.svg
-share/apps/marble/data/flags/flag_sd.svg
-share/apps/marble/data/flags/flag_se.svg
-share/apps/marble/data/flags/flag_sg.svg
-share/apps/marble/data/flags/flag_sh.svg
-share/apps/marble/data/flags/flag_si.svg
-share/apps/marble/data/flags/flag_sj.svg
-share/apps/marble/data/flags/flag_sk.svg
-share/apps/marble/data/flags/flag_sl.svg
-share/apps/marble/data/flags/flag_sm.svg
-share/apps/marble/data/flags/flag_sn.svg
-share/apps/marble/data/flags/flag_so.svg
-share/apps/marble/data/flags/flag_sr.svg
-share/apps/marble/data/flags/flag_st.svg
-share/apps/marble/data/flags/flag_sv.svg
-share/apps/marble/data/flags/flag_sy.svg
-share/apps/marble/data/flags/flag_sz.svg
-share/apps/marble/data/flags/flag_tc.svg
-share/apps/marble/data/flags/flag_td.svg
-share/apps/marble/data/flags/flag_tf.svg
-share/apps/marble/data/flags/flag_tg.svg
-share/apps/marble/data/flags/flag_th.svg
-share/apps/marble/data/flags/flag_tj.svg
-share/apps/marble/data/flags/flag_tk.svg
-share/apps/marble/data/flags/flag_tl.svg
-share/apps/marble/data/flags/flag_tm.svg
-share/apps/marble/data/flags/flag_tn.svg
-share/apps/marble/data/flags/flag_to.svg
-share/apps/marble/data/flags/flag_tr.svg
-share/apps/marble/data/flags/flag_tt.svg
-share/apps/marble/data/flags/flag_tv.svg
-share/apps/marble/data/flags/flag_tw.svg
-share/apps/marble/data/flags/flag_tz.svg
-share/apps/marble/data/flags/flag_ua.svg
-share/apps/marble/data/flags/flag_ug.svg
-share/apps/marble/data/flags/flag_um.svg
-share/apps/marble/data/flags/flag_us.svg
-share/apps/marble/data/flags/flag_uy.svg
-share/apps/marble/data/flags/flag_uz.svg
-share/apps/marble/data/flags/flag_vc.svg
-share/apps/marble/data/flags/flag_ve.svg
-share/apps/marble/data/flags/flag_vg.svg
-share/apps/marble/data/flags/flag_vi.svg
-share/apps/marble/data/flags/flag_vn.svg
-share/apps/marble/data/flags/flag_vu.svg
-share/apps/marble/data/flags/flag_wf.svg
-share/apps/marble/data/flags/flag_ws.svg
-share/apps/marble/data/flags/flag_ye.svg
-share/apps/marble/data/flags/flag_yt.svg
-share/apps/marble/data/flags/flag_za.svg
-share/apps/marble/data/flags/flag_zm.svg
-share/apps/marble/data/flags/flag_zw.svg
-share/apps/marble/data/landcolors.leg
-share/apps/marble/data/legend.css
-share/apps/marble/data/legend.html
-share/apps/marble/data/licenses/lgpl2.txt
-share/apps/marble/data/maps/earth/bluemarble/bluemarble-preview.png
-share/apps/marble/data/maps/earth/bluemarble/bluemarble.dgml
-share/apps/marble/data/maps/earth/bluemarble/bluemarble.jpg
-share/apps/marble/data/maps/earth/bluemarble/legend/desert.png
-share/apps/marble/data/maps/earth/bluemarble/legend/ice.png
-share/apps/marble/data/maps/earth/bluemarble/legend/mountain.png
-share/apps/marble/data/maps/earth/bluemarble/legend/vegetation.png
-share/apps/marble/data/maps/earth/bluemarble/legend/water.png
-share/apps/marble/data/maps/earth/citylights/citylights-preview.png
-share/apps/marble/data/maps/earth/citylights/citylights.dgml
-share/apps/marble/data/maps/earth/citylights/citylights.jpg
-share/apps/marble/data/maps/earth/citylights/legend/city.png
-share/apps/marble/data/maps/earth/citylights/legend/darkterrain.png
-share/apps/marble/data/maps/earth/citylights/legend/lightterrain.png
-share/apps/marble/data/maps/earth/citylights/legend/water.png
-share/apps/marble/data/maps/earth/clouds/0/000000/000000_000000.jpg
-share/apps/marble/data/maps/earth/clouds/0/000000/000000_000001.jpg
-share/apps/marble/data/maps/earth/hillshading/0/0/0.png
-share/apps/marble/data/maps/earth/openstreetmap/0/0/0.png
-share/apps/marble/data/maps/earth/openstreetmap/legend.html
-share/apps/marble/data/maps/earth/openstreetmap/legend/airportapron.png
-share/apps/marble/data/maps/earth/openstreetmap/legend/airportrunway.png
-share/apps/marble/data/maps/earth/openstreetmap/legend/boundary.png
-share/apps/marble/data/maps/earth/openstreetmap/legend/bridge.png
-share/apps/marble/data/maps/earth/openstreetmap/legend/bridleway.png
-share/apps/marble/data/maps/earth/openstreetmap/legend/byway.png
-share/apps/marble/data/maps/earth/openstreetmap/legend/cycleway.png
-share/apps/marble/data/maps/earth/openstreetmap/legend/footway.png
-share/apps/marble/data/maps/earth/openstreetmap/legend/mapicons/accommodation_hotel2.p.12.png
-share/apps/marble/data/maps/earth/openstreetmap/legend/mapicons/accommodation_motel.p.12.png
-share/apps/marble/data/maps/earth/openstreetmap/legend/mapicons/amenity_court.p.12.png
-share/apps/marble/data/maps/earth/openstreetmap/legend/mapicons/amenity_firestation.p.12.png
-share/apps/marble/data/maps/earth/openstreetmap/legend/mapicons/amenity_library.p.12.png

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201804081721.w38HLYhs021725>