|
[-]
[+]
|
Changed |
marble.spec
|
|
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160427.tar.xz/CMakeLists.txt
^
|
| @@ -100,7 +100,9 @@
if(QTONLY)
# Forward the old QTONLY=TRUE option to the new WITH_KDE=FALSE
- set(WITH_KF5 FALSE)
+ # needs to be written to cache and forcefully, otherwise macro_optional_find_package's
+ # option(WITH_${_name} ON) seems to operate on a shadowed variant of the variable
+ set(WITH_KF5 FALSE CACHE BOOL "Search for KF5 package" FORCE)
# And unset it quickly. Nobody shall use it anymore anywhere.
# to detect if KDE _should_ be used (set by user): WITH_KDE but do not use it within src/lib/
unset(QTONLY)
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160427.tar.xz/data/CMakeLists.txt
^
|
| @@ -246,17 +246,18 @@
install (FILES placemarks/cityplacemarks.cache DESTINATION ${MARBLE_DATA_INSTALL_PATH}/placemarks)
endif(MOBILE)
-if(FALSE)
-if(NOT APPLE AND NOT WIN32)
+if(NOT APPLE AND NOT WIN32 AND NOT SAILFISHOS)
install (FILES icons/128-apps-marble.png DESTINATION ${ICON_INSTALL_DIR}/hicolor/128x128/apps/ RENAME marble.png)
install (FILES icons/64-apps-marble.png DESTINATION ${ICON_INSTALL_DIR}/hicolor/64x64/apps/ RENAME marble.png)
install (FILES icons/48-apps-marble.png DESTINATION ${ICON_INSTALL_DIR}/hicolor/48x48/apps/ RENAME marble.png)
install (FILES icons/32-apps-marble.png DESTINATION ${ICON_INSTALL_DIR}/hicolor/32x32/apps/ RENAME marble.png)
install (FILES icons/22-apps-marble.png DESTINATION ${ICON_INSTALL_DIR}/hicolor/22x22/apps/ RENAME marble.png)
install (FILES icons/16-apps-marble.png DESTINATION ${ICON_INSTALL_DIR}/hicolor/16x16/apps/ RENAME marble.png)
-endif(NOT APPLE AND NOT WIN32 )
+endif(NOT APPLE AND NOT WIN32 AND NOT SAILFISHOS)
+
+if(SAILFISHOS)
+ install (FILES icons/86-apps-marble.png DESTINATION ${ICON_INSTALL_DIR}/hicolor/86x86/apps/ RENAME marble.png)
endif()
-install (FILES icons/86-apps-marble.png DESTINATION ${ICON_INSTALL_DIR}/hicolor/86x86/apps/ RENAME marble.png)
FILE (GLOB AUDIO_FILES audio/*.ogg)
install (FILES
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160427.tar.xz/data/mimetypes/geo.xml
^
|
| @@ -6,7 +6,7 @@
-->
<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
<mime-type type="application/x-gpx+xml">
- <!-- prevent txt/plain thumbnailer <sub-class-of type="application/xml"/> -->
+ <sub-class-of type="application/xml"/>
<comment>GPX geographic data</comment>
<comment xml:lang="ast">Datos xeográficos GPX</comment>
<comment xml:lang="bg">Географски данни GPX</comment>
@@ -53,16 +53,11 @@
<alias type="application/gpx"/>
<alias type="application/gpx+xml"/>
<alias type="application/x-gpx"/>
- <!-- temporary solution, until thumbnailer is done, remove for root-XML stuff -->
- <magic priority="80">
- <match value="<gpx" type="string" offset="0:256"/>
- </magic>
- <!-- use again if thumbnailer is done -->
- <!-- <root-XML namespaceURI='http://www.topografix.com/GPX/1/0' localName='gpx'/> -->
- <!-- <root-XML namespaceURI='http://www.topografix.com/GPX/1/1' localName='gpx'/> -->
+ <root-XML namespaceURI='http://www.topografix.com/GPX/1/0' localName='gpx'/>
+ <root-XML namespaceURI='http://www.topografix.com/GPX/1/1' localName='gpx'/>
</mime-type>
<mime-type type="application/x-osm+xml">
- <!-- prevent txt/plain thumbnailer <sub-class-of type="application/xml"/> -->
+ <sub-class-of type="application/xml"/>
<comment>OSM Data</comment>
<comment xml:lang="ast">Datos d'OSM</comment>
<comment xml:lang="bg">Данни OSM</comment>
@@ -107,12 +102,10 @@
<generic-icon name="application-vnd-google-earth-kml"/>
<glob pattern="*.osm" />
<glob pattern="*.osc" />
- <!-- temporary solution, until thumbnailer is done, remove for root-XML stuff -->
+ <!-- no official namespaceURI defined for OSM XML, so cannot use root-XML tag -->
<magic priority="80">
<match value="<osm" type="string" offset="0:256"/>
</magic>
- <!-- use again if thumbnailer is done -->
- <!-- <root-XML namespaceURI='? TODO' localName='osm'/> -->
</mime-type>
<mime-type type="application/x-esri-shape">
<generic-icon name="application-vnd-google-earth-kml"/>
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160427.tar.xz/src/apps/marble-maps/package/AndroidManifest.xml
^
|
| @@ -16,6 +16,7 @@
<data android:scheme="file" android:host="*" android:mimeType="*/*" android:pathPattern=".*\\.kml"/>
<data android:scheme="file" android:host="*" android:mimeType="*/*" android:pathPattern=".*\\.gpx"/>
<data android:scheme="file" android:host="*" android:mimeType="*/*" android:pathPattern=".*\\.osm"/>
+ <data android:scheme="file" android:host="*" android:mimeType="*/*" android:pathPattern=".*\\.geojson"/>
</intent-filter>
<meta-data android:name="android.app.lib_name" android:value="-- %%INSERT_APP_LIB_NAME%% --"/>
<meta-data android:name="android.app.qt_sources_resource_id" android:resource="@array/qt_sources"/>
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160427.tar.xz/src/lib/marble/CMakeLists.txt
^
|
| @@ -4,6 +4,9 @@
marble_set_package_properties( Phonon PROPERTIES DESCRIPTION "cross-platform multimedia framework that enables the use of audio and video content" )
marble_set_package_properties( Phonon PROPERTIES URL "http://qt.digia.com/" )
marble_set_package_properties( Phonon PROPERTIES TYPE OPTIONAL PURPOSE "Support for playback of soundcue elements" )
+if(PHONON_FOUND)
+ set(HAVE_PHONON TRUE)
+endif()
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}
@@ -24,6 +27,7 @@
${CMAKE_CURRENT_SOURCE_DIR}/cloudsync
${CMAKE_SOURCE_DIR}/src/lib/astro
${ZLIB_INCLUDE_DIRS}
+ ${PHONON_INCLUDES}
)
INCLUDE(geodata/CMakeLists.txt)
@@ -389,6 +393,12 @@
Qt5::DBus
)
endif ()
+if (PHONON_FOUND)
+ TARGET_LINK_LIBRARIES (${MARBLEWIDGET}
+ LINK_PRIVATE
+ ${PHONON_LIBS}
+ )
+endif()
if (APPLE)
# TODO: PUBLIC or can be PRIVATE?
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160427.tar.xz/src/plugins/runner/json/CMakeLists.txt
^
|
| @@ -10,3 +10,21 @@
set( JsonPlugin_LIBS Qt5::Script )
marble_add_plugin( JsonPlugin ${json_SRCS} )
+
+if(WIN32 OR APPLE)
+ # nothing to do
+else()
+ install(FILES marble_geojson.desktop DESTINATION ${APPS_INSTALL_DIR})
+endif()
+
+set(KDE_SKIP_UNINSTALL_TARGET ON CACHE BOOL "KDE uninstall target must be disabled")
+find_package(ECM QUIET)
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH})
+if(ECM_FOUND)
+ include(KDEInstallDirs)
+endif()
+macro_optional_find_package(KF5 QUIET COMPONENTS KIO)
+if(KF5_FOUND)
+ install(FILES marble_part_geojson.desktop DESTINATION ${SERVICES_INSTALL_DIR})
+ install(FILES marble_thumbnail_geojson.desktop DESTINATION ${SERVICES_INSTALL_DIR})
+endif()
|
|
[-]
[+]
|
Added |
marble-1.14.21_sfos_160427.tar.xz/src/plugins/runner/json/marble_geojson.desktop
^
|
| @@ -0,0 +1,11 @@
+[Desktop Entry]
+Type=Application
+TryExec=marble
+Exec=marble %F
+Name=Marble
+NoDisplay=true
+GenericName=Virtual Globe
+MimeType=application/vnd.geo+json;
+Icon=marble
+Terminal=false
+Categories=Qt;KDE;Education;Geography;
|
|
[-]
[+]
|
Added |
marble-1.14.21_sfos_160427.tar.xz/src/plugins/runner/json/marble_part_geojson.desktop
^
|
| @@ -0,0 +1,7 @@
+[Desktop Entry]
+Type=Service
+Name=Marble Part
+MimeType=application/vnd.geo+json;
+X-KDE-ServiceTypes=Browser/View,KParts/ReadOnlyPart
+X-KDE-Library=libmarble_part
+Icon=marble
|
|
[-]
[+]
|
Added |
marble-1.14.21_sfos_160427.tar.xz/src/plugins/runner/json/marble_thumbnail_geojson.desktop
^
|
| @@ -0,0 +1,9 @@
+[Desktop Entry]
+Type=Service
+Name=GeoJSON Geographic Data
+
+X-KDE-ServiceTypes=ThumbCreator
+MimeType=application/vnd.geo+json;
+
+X-KDE-Library=marblethumbnail
+CacheThumbnail=true
|
|
[-]
[+]
|
Changed |
marble.yaml
^
|
| @@ -1,6 +1,6 @@
Name: marble
Summary: Virtual Globe
-Version: 1.14.21_sfos_160424
+Version: 1.14.21_sfos_160427
Release: 1
Group: Applications/Engineering
License: LGPLv2+
|
