Sophie

Sophie

distrib > Mageia > 6 > armv7hl > media > core-updates-src > by-pkgid > f70f865b656a5d30dbc71524c8b3bb46 > files > 3

marble-17.12.2-1.1.mga6.src.rpm

diff -up marble-14.12.3/CMakeLists.txt.app_versions marble-14.12.3/CMakeLists.txt
--- marble-14.12.3/CMakeLists.txt.app_versions	2015-02-23 02:27:55.000000000 -0600
+++ marble-14.12.3/CMakeLists.txt	2015-03-11 07:29:17.853081170 -0500
@@ -26,7 +26,8 @@ include( MarbleMacros )
 # Generate the tiles with the tilecreator at compile time
 # if this option is set, srtm.jpg will not be installed but the generated tiles instead
 option(QTONLY "Create Marble version without KDE dependencies" OFF)
-option(MOBILE "Create a Marble version optimized for handheld devices")
+option(MOBILE "Create a Marble version optimized for handheld devices" ON)
+option(TOUCH  "Create a Marble version optimized for meego/touch devices" OFF)
 
 ####################################################
 # Specific options for if building with Qt or kde4 libs
diff -up marble-14.12.3/data/CMakeLists.txt.app_versions marble-14.12.3/data/CMakeLists.txt
--- marble-14.12.3/data/CMakeLists.txt.app_versions	2015-02-23 02:27:55.000000000 -0600
+++ marble-14.12.3/data/CMakeLists.txt	2015-03-11 07:58:05.895148797 -0500
@@ -237,11 +237,11 @@ placemarks/boundaryplacemarks.cache
 placemarks/moonterrain.cache
 DESTINATION ${MARBLE_DATA_INSTALL_PATH}/placemarks)
 
-if(MOBILE)
-    install (FILES placemarks/cityplacemarks_large_population.cache DESTINATION ${MARBLE_DATA_INSTALL_PATH}/placemarks RENAME placemarks/cityplacemarks.cache)
-else(MOBILE)
+#if(MOBILE)
+#    install (FILES placemarks/cityplacemarks_large_population.cache DESTINATION ${MARBLE_DATA_INSTALL_PATH}/placemarks RENAME placemarks/cityplacemarks.cache)
+#else(MOBILE)
     install (FILES placemarks/cityplacemarks.cache DESTINATION ${MARBLE_DATA_INSTALL_PATH}/placemarks)
-endif(MOBILE)
+#endif(MOBILE)
 
 if(NOT APPLE AND NOT WIN32)
   install (FILES icons/hi128-app-marble.png DESTINATION ${ICON_INSTALL_DIR}/hicolor/128x128/apps/ RENAME marble.png)
diff -up marble-14.12.3/src/apps/CMakeLists.txt.app_versions marble-14.12.3/src/apps/CMakeLists.txt
--- marble-14.12.3/src/apps/CMakeLists.txt.app_versions	2015-02-23 02:27:55.000000000 -0600
+++ marble-14.12.3/src/apps/CMakeLists.txt	2015-03-11 07:29:17.851081128 -0500
@@ -1,11 +1,15 @@
 add_subdirectory(marble-ui)
 add_subdirectory(marble-qt)
+if ( MOBILE )
 add_subdirectory(marble-mobile)
+endif ( MOBILE )
 
 if (NOT QTONLY)
   add_subdirectory(marble-kde)
 endif()
 
+if( TOUCH )
 if( QT_QTDECLARATIVE_FOUND OR Qt5Quick_FOUND )
     add_subdirectory(marble-touch)
 endif( QT_QTDECLARATIVE_FOUND OR Qt5Quick_FOUND )
+endif( TOUCH )